From af5d2e08f665495d839cbb3797806ba29002847d Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Fri, 2 Jun 2023 10:04:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=86=99=E5=85=A5bool=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Instance/Detail/Running/Property/Save.vue | 95 ++++++++++++-------
 src/views/system/Menu/Setting/utils.ts        |  2 +-
 2 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/src/views/device/Instance/Detail/Running/Property/Save.vue b/src/views/device/Instance/Detail/Running/Property/Save.vue
index 8879f7c7..8216ee0d 100644
--- a/src/views/device/Instance/Detail/Running/Property/Save.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Save.vue
@@ -1,5 +1,5 @@
 <template>
-    <j-modal 
+    <j-modal
         :maskClosable="false"
         :visible="true"
         title="编辑"
@@ -7,80 +7,111 @@
         @cancel="handleCancel"
         :confirmLoading="loading"
     >
-        <j-alert message="当数据来源为设备时，填写的值将下发到设备" type="warning" showIcon />
-        <j-form :rules="rules" layout="vertical" ref="formRef" :model="modelRef" style="margin-top: 20px">
-            <j-form-item name="propertyValue" :label="data?.name || '自定义属性'">
+        <j-alert
+            message="当数据来源为设备时，填写的值将下发到设备"
+            type="warning"
+            showIcon
+        />
+        <j-form
+            :rules="rules"
+            layout="vertical"
+            ref="formRef"
+            :model="modelRef"
+            style="margin-top: 20px"
+        >
+            <j-form-item
+                name="propertyValue"
+                :label="data?.name || '自定义属性'"
+            >
                 <ValueItem
                     v-model:modelValue="modelRef.propertyValue"
                     :itemType="data?.valueType?.type || data?.dataType"
-                    :options="
-                        (data?.valueType?.type || data?.dataType) === 'enum'
-                            ? (data?.valueType?.elements || []).map((item) => {
-                                    return {
-                                        label: item?.text,
-                                        value: item?.value
-                                    };
-                                })
-                            : undefined
-                    "
+                    :options="options"
                 />
             </j-form-item>
         </j-form>
-    </j-modal> 
+    </j-modal>
 </template>
 
 <script lang="ts" setup>
-import { setProperty } from '@/api/device/instance'
-import { useInstanceStore } from "@/store/instance"
+import { setProperty } from '@/api/device/instance';
+import { useInstanceStore } from '@/store/instance';
 import { message } from 'jetlinks-ui-components';
 
 const props = defineProps({
     data: {
         type: Object,
-        default: () => {}
-    }
-})
+        default: () => {},
+    },
+});
 
 const emit = defineEmits(['close']);
 
-const loading = ref<boolean>(false)
-const instanceStore = useInstanceStore()
+const loading = ref<boolean>(false);
+const instanceStore = useInstanceStore();
 
 const formRef = ref();
 
 const modelRef = reactive({
-    propertyValue: undefined
+    propertyValue: undefined,
 });
 
 const handleCancel = () => {
-    emit('close')
-}
+    emit('close');
+};
+
+const options = computed(() => {
+    const _type = props.data?.valueType?.type || props.data?.dataType;
+    if (_type === 'enum') {
+        return (props.data?.valueType?.elements || []).map((item: any) => {
+            return {
+                label: item?.text,
+                value: item?.value,
+            };
+        });
+    }
+    if (_type === 'boolean') {
+        return [
+            {
+                label: props.data?.valueType?.falseText,
+                value: props.data?.valueType?.falseValue,
+            },
+            {
+                label: props.data?.valueType?.trueText,
+                value: props.data?.valueType?.trueValue,
+            }
+        ];
+    }
+    return undefined;
+});
 
 const rules = {
     propertyValue: [
         {
             required: true,
             message: '该字段是必填字段',
-        }
+        },
     ],
-}
+};
 
 const handleSave = () => {
     formRef.value
         .validate()
         .then(async () => {
             loading.value = true;
-            const resp = await setProperty(instanceStore.current?.id || '', {[props.data?.id]: toRaw(modelRef)?.propertyValue}).finally(() => {
-                loading.value = false
-            })
+            const resp = await setProperty(instanceStore.current?.id || '', {
+                [props.data?.id]: toRaw(modelRef)?.propertyValue,
+            }).finally(() => {
+                loading.value = false;
+            });
             if (resp.status === 200) {
                 message.success('操作成功！');
-                emit('close')
+                emit('close');
                 formRef.value.resetFields();
             }
         })
         .catch((err: any) => {
             console.log('error', err);
         });
-}
+};
 </script>
\ No newline at end of file
diff --git a/src/views/system/Menu/Setting/utils.ts b/src/views/system/Menu/Setting/utils.ts
index 73457baf..e1be234f 100644
--- a/src/views/system/Menu/Setting/utils.ts
+++ b/src/views/system/Menu/Setting/utils.ts
@@ -40,7 +40,7 @@ export const mergeArr = (oldData: Array<any>, newData: Array<any>) => {
         }
 
         if(oldItem && newItem){
-            oldItem = { ...oldData,...omit(newItem, ['children'])} 
+            oldItem.sortIndex = newItem?.sortIndex
         }
 
         if (!oldItem.children && newItem.children) {