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 @@
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 @@