Merge branch 'main' into sqy_dev

@@ -151,7 +151,7 @@ export const columns: BasicColumn[] = [
   },
   },
 ];
 ];
 
 
-export const getData = ref(null);
+export const changeOriginId = ref(null);
 
 
 export const formSchema: FormSchema[] = [
 export const formSchema: FormSchema[] = [
   {
   {
@@ -189,7 +189,7 @@ export const formSchema: FormSchema[] = [
               },
               },
             });
             });
           } else {
           } else {
-            getData.value = v;
+            changeOriginId.value = v;
           }
           }
         },
         },
       };
       };
@@ -511,6 +511,8 @@ export const useActionDrawerSchema: FormSchema[] = [
     field: 'doContext',
     field: 'doContext',
     component: 'InputTextArea',
     component: 'InputTextArea',
     label: '',
     label: '',
+    // defaultValue:
+    //   '{"method": "setDOValue","params": {"devID": "492S211218028819","data": {"DO1": 1}}}',
     componentProps: {
     componentProps: {
       maxLength: 255,
       maxLength: 255,
       placeholder: '请输入下发指定',
       placeholder: '请输入下发指定',
@@ -521,22 +523,22 @@ export const useActionDrawerSchema: FormSchema[] = [
       span: 12,
       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')),
-    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')),
+  //   colProps: {
+  //     span: 12,
+  //   },
+  // },
   {
   {
     field: 'wu2',
     field: 'wu2',
     component: 'Input',
     component: 'Input',

@@ -12,7 +12,7 @@
   </CollapseContainer>
   </CollapseContainer>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref } from 'vue';
+  import { defineComponent, reactive, ref } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Input } from 'ant-design-vue';
   import { Input } from 'ant-design-vue';
@@ -20,10 +20,9 @@
 
 
   export default defineComponent({
   export default defineComponent({
     components: { CollapseContainer, BasicForm, [Input.name]: Input },
     components: { CollapseContainer, BasicForm, [Input.name]: Input },
-    props: ['deviceInfo2', 'editActionFather', 'newActionMapFather'],
-
+    props: ['bindActionFather', 'bindActionEntryIdFather'],
     setup(props) {
     setup(props) {
-      const fieldValue: any = ref({});
+      let fieldValue = reactive({});
       const option = ref<[]>([]);
       const option = ref<[]>([]);
       const [registerAction, { setFieldsValue, getFieldsValue, resetFields, updateSchema }] =
       const [registerAction, { setFieldsValue, getFieldsValue, resetFields, updateSchema }] =
         useForm({
         useForm({
@@ -32,8 +31,8 @@
           actionColOptions: { span: 24 },
           actionColOptions: { span: 24 },
         });
         });
       const getFieldsValueFunc = () => {
       const getFieldsValueFunc = () => {
-        fieldValue.value = getFieldsValue();
-        return fieldValue.value;
+        fieldValue = getFieldsValue();
+        return fieldValue;
       };
       };
       const resetFieldsValueFunc = () => {
       const resetFieldsValueFunc = () => {
         resetFields();
         resetFields();
@@ -61,20 +60,20 @@
 
 
       //回显数据
       //回显数据
       const setFieldsFormValueFun = () => {
       const setFieldsFormValueFun = () => {
-        if (props.editActionFather !== 1) {
+        if (props.bindActionFather !== 1) {
           setTimeout(() => {
           setTimeout(() => {
-            setFieldsValue(props.editActionFather);
+            setFieldsValue(props.bindActionFather);
           }, 10);
           }, 10);
         }
         }
       };
       };
       setFieldsFormValueFun();
       setFieldsFormValueFun();
       const editSelectDevice = () => {
       const editSelectDevice = () => {
-        if (props.newActionMapFather !== 1) {
+        if (props.bindActionEntryIdFather !== 1) {
           setTimeout(() => {
           setTimeout(() => {
             updateSchema({
             updateSchema({
               field: 'deviceId',
               field: 'deviceId',
               componentProps: {
               componentProps: {
-                options: props.newActionMapFather,
+                options: props.bindActionEntryIdFather,
               },
               },
             });
             });
           }, 10);
           }, 10);
@@ -109,7 +108,7 @@
     vertical-align: middle;
     vertical-align: middle;
     display: inline-block;
     display: inline-block;
     position: relative;
     position: relative;
-    top: 20px;
+    top: 1vh;
     left: 5px;
     left: 5px;
   }
   }
 </style>
 </style>

@@ -12,7 +12,7 @@
   </CollapseContainer>
   </CollapseContainer>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref } from 'vue';
+  import { defineComponent, reactive, ref } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Input } from 'ant-design-vue';
   import { Input } from 'ant-design-vue';
@@ -21,10 +21,9 @@
 
 
   export default defineComponent({
   export default defineComponent({
     components: { CollapseContainer, BasicForm, [Input.name]: Input },
     components: { CollapseContainer, BasicForm, [Input.name]: Input },
-    props: ['deviceInfo1', 'editConditionFather', 'newConditionMapFather'],
-
+    props: ['bindConditionFather', 'bindConditionEntryIdFather'],
     setup(props) {
     setup(props) {
-      const fieldValue: any = ref({});
+      let fieldValue = reactive({});
       const option = ref<[]>([]);
       const option = ref<[]>([]);
       const [registerCondition, { setFieldsValue, getFieldsValue, updateSchema, resetFields }] =
       const [registerCondition, { setFieldsValue, getFieldsValue, updateSchema, resetFields }] =
         useForm({
         useForm({
@@ -33,8 +32,8 @@
           actionColOptions: { span: 24 },
           actionColOptions: { span: 24 },
         });
         });
       const getFieldsValueFunc = () => {
       const getFieldsValueFunc = () => {
-        fieldValue.value = getFieldsValue();
-        return fieldValue.value;
+        fieldValue = getFieldsValue();
+        return fieldValue;
       };
       };
       const resetFieldsValueFunc = () => {
       const resetFieldsValueFunc = () => {
         resetFields();
         resetFields();
@@ -49,7 +48,7 @@
               onChange(e) {
               onChange(e) {
                 if (e) {
                 if (e) {
                   setTimeout(() => {
                   setTimeout(() => {
-                    updateFieldType2Func(e);
+                    updateFieldAttributeFunc(e);
                   }, 10);
                   }, 10);
                 }
                 }
               },
               },
@@ -64,7 +63,7 @@
                 onChange(e) {
                 onChange(e) {
                   if (e) {
                   if (e) {
                     setTimeout(() => {
                     setTimeout(() => {
-                      updateFieldType2Func(e);
+                      updateFieldAttributeFunc(e);
                     }, 10);
                     }, 10);
                   }
                   }
                 },
                 },
@@ -73,8 +72,7 @@
           }, 10);
           }, 10);
         }
         }
       };
       };
-
-      const updateFieldType2Func = async (e) => {
+      const updateFieldAttributeFunc = async (e) => {
         const data1 = await screenLinkPageByDeviceIdGetAttribut('DEVICE', e);
         const data1 = await screenLinkPageByDeviceIdGetAttribut('DEVICE', e);
         const data = data1.map((m) => {
         const data = data1.map((m) => {
           return {
           return {
@@ -119,26 +117,33 @@
           });
           });
         }, 10);
         }, 10);
       };
       };
-
+      const clearSelectAttribute = () => {
+        updateSchema({
+          field: 'type',
+          componentProps: {
+            options: [],
+          },
+        });
+      };
       //回显数据
       //回显数据
       const setFieldsFormValueFun = () => {
       const setFieldsFormValueFun = () => {
-        if (props.editConditionFather !== 1) {
+        if (props.bindConditionFather !== 1) {
           setTimeout(() => {
           setTimeout(() => {
-            setFieldsValue(props.editConditionFather);
+            setFieldsValue(props.bindConditionFather);
             setFieldsValue({
             setFieldsValue({
               type:
               type:
-                props.editConditionFather?.triggerCondition?.condition[0]?.valueType == 'NUMERIC'
+                props.bindConditionFather?.triggerCondition?.condition[0]?.valueType == 'NUMERIC'
                   ? 'NUMERIC1'
                   ? 'NUMERIC1'
                   : 'NUMERIC2',
                   : 'NUMERIC2',
               operation1:
               operation1:
-                props.editConditionFather?.triggerCondition?.condition[0]?.predicate?.operation,
+                props.bindConditionFather?.triggerCondition?.condition[0]?.predicate?.operation,
               operation2:
               operation2:
-                props.editConditionFather?.triggerCondition?.condition[0]?.predicate?.operation,
+                props.bindConditionFather?.triggerCondition?.condition[0]?.predicate?.operation,
               value1:
               value1:
-                props.editConditionFather?.triggerCondition?.condition[0]?.predicate?.value
+                props.bindConditionFather?.triggerCondition?.condition[0]?.predicate?.value
                   ?.defaultValue,
                   ?.defaultValue,
               value2:
               value2:
-                props.editConditionFather?.triggerCondition?.condition[0]?.predicate?.value
+                props.bindConditionFather?.triggerCondition?.condition[0]?.predicate?.value
                   ?.defaultValue,
                   ?.defaultValue,
             });
             });
           }, 100);
           }, 100);
@@ -146,12 +151,12 @@
       };
       };
       setFieldsFormValueFun();
       setFieldsFormValueFun();
       const editSelectDevice = () => {
       const editSelectDevice = () => {
-        if (props.newConditionMapFather !== 1) {
+        if (props.bindConditionEntryIdFather !== 1) {
           setTimeout(() => {
           setTimeout(() => {
             updateSchema({
             updateSchema({
               field: 'entityId',
               field: 'entityId',
               componentProps: {
               componentProps: {
-                options: props.newConditionMapFather,
+                options: props.bindConditionEntryIdFather,
               },
               },
             });
             });
           }, 100);
           }, 100);
@@ -167,13 +172,15 @@
           },
           },
         });
         });
       };
       };
+
       return {
       return {
         updateFieldDeviceId,
         updateFieldDeviceId,
-        resetFieldsValueFunc,
         clearSelectDevice,
         clearSelectDevice,
         editSelectDevice,
         editSelectDevice,
         getFieldsValueFunc,
         getFieldsValueFunc,
         registerCondition,
         registerCondition,
+        resetFieldsValueFunc,
+        clearSelectAttribute,
       };
       };
     },
     },
   });
   });

+export const formatTriggerData = (m) => {
+  return {
+    triggerType: m?.triggerType,
+    entityId: m?.entityId || m?.entityId1 || m?.entityId2,
+    triggerCondition: {
+      condition: [
+        {
+          key: {
+            key: m.type2 == null ? 'CO2' : m.type2,
+            type: m.type1 == null ? 'TIME_SERIES' : m.type1,
+          },
+          valueType: 'NUMERIC',
+          predicate: {
+            type: 'NUMERIC',
+            value: {
+              defaultValue: Number(m.value),
+            },
+            operation: m.operation == null ? 'EQUAL' : m.operation,
+          },
+        },
+      ],
+      spec: {
+        type: 'SIMPLE',
+      },
+    },
+  };
+};
+
+export const formatConditionData = (m) => {
+  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',
+      },
+    },
+  };
+};

@@ -7,14 +7,14 @@
           :showResetButton="false"
           :showResetButton="false"
           :showSubmitButton="false"
           :showSubmitButton="false"
           :emptySpan="10"
           :emptySpan="10"
-          @register="registerTrigger"
+          @register="registerForm"
         />
         />
       </div>
       </div>
     </CollapseContainer>
     </CollapseContainer>
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref } from 'vue';
+  import { defineComponent, reactive, ref } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Input } from 'ant-design-vue';
   import { Input } from 'ant-design-vue';
@@ -23,20 +23,21 @@
 
 
   export default defineComponent({
   export default defineComponent({
     components: { CollapseContainer, BasicForm, [Input.name]: Input },
     components: { CollapseContainer, BasicForm, [Input.name]: Input },
-    props: ['deviceInfo', 'editTriggerFather', 'newFilterMapFather'],
+    props: ['bindTriggerFather', 'bindTriggerEntryIdFather'],
     setup(props) {
     setup(props) {
-      const fieldValue: any = ref({});
+      let fieldValue = reactive({});
       const option = ref<[]>([]);
       const option = ref<[]>([]);
       const data = ref<[]>([]);
       const data = ref<[]>([]);
-      const [registerTrigger, { resetFields, setFieldsValue, getFieldsValue, updateSchema }] =
-        useForm({
+      const [registerForm, { setFieldsValue, resetFields, getFieldsValue, updateSchema }] = useForm(
+        {
           labelWidth: 100,
           labelWidth: 100,
           schemas: useTriggerDrawerSchema,
           schemas: useTriggerDrawerSchema,
           actionColOptions: { span: 24 },
           actionColOptions: { span: 24 },
-        });
+        }
+      );
       const getFieldsValueFunc = () => {
       const getFieldsValueFunc = () => {
-        fieldValue.value = getFieldsValue();
-        return fieldValue.value;
+        fieldValue = getFieldsValue();
+        return fieldValue;
       };
       };
       const updateFieldDeviceId = (v) => {
       const updateFieldDeviceId = (v) => {
         if (v.length == 0 || v.length > 0) {
         if (v.length == 0 || v.length > 0) {
@@ -48,7 +49,7 @@
               onChange(e) {
               onChange(e) {
                 if (e) {
                 if (e) {
                   setTimeout(() => {
                   setTimeout(() => {
-                    updateFieldType2Func(e);
+                    updateFieldAttributeFunc(e);
                   }, 10);
                   }, 10);
                 }
                 }
               },
               },
@@ -63,7 +64,7 @@
                 onChange(e) {
                 onChange(e) {
                   if (e) {
                   if (e) {
                     setTimeout(() => {
                     setTimeout(() => {
-                      updateFieldType2Func(e);
+                      updateFieldAttributeFunc(e);
                     }, 10);
                     }, 10);
                   }
                   }
                 },
                 },
@@ -72,8 +73,7 @@
           }, 10);
           }, 10);
         }
         }
       };
       };
-
-      const updateFieldType2Func = async (e) => {
+      const updateFieldAttributeFunc = async (e) => {
         const data1 = await screenLinkPageByDeviceIdGetAttribut('DEVICE', e);
         const data1 = await screenLinkPageByDeviceIdGetAttribut('DEVICE', e);
         data.value = data1.map((m) => {
         data.value = data1.map((m) => {
           return {
           return {
@@ -81,7 +81,6 @@
             value: m,
             value: m,
           };
           };
         });
         });
-
         updateSchema({
         updateSchema({
           field: 'type2',
           field: 'type2',
           componentProps: {
           componentProps: {
@@ -127,28 +126,26 @@
           },
           },
         ]);
         ]);
       };
       };
-
       const resetFieldsValueFunc = () => {
       const resetFieldsValueFunc = () => {
         resetFields();
         resetFields();
       };
       };
-
       //回显数据
       //回显数据
       const setFieldsFormValueFun = () => {
       const setFieldsFormValueFun = () => {
-        if (props.editTriggerFather != 1) {
+        if (props.bindTriggerFather != 1) {
           setTimeout(() => {
           setTimeout(() => {
-            setFieldsValue(props.editTriggerFather);
+            setFieldsValue(props.bindTriggerFather);
             setFieldsValue({
             setFieldsValue({
-              entityId1: props.editTriggerFather.entityId,
-              entityId2: props.editTriggerFather.entityId,
-              type1: props.editTriggerFather?.triggerCondition?.condition[0]?.key?.type,
-              type2: props.editTriggerFather?.triggerCondition?.condition[0]?.key?.key,
+              entityId1: props.bindTriggerFather.entityId,
+              entityId2: props.bindTriggerFather.entityId,
+              type1: props.bindTriggerFather?.triggerCondition?.condition[0]?.key?.type,
+              type2: props.bindTriggerFather?.triggerCondition?.condition[0]?.key?.key,
               operation:
               operation:
-                props.editTriggerFather?.triggerCondition?.condition[0]?.predicate?.operation,
+                props.bindTriggerFather?.triggerCondition?.condition[0]?.predicate?.operation,
               value:
               value:
-                props.editTriggerFather?.triggerCondition?.condition[0]?.predicate?.value
+                props.bindTriggerFather?.triggerCondition?.condition[0]?.predicate?.value
                   ?.defaultValue,
                   ?.defaultValue,
             });
             });
-            if (props.editTriggerFather?.triggerCondition?.condition[0]?.key?.key) {
+            if (props.bindTriggerFather?.triggerCondition?.condition[0]?.key?.key) {
               updateSchema([
               updateSchema([
                 {
                 {
                   field: 'operation',
                   field: 'operation',
@@ -163,7 +160,6 @@
           }, 1);
           }, 1);
         }
         }
       };
       };
-
       setFieldsFormValueFun();
       setFieldsFormValueFun();
       //新增清空设备选择
       //新增清空设备选择
       const clearSelectDevice = () => {
       const clearSelectDevice = () => {
@@ -183,47 +179,28 @@
         });
         });
       };
       };
       const editSelectDevice = () => {
       const editSelectDevice = () => {
-        if (props.newFilterMapFather != 1) {
+        if (props.bindTriggerEntryIdFather != 1) {
           setTimeout(() => {
           setTimeout(() => {
             updateSchema({
             updateSchema({
               field: 'entityId',
               field: 'entityId',
               componentProps: {
               componentProps: {
-                options: props.newFilterMapFather,
+                options: props.bindTriggerEntryIdFather,
               },
               },
             });
             });
           }, 100);
           }, 100);
         }
         }
       };
       };
       editSelectDevice();
       editSelectDevice();
-      //新增清空场景触发器选择
-      const clearSelectScene = () => {
-        updateSchema({
-          field: 'sceneLinkageId',
-          componentProps: {
-            options: [],
-          },
-        });
-      };
-      const editSelectScene = (v) => {
-        updateSchema({
-          field: 'sceneLinkageId',
-          componentProps: {
-            options: v,
-          },
-        });
-      };
       return {
       return {
         updateOperatorAndValue,
         updateOperatorAndValue,
         clearSelectAttribute,
         clearSelectAttribute,
-        updateFieldType2Func,
+        updateFieldAttributeFunc,
         updateFieldDeviceId,
         updateFieldDeviceId,
         resetFieldsValueFunc,
         resetFieldsValueFunc,
-        clearSelectScene,
-        editSelectScene,
         clearSelectDevice,
         clearSelectDevice,
         editSelectDevice,
         editSelectDevice,
         getFieldsValueFunc,
         getFieldsValueFunc,
-        registerTrigger,
+        registerForm,
       };
       };
     },
     },
   });
   });

@@ -49,7 +49,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, getCurrentInstance, ref, computed } from 'vue';
+  import { defineComponent, ref, computed } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import SceneLinkAgeDrawer from './useDrawer.vue';
   import SceneLinkAgeDrawer from './useDrawer.vue';
@@ -72,7 +72,6 @@
       const isCustomer = computed(() => userStore.getRoleList.includes(RoleEnum.CUSTOMER_USER));
       const isCustomer = computed(() => userStore.getRoleList.includes(RoleEnum.CUSTOMER_USER));
       const isSysadmin = computed(() => userStore.getRoleList.includes(RoleEnum.SYS_ADMIN));
       const isSysadmin = computed(() => userStore.getRoleList.includes(RoleEnum.SYS_ADMIN));
       const isPlatform = computed(() => userStore.getRoleList.includes(RoleEnum.PLATFORM_ADMIN));
       const isPlatform = computed(() => userStore.getRoleList.includes(RoleEnum.PLATFORM_ADMIN));
-      const { proxy } = getCurrentInstance() as any;
       const sceneLinkAgeDrawerRef: any = ref(null);
       const sceneLinkAgeDrawerRef: any = ref(null);
       const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
       const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
         screenLinkPageDeleteApi,
         screenLinkPageDeleteApi,
@@ -107,13 +106,6 @@
         openDrawer(true, {
         openDrawer(true, {
           isUpdate: false,
           isUpdate: false,
         });
         });
-        try {
-          setTimeout(() => {
-            proxy.$refs.sceneLinkAgeDrawerRef.defaultAddAction();
-          }, 50);
-        } catch (e) {
-          return e;
-        }
       }
       }
 
 
       const useSelectionChange = () => {
       const useSelectionChange = () => {

@@ -4,31 +4,29 @@
       v-bind="$attrs"
       v-bind="$attrs"
       @register="registerDrawer"
       @register="registerDrawer"
       showFooter
       showFooter
-      :title="getTitle"
-      width="1000px"
-      @ok="handleSubmit"
+      width="50vw"
+      @ok="handleSubmit(drawerStatus)"
       @close="handleClose"
       @close="handleClose"
     >
     >
       <div>
       <div>
+        <!-- 基础表单 -->
         <BasicForm @register="registerForm" />
         <BasicForm @register="registerForm" />
+        <!-- 基础表单 -->
         <!-- 触发器 -->
         <!-- 触发器 -->
         <div style="border-radius: 4px">
         <div style="border-radius: 4px">
           <template
           <template
-            v-for="(item, index) in isUpdate == false ? addTriggerPushData : editTriggerPushData"
+            v-for="(item, index) in !drawerStatus ? triggerData : editTriggerData"
             :key="index"
             :key="index"
           >
           >
             <span style="display: none">{{ item + index }}</span>
             <span style="display: none">{{ item + index }}</span>
-            <span style="position: relative; top: 3.2vh; left: 0.5vw">触发器 {{ index + 1 }}</span>
-            <div style="display: block">
-              <AddTriggerForm
-                ref="refTriggerChild"
-                :editTriggerFather="isUpdate == false ? 1 : item"
-                :newFilterMapFather="isUpdate == false ? 1 : newFilterMap"
-                :deviceInfo="getDeviceInfo"
-              />
-            </div>
-            <div style="height: 3vh"></div>
+            <span style="position: relative; top: 3.2vh; left: 0.6vw">触发器 {{ index + 1 }}</span>
+            <useTriggerCpn
+              ref="triggerBindRef"
+              :bindTriggerFather="!drawerStatus ? 1 : item"
+              :bindTriggerEntryIdFather="!drawerStatus ? 1 : getTriggerFatherEntryIdData"
+            />
           </template>
           </template>
+          <!-- 按钮 -->
           <div
           <div
             style="
             style="
               display: flex;
               display: flex;
@@ -39,47 +37,47 @@
             "
             "
           >
           >
             <div style="display: flex; width: 4vw; height: 4vh">
             <div style="display: flex; width: 4vw; height: 4vh">
-              <Button type="primary" style="border-radius: 2px" class="mt-5" @click="addTrigger"
-                >新增触发器</Button
+              <Button
+                type="primary"
+                style="border-radius: 2px"
+                class="mt-5"
+                @click="triggerClickAdd(drawerStatus)"
+                >触发器</Button
               >
               >
             </div>
             </div>
             <div style="display: flex; width: 4vw; height: 4vh">
             <div style="display: flex; width: 4vw; height: 4vh">
               <Button
               <Button
-                v-if="addTriggerPushData.length != 0 || editTriggerPushData.length != 0"
+                v-if="triggerData.length !== 0 || editTriggerData.length !== 0"
                 type="default"
                 type="default"
                 style="border-radius: 2px; background-color: rgba(237, 111, 111, 1)"
                 style="border-radius: 2px; background-color: rgba(237, 111, 111, 1)"
                 class="mt-5"
                 class="mt-5"
-                @click="removeTrigger"
+                @click="triggerClickRemove(drawerStatus)"
               >
               >
                 <span style="color: white">删除</span></Button
                 <span style="color: white">删除</span></Button
               >
               >
             </div>
             </div>
           </div>
           </div>
+          <!-- 按钮 -->
         </div>
         </div>
+        <!-- 触发器 -->
         <div style="height: 5vh"></div>
         <div style="height: 5vh"></div>
         <!-- 执行条件 -->
         <!-- 执行条件 -->
-        <div style="border-radius: 4px" class="condition-style">
+        <div style="border-radius: 4px">
           <template
           <template
-            v-for="(item, index) in isUpdate == false
-              ? addConditionPushData
-              : editConditionPushData"
+            v-for="(item, index) in !drawerStatus ? conditionData : editConditionData"
             :key="index"
             :key="index"
           >
           >
             <span style="display: none">{{ item + index }}</span>
             <span style="display: none">{{ item + index }}</span>
-            <span style="position: relative; top: 3.2vh; left: 0.5vw"
+            <span style="position: relative; top: 3.2vh; left: 0.6vw"
               >执行条件 {{ index + 1 }}</span
               >执行条件 {{ index + 1 }}</span
             >
             >
-
-            <div>
-              <AddConditiForm
-                :editConditionFather="isUpdate == false ? 1 : item"
-                :newConditionMapFather="isUpdate == false ? 1 : newConditionFilterMap"
-                :deviceInfo1="getDeviceInfo1"
-                ref="refConditionChild"
-              />
-            </div>
-            <div style="height: 3vh"></div>
+            <useConditionCpn
+              ref="conditionBindRef"
+              :bindConditionFather="!drawerStatus ? 1 : item"
+              :bindConditionEntryIdFather="!drawerStatus ? 1 : getConditionFatherEntryIdData"
+            />
           </template>
           </template>
+          <!-- 按钮 -->
           <div
           <div
             style="
             style="
               display: flex;
               display: flex;
@@ -90,45 +88,45 @@
             "
             "
           >
           >
             <div style="display: flex; width: 4vw; height: 4vh">
             <div style="display: flex; width: 4vw; height: 4vh">
-              <Button type="primary" style="border-radius: 2px" class="mt-5" @click="addCondition"
-                >新增执行条件</Button
+              <Button
+                type="primary"
+                style="border-radius: 2px"
+                class="mt-5"
+                @click="conditionClickAdd(drawerStatus)"
+                >执行条件</Button
               >
               >
             </div>
             </div>
             <div style="display: flex; width: 4vw; height: 4vh">
             <div style="display: flex; width: 4vw; height: 4vh">
               <Button
               <Button
-                v-if="addConditionPushData.length != 0 || editConditionPushData.length != 0"
-                style="border-radius: 2px; background-color: rgba(237, 111, 111, 1)"
+                v-if="conditionData.length !== 0 || editConditionData.length !== 0"
                 type="default"
                 type="default"
+                style="border-radius: 2px; background-color: rgba(237, 111, 111, 1)"
                 class="mt-5"
                 class="mt-5"
-                @click="removeCondition"
+                @click="conditionClickRemove(drawerStatus)"
               >
               >
                 <span style="color: white">删除</span></Button
                 <span style="color: white">删除</span></Button
               >
               >
             </div>
             </div>
           </div>
           </div>
+          <!-- 按钮 -->
         </div>
         </div>
-        <!-- 执行动作 -->
+        <!-- 执行条件 -->
         <div style="height: 5vh"></div>
         <div style="height: 5vh"></div>
+        <!-- 执行动作 -->
         <div style="border-radius: 4px">
         <div style="border-radius: 4px">
           <template
           <template
-            v-for="(item, index) in isUpdate == false ? addActionPushData : editActionPushData"
+            v-for="(item, index) in !drawerStatus ? actionData : editActionData"
             :key="index"
             :key="index"
           >
           >
             <span style="display: none">{{ item + index }}</span>
             <span style="display: none">{{ item + index }}</span>
-            <span style="position: relative; top: 4.2vh; left: 0.65vw"
-              >执行动作 {{ index + 1 }}</span
-            >
-
-            <div>
-              <AddActionForm
-                :editActionFather="isUpdate == false ? 1 : item"
-                :newActionMapFather="isUpdate == false ? 1 : newActionFilterMap"
-                :deviceInfo2="getDeviceInfo2"
-                ref="refActionChild"
-              />
-            </div>
-            <div style="height: 3vh"></div>
+            <span style="position: relative; top: 3.6vh; left: 1vw">执行动作 {{ index + 1 }}</span>
+            <useActionCpn
+              ref="actionBindRef"
+              :bindActionFather="!drawerStatus ? 1 : item"
+              :bindActionEntryIdFather="!drawerStatus ? 1 : getActionFatherEntryIdData"
+            />
           </template>
           </template>
+          <!-- 按钮 -->
           <div
           <div
             style="
             style="
               display: flex;
               display: flex;
@@ -139,737 +137,366 @@
             "
             "
           >
           >
             <div style="display: flex; width: 4vw; height: 4vh">
             <div style="display: flex; width: 4vw; height: 4vh">
-              <Button type="primary" style="border-radius: 2px" class="mt-5" @click="addAction"
-                >新增执行动作</Button
+              <Button
+                type="primary"
+                style="border-radius: 2px"
+                class="mt-5"
+                @click="actionClickAdd(drawerStatus)"
+                >执行动作</Button
               >
               >
             </div>
             </div>
             <div style="display: flex; width: 4vw; height: 4vh">
             <div style="display: flex; width: 4vw; height: 4vh">
               <Button
               <Button
-                v-if="addActionPushData.length !== 0 || editActionPushData.length !== 0"
-                style="border-radius: 2px; background-color: rgba(237, 111, 111, 1)"
+                v-if="actionData.length !== 0 || editActionData.length !== 0"
                 type="default"
                 type="default"
+                style="border-radius: 2px; background-color: rgba(237, 111, 111, 1)"
                 class="mt-5"
                 class="mt-5"
-                @click="removeAction"
+                @click="actionClickRemove(drawerStatus)"
               >
               >
                 <span style="color: white">删除</span></Button
                 <span style="color: white">删除</span></Button
               >
               >
             </div>
             </div>
           </div>
           </div>
-          <div style="height: 5vh"></div>
+          <!-- 按钮 -->
         </div>
         </div>
+        <!-- 执行动作 -->
       </div>
       </div>
     </BasicDrawer>
     </BasicDrawer>
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref, computed, unref, reactive, getCurrentInstance, watch } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchema, getData } from './config';
+  import { defineComponent, reactive, ref, getCurrentInstance, watch } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { formSchema, changeOriginId } from './config';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import useTriggerCpn from './cpns/trigger.vue';
+  import useConditionCpn from './cpns/condition.vue';
+  import useActionCpn from './cpns/action.vue';
+  import { Button } from '/@/components/Button';
+  import { formatTriggerData, formatConditionData } from './cpns/format-data/index';
+  import { useMessage } from '/@/hooks/web/useMessage';
   import {
   import {
     screenLinkPageAddApi,
     screenLinkPageAddApi,
-    screenLinkPageUpdateApi,
     screenLinkPageByDeptIdGetDevice,
     screenLinkPageByDeptIdGetDevice,
+    screenLinkPageUpdateApi,
   } from '/@/api/ruleengine/ruleengineApi';
   } from '/@/api/ruleengine/ruleengineApi';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import AddTriggerForm from './addForm/trigger.vue';
-  import AddConditiForm from './addForm/condition.vue';
-  import AddActionForm from './addForm/doaction.vue';
-  import { IAddTrigger } from './index';
-  import { Button } from '/@/components/Button';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'ConfigDrawer',
     name: 'ConfigDrawer',
     components: {
     components: {
       BasicDrawer,
       BasicDrawer,
       BasicForm,
       BasicForm,
-      AddTriggerForm,
-      AddConditiForm,
-      AddActionForm,
+      useTriggerCpn,
+      useConditionCpn,
+      useActionCpn,
       Button,
       Button,
     },
     },
-    emits: ['success', 'register', 'registerForm'],
+    emits: ['register', 'success'],
     setup(_, { emit }) {
     setup(_, { emit }) {
       const { proxy } = getCurrentInstance() as any;
       const { proxy } = getCurrentInstance() as any;
-      const lastEditRefTriggerChildDataArray = ref<[]>([]);
-      const lastRefTriggerChildDataArray = ref<[]>([]);
-      const lastRefConditionChildDataArray = ref<[]>([]);
-      const lastRefActionChildDataArray = ref<[]>([]);
-      let refTriggerChildData: any = reactive({});
-      let refConditionChildData: any = reactive({});
-      let refActionChildData: any = reactive({});
-      const addTriggerData = reactive<IAddTrigger>({
-        triggerType: '',
-        entityId: '',
-        touchWay: '',
-        attributeChoose: '',
-        compare: '',
-        value: '',
-      });
-      const addTriggerPushData = ref<[]>([]);
-      const addConditionPushData = ref<[]>([]);
-      const addActionPushData = ref<[]>([]);
-      //edit data
-      const editTriggerPushData = ref<[]>([]);
-      const editConditionPushData = ref<[]>([]);
-      const editActionPushData = ref<[]>([]);
-      const getChildData = ref(null);
-      const refTriggerChild = ref(null);
-      const refConditionChild = ref(null);
-      const refActionChild = ref(null);
-      const getConditionChildData = ref(null);
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
-      const isUpdate = ref(true);
-      let getAllFormData: any = reactive({});
-      let getValuesFormData: any = reactive({});
+      const triggerData = reactive([]);
+      const conditionData = reactive([]);
+      const actionData = reactive([1]);
+      const triggerBindRef = ref(null);
+      const conditionBindRef = ref(null);
+      const actionBindRef = ref(null);
+      let getTriggerFormValue: any = reactive({});
+      let getConditionFormValue: any = reactive({});
+      let getActionFormValue: any = reactive({});
+      const drawerStatus = ref(true);
+      let postAddOrEditData: any = reactive({});
+      let concatTrigger: any = reactive([]);
+      let concatCondition: any = reactive([]);
+      let concatAction: any = reactive([]);
+      let optionsItemDeviceId: any = ref([]);
+      let editTriggerData: any = ref([]);
+      let editConditionData: any = ref([]);
+      let editActionData: any = ref([]);
+      let getTriggerFatherEntryIdData: any = reactive([]);
+      let getConditionFatherEntryIdData: any = reactive([]);
+      let getActionFatherEntryIdData: any = reactive([]);
+      const editEntryIdData: any = ref([]);
       const getId = ref('');
       const getId = ref('');
       const getTenantId = ref('');
       const getTenantId = ref('');
-      const getDeviceInfo = ref(null);
-      const getDeviceInfo1 = ref(null);
-      const getDeviceInfo2 = ref(null);
-      const newFilterMap = ref<[]>([]);
-      const newConditionFilterMap = ref<[]>([]);
-      const newActionFilterMap = ref<[]>([]);
-      let filterNewConditionArr = [];
-      const pushEditArray = ref<any>([{}]);
-      const pushEditConditionArray = ref<any>([{}]);
-      const pushEditActionArray = ref<any>([{}]);
-      let filterArrayTrigger = [];
-      const filterArrayCondition = ref<[]>([]);
-      const filterArrayAction = ref<[]>([]);
-      let filterNewTriggerArr = [];
-      let triggersObj = {
-        triggers: [],
-      };
-      let conditionsObj = {
-        doConditions: [],
-      };
-      let actionsObj = {
-        doActions: [],
-      };
-      let optionsItemArray = ref<[]>([]);
-      const isNoChange = ref(false);
-      let kongTriggerObj = {};
-      let kongConditionObj = {};
-      let kongActionObj = {};
-      let optionsEditArray = ref<[]>([]);
-      const oldOrigzaition = ref('');
-
-      const [registerForm, { resetFields, setFieldsValue, validateFields }] = useForm({
+      const [registerForm, { resetFields, validate, setFieldsValue }] = useForm({
         labelWidth: 120,
         labelWidth: 120,
         schemas: formSchema,
         schemas: formSchema,
         showActionButtonGroup: false,
         showActionButtonGroup: false,
       });
       });
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-        await resetFields();
         setDrawerProps({ confirmLoading: false });
         setDrawerProps({ confirmLoading: false });
-        isUpdate.value = !!data?.isUpdate;
-        if (!unref(isUpdate)) {
+        drawerStatus.value = data.isUpdate;
+        if (!drawerStatus.value) {
+          triggerData.length = 0;
+          conditionData.length = 0;
+          actionData.length = 0;
+          resetFields();
+          defaultAddAction();
           try {
           try {
-            refTriggerChildData = {};
-            refConditionChildData = {};
-            refActionChildData = {};
-            getAllFormData = {};
-            triggersObj = {
-              triggers: [],
-            };
-            conditionsObj = {
-              doConditions: [],
-            };
-            actionsObj = {
-              doActions: [],
-            };
-            filterNewTriggerArr.length = 0;
-            filterNewConditionArr.length = 0;
-            lastRefTriggerChildDataArray.value.length = 0;
-            lastRefConditionChildDataArray.value.length = 0;
-            lastRefActionChildDataArray.value.length = 0;
-            editTriggerPushData.value.length = 0;
-            editConditionPushData.value.length = 0;
-            editActionPushData.value.length = 0;
-            addTriggerPushData.value.length = 0;
-            addConditionPushData.value.length = 0;
-            addActionPushData.value.length = 0;
-            handleClose();
-            optionsItemArray.value.length = 0;
-            optionsItemArray.value = [];
-            optionsEditArray.value = [];
-            optionsEditArray.value.length = 0;
-            try {
-              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;
-          }
+            proxy.$refs.triggerBindRef?.resetFieldsValueFunc();
+            proxy.$refs.triggerBindRef?.clearSelectDevice();
+            proxy.$refs.triggerBindRef?.clearSelectAttribute();
+            proxy.$refs.conditionBindRef?.resetFieldsValueFunc();
+            proxy.$refs.conditionBindRef?.clearSelectDevice();
+            proxy.$refs.conditionBindRef?.clearSelectAttribute();
+            proxy.$refs.actionBindRef?.clearSelectDevice();
+            proxy.$refs.actionBindRef.resetFieldsValueFunc();
+          } catch {}
         } else {
         } else {
-          try {
-            optionsEditArray.value = [];
-            optionsEditArray.value.length = 0;
-            kongTriggerObj = {};
-            kongConditionObj = {};
-            kongActionObj = {};
-            pushEditArray.value = [];
-            pushEditArray.value.length = 0;
-            pushEditConditionArray.value.length = 0;
-            pushEditConditionArray.value = [];
-            pushEditActionArray.value = [];
-            pushEditActionArray.value.length = 0;
-            newFilterMap.value = [];
-            newConditionFilterMap.value = [];
-            newActionFilterMap.value = [];
-            clearAllArrayFunc();
-            editTriggerPushData.value = [];
-            editTriggerPushData.value.length = 0;
-            editConditionPushData.value = [];
-            editConditionPushData.value.length = 0;
-            editActionPushData.value = [];
-            editActionPushData.value.length = 0;
-            lastEditRefTriggerChildDataArray.value = [];
-            getId.value = data.record.id;
-            getTenantId.value = data.record.tenantId;
-            await setFieldsValue({
-              ...data.record,
-            });
-            editTriggerPushData.value = data.record.triggers;
-            isNoChange.value = true;
-            editConditionPushData.value = data.record.doConditions;
-            editActionPushData.value = data.record.doActions;
-            const options = await screenLinkPageByDeptIdGetDevice({
-              organizationId: data.record.organizationId,
-            });
-            data.record.triggers.forEach((f1) => {
-              options.items?.forEach((f2) => {
-                if (f2.tbDeviceId == f1.entityId) {
-                  newFilterMap.value.push({
-                    value: f2.tbDeviceId,
-                    label: f2.name,
-                  } as never);
-                }
-              });
-            });
-            data.record.doConditions.forEach((f1) => {
-              options.items?.forEach((f2) => {
-                if (f2.tbDeviceId == f1.entityId) {
-                  newConditionFilterMap.value.push({
-                    value: f2.tbDeviceId,
-                    label: f2.name,
-                  } as never);
-                }
-              });
+          emit('success');
+          editTriggerData.value.length = 0;
+          editConditionData.value.length = 0;
+          editActionData.value.length = 0;
+          editEntryIdData.value.length = 0;
+          await setFieldsValue({
+            ...data.record,
+          });
+          getId.value = data.record.id;
+          getTenantId.value = data.record.tenantId;
+          editTriggerData.value = data.record.triggers;
+          editConditionData.value = data.record.doConditions;
+          editActionData.value = data.record.doActions;
+          const options = await screenLinkPageByDeptIdGetDevice({
+            organizationId: data.record.organizationId,
+          });
+          data.record.triggers.forEach((f1) => {
+            options.items?.forEach((f2) => {
+              if (f2.tbDeviceId == f1.entityId) {
+                getTriggerFatherEntryIdData.push({
+                  value: f2.tbDeviceId,
+                  label: f2.name,
+                } as never);
+              }
             });
             });
-            data.record.doActions.forEach((f1) => {
-              options.items?.forEach((f2) => {
-                if (f2.tbDeviceId == f1.deviceId) {
-                  newActionFilterMap.value.push({
-                    value: f2.tbDeviceId,
-                    label: f2.name,
-                  } as never);
-                }
-              });
+          });
+          data.record.doConditions.forEach((f1) => {
+            options.items?.forEach((f2) => {
+              if (f2.tbDeviceId == f1.entityId) {
+                getConditionFatherEntryIdData.push({
+                  value: f2.tbDeviceId,
+                  label: f2.name,
+                } as never);
+              }
             });
             });
-            optionsEditArray.value = options.items.map((v) => {
-              return {
-                value: v.tbDeviceId,
-                label: v.name,
-              };
+          });
+          data.record.doActions.forEach((f1) => {
+            options.items?.forEach((f2) => {
+              if (f2.tbDeviceId == f1.deviceId) {
+                getActionFatherEntryIdData.push({
+                  value: f2.tbDeviceId,
+                  label: f2.name,
+                } as never);
+              }
             });
             });
-            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;
-          }
+          });
+          editEntryIdData.value = options.items.map((v) => {
+            return {
+              value: v.tbDeviceId,
+              label: v.name,
+            };
+          });
+          setTimeout(() => {
+            proxy.$refs.triggerBindRef?.updateFieldDeviceId(editEntryIdData.value);
+            proxy.$refs.conditionBindRef?.updateFieldDeviceId(editEntryIdData.value);
+            proxy.$refs.actionBindRef?.updateFieldDeviceId(editEntryIdData.value);
+          }, 10);
         }
         }
       });
       });
-      const getTitle = computed(() => (!unref(isUpdate) ? '新增场景联动' : '编辑场景联动'));
-      const handleClose = () => {
-        editTriggerPushData.value.length = 0;
-        pushEditArray.value.length = 0;
-        pushEditConditionArray.value.length = 0;
-        pushEditActionArray.value.length = 0;
-        lastRefTriggerChildDataArray.value.length = 0;
-        lastRefTriggerChildDataArray.value = [];
-        lastRefConditionChildDataArray.value.length = 0;
-        lastRefActionChildDataArray.value.length = 0;
-        lastRefActionChildDataArray.value = [];
-        filterArrayTrigger.length = 0;
-        filterArrayCondition.value.length = 0;
-        filterArrayAction.value.length = 0;
-        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();
-      };
-
-      const clearAllArrayFunc = () => {
-        unref(addTriggerPushData).length = 0;
-        unref(addConditionPushData).length = 0;
-        unref(addActionPushData).length = 0;
-        lastRefTriggerChildDataArray.value.length = 0;
-        lastRefConditionChildDataArray.value.length = 0;
-        lastRefActionChildDataArray.value.length = 0;
-        lastEditRefTriggerChildDataArray.value.length = 0;
-      };
-      const resetActionsAllArrayFunc = () => {
-        try {
-          proxy.$refs.refActionChild.resetFieldsValueFunc();
-        } catch (e) {
-          return e;
-        }
-      };
-      const clearActionsAllDevice = () => {
-        try {
-          proxy.$refs.refActionChild.clearSelectDevice();
-        } catch (e) {
-          return e;
-        }
-      };
-
-      watch(getData, async (newV: string) => {
-        oldOrigzaition.value = newV;
-        const options = await screenLinkPageByDeptIdGetDevice({ organizationId: newV });
-        optionsItemArray.value = options.items.map((v) => {
+      watch(changeOriginId, async (newV: string) => {
+        const result = await screenLinkPageByDeptIdGetDevice({ organizationId: newV });
+        optionsItemDeviceId.value = result.items.map((v) => {
           return {
           return {
             value: v.tbDeviceId,
             value: v.tbDeviceId,
             label: v.name,
             label: v.name,
           };
           };
         });
         });
         setTimeout(() => {
         setTimeout(() => {
-          proxy.$refs.refTriggerChild?.updateFieldDeviceId(optionsItemArray.value);
-          proxy.$refs.refConditionChild?.updateFieldDeviceId(optionsItemArray.value);
-          proxy.$refs.refActionChild?.updateFieldDeviceId(optionsItemArray.value);
+          proxy.$refs.triggerBindRef?.updateFieldDeviceId(optionsItemDeviceId.value);
+          proxy.$refs.conditionBindRef?.updateFieldDeviceId(optionsItemDeviceId.value);
+          proxy.$refs.actionBindRef?.updateFieldDeviceId(optionsItemDeviceId.value);
         }, 10);
         }, 10);
       });
       });
 
 
-      //获取触发器方法
-      const refTriggerChildDataFunc = () => {
-        try {
-          refTriggerChildData = proxy.$refs.refTriggerChild.getFieldsValueFunc();
-        } catch (e) {
-          return e;
-        }
-      };
-      //获取执行条件方法
-      const refConditionChildDataFunc = () => {
+      /**
+       * 获取触发器表单值
+       */
+      const getTriggerFormValueFunc = () => {
         try {
         try {
-          refConditionChildData = proxy.$refs.refConditionChild.getFieldsValueFunc();
-        } catch (e) {
-          return e;
-        }
+          getTriggerFormValue = proxy.$refs.triggerBindRef.getFieldsValueFunc();
+        } catch {}
       };
       };
-      //获取执行动作方法
-      const refActionChildDataFunc = () => {
-        try {
-          refActionChildData = proxy.$refs.refActionChild.getFieldsValueFunc();
-        } catch (e) {
-          return e;
+      const triggerClickAdd = (e) => {
+        if (!e) {
+          getTriggerFormValueFunc();
+          triggerData.push(getTriggerFormValue as never);
+          setTimeout(() => {
+            proxy.$refs.triggerBindRef?.updateFieldDeviceId(optionsItemDeviceId.value);
+          }, 10);
+        } else {
+          //TODO
+          editTriggerData.value.push(getTriggerFormValue);
         }
         }
       };
       };
-
-      const getDefaultValue = () => {
-        if (!unref(isUpdate)) {
-          refTriggerChildDataFunc();
-          refConditionChildDataFunc();
-          refActionChildDataFunc();
-          let newTriggerArray = addTriggerPushData.value.concat(refTriggerChildData);
-          let newConditionArray = addConditionPushData.value.concat(refConditionChildData);
-          let newActionArray = addActionPushData.value.concat(refActionChildData);
-          (newTriggerArray as any) = newTriggerArray.map((m: any) => {
-            return {
-              triggerType: m?.triggerType,
-              entityId: m?.entityId || m?.entityId1 || m?.entityId2,
-              triggerCondition: {
-                condition: [
-                  {
-                    key: {
-                      key: m.type2 == null ? 'CO2' : m.type2,
-                      type: m.type1 == null ? 'TIME_SERIES' : m.type1,
-                    },
-                    valueType: 'NUMERIC',
-                    predicate: {
-                      type: 'NUMERIC',
-                      value: {
-                        defaultValue: Number(m.value),
-                      },
-                      operation: m.operation == null ? 'EQUAL' : m.operation,
-                    },
-                  },
-                ],
-                spec: {
-                  type: 'SIMPLE',
-                },
-              },
-            };
-          });
-          (newConditionArray as any) = newConditionArray.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',
-                },
-              },
-            };
-          });
-          newTriggerArray.shift();
-          newConditionArray.shift();
-          newActionArray.shift();
-          delete getAllFormData.id;
-          delete getAllFormData.getTenantId;
-          triggersObj = {
-            triggers: newTriggerArray,
-          };
-          conditionsObj = {
-            doConditions: newConditionArray,
-          };
-          actionsObj = {
-            doActions: newActionArray,
-          };
-          Object.assign(getAllFormData, triggersObj, conditionsObj, actionsObj);
+      const triggerClickRemove = (e) => {
+        if (!e) {
+          triggerData.pop();
         } else {
         } else {
-          editTriggerPushData.value.forEach((f) => {
-            kongTriggerObj = f;
-            pushEditArray.value.push(kongTriggerObj);
-          });
-          editConditionPushData.value.forEach((f) => {
-            kongConditionObj = f;
-            pushEditConditionArray.value.push(kongConditionObj);
-          });
-          editActionPushData.value.forEach((f) => {
-            kongActionObj = f;
-            pushEditActionArray.value.push(kongActionObj);
-          });
-          refTriggerChildDataFunc();
-          let newTriggerArray = pushEditArray.value.concat(refTriggerChildData);
-          newTriggerArray = newTriggerArray.filter((f) => Object.keys(f).length !== 0);
-          newTriggerArray.shift();
-          triggersObj = {
-            triggers: isNoChange.value ? editTriggerPushData.value : newTriggerArray,
-          };
-          refConditionChildDataFunc();
-          let newConditionArray = pushEditConditionArray.value.concat(refConditionChildData);
-          newConditionArray = newConditionArray.filter((f) => Object.keys(f).length !== 0);
-          newConditionArray.shift();
-          conditionsObj = {
-            doConditions: newConditionArray,
-          };
-          refActionChildDataFunc();
-          let newActionArray = pushEditActionArray.value.concat(refActionChildData);
-          newActionArray = newActionArray.filter((f) => Object.keys(f).length !== 0);
-          newActionArray.shift();
-          actionsObj = {
-            doActions: newActionArray,
-          };
-          Object.assign(getAllFormData, triggersObj, conditionsObj, actionsObj);
+          editTriggerData.value.pop();
         }
         }
       };
       };
 
 
-      const handleSubmit = async () => {
-        if (!unref(isUpdate)) {
-          getDefaultValue();
-          getValuesFormData = await validateFields();
-          if (!getValuesFormData) return;
-          let isKongNum = 0;
-          getAllFormData.doActions.forEach((f) => {
-            isKongNum = Object.keys(f).length;
-          });
-          if (getAllFormData.doActions.length == 1 && isKongNum == 0)
-            return createMessage.error('请填写执行动作');
-          Object.assign(getAllFormData, getValuesFormData);
-          await screenLinkPageAddApi(getAllFormData);
-          createMessage.success('场景联动新增成功');
-          closeDrawer();
-          emit('success');
-        } else {
-          getDefaultValue();
-          getValuesFormData = await validateFields();
-          Object.assign(getAllFormData, getValuesFormData);
-          getAllFormData.id = getId.value;
-          getAllFormData.tenantId = getTenantId.value;
-          refTriggerChildData = {};
-          refConditionChildData = {};
-          refActionChildData = {};
-          pushEditArray.value.length = 0;
-          pushEditConditionArray.value.length = 0;
-          pushEditActionArray.value.length = 0;
-          await screenLinkPageUpdateApi(getAllFormData);
-          createMessage.success('场景联动编辑成功');
-          closeDrawer();
-          emit('success');
-        }
+      /**
+       * 获取执行条件表单值
+       */
+      const getConditionFormValueFunc = () => {
+        try {
+          getConditionFormValue = proxy.$refs.conditionBindRef.getFieldsValueFunc();
+        } catch {}
       };
       };
-      //新增触发器
-      const addTrigger = () => {
-        if (!unref(isUpdate)) {
-          refTriggerChildDataFunc();
-          unref(addTriggerPushData).push(refTriggerChildData as never);
+      const conditionClickAdd = (e) => {
+        if (!e) {
+          getConditionFormValueFunc();
+          conditionData.push(getConditionFormValue as never);
           setTimeout(() => {
           setTimeout(() => {
-            proxy.$refs.refTriggerChild?.updateFieldDeviceId(optionsItemArray.value);
-          }, 20);
+            proxy.$refs.conditionBindRef?.updateFieldDeviceId(optionsItemDeviceId.value);
+          }, 10);
         } else {
         } else {
-          isNoChange.value = false;
-          unref(editTriggerPushData).push(refTriggerChildData as never);
-          refTriggerChildDataFunc();
-          pushEditArray.value.push(refTriggerChildData);
-          pushEditArray.value = pushEditArray.value.map((m) => {
-            return {
-              triggerType: m?.triggerType,
-              entityId: m?.entityId || m?.entityId1 || m?.entityId2,
-              triggerCondition: {
-                condition: [
-                  {
-                    key: {
-                      key: m.type2 == null ? 'CO2' : m.type2,
-                      type: m.type1 == null ? 'TIME_SERIES' : m.type1,
-                    },
-                    valueType: 'NUMERIC',
-                    predicate: {
-                      type: 'NUMERIC',
-                      value: {
-                        defaultValue: Number(m.value),
-                      },
-                      operation: m.operation == null ? 'EQUAL' : m.operation,
-                    },
-                  },
-                ],
-                spec: {
-                  type: 'SIMPLE',
-                },
-              },
-            };
-          });
-          try {
-            setTimeout(() => {
-              proxy.$refs.refTriggerChild?.updateFieldDeviceId({
-                status: 'edit',
-                item: optionsEditArray.value,
-              });
-            }, 20);
-          } catch (e) {
-            return e;
-          }
-          refTriggerChildData = {};
+          //TODO
         }
         }
       };
       };
-      const removeTrigger = () => {
-        if (!unref(isUpdate)) {
-          try {
-            unref(addTriggerPushData).pop();
-          } catch (e) {
-            return e;
-          }
+      const conditionClickRemove = (e) => {
+        if (!e) {
+          conditionData.pop();
         } else {
         } else {
-          try {
-            unref(editTriggerPushData).pop();
-          } catch (e) {
-            return e;
-          }
+          editConditionData.value.pop();
         }
         }
       };
       };
 
 
-      //新增执行条件
-      const addCondition = () => {
-        if (!unref(isUpdate)) {
-          refConditionChildDataFunc();
-          unref(addConditionPushData).push(refConditionChildData as never);
-          try {
-            setTimeout(() => {
-              proxy.$refs.refConditionChild?.updateFieldDeviceId(optionsItemArray.value);
-            }, 20);
-          } catch (e) {
-            return e;
-          }
-        } else {
-          isNoChange.value = false;
-          unref(editConditionPushData).push(refConditionChildData as never);
-          refConditionChildDataFunc();
-          pushEditConditionArray.value.push(refConditionChildData);
-          pushEditConditionArray.value = pushEditConditionArray.value.map((m) => {
-            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({
-                status: 'edit',
-                item: optionsEditArray.value,
-              });
-            }, 20);
-          } catch (e) {
-            return e;
-          }
-          refConditionChildData = {};
+      /**
+       * 获取执行动作表单值
+       */
+      const getActionFormValueFunc = () => {
+        try {
+          getActionFormValue = proxy.$refs.actionBindRef.getFieldsValueFunc();
+        } catch {}
+      };
+      //默认新增执行动作
+      const defaultAddAction = () => {
+        if (actionData.length == 0) {
+          actionClickAdd(false);
         }
         }
       };
       };
-      const removeCondition = () => {
-        if (!unref(isUpdate)) {
-          try {
-            unref(addConditionPushData).pop();
-          } catch (e) {
-            return e;
-          }
+      const actionClickAdd = (e) => {
+        if (!e) {
+          getActionFormValueFunc();
+          actionData.push(getActionFormValue as never);
+          setTimeout(() => {
+            proxy.$refs.actionBindRef?.updateFieldDeviceId(optionsItemDeviceId.value);
+          }, 10);
         } else {
         } else {
-          try {
-            unref(editConditionPushData).pop();
-          } catch (e) {
-            return e;
-          }
+          //TODO
         }
         }
       };
       };
-
-      //默认新增执行动作
-      const defaultAddAction = () => {
-        if (unref(addActionPushData).length == 0) {
-          addAction();
+      const actionClickRemove = (e) => {
+        if (!e) {
+          actionData.pop();
+        } else {
+          editActionData.value.pop();
         }
         }
       };
       };
-      //新增执行动作
-      const addAction = () => {
-        if (!unref(isUpdate)) {
-          refActionChildDataFunc();
-          unref(addActionPushData).push(refActionChildData as never);
-          try {
-            setTimeout(() => {
-              proxy.$refs.refActionChild.updateFieldDeviceId(optionsItemArray.value);
-            }, 20);
-          } catch (e) {
-            return e;
-          }
+      const submitOrEditFunc = (e) => {
+        if (!e) {
+          getTriggerFormValueFunc();
+          concatTrigger = triggerData.concat(getTriggerFormValue);
+          //去除第一个空对象
+          concatTrigger.shift();
+          concatTrigger = concatTrigger.map((m) => formatTriggerData(m));
+          getConditionFormValueFunc();
+          concatCondition = conditionData.concat(getConditionFormValue);
+          //去除第一个空对象
+          concatCondition.shift();
+          concatCondition = concatCondition.map((m) => formatConditionData(m));
+          getActionFormValueFunc();
+          concatAction = actionData.concat(getActionFormValue);
+          // 去除第一个空对象;
+          concatAction.shift();
         } else {
         } else {
-          isNoChange.value = false;
-          unref(editActionPushData).push(refActionChildData as never);
-          refActionChildDataFunc();
-          pushEditActionArray.value.push(refActionChildData);
-          try {
-            setTimeout(() => {
-              proxy.$refs.refActionChild.updateFieldDeviceId({
-                status: 'edit',
-                item: optionsEditArray.value,
-              });
-            }, 20);
-          } catch (e) {
-            return e;
-          }
-          refActionChildData = {};
+          //TODO
         }
         }
       };
       };
-      const removeAction = () => {
-        if (!unref(isUpdate)) {
-          try {
-            unref(addActionPushData).pop();
-          } catch (e) {
-            return e;
-          }
+
+      const handleSubmit = async (e) => {
+        let basicFormValue = await validate();
+        if (!basicFormValue) return;
+        if (!e) {
+          submitOrEditFunc(e);
+          let isKongNum = 0;
+          concatAction.forEach((f) => {
+            isKongNum = Object.keys(f).length;
+          });
+          if (concatAction.length == 1 && isKongNum == 0)
+            return createMessage.error('请填写执行动作');
+          postAddOrEditData = {
+            ...basicFormValue,
+            ...{
+              triggers: concatTrigger,
+            },
+            ...{
+              doConditions: concatCondition,
+            },
+            ...{
+              doActions: concatAction,
+            },
+          };
+          await screenLinkPageAddApi(postAddOrEditData);
+          createMessage.success('新增成功');
+          closeDrawer();
+          emit('success');
         } else {
         } else {
-          try {
-            unref(editActionPushData).pop();
-          } catch (e) {
-            return e;
-          }
+          submitOrEditFunc(e);
+          postAddOrEditData = {
+            ...basicFormValue,
+            ...{ id: getId.value },
+            ...{ tenantId: getTenantId.value },
+          };
+          await screenLinkPageUpdateApi(postAddOrEditData);
+          createMessage.success('编辑成功');
+          closeDrawer();
+          emit('success');
         }
         }
       };
       };
+      const handleClose = () => {
+        closeDrawer();
+      };
 
 
       return {
       return {
-        handleClose,
-        newFilterMap,
-        newConditionFilterMap,
-        newActionFilterMap,
-        editTriggerPushData,
-        editConditionPushData,
-        editActionPushData,
-        isUpdate,
-        clearActionsAllDevice,
-        getDeviceInfo,
-        getDeviceInfo1,
-        getDeviceInfo2,
-        resetActionsAllArrayFunc,
-        addActionPushData,
-        defaultAddAction,
-        refActionChild,
-        addAction,
-        removeAction,
-        addConditionPushData,
-        refConditionChild,
-        addCondition,
-        removeCondition,
-        clearAllArrayFunc,
-        removeTrigger,
-        addTriggerPushData,
-        addTriggerData,
-        addTrigger,
-        getConditionChildData,
-        refTriggerChild,
-        getChildData,
-        getAllFormData,
         registerDrawer,
         registerDrawer,
         registerForm,
         registerForm,
-        getTitle,
+        triggerData,
+        triggerClickAdd,
+        triggerClickRemove,
+        conditionClickAdd,
+        conditionClickRemove,
+        actionClickAdd,
+        actionClickRemove,
+        triggerBindRef,
+        conditionBindRef,
+        actionBindRef,
         handleSubmit,
         handleSubmit,
+        handleClose,
+        drawerStatus,
+        conditionData,
+        actionData,
+        editTriggerData,
+        editConditionData,
+        editActionData,
+        getTriggerFatherEntryIdData,
+        getConditionFatherEntryIdData,
+        getActionFatherEntryIdData,
       };
       };
     },
     },
   });
   });
 </script>
 </script>
 
 
-<style lang="less" scoped>
-  .condition-style {
-    :deep .ant-calendar-picker {
-      width: 24.9vw !important;
-    }
-  }
-</style>
+<style lang="less" scoped></style>