From 83b9cc8dfc80e60cce44ffd09942304d938f6392 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Sat, 1 Apr 2023 14:22:54 +0800
Subject: [PATCH] fix: bug#11218

---
 .../action/Device/actions/FunctionItem.vue     |  4 ++--
 .../action/Device/actions/WriteProperty.vue    | 11 +++++++----
 .../Save/components/DropdownButton/Menus.vue   | 18 +++++++++++++++---
 .../Save/components/ParamsDropdown/index.vue   |  1 +
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
index 86516c7d..cc5fe7d2 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
@@ -65,12 +65,12 @@ const handleOptions = computed(() => {
             {
                 label: _item.trueText || true,
                 value: _item.trueValue || true,
-                id: _item.trueValue || true,
+                id: String(_item.trueValue || true),
             },
             {
                 label: _item.falseText || false,
                 value: _item.falseValue || false,
-                id: _item.falseValue || false,
+                id: String(_item.falseValue || false),
             },
         ];
     }
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
index 66e79d5f..167f84c1 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
@@ -135,13 +135,15 @@ const handleOptions = computed(() => {
         return [
             {
                 label: _item.trueText || true,
+                name: _item.trueText || true,
                 value: _item.trueValue || true,
-                id: _item.trueValue || true,
+                id: String(_item.trueValue || true),
             },
             {
                 label: _item.falseText || false,
+                name: _item.falseText || false,
                 value: _item.falseValue || false,
-                id: _item.falseValue || false,
+                id: String(_item.falseValue || false),
             },
         ];
     }
@@ -149,6 +151,7 @@ const handleOptions = computed(() => {
         return _item?.elements.map((i: any) => {
             return {
                 label: i.text,
+                name: i.text,
                 value: i.value,
                 id: i.value,
             };
@@ -168,7 +171,7 @@ const onChange = () => {
     });
 };
 
-const onValueChange = (val: any) => {
+const onValueChange = (val: any, label: string) => {
     const obj = {
         [`${propertyModelRef.properties}`]: {
             value: propertyModelRef?.propertiesValue,
@@ -176,7 +179,7 @@ const onValueChange = (val: any) => {
         },
     };
     emit('update:value', obj);
-    emit('change', val?.name || val)
+    emit('change', label || val)
 };
 
 watch(
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue b/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
index caf8b729..a4e76bda 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script lang='ts' setup name='DropdownMenus'>
-import { isBoolean, isUndefined } from 'lodash-es'
+import { isArray, isBoolean, isString, isUndefined } from 'lodash-es'
 import { getOption } from '../DropdownButton/util'
 
 type ValueType = string| number | boolean
@@ -45,6 +45,9 @@ const myOptions = computed(() => {
       _label = _value === true ? '是' : '否'
       _value = String(_value)
     }
+    if (isArray(_value)) {
+      _value = JSON.stringify(_value)
+    }
     return {
       ...item,
       label: _label,
@@ -60,7 +63,10 @@ const handleBoolean = (key: string) => {
 }
 
 const click = (e: any) => {
-  const _key = ['true', 'false'].includes(e.key) ? handleBoolean(e.key) : e.key
+  let _key = ['true', 'false'].includes(e.key) ? handleBoolean(e.key) : e.key
+  if (isString(_key) && _key.startsWith('[') && _key.endsWith(']')) {
+    _key = JSON.parse(_key)
+  }
   const option = getOption(myOptions.value, _key, props.valueName)
   myValue.value = e.key
   emit('update:value', _key)
@@ -71,7 +77,13 @@ const click = (e: any) => {
 }
 
 watch(() => props.value, () => {
-  myValue.value = isBoolean(props.value) ? String(props.value) : props.value
+  if (isBoolean(props.value)) {
+    myValue.value = isBoolean(props.value)
+  } else if (isArray(props.value)) {
+    myValue.value = JSON.stringify(props.value)
+  } else {
+    myValue.value = props.value
+  }
 }, { immediate: true})
 </script>
 
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
index 8cc74c31..954a3db3 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
@@ -38,6 +38,7 @@
                 <DropdownMenus
                   v-if='(["metric", "upper"].includes(item.key) ?  metricOptions : options).length'
                   :options='["metric", "upper"].includes(item.key) ?  metricOptions : options'
+                  :value='myValue'
                   :valueName='valueName'
                   @click='onSelect'
                 />