Merge branch 'ft-dev' into 'main'

fix:修复设备配置第三步点击新增数据一样的问题,fix：修改场景联动一些字段

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

@@ -65,7 +65,7 @@ function dynamicImport(
 
 // Turn background objects into routing objects
 export function transformObjToRoute<T = AppRouteModule>(routeList: AppRouteModule[]): T[] {
-  routeList.forEach((route) => {
+  routeList?.forEach((route) => {
     const component = route.component as string;
     if (component) {
       if (component.toUpperCase() === 'LAYOUT') {

@@ -89,25 +89,7 @@
                           :key="index2"
                         >
                           <p v-if="index2 == createIndex && !getStepThreeEditStatus"
-                            >报警规则条件：{{
-                              v2.predicate.operation == 'EQUAL'
-                                ? v2.key.key + '等于' + v2.predicate.value.defaultValue
-                                : v2.predicate.operation == 'STARTS_WITH'
-                                ? v2.key.key + '开始于' + v2.predicate.value.defaultValue
-                                : v2.predicate.operation == 'ENDS_WITH'
-                                ? v2.key.key + '结束于' + v2.predicate.value.defaultValue
-                                : v2.predicate.operation == 'NOT_CONTAINS'
-                                ? v2.key.key + '不包含' + v2.predicate.value.defaultValue
-                                : v2.predicate.operation == 'NOT_EQUAL'
-                                ? v2.key.key + '不等于' + v2.predicate.value.defaultValue
-                                : v2.predicate.operation == 'GREATER'
-                                ? v2.key.key + '大于' + v2.predicate.value.defaultValue
-                                : v2.predicate.operation == 'LESS'
-                                ? v2.key.key + '小于' + v2.predicate.value.defaultValue
-                                : v2.predicate.operation == 'GREATER_OR_EQUAL'
-                                ? v2.key.key + '大于或等于' + v2.predicate.value.defaultValue
-                                : v2.key.key + '小于或等于' + v2.predicate.value.defaultValue
-                            }}</p
+                            >报警规则条件：{{ formatAddRuleFunc(v2) }}</p
                           >
                           <p v-if="index2 == createIndex && getStepThreeEditStatus"
                             >报警规则条件：{{ openRuleConditionComp(v2) }}</p
@@ -462,9 +444,7 @@
         schedule: {},
       });
       let kongRuleConditionObj = reactive({
-        condition: {
-          condition: {},
-        },
+        condition: {},
       });
       let fliterTempRuleConditionTempArr = ref<[]>([]);
       let fliterTempOpenRuleTempArr = ref<[]>([]);
@@ -829,7 +809,10 @@
         addNewOpenRule.schedule = enableObj.value as never;
         addNewRuleTem.condition.condition = ruleObj.value as never;
         tempOpenRuleTempArr.value.push(addNewOpenRule.schedule as never);
-        tempRuleConditionTempArr.value.push(addNewRuleTem.condition.condition as never);
+        tempRuleConditionTempArr.value.push({
+          condition: addNewRuleTem.condition.condition,
+        });
+        console.log(tempRuleConditionTempArr.value);
       };
 
       const getClearOpenRuleAndRuleCondition = () => {
@@ -867,7 +850,7 @@
         });
 
         tempRuleConditionTempArr.value.forEach((f3) => {
-          kongRuleConditionObj.condition.condition = f3;
+          kongRuleConditionObj.condition = f3;
         });
 
         createRulesObj.value[addChangeSeverity.value?.default] = {
@@ -920,11 +903,44 @@
       //规则条件
       const getAllFieldsRuleFunc = (v) => {
         ruleObj.value = v;
-        let splitRuleObj = {};
-        ruleObj.value.forEach((f) => {
-          splitRuleObj = f;
+        // let splitRuleObj = {};
+        // ruleObj.value.forEach((f) => {
+        //   splitRuleObj = f;
+        // });
+        // fliterTempRuleConditionTempArr.value.push(splitRuleObj as never);
+        // fliterTempRuleConditionTempArr.value = ruleObj.value;
+        addNewRuleTem.condition.condition = ruleObj.value as never;
+        fliterTempRuleConditionTempArr.value.push({
+          condition: addNewRuleTem.condition.condition,
+        });
+        console.log(fliterTempRuleConditionTempArr.value);
+      };
+      //格式化新增
+      const formatAddRuleFunc = (v) => {
+        console.log(v.condition);
+        let kongFormatObj = {};
+        v.condition.forEach((f) => {
+          kongFormatObj =
+            f.predicate.operation == 'EQUAL'
+              ? f.key.key + '等于' + f.predicate.value.defaultValue
+              : f.predicate.operation == 'STARTS_WITH'
+              ? f.key.key + '开始于' + f.predicate.value.defaultValue
+              : f.predicate.operation == 'ENDS_WITH'
+              ? f.key.key + '结束于' + f.predicate.value.defaultValue
+              : f.predicate.operation == 'NOT_CONTAINS'
+              ? f.key.key + '不包含' + f.predicate.value.defaultValue
+              : f.predicate.operation == 'NOT_EQUAL'
+              ? f.key.key + '不等于' + f.predicate.value.defaultValue
+              : f.predicate.operation == 'GREATER'
+              ? f.key.key + '大于' + f.predicate.value.defaultValue
+              : f.predicate.operation == 'LESS'
+              ? f.key.key + '小于' + f.predicate.value.defaultValue
+              : f.predicate.operation == 'GREATER_OR_EQUAL'
+              ? f.key.key + '大于或等于' + f.predicate.value.defaultValue
+              : f.key.key + '小于或等于' + f.predicate.value.defaultValue;
         });
-        fliterTempRuleConditionTempArr.value.push(splitRuleObj as never);
+        console.log(kongFormatObj);
+        return kongFormatObj;
       };
       //清除报警规则
       //启用规则
@@ -1057,6 +1073,7 @@
       };
 
       return {
+        formatAddRuleFunc,
         getFilterStepThreeClearDetailEditArr,
         getIsShowAddRule,
         openRuleConditionComp,

@@ -14,13 +14,13 @@ import { copyTransFun } from '/@/utils/fnUtils';
  */
 
 export enum TriggerEnum {
-  IS_DEVICE_ACT = 'DEVICE_ACT',
-  IS_TIME_ACT = 'TIME_ACT',
-  IS_SCENE_ACT = 'SCENE_ACT',
+  IS_DEVICE_ACT = 'DEVICE_TRIGGER',
+  IS_TIME_ACT = 'SCHEDULE_TRIGGER',
+  IS_SCENE_ACT = 'SCENE_TRIGGER',
   IS_HAND_ACT = 'HAND_ACT',
   IS_MSG_NOTIFY = 'MSG_NOTIFY',
   IS_DEVICE_STATUS = 'DEVICE_STATUS',
-  IS_TIME_ALL = 'TIME_ALL',
+  IS_TIME_ALL = 'SCHEDULE_TRIGGER',
 }
 
 export enum AttributeActionEnum {
@@ -37,6 +37,7 @@ export enum AttrAndWenDuEnum {
 export const isShiDu = (type: string) => {
   return type === AttrAndWenDuEnum.IS_SHIDU;
 };
+
 export const isWenDu = (type: string) => {
   return type === AttrAndWenDuEnum.IS_WENDU_ACT;
 };
@@ -77,13 +78,13 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '触发方式',
-    dataIndex: 'triggerEvent',
+    dataIndex: 'triggerType',
     format: (text: string, record: Recordable) => {
-      return record.triggers[0]?.triggerEvent == 'DEVICE_ACT'
+      return record.triggers[0]?.triggerType == 'DEVICE_TRIGGER'
         ? '设备触发'
-        : record.triggers[0]?.triggerEvent == 'TIME_ACT'
+        : record.triggers[0]?.triggerType == 'SCHEDULE_TRIGGER'
         ? '定时触发'
-        : record.triggers[0]?.triggerEvent == 'SCENE_ACT'
+        : record.triggers[0]?.triggerType == 'SCENE_TRIGGER'
         ? '场景触发'
         : '手动触发';
     },
@@ -190,19 +191,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 255,
       placeholder: '请输入描述',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 255) {
-              return Promise.reject('字数不超过255个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
 ];
 
@@ -229,19 +217,6 @@ export const searchFormSchema: FormSchema[] = [
       maxLength: 36,
       placeholder: '请输入名称',
     },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 36) {
-              return Promise.reject('字数不超过36个字');
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
-    },
   },
   {
     field: 'status',
@@ -260,15 +235,15 @@ export const searchFormSchema: FormSchema[] = [
 
 export const useTriggerDrawerSchema: FormSchema[] = [
   {
-    field: 'triggerEvent',
+    field: 'triggerType',
     label: '',
     component: 'Select',
     componentProps: {
       placeholder: '设备触发',
       options: [
-        { label: '设备触发', value: 'DEVICE_ACT' },
-        { label: '定时触发', value: 'TIME_ACT' },
-        { label: '场景触发', value: 'SCENE_ACT' },
+        { label: '设备触发', value: 'DEVICE_TRIGGER' },
+        { label: '定时触发', value: 'SCHEDULE_TRIGGER' },
+        { label: '场景触发', value: 'SCENE_TRIGGER' },
         { label: '手动触发', value: 'HAND_ACT' },
       ],
     },
@@ -282,9 +257,9 @@ export const useTriggerDrawerSchema: FormSchema[] = [
       placeholder: '请选择设备',
     },
     ifShow: ({ values }) =>
-      !isTime(Reflect.get(values, 'triggerEvent')) &&
-      !isScene(Reflect.get(values, 'triggerEvent')) &&
-      !isHand(Reflect.get(values, 'triggerEvent')),
+      !isTime(Reflect.get(values, 'triggerType')) &&
+      !isScene(Reflect.get(values, 'triggerType')) &&
+      !isHand(Reflect.get(values, 'triggerType')),
     colProps: {
       span: 12,
     },
@@ -300,7 +275,7 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     colProps: {
       span: 12,
     },
-    ifShow: ({ values }) => isTime(Reflect.get(values, 'triggerEvent')),
+    ifShow: ({ values }) => isTime(Reflect.get(values, 'triggerType')),
   },
   {
     field: 'touchWay',
@@ -314,9 +289,9 @@ export const useTriggerDrawerSchema: FormSchema[] = [
       ],
     },
     ifShow: ({ values }) =>
-      !isTime(Reflect.get(values, 'triggerEvent')) &&
-      !isScene(Reflect.get(values, 'triggerEvent')) &&
-      !isHand(Reflect.get(values, 'triggerEvent')),
+      !isTime(Reflect.get(values, 'triggerType')) &&
+      !isScene(Reflect.get(values, 'triggerType')) &&
+      !isHand(Reflect.get(values, 'triggerType')),
     colProps: { span: 12 },
   },
   {
@@ -334,9 +309,9 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     colProps: { span: 12 },
     ifShow: ({ values }) =>
       isUpAndDown(Reflect.get(values, 'touchWay')) &&
-      !isTime(Reflect.get(values, 'triggerEvent')) &&
-      !isScene(Reflect.get(values, 'triggerEvent')) &&
-      !isHand(Reflect.get(values, 'triggerEvent')),
+      !isTime(Reflect.get(values, 'triggerType')) &&
+      !isScene(Reflect.get(values, 'triggerType')) &&
+      !isHand(Reflect.get(values, 'triggerType')),
   },
   {
     field: 'attributeChoose',
@@ -350,9 +325,9 @@ export const useTriggerDrawerSchema: FormSchema[] = [
       ],
     },
     ifShow: ({ values }) =>
-      !isTime(Reflect.get(values, 'triggerEvent')) &&
-      !isScene(Reflect.get(values, 'triggerEvent')) &&
-      !isHand(Reflect.get(values, 'triggerEvent')) &&
+      !isTime(Reflect.get(values, 'triggerType')) &&
+      !isScene(Reflect.get(values, 'triggerType')) &&
+      !isHand(Reflect.get(values, 'triggerType')) &&
       !isUpAndDown(Reflect.get(values, 'touchWay')),
     colProps: { span: 12 },
   },
@@ -373,9 +348,9 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     ifShow: ({ values }) =>
       isWenDu(Reflect.get(values, 'attributeChoose')) &&
       !isUpAndDown(Reflect.get(values, 'touchWay')) &&
-      !isTime(Reflect.get(values, 'triggerEvent')) &&
-      !isScene(Reflect.get(values, 'triggerEvent')) &&
-      !isHand(Reflect.get(values, 'triggerEvent')),
+      !isTime(Reflect.get(values, 'triggerType')) &&
+      !isScene(Reflect.get(values, 'triggerType')) &&
+      !isHand(Reflect.get(values, 'triggerType')),
     colProps: { span: 12 },
   },
   {
@@ -390,9 +365,9 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     ifShow: ({ values }) =>
       isWenDu(Reflect.get(values, 'attributeChoose')) &&
       !isUpAndDown(Reflect.get(values, 'touchWay')) &&
-      !isTime(Reflect.get(values, 'triggerEvent')) &&
-      !isScene(Reflect.get(values, 'triggerEvent')) &&
-      !isHand(Reflect.get(values, 'triggerEvent')),
+      !isTime(Reflect.get(values, 'triggerType')) &&
+      !isScene(Reflect.get(values, 'triggerType')) &&
+      !isHand(Reflect.get(values, 'triggerType')),
     colProps: {
       span: 12,
     },
@@ -413,7 +388,7 @@ export const useTriggerDrawerSchema: FormSchema[] = [
         { label: '场景触发器3', value: '3' },
       ],
     },
-    ifShow: ({ values }) => isScene(Reflect.get(values, 'triggerEvent')),
+    ifShow: ({ values }) => isScene(Reflect.get(values, 'triggerType')),
   },
 
   {
@@ -426,29 +401,20 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     componentProps: {
       placeholder: '暂不实现',
     },
-    ifShow: ({ values }) => isHand(Reflect.get(values, 'triggerEvent')),
-  },
-  {
-    field: '0',
-    component: 'Input',
-    label: ' ',
-    colProps: {
-      span: 12,
-    },
-    slot: 'add',
+    ifShow: ({ values }) => isHand(Reflect.get(values, 'triggerType')),
   },
 ];
 
 export const useConditionDrawerSchema: FormSchema[] = [
   {
-    field: 'status',
+    field: 'triggerType',
     label: '',
     component: 'Select',
     componentProps: {
       placeholder: '设备状态',
       options: [
-        { label: '设备触发', value: 'DEVICE_STATUS' },
-        { label: '时间范围', value: 'TIME_ALL' },
+        { label: '设备触发', value: 'DEVICE_TRIGGER' },
+        { label: '时间范围', value: 'SCHEDULE_TRIGGER' },
       ],
     },
     colProps: { span: 12 },
@@ -460,7 +426,7 @@ export const useConditionDrawerSchema: FormSchema[] = [
     componentProps: {
       placeholder: '请选择设备',
     },
-    ifShow: ({ values }) => !isTimeAll(Reflect.get(values, 'status')),
+    ifShow: ({ values }) => !isTimeAll(Reflect.get(values, 'triggerType')),
     colProps: {
       span: 12,
     },
@@ -475,7 +441,7 @@ export const useConditionDrawerSchema: FormSchema[] = [
     colProps: {
       span: 12,
     },
-    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'status')),
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'triggerType')),
   },
   {
     field: 'updateTime',
@@ -487,7 +453,7 @@ export const useConditionDrawerSchema: FormSchema[] = [
     colProps: {
       span: 12,
     },
-    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'status')),
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'triggerType')),
   },
   {
     field: 'property',
@@ -500,19 +466,7 @@ export const useConditionDrawerSchema: FormSchema[] = [
         { label: 'wendu', value: 'WENDU' },
       ],
     },
-    ifShow: ({ values }) => !isTimeAll(Reflect.get(values, 'status')),
-    colProps: { span: 12 },
-  },
-  {
-    field: 'wu',
-    label: '',
-    component: 'Input',
-    componentProps: {
-      placeholder: '无',
-      style: {
-        visibility: 'hidden',
-      },
-    },
+    ifShow: ({ values }) => !isTimeAll(Reflect.get(values, 'triggerType')),
     colProps: { span: 12 },
   },
   {
@@ -530,7 +484,7 @@ export const useConditionDrawerSchema: FormSchema[] = [
       ],
     },
     ifShow: ({ values }) =>
-      isShiDu(Reflect.get(values, 'property')) && !isTimeAll(Reflect.get(values, 'status')),
+      isShiDu(Reflect.get(values, 'property')) && !isTimeAll(Reflect.get(values, 'triggerType')),
     colProps: { span: 12 },
   },
   {
@@ -543,7 +497,7 @@ export const useConditionDrawerSchema: FormSchema[] = [
     },
 
     ifShow: ({ values }) =>
-      isShiDu(Reflect.get(values, 'property')) && !isTimeAll(Reflect.get(values, 'status')),
+      isShiDu(Reflect.get(values, 'property')) && !isTimeAll(Reflect.get(values, 'triggerType')),
     colProps: {
       span: 12,
     },
@@ -564,7 +518,7 @@ export const useConditionDrawerSchema: FormSchema[] = [
       ],
     },
     ifShow: ({ values }) =>
-      isWenDu(Reflect.get(values, 'property')) && !isTimeAll(Reflect.get(values, 'status')),
+      isWenDu(Reflect.get(values, 'property')) && !isTimeAll(Reflect.get(values, 'triggerType')),
     colProps: { span: 12 },
   },
   {
@@ -576,20 +530,11 @@ export const useConditionDrawerSchema: FormSchema[] = [
       placeholder: '请输入比较值',
     },
     ifShow: ({ values }) =>
-      isWenDu(Reflect.get(values, 'property')) && !isTimeAll(Reflect.get(values, 'status')),
+      isWenDu(Reflect.get(values, 'property')) && !isTimeAll(Reflect.get(values, 'triggerType')),
     colProps: {
       span: 12,
     },
   },
-  {
-    field: '0',
-    component: 'Input',
-    label: ' ',
-    colProps: {
-      span: 12,
-    },
-    slot: 'add',
-  },
 ];
 
 export const useActionDrawerSchema: FormSchema[] = [
@@ -602,7 +547,7 @@ export const useActionDrawerSchema: FormSchema[] = [
       options: [
         { label: '设备输出', value: 'DEVICE_OUT' },
         { label: '消息通知', value: 'MSG_NOTIFY' },
-        { label: '场景联动', value: 'SCENE_ACT' },
+        { label: '场景联动', value: 'SCENE_TRIGGER' },
       ],
     },
     colProps: { span: 12 },
@@ -621,7 +566,7 @@ export const useActionDrawerSchema: FormSchema[] = [
     },
   },
   {
-    field: 'command',
+    field: 'doContext',
     component: 'Input',
     label: '',
     componentProps: {
@@ -635,18 +580,6 @@ export const useActionDrawerSchema: FormSchema[] = [
     },
   },
   {
-    field: 'wu1',
-    label: '',
-    component: 'Input',
-    componentProps: {
-      placeholder: '无',
-      style: {
-        visibility: 'hidden',
-      },
-    },
-    colProps: { span: 12 },
-  },
-  {
     field: 'wu2',
     component: 'Input',
     label: '',
@@ -702,13 +635,4 @@ export const useActionDrawerSchema: FormSchema[] = [
     colProps: { span: 12 },
     ifShow: ({ values }) => isScene(Reflect.get(values, 'outTarget')),
   },
-  {
-    field: '0',
-    component: 'Input',
-    label: ' ',
-    colProps: {
-      span: 12,
-    },
-    slot: 'add',
-  },
 ];

 export interface IAddTrigger {
-  id: string;
-  triggerEvent: string;
+  triggerType: string;
   deviceId: string;
   touchWay: string;
   attributeChoose: string;
@@ -9,18 +8,15 @@ export interface IAddTrigger {
 }
 
 export interface IAddCondition {
-  id: string;
-  status: string;
+  triggerType: string;
   deviceId: string;
   createTime: string;
   updateTime: string;
-  property: string;
   compare: string;
   value: string;
 }
 
 export interface IAddAction {
-  id: string;
   outTarget: string;
   deviceId: string;
   command: string;

@@ -6,6 +6,7 @@
     :title="getTitle"
     width="1000px"
     @ok="handleSubmit"
+    @close="handleClose"
   >
     <div>
       <BasicForm @register="registerForm" />
@@ -56,7 +57,7 @@
       </div>
       <div style="height: 5vh"></div>
       <!-- 执行条件 -->
-      <div>
+      <div class="condition-style">
         <template
           v-for="(item, index) in isUpdate == false ? addConditionPushData : editConditionPushData"
           :key="index"
@@ -195,8 +196,7 @@
       const refConditionChildData: any = ref({});
       const refActionChildData: any = ref({});
       const addTriggerData = reactive<IAddTrigger>({
-        id: Date.now() + Math.random() + '',
-        triggerEvent: '',
+        triggerType: '',
         deviceId: '',
         touchWay: '',
         attributeChoose: '',
@@ -204,44 +204,37 @@
         value: '',
       });
       const editTriggerData = reactive<IAddTrigger>({
-        id: Date.now() + Math.random() + '',
-        triggerEvent: '请选择设备触发',
+        triggerType: '',
         deviceId: '请选择设备',
-        touchWay: '请选择出发方式',
+        touchWay: '请选择触发方式',
         attributeChoose: '请选择属性',
         compare: '',
         value: '',
       });
       const addConditionData = reactive<IAddCondition>({
-        id: Date.now() + Math.random() + '',
-        status: '',
+        triggerType: '',
         deviceId: '',
         createTime: '',
         updateTime: '',
-        property: '',
         compare: '',
         value: '',
       });
       const editConditionData = reactive<IAddCondition>({
-        id: Date.now() + Math.random() + '',
-        status: '',
-        deviceId: '',
+        deviceId: '请选择设备',
         createTime: '',
         updateTime: '',
-        property: '请选择',
+        triggerType: '',
         compare: '',
         value: '',
       });
       const addActionData = reactive<IAddAction>({
-        id: Date.now() + Math.random() + '',
         outTarget: '',
         deviceId: '',
         command: '',
         sceneLinkageId: '',
       });
       const editActionData = reactive<IAddAction>({
-        id: Date.now() + Math.random() + '',
-        outTarget: '请选择触发方式',
+        outTarget: '',
         deviceId: '请选择设备',
         command: '请输入执行命令',
         sceneLinkageId: '',
@@ -260,7 +253,7 @@
       const getConditionChildData = ref(null);
       const { createMessage } = useMessage();
       const isUpdate = ref(true);
-      const getAllFormData: any = reactive({});
+      let getAllFormData: any = reactive({});
       let getValuesFormData: any = reactive({});
       const getId = ref('');
       const getTenantId = ref('');
@@ -270,18 +263,25 @@
       const newFilterMap = ref<[]>([]);
       const newConditionFilterMap = ref<[]>([]);
       const newActionFilterMap = ref<[]>([]);
-      const filterNewTriggerArr = ref<[]>([]);
-      const filterNewConditionArr = ref<[]>([]);
-      const filterNewActionArr = ref<[]>([]);
-      const pushEditArray = ref<[]>([]);
-      const pushEditConditionArray = ref<[]>([]);
-      const pushEditActionArray = ref<[]>([]);
-      const filterArrayTrigger = ref<[]>([]);
+      let filterNewConditionArr = [];
+      let filterNewActionArr = [];
+      const pushEditArray = [];
+      const pushEditConditionArray = [];
+      const pushEditActionArray = [];
+      let filterArrayTrigger = [];
       const filterArrayCondition = ref<[]>([]);
       const filterArrayAction = ref<[]>([]);
-      const filterArrayTriggerObj = ref({});
-      const filterArrayConditionObj = ref({});
-      const filterArrayActionObj = ref({});
+      let filterNewTriggerArr = [];
+
+      let triggersObj = {
+        triggers: [],
+      };
+      let conditionsObj = {
+        doConditions: [],
+      };
+      let actionsObj = {
+        doActions: [],
+      };
 
       const [registerForm, { resetFields, setFieldsValue, validateFields }] = useForm({
         labelWidth: 120,
@@ -295,16 +295,24 @@
         isUpdate.value = !!data?.isUpdate;
         if (!unref(isUpdate)) {
           try {
-            proxy.$refs.refTriggerChild.resetFieldsValueFunc();
-            proxy.$refs.refConditionChild.resetFieldsValueFunc();
-            proxy.$refs.refActionChild.resetFieldsValueFunc();
+            triggersObj = {
+              triggers: [],
+            };
+            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();
+            proxy.$refs.refTriggerChild.resetFieldsValueFunc();
+            proxy.$refs.refConditionChild.resetFieldsValueFunc();
+            proxy.$refs.refActionChild.resetFieldsValueFunc();
           } catch (e) {
             return e;
           }
@@ -316,7 +324,9 @@
           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;
@@ -365,6 +375,16 @@
         }
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '新增场景联动' : '编辑场景联动'));
+      const handleClose = () => {
+        pushEditArray.length = 0;
+        lastRefTriggerChildDataArray.value.length = 0;
+        lastRefTriggerChildDataArray.value = [];
+        lastRefConditionChildDataArray.value.length = 0;
+        lastRefActionChildDataArray.value.length = 0;
+        filterArrayTrigger.length = 0;
+        filterArrayCondition.value.length = 0;
+        filterArrayAction.value.length = 0;
+      };
 
       const clearAllArrayFunc = () => {
         unref(addTriggerPushData).length = 0;
@@ -430,54 +450,81 @@
           lastRefTriggerChildDataArray.value.push(refTriggerChildData.value as never);
           lastRefConditionChildDataArray.value.push(refConditionChildData.value as never);
           lastRefActionChildDataArray.value.push(refActionChildData.value as never);
-          const triggersObj = {
+          triggersObj = {
             triggers: lastRefTriggerChildDataArray.value,
           };
-          const conditionsObj = {
+          conditionsObj = {
             doConditions: lastRefConditionChildDataArray.value,
           };
-          const actionsObj = {
+          actionsObj = {
             doActions: lastRefActionChildDataArray.value,
           };
+
           Object.assign(getAllFormData, triggersObj, conditionsObj, actionsObj);
         } else {
           refTriggerChildDataFunc();
           refConditionChildDataFunc();
           refActionChildDataFunc();
-          pushEditArray.value.push(refTriggerChildData.value as never);
-          pushEditConditionArray.value.push(refConditionChildData.value as never);
-          pushEditActionArray.value.push(refActionChildData.value as never);
-          filterArrayTrigger.value = editTriggerPushData.value.filter(
-            (f) => f?.triggerEvent !== ''
+          pushEditArray.push(refTriggerChildData.value as never);
+          pushEditConditionArray.push(refConditionChildData.value as never);
+          pushEditActionArray.push(refActionChildData.value as never);
+          pushEditArray.forEach((f) => {
+            editTriggerPushData.value.push(f as never);
+          });
+          pushEditConditionArray.forEach((f) => {
+            editConditionPushData.value.push(f as never);
+          });
+          pushEditActionArray.forEach((f) => {
+            editActionPushData.value.push(f as never);
+          });
+          const filterTwoArrayTrigger = editTriggerPushData.value.filter((f) =>
+            f?.hasOwnProperty('id')
           );
-          filterArrayCondition.value = editTriggerPushData.value.filter((f) => f?.property !== '');
 
-          filterArrayAction.value = editTriggerPushData.value.filter((f) => f?.outTarget !== '');
+          const filterTwoArrayCondition = editConditionPushData.value.filter((f) =>
+            f?.hasOwnProperty('id')
+          );
+
+          const filterTwoArrayAction = editActionPushData.value.filter((f) =>
+            f?.hasOwnProperty('id')
+          );
 
-          pushEditArray.value.forEach((f) => {
-            filterArrayTriggerObj.value = f;
-            filterArrayTrigger.value.push(filterArrayTriggerObj.value as never);
+          const filterThreeArrayTrigger = editTriggerPushData.value.filter(
+            (f) => f?.deviceId == ''
+          );
+          const filterThreeArrayCondition = editConditionPushData.value.filter(
+            (f) => f?.deviceId == ''
+          );
+          const filterThreeArrayAction = editActionPushData.value.filter((f) => f?.deviceId == '');
+          const filterFourArrayTrigger = filterThreeArrayTrigger.filter(
+            (f) => f?.triggerType !== ''
+          );
+          const filterFourArrayCondition = filterThreeArrayCondition.filter(
+            (f) => f?.triggerType !== ''
+          );
+
+          const filterFourArrayAction = filterThreeArrayAction.filter((f) => f?.outTarget !== '');
+
+          filterFourArrayTrigger.forEach((f) => {
+            filterTwoArrayTrigger.push(f);
           });
-          pushEditConditionArray.value.forEach((f) => {
-            filterArrayConditionObj.value = f;
-            filterArrayCondition.value.push(filterArrayConditionObj.value as never);
+          filterFourArrayCondition.forEach((f) => {
+            filterTwoArrayCondition.push(f);
           });
-
-          pushEditActionArray.value.forEach((f) => {
-            filterArrayActionObj.value = f;
-            filterArrayAction.value.push(filterArrayActionObj.value as never);
+          filterFourArrayAction.forEach((f) => {
+            filterTwoArrayAction.push(f);
           });
 
-          const triggersObj = {
-            triggers: filterArrayTrigger.value,
+          let editTriggersObj = {
+            triggers: filterTwoArrayTrigger,
           };
-          const conditionsObj = {
-            doConditions: filterArrayCondition.value,
+          let editConditionsObj = {
+            doConditions: filterTwoArrayCondition,
           };
-          const actionsObj = {
-            doActions: filterArrayAction.value,
+          let editActionsObj = {
+            doActions: filterTwoArrayAction,
           };
-          Object.assign(getAllFormData, triggersObj, conditionsObj, actionsObj);
+          Object.assign(getAllFormData, editTriggersObj, editConditionsObj, editActionsObj);
         }
       };
 
@@ -518,14 +565,14 @@
           unref(addTriggerPushData).push(addTriggerData as never);
           refTriggerChildDataFunc();
           lastRefTriggerChildData.value = refTriggerChildData.value;
-          filterNewTriggerArr.value.push(lastRefTriggerChildData.value as never);
-          lastRefTriggerChildDataArray.value = filterNewTriggerArr.value.filter(
+          filterNewTriggerArr.push(lastRefTriggerChildData.value as never);
+          (lastRefTriggerChildDataArray.value as never[]) = filterNewTriggerArr.filter(
             (v) => Object.keys(v).length !== 0
           );
         } else {
           refTriggerChildDataFunc();
-          pushEditArray.value.push(refTriggerChildData.value);
-          unref(editTriggerPushData).push(editTriggerData as never);
+          pushEditArray.push(refTriggerChildData.value as never);
+          unref(editTriggerPushData).push(addTriggerData as never);
         }
       };
       const removeTrigger = () => {
@@ -539,7 +586,7 @@
         } else {
           try {
             unref(editTriggerPushData).splice(0, 1);
-            lastEditRefTriggerChildDataArray.value.splice(0, 1);
+            lastEditRefTriggerChildDataArray.value.pop();
           } catch (e) {
             return e;
           }
@@ -558,14 +605,14 @@
           unref(addConditionPushData).push(addConditionData as never);
           refConditionChildDataFunc();
           lastRefConditionChildData.value = refConditionChildData.value;
-          filterNewConditionArr.value.push(lastRefConditionChildData.value as never);
-          lastRefConditionChildDataArray.value = filterNewConditionArr.value.filter(
+          filterNewConditionArr.push(lastRefConditionChildData.value as never);
+          (lastRefConditionChildDataArray.value as never[]) = filterNewConditionArr.filter(
             (v) => Object.keys(v).length !== 0
           );
         } else {
           refConditionChildDataFunc();
-          pushEditConditionArray.value.push(refConditionChildData.value);
-          unref(editConditionPushData).push(editConditionData as never);
+          pushEditConditionArray.push(refConditionChildData.value as never);
+          unref(editConditionPushData).push(addConditionData as never);
         }
       };
       const removeCondition = () => {
@@ -579,7 +626,7 @@
         } else {
           try {
             unref(editConditionPushData).splice(0, 1);
-            lastEditRefConditionChildDataArray.value.splice(0, 1);
+            lastEditRefConditionChildDataArray.value.pop();
           } catch (e) {
             return e;
           }
@@ -598,14 +645,14 @@
           unref(addActionPushData).push(addActionData as never);
           refActionChildDataFunc();
           lastRefActionChildData.value = refActionChildData.value;
-          filterNewActionArr.value.push(lastRefActionChildData.value as never);
-          lastRefActionChildDataArray.value = filterNewActionArr.value.filter(
+          filterNewActionArr.push(lastRefActionChildData.value as never);
+          (lastRefActionChildDataArray.value as never[]) = filterNewActionArr.filter(
             (v) => Object.keys(v).length !== 0
           );
         } else {
           refActionChildDataFunc();
-          pushEditActionArray.value.push(refActionChildData.value);
-          unref(editActionPushData).push(editActionData as never);
+          pushEditActionArray.push(refActionChildData.value as never);
+          unref(editActionPushData).push(addActionData as never);
         }
       };
       const removeAction = () => {
@@ -619,7 +666,7 @@
         } else {
           try {
             unref(editActionPushData).splice(0, 1);
-            lastEditRefActionChildDataArray.value.splice(0, 1);
+            lastEditRefActionChildDataArray.value.pop();
           } catch (e) {
             return e;
           }
@@ -627,6 +674,7 @@
       };
 
       return {
+        handleClose,
         defaultAddTrigger,
         defaultAddCondition,
         newFilterMap,
@@ -667,3 +715,11 @@
     },
   });
 </script>
+
+<style lang="less" scoped>
+  .condition-style {
+    :deep .ant-calendar-picker {
+      width: 24.9vw !important;
+    }
+  }
+</style>