Merge branch 'ft-dev' into 'main'

fix:修复场景联动，编辑，然后设备回显问题

See merge request huang/yun-teng-iot-front!151

@@ -11,7 +11,7 @@
     >
       <div class="step-form-form">
         <a-steps :current="current">
-          <a-step title="选择转换方式" />
+          <a-step title="选择流转方式" />
           <a-step title="完善配置参数" />
         </a-steps>
       </div>
@@ -70,7 +70,7 @@
       const refTransferConfigMode = ref(null);
       const getModeSelectVal = ref({});
       const isUpdate = ref(true);
-      const getTitle = computed(() => (!unref(isUpdate) ? '新增转换配置' : '编辑数据转换'));
+      const getTitle = computed(() => (!unref(isUpdate) ? '新增流转配置' : '编辑数据流转'));
       const current = ref(0);
       const editPostId = ref('');
       const editType = reactive({
@@ -200,14 +200,14 @@
         if (!unref(isUpdate)) {
           await addOrEditFunc();
           await postAddConvertApi(allPostForm);
-          createMessage.success('数据转换新增成功');
+          createMessage.success('数据流转新增成功');
           emit('success');
           defineClearFunc();
           closeModal();
         } else {
           await addOrEditFunc();
           await postAddConvertApi(allPostForm);
-          createMessage.success('数据转换编辑成功');
+          createMessage.success('数据流转编辑成功');
           emit('success');
           defineClearFunc();
           closeModal();

@@ -4,7 +4,7 @@ import { Tag } from 'ant-design-vue';
 
 export const columns: BasicColumn[] = [
   {
-    title: '数据转换名称',
+    title: '数据流转名称',
     dataIndex: 'name',
     width: 200,
   },

@@ -127,6 +127,7 @@ export const modeKafkaForm: FormSchema[] = [
               } else {
                 if (values.name != undefined) {
                   isExistDataManagerNameApi({
+                    id: '',
                     name: value,
                     type:
                       typeValue.value == ''
@@ -152,7 +153,7 @@ export const modeKafkaForm: FormSchema[] = [
   },
   {
     field: 'topicPattern',
-    label: 'Topic',
+    label: '消息次数',
     colProps: { span: 12 },
     required: true,
     component: 'Input',
@@ -164,7 +165,7 @@ export const modeKafkaForm: FormSchema[] = [
   },
   {
     field: 'bootstrapServers',
-    label: 'Bootstrap',
+    label: '服务器',
     colProps: { span: 12 },
     component: 'Input',
     defaultValue: 'localhost:9092',
@@ -176,7 +177,7 @@ export const modeKafkaForm: FormSchema[] = [
   },
   {
     field: 'retries',
-    label: 'Retries',
+    label: '重连次数',
     colProps: { span: 12 },
     component: 'InputNumber',
     defaultValue: 0,
@@ -187,7 +188,7 @@ export const modeKafkaForm: FormSchema[] = [
   },
   {
     field: 'batchSize',
-    label: 'BatchSize',
+    label: '生产者并发',
     colProps: { span: 12 },
     component: 'InputNumber',
     defaultValue: 16384,
@@ -198,7 +199,7 @@ export const modeKafkaForm: FormSchema[] = [
   },
   {
     field: 'linger',
-    label: 'Linger',
+    label: '缓存时间',
     colProps: { span: 12 },
     component: 'InputNumber',
     defaultValue: 0,
@@ -209,7 +210,7 @@ export const modeKafkaForm: FormSchema[] = [
   },
   {
     field: 'bufferMemory',
-    label: 'BufferMemory',
+    label: '最大缓存',
     colProps: { span: 12 },
     component: 'InputNumber',
     defaultValue: 33554432,
@@ -221,7 +222,7 @@ export const modeKafkaForm: FormSchema[] = [
   {
     field: 'acks',
     component: 'Select',
-    label: 'Acks',
+    label: '响应码',
     colProps: { span: 12 },
     defaultValue: '-1',
     componentProps: {
@@ -236,7 +237,7 @@ export const modeKafkaForm: FormSchema[] = [
   },
   {
     field: 'keySerializer',
-    label: 'Key',
+    label: '键序列化',
     colProps: { span: 12 },
     required: true,
     component: 'Input',
@@ -248,7 +249,7 @@ export const modeKafkaForm: FormSchema[] = [
   },
   {
     field: 'valueSerializer',
-    label: 'Value',
+    label: '值序列化',
     colProps: { span: 12 },
     required: true,
     component: 'Input',
@@ -270,7 +271,7 @@ export const modeKafkaForm: FormSchema[] = [
     label: '选择',
     colProps: { span: 12 },
     component: 'Checkbox',
-    renderComponentContent: 'Add Message metadata key-value pairs to Kafka record headers',
+    renderComponentContent: '将消息的元数据以键值对的方式添加到Kafka消息头中',
   },
   {
     field: 'kafkaHeadersCharset',

@@ -114,6 +114,7 @@
       const otherPropertiesValues = reactive({
         otherProperties: {},
       });
+      const clearName = ref('');
 
       const [register, { validate, setFieldsValue, resetFields: defineClearFunc, clearValidate }] =
         useForm({
@@ -144,6 +145,7 @@
       };
 
       const setStepTwoFieldsValueFunc = async (v, v1) => {
+        clearName.value = v1;
         setFieldsValue(v);
         vType.value = v1;
         setFieldsValue({
@@ -222,7 +224,7 @@
   .root {
     width: 47.55vw;
     border: 1px solid #d9d9d9;
-    display: flex;
+    // display: flex;
     margin-top: 1vh;
     margin-left: 1.5vw;
     border-radius: 8px;

@@ -7,7 +7,7 @@
       :rowSelection="{ type: 'checkbox' }"
     >
       <template #toolbar>
-        <a-button type="primary" @click="handleAdd"> 添加转换 </a-button>
+        <a-button type="primary" @click="handleAdd"> 添加流转 </a-button>
         <a-button
           :disabled="disabledStatus1"
           @click="handleDelete"
@@ -174,11 +174,11 @@
           }
           const res = await isEnableOrDisableApi(enableObj as never);
           if (res !== '') {
-            createMessage.success('转换配置启用成功');
+            createMessage.success('流转配置启用成功');
             setLoading(false);
             reload();
           } else {
-            createMessage.error('转换配置启用失败');
+            createMessage.error('流转配置启用失败');
           }
         } catch (e) {
           return e;
@@ -197,11 +197,11 @@
           }
           const res = await isEnableOrDisableApi(enableObj as never);
           if (res !== '') {
-            createMessage.success('转换配置禁用成功');
+            createMessage.success('流转配置禁用成功');
             setLoading(false);
             reload();
           } else {
-            createMessage.error('转换配置禁用失败');
+            createMessage.error('流转配置禁用失败');
           }
         } catch (e) {
         } finally {
@@ -282,11 +282,11 @@
           });
           const res = await isEnableOrDisableApi(enableObj as never);
           if (res !== '') {
-            createMessage.success('转换配置多项禁用成功');
+            createMessage.success('流转配置多项禁用成功');
             setLoading(false);
             reload();
           } else {
-            createMessage.error('转换配置多项禁用失败');
+            createMessage.error('流转配置多项禁用失败');
           }
         } catch (e) {
           return e;
@@ -309,11 +309,11 @@
           });
           const res = await isEnableOrDisableApi(enableObj as never);
           if (res !== '') {
-            createMessage.success('转换配置多项启用成功');
+            createMessage.success('流转配置多项启用成功');
             setLoading(false);
             reload();
           } else {
-            createMessage.error('转换配置多项启用失败');
+            createMessage.error('流转配置多项启用失败');
           }
         } catch (e) {
           return e;

@@ -25,6 +25,7 @@
 
     setup(props) {
       const fieldValue: any = ref({});
+      const option = ref<[]>([]);
       const [registerCondition, { setFieldsValue, getFieldsValue, updateSchema, resetFields }] =
         useForm({
           labelWidth: 100,
@@ -39,19 +40,40 @@
         resetFields();
       };
       const updateFieldDeviceId = (v) => {
-        const option = v;
-        setTimeout(() => {
+        if (v.length == 0 || v.length > 0) {
+          option.value = v;
           updateSchema({
             field: 'entityId',
             componentProps: {
-              options: option,
+              options: option.value,
               onChange(e) {
-                updateFieldType2Func(e);
+                if (e) {
+                  setTimeout(() => {
+                    updateFieldType2Func(e);
+                  }, 10);
+                }
               },
             },
           });
-        }, 10);
+        } else if (v.length == undefined) {
+          setTimeout(() => {
+            updateSchema({
+              field: 'entityId',
+              componentProps: {
+                options: v.item,
+                onChange(e) {
+                  if (e) {
+                    setTimeout(() => {
+                      updateFieldType2Func(e);
+                    }, 10);
+                  }
+                },
+              },
+            });
+          }, 10);
+        }
       };
+
       const updateFieldType2Func = async (e) => {
         const data1 = await screenLinkPageByDeviceIdGetAttribut('DEVICE', e);
         const data = data1.map((m) => {

@@ -24,6 +24,7 @@
 
     setup(props) {
       const fieldValue: any = ref({});
+      const option = ref<[]>([]);
       const [registerAction, { setFieldsValue, getFieldsValue, resetFields, updateSchema }] =
         useForm({
           labelWidth: 100,
@@ -38,14 +39,24 @@
         resetFields();
       };
       const updateFieldDeviceId = (v) => {
-        setTimeout(() => {
+        if (v.length == 0 || v.length > 0) {
+          option.value = v;
           updateSchema({
             field: 'deviceId',
             componentProps: {
-              options: v,
+              options: option.value,
             },
           });
-        }, 10);
+        } else if (v.length == undefined) {
+          setTimeout(() => {
+            updateSchema({
+              field: 'deviceId',
+              componentProps: {
+                options: v.item,
+              },
+            });
+          }, 10);
+        }
       };
 
       //回显数据

@@ -26,6 +26,8 @@
     props: ['deviceInfo', 'editTriggerFather', 'newFilterMapFather'],
     setup(props) {
       const fieldValue: any = ref({});
+      const option = ref<[]>([]);
+      const data = ref<[]>([]);
       const [registerTrigger, { resetFields, setFieldsValue, getFieldsValue, updateSchema }] =
         useForm({
           labelWidth: 100,
@@ -37,67 +39,81 @@
         return fieldValue.value;
       };
       const updateFieldDeviceId = (v) => {
-        const option = v;
-        console.log(option);
-        setTimeout(() => {
+        if (v.length == 0 || v.length > 0) {
+          option.value = v;
           updateSchema({
             field: 'entityId',
-            componentProps() {
-              return {
-                options: option,
-                onChange(e) {
-                  updateFieldType2Func(e);
-                },
-              };
+            componentProps: {
+              options: option.value,
+              onChange(e) {
+                if (e) {
+                  setTimeout(() => {
+                    updateFieldType2Func(e);
+                  }, 10);
+                }
+              },
             },
           });
-        }, 10);
+        } else if (v.length == undefined) {
+          setTimeout(() => {
+            updateSchema({
+              field: 'entityId',
+              componentProps: {
+                options: v.item,
+                onChange(e) {
+                  if (e) {
+                    setTimeout(() => {
+                      updateFieldType2Func(e);
+                    }, 10);
+                  }
+                },
+              },
+            });
+          }, 10);
+        }
       };
 
       const updateFieldType2Func = async (e) => {
         const data1 = await screenLinkPageByDeviceIdGetAttribut('DEVICE', e);
-        const data = data1.map((m) => {
+        data.value = data1.map((m) => {
           return {
             label: m,
             value: m,
           };
         });
-        setTimeout(() => {
-          updateSchema({
-            field: 'type2',
-            componentProps() {
-              return {
-                placeholder: '请选择属性',
-                options: data,
-                onChange(e) {
-                  if (e) {
-                    updateSchema([
-                      {
-                        field: 'operation',
-                        ifShow: true,
-                      },
-                      {
-                        field: 'value',
-                        ifShow: true,
-                      },
-                    ]);
-                  } else {
-                    updateSchema([
-                      {
-                        field: 'operation',
-                        ifShow: false,
-                      },
-                      {
-                        field: 'value',
-                        ifShow: false,
-                      },
-                    ]);
-                  }
-                },
-              };
+
+        updateSchema({
+          field: 'type2',
+          componentProps: {
+            placeholder: '请选择属性',
+            options: data.value,
+            onChange(e) {
+              if (e) {
+                updateSchema([
+                  {
+                    field: 'operation',
+                    ifShow: true,
+                  },
+                  {
+                    field: 'value',
+                    ifShow: true,
+                  },
+                ]);
+              } else {
+                updateSchema([
+                  {
+                    field: 'operation',
+                    ifShow: false,
+                  },
+                  {
+                    field: 'value',
+                    ifShow: false,
+                  },
+                ]);
+              }
             },
-          });
-        }, 10);
+          },
+        });
       };
       const updateOperatorAndValue = () => {
         updateSchema([

@@ -267,10 +267,8 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     field: 'entityId',
     label: '',
     component: 'Select',
-    componentProps() {
-      return {
-        placeholder: '请选择设备',
-      };
+    componentProps: {
+      placeholder: '请选择设备',
     },
     ifShow: ({ values }) =>
       !isTime(Reflect.get(values, 'triggerType')) &&
@@ -311,13 +309,11 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     field: 'type2',
     label: '',
     component: 'Select',
-    componentProps() {
-      return {
-        placeholder: '请选择属性',
-        onChange(v) {
-          console.log(v);
-        },
-      };
+    componentProps: {
+      placeholder: '请选择属性',
+      onChange(v) {
+        console.log(v);
+      },
     },
     ifShow: ({ values }) =>
       !isTime(Reflect.get(values, 'triggerType')) &&
@@ -341,6 +337,10 @@ export const useTriggerDrawerSchema: FormSchema[] = [
       ],
     },
     ifShow: ({ values }) => isType2(Reflect.get(values, 'type2')),
+    show: ({ values }) =>
+      !isTime(Reflect.get(values, 'triggerType')) &&
+      !isScene(Reflect.get(values, 'triggerType')) &&
+      !isHand(Reflect.get(values, 'triggerType')),
     colProps: { span: 12 },
   },
   {
@@ -353,26 +353,30 @@ export const useTriggerDrawerSchema: FormSchema[] = [
       placeholder: '请输入比较值',
     },
     ifShow: ({ values }) => isType2(Reflect.get(values, 'type2')),
+    show: ({ values }) =>
+      !isTime(Reflect.get(values, 'triggerType')) &&
+      !isScene(Reflect.get(values, 'triggerType')) &&
+      !isHand(Reflect.get(values, 'triggerType')),
     colProps: {
       span: 12,
     },
   },
-  {
-    field: 'sceneLinkageId',
-    label: '',
-    component: 'Select',
-    colProps: {
-      span: 12,
-    },
-    componentProps: {
-      placeholder: '请选择场景',
-      options: [
-        { label: '场景触发器1', value: '' },
-        { label: '场景触发器2', value: '' },
-      ],
-    },
-    ifShow: ({ values }) => isScene(Reflect.get(values, 'triggerType')),
-  },
+  // {
+  //   field: 'sceneLinkageId',
+  //   label: '',
+  //   component: 'Select',
+  //   colProps: {
+  //     span: 12,
+  //   },
+  //   componentProps: {
+  //     placeholder: '请选择场景',
+  //     options: [
+  //       { label: '场景触发器1', value: '' },
+  //       { label: '场景触发器2', value: '' },
+  //     ],
+  //   },
+  //   ifShow: ({ values }) => isScene(Reflect.get(values, 'triggerType')),
+  // },
 ];
 
 export const useConditionDrawerSchema: FormSchema[] = [
@@ -509,8 +513,23 @@ export const useActionDrawerSchema: FormSchema[] = [
     label: '',
     componentProps: {
       maxLength: 255,
-      placeholder:
-        '请输入下发指定(JSON格式：{"method": "setDOValue","params": {"devID": "492S211218028819","data": {"DO1": 1}})',
+      placeholder: '请输入下发指定',
+    },
+    ifShow: ({ values }) =>
+      !isScene(Reflect.get(values, 'outTarget')) && !isMsg(Reflect.get(values, 'outTarget')),
+    colProps: {
+      span: 12,
+    },
+  },
+  {
+    field: 'no',
+    component: 'InputTextArea',
+    label: '',
+    defaultValue:
+      '(可复制)下发指定格式(JSON格式：{"method": "setDOValue","params": {"devID": "492S211218028819","data": {"DO1": 1}})',
+    componentProps: {
+      maxLength: 255,
+      disabled: true,
     },
     ifShow: ({ values }) =>
       !isScene(Reflect.get(values, 'outTarget')) && !isMsg(Reflect.get(values, 'outTarget')),

@@ -252,6 +252,8 @@
       let kongTriggerObj = {};
       let kongConditionObj = {};
       let kongActionObj = {};
+      let optionsEditArray = ref<[]>([]);
+      const oldOrigzaition = ref('');
 
       const [registerForm, { resetFields, setFieldsValue, validateFields }] = useForm({
         labelWidth: 120,
@@ -290,27 +292,27 @@
             addActionPushData.value.length = 0;
             handleClose();
             optionsItemArray.value.length = 0;
+            optionsItemArray.value = [];
+            optionsEditArray.value = [];
+            optionsEditArray.value.length = 0;
             try {
-              setTimeout(() => {
-                proxy.$refs.refTriggerChild?.resetFieldsValueFunc();
-                proxy.$refs.refTriggerChild?.clearSelectDevice();
-                proxy.$refs.refTriggerChild?.clearSelectAttribute();
-                proxy.$refs.refConditionChild?.resetFieldsValueFunc();
-                proxy.$refs.refConditionChild?.clearSelectDevice();
-                proxy.$refs.refActionChild?.resetFieldsValueFunc();
-                proxy.$refs.refActionChild?.clearSelectDevice();
-                clearActionsAllDevice();
-                resetActionsAllArrayFunc();
-              }, 10);
-            } catch (e) {
-              return e;
-            }
+              proxy.$refs.refTriggerChild?.resetFieldsValueFunc();
+              proxy.$refs.refTriggerChild?.clearSelectDevice();
+              proxy.$refs.refTriggerChild?.clearSelectAttribute();
+              proxy.$refs.refConditionChild?.resetFieldsValueFunc();
+              proxy.$refs.refConditionChild?.clearSelectDevice();
+              proxy.$refs.refActionChild?.resetFieldsValueFunc();
+              proxy.$refs.refActionChild?.clearSelectDevice();
+              clearActionsAllDevice();
+              resetActionsAllArrayFunc();
+            } catch {}
           } catch (e) {
             return e;
           }
         } else {
           try {
-            emit('success');
+            optionsEditArray.value = [];
+            optionsEditArray.value.length = 0;
             kongTriggerObj = {};
             kongConditionObj = {};
             kongActionObj = {};
@@ -373,16 +375,18 @@
                 }
               });
             });
-
-            optionsItemArray.value = options.items.map((v) => {
+            optionsEditArray.value = options.items.map((v) => {
               return {
                 value: v.tbDeviceId,
                 label: v.name,
               };
             });
-            proxy.$refs.refTriggerChild?.updateFieldDeviceId(optionsItemArray.value);
-            proxy.$refs.refConditionChild?.updateFieldDeviceId(optionsItemArray.value);
-            proxy.$refs.refActionChild?.updateFieldDeviceId(optionsItemArray.value);
+            setTimeout(() => {
+              proxy.$refs.refTriggerChild?.updateFieldDeviceId(optionsEditArray.value);
+              proxy.$refs.refConditionChild?.updateFieldDeviceId(optionsEditArray.value);
+              proxy.$refs.refActionChild?.updateFieldDeviceId(optionsEditArray.value);
+            }, 20);
+            emit('success');
           } catch (e) {
             return e;
           }
@@ -434,7 +438,9 @@
           return e;
         }
       };
+
       watch(getData, async (newV: string) => {
+        oldOrigzaition.value = newV;
         const options = await screenLinkPageByDeptIdGetDevice({ organizationId: newV });
         optionsItemArray.value = options.items.map((v) => {
           return {
@@ -442,23 +448,13 @@
             label: v.name,
           };
         });
-        // optionsItemArray.value = options.items;
-        updateDeviceIdFunc(optionsItemArray.value);
-        proxy.$refs.refActionChild?.updateFieldDeviceId(optionsItemArray.value);
-        proxy.$refs.refConditionChild?.updateFieldDeviceId(optionsItemArray.value);
-        proxy.$refs.refTriggerChild?.updateFieldDeviceId(optionsItemArray.value);
+        setTimeout(() => {
+          proxy.$refs.refTriggerChild?.updateFieldDeviceId(optionsItemArray.value);
+          proxy.$refs.refConditionChild?.updateFieldDeviceId(optionsItemArray.value);
+          proxy.$refs.refActionChild?.updateFieldDeviceId(optionsItemArray.value);
+        }, 10);
       });
 
-      const updateDeviceIdFunc = (v) => {
-        try {
-          proxy.$refs.refTriggerChild?.updateFieldDeviceId(v);
-          proxy.$refs.refConditionChild?.updateFieldDeviceId(v);
-          proxy.$refs.refActionChild?.updateFieldDeviceId(v);
-        } catch (e) {
-          return e;
-        }
-      };
-
       //获取触发器方法
       const refTriggerChildDataFunc = () => {
         try {
@@ -503,11 +499,8 @@
                       key: m.type2 == null ? 'CO2' : m.type2,
                       type: m.type1 == null ? 'TIME_SERIES' : m.type1,
                     },
-                    // valueType: m.type2 == null ? 'NUMERIC' : m.type2,
                     valueType: 'NUMERIC',
-                    // value: {},
                     predicate: {
-                      // type: m.type2 == null ? 'NUMERIC' : m.type2,
                       type: 'NUMERIC',
                       value: {
                         defaultValue: Number(m.value),
@@ -642,44 +635,9 @@
         if (!unref(isUpdate)) {
           refTriggerChildDataFunc();
           unref(addTriggerPushData).push(refTriggerChildData as never);
-          (addTriggerPushData.value as any) = addTriggerPushData.value.map((m: any) => {
-            return {
-              triggerType: m?.triggerType,
-              entityId: m?.entityId || m?.entityId1,
-              sceneLinkageId: m?.sceneLinkageId,
-              triggerCondition: {
-                condition: [
-                  {
-                    key: {
-                      key: m.type2 == null ? 'CO2' : m.type2,
-                      type: m.type1 == null ? 'TIME_SERIES' : m.type1,
-                    },
-                    // valueType: m.type2 == null ? 'NUMERIC' : m.type2,
-                    valueType: 'NUMERIC',
-                    // value: {},
-                    predicate: {
-                      // type: m.type2 == null ? 'NUMERIC' : m.type2,
-                      type: 'NUMERIC',
-                      value: {
-                        defaultValue: Number(m.value),
-                      },
-                      operation: m.operation == null ? 'EQUAL' : m.operation,
-                    },
-                  },
-                ],
-                spec: {
-                  type: 'SIMPLE',
-                },
-              },
-            };
-          });
-          try {
-            setTimeout(() => {
-              proxy.$refs.refTriggerChild?.updateFieldDeviceId(optionsItemArray.value);
-            }, 10);
-          } catch (e) {
-            return e;
-          }
+          setTimeout(() => {
+            proxy.$refs.refTriggerChild?.updateFieldDeviceId(optionsItemArray.value);
+          }, 20);
         } else {
           isNoChange.value = false;
           unref(editTriggerPushData).push(refTriggerChildData as never);
@@ -693,15 +651,14 @@
                 condition: [
                   {
                     key: {
-                      key: m.key1 == null ? 'CO2' : m.key1,
+                      key: m.type2 == null ? 'CO2' : m.type2,
                       type: m.type1 == null ? 'TIME_SERIES' : m.type1,
                     },
-                    valueType: m.type2 == null ? 'NUMERIC' : m.type2,
-                    value: {},
+                    valueType: 'NUMERIC',
                     predicate: {
-                      type: m.type2 == null ? 'NUMERIC' : m.type2,
+                      type: 'NUMERIC',
                       value: {
-                        defaultValue: Number(m.value) == null ? 0 : Number(m.value),
+                        defaultValue: Number(m.value),
                       },
                       operation: m.operation == null ? 'EQUAL' : m.operation,
                     },
@@ -715,8 +672,11 @@
           });
           try {
             setTimeout(() => {
-              proxy.$refs.refTriggerChild.updateFieldDeviceId(optionsItemArray.value);
-            }, 50);
+              proxy.$refs.refTriggerChild?.updateFieldDeviceId({
+                status: 'edit',
+                item: optionsEditArray.value,
+              });
+            }, 20);
           } catch (e) {
             return e;
           }
@@ -744,38 +704,10 @@
         if (!unref(isUpdate)) {
           refConditionChildDataFunc();
           unref(addConditionPushData).push(refConditionChildData as never);
-          (addConditionPushData.value as any) = addConditionPushData.value.map((m: any) => {
-            return {
-              triggerType: m?.triggerType,
-              entityId: m?.entityId,
-              triggerCondition: {
-                condition: [
-                  {
-                    key: {
-                      key: m.type == null ? 'CO2' : m.type,
-                      type: 'TIME_SERIES',
-                    },
-                    valueType: 'NUMERIC',
-                    // value: {},
-                    predicate: {
-                      type: 'NUMERIC',
-                      value: {
-                        defaultValue: Number(m.value) == null ? 0 : Number(m.value),
-                      },
-                      operation: m.operation,
-                    },
-                  },
-                ],
-                spec: {
-                  type: 'SIMPLE',
-                },
-              },
-            };
-          });
           try {
             setTimeout(() => {
-              proxy.$refs.refConditionChild.updateFieldDeviceId(optionsItemArray.value);
-            }, 50);
+              proxy.$refs.refConditionChild?.updateFieldDeviceId(optionsItemArray.value);
+            }, 20);
           } catch (e) {
             return e;
           }
@@ -792,32 +724,17 @@
                 condition: [
                   {
                     key: {
+                      key: m.type == null ? 'CO2' : m.type,
                       type: 'TIME_SERIES',
-                      key: 'CO2',
                     },
-                    valueType:
-                      m.type == 'NUMERIC1'
-                        ? 'NUMERIC'
-                        : m.type == 'NUMERIC2'
-                        ? 'NUMERIC'
-                        : 'NUMERIC',
-                    value: {},
+                    valueType: 'NUMERIC',
+                    // value: {},
                     predicate: {
-                      type:
-                        m.type == 'NUMERIC1'
-                          ? 'NUMERIC'
-                          : m.type == 'NUMERIC2'
-                          ? 'NUMERIC'
-                          : 'NUMERIC',
+                      type: 'NUMERIC',
                       value: {
-                        defaultValue:
-                          Number(m.value1) == null
-                            ? 0
-                            : Number(m.value1) || Number(m.value2) == null
-                            ? 0
-                            : Number(m.value2),
+                        defaultValue: Number(m.value) == null ? 0 : Number(m.value),
                       },
-                      operation: m.operation1 || m.operatio2,
+                      operation: m.operation,
                     },
                   },
                 ],
@@ -829,8 +746,11 @@
           });
           try {
             setTimeout(() => {
-              proxy.$refs.refConditionChild.updateFieldDeviceId(optionsItemArray.value);
-            }, 50);
+              proxy.$refs.refConditionChild?.updateFieldDeviceId({
+                status: 'edit',
+                item: optionsEditArray.value,
+              });
+            }, 20);
           } catch (e) {
             return e;
           }
@@ -867,7 +787,7 @@
           try {
             setTimeout(() => {
               proxy.$refs.refActionChild.updateFieldDeviceId(optionsItemArray.value);
-            }, 50);
+            }, 20);
           } catch (e) {
             return e;
           }
@@ -878,8 +798,11 @@
           pushEditActionArray.value.push(refActionChildData);
           try {
             setTimeout(() => {
-              proxy.$refs.refActionChild.updateFieldDeviceId(optionsItemArray.value);
-            }, 50);
+              proxy.$refs.refActionChild.updateFieldDeviceId({
+                status: 'edit',
+                item: optionsEditArray.value,
+              });
+            }, 20);
           } catch (e) {
             return e;
           }
@@ -903,7 +826,6 @@
       };
 
       return {
-        updateDeviceIdFunc,
         handleClose,
         newFilterMap,
         newConditionFilterMap,