Merge branch 'ft-dev' into 'main'

fix:修复设备配置报警规则数据和详情数据回显问题，feat:新增日程表数据收集

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

@@ -8,7 +8,7 @@
     @cancel="handleCancel"
   >
     <div class="step-form-form">
-      <a-steps :current="current">
+      <a-steps :current="current" @change="handleChange">
         <a-step title="设备配置" />
         <a-step title="传输配置" />
         <a-step title="告警配置" />
@@ -86,10 +86,15 @@
       const current = ref(0);
       const isUpdate = ref(true);
       const getTitle = computed(() => (!unref(isUpdate) ? '新增设备配置' : '编辑设备配置'));
+      const handleChange = (v) => {
+        console.log(v);
+      };
       const [register, { closeModal }] = useModalInner(async (data) => {
         isUpdate.value = !!data?.isUpdate;
         if (!unref(isUpdate)) {
           current.value = 0;
+          proxy.$refs.DeviceProfileStep3Ref.clearProfileDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
           switch (current.value) {
             case 0:
               proxy.$refs.DeviceProfileStep1Ref.customResetFunc();
@@ -109,33 +114,15 @@
         }
         if (unref(isUpdate)) {
           current.value = 0;
+          proxy.$refs.DeviceProfileStep3Ref.clearProfileDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
           postEditId.value = data.record.id;
           const getBackendData = await deviceConfigGetDetail(postEditId.value);
           editEchoData.value = { ...getBackendData };
-          console.log(editEchoData.value);
           switch (current.value) {
             case 0:
               proxy.$refs.DeviceProfileStep1Ref.resetFieldsFunc(editEchoData.value);
               break;
-            case 1:
-              proxy.$refs.DeviceProfileStep2Ref.resetFieldsFunc({
-                transportType: editEchoData.value.profileData.transportConfiguration.type,
-              });
-              break;
-            case 2:
-              proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormFunc({
-                alarmType: editEchoData.value.profileData?.alarms[0].alarmType,
-              });
-              proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormHighSettingmFunc(
-                editEchoData.value
-              );
-              proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormCreateAlarmFunc(
-                editEchoData.value
-              );
-              break;
-            case 3:
-              proxy.$refs.DeviceProfileStep4Ref.resetFieldsFunc(editEchoData.value);
-              break;
           }
         }
       });
@@ -145,15 +132,116 @@
       function handleStepNext1(v) {
         current.value++;
         getStepOneData.value = v;
+        if (unref(isUpdate)) {
+          proxy.$refs.DeviceProfileStep2Ref.resetFieldsFunc({
+            transportType: editEchoData.value.profileData.transportConfiguration.type,
+          });
+        } else {
+          // proxy.$refs.DeviceProfileStep2Ref.customResetAndFunc();
+        }
       }
       function handleStep2Next(v) {
         current.value++;
         getStepTwoData.value = v;
-        proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
+        if (unref(isUpdate)) {
+          proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormFunc({
+            alarmType: editEchoData.value.profileData.alarms[0].alarmType,
+          });
+          proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormHighSettingmFunc({
+            propagate: editEchoData.value.profileData.alarms[0].propagate,
+            propagateRelationTypes:
+              editEchoData.value.profileData?.alarms[0].propagateRelationTypes,
+          });
+          const getKey = Object.keys(editEchoData.value.profileData?.alarms[0].createRules);
+          proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormCreateAlarmFunc({
+            default: getKey[0],
+          });
+          const findDay = [
+            { label: '等于', value: 'EQUAL' },
+            { label: '不等于', value: 'NOT_EQUAL' },
+            { label: '开始于', value: 'STARTS_WITH' },
+            { label: '结束于', value: 'ENDS_WITH' },
+            { label: '包含', value: 'CONTAINS' },
+            { label: '不包含', value: 'NOT_CONTAINS' },
+            { label: '等于', value: 'EQUAL' },
+            { label: '不等于', value: 'NOT_EQUAL' },
+            { label: '大于', value: 'GREATER' },
+            { label: '小于', value: 'LESS' },
+            { label: '大于或等于', value: 'GREATER_OR_EQUAL' },
+            { label: '小于或等于', value: 'LESS_OR_EQUAL' },
+          ];
+          const findRuleByValue = findDay.find((f) => {
+            if (
+              f.value ==
+              editEchoData.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                .condition[0].predicate.operation
+            ) {
+              return f.label;
+            }
+          });
+          const findClearRuleByValue = findDay.find((f) => {
+            if (
+              f.value ==
+              editEchoData.value.profileData?.alarms[0].clearRule.condition.condition[0].predicate
+                .operation
+            ) {
+              return f.label;
+            }
+          });
+          proxy.$refs.DeviceProfileStep3Ref.retryRulesFormDataFunc(
+            `
+            键名:${
+              editEchoData.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                .condition[0].key.key
+            }...操作:${findRuleByValue?.label}...值:${
+              editEchoData.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                .condition[0].predicate.value.defaultValue
+            }
+            `
+          );
+          proxy.$refs.DeviceProfileStep3Ref.retryEnableFormDataFunc(`始终启用`);
+          proxy.$refs.DeviceProfileStep3Ref.retryTemplateFormDataFunc(
+            `
+           报警详细信息:${
+             editEchoData.value.profileData?.alarms[0].createRules[getKey[0]].alarmDetails
+           }
+           `
+          );
+          //清除报警
+          proxy.$refs.DeviceProfileStep3Ref.retryRulesClearFormDataFunc(
+            `
+            键名:${editEchoData.value.profileData?.alarms[0].clearRule.condition.condition[0].key.key}...操作:${findClearRuleByValue?.label}...值:${editEchoData.value.profileData?.alarms[0].clearRule.condition.condition[0].predicate.value.defaultValue}
+            `
+          );
+          proxy.$refs.DeviceProfileStep3Ref.retryEnableClearFormDataFunc(`始终启用`);
+          proxy.$refs.DeviceProfileStep3Ref.retryTemplateClearFormDataFunc(
+            `
+           报警详细信息:${editEchoData.value.profileData?.alarms[0].clearRule.alarmDetails}
+           `
+          );
+        } else {
+          proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormHighSettingmFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormCreateAlarmFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetRulesFormDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetEnableFormDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetTemplateFormDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetRulesClearFormDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetEnableClearFormDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetTemplateClearFormDataFunc();
+        }
       }
       function handleStep3Next(v) {
         current.value++;
         getStepThreeData.value = v;
+        if (unref(isUpdate)) {
+          proxy.$refs.DeviceProfileStep4Ref.resetFieldsFunc({
+            alarmContactId: editEchoData.value.alarmProfile.alarmContactId,
+            messageMode: editEchoData.value.alarmProfile.messageMode,
+          });
+        } else {
+          // proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();
+        }
       }
       function handleRedo() {
         current.value = 0;
@@ -197,6 +285,7 @@
         return;
       };
       return {
+        handleChange,
         DeviceProfileStep2Ref,
         DeviceProfileStep3Ref,
         DeviceProfileStep4Ref,

@@ -21,41 +21,70 @@
         /></TabPane>
         <TabPane key="3" tab="报警规则">
           <div style="padding-top: 10px">
-            <BasicForm
-              :showSubmitButton="false"
-              :showResetButton="false"
-              @register="registerStep3Schemas"
-            />
-            <BasicForm
-              :showSubmitButton="false"
-              :showResetButton="false"
-              @register="registerStep3HighSetting"
-            />
-            <BasicForm
-              :showSubmitButton="false"
-              :showResetButton="false"
-              @register="registerStep3CreateAlarm"
-            />
-            <BasicForm
-              :showSubmitButton="false"
-              :showResetButton="false"
-              @register="registerStep3RuleAlarm"
-            />
-            <BasicForm
-              :showSubmitButton="false"
-              :showResetButton="false"
-              @register="registerStep3Condition"
-            />
-            <BasicForm
-              :showSubmitButton="false"
-              :showResetButton="false"
-              @register="registerStep3Enable"
-            />
-            <BasicForm
-              :showSubmitButton="false"
-              :showResetButton="false"
-              @register="registerStep3TemplateDetail"
-            />
+            <div style="border-radius: 10px; border: 1px solid #f0f0f0">
+              <div style="margin-left: 15px">
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3Schemas"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3HighSetting"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3CreateAlarm"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3RuleAlarm"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3Condition"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3Enable"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3TemplateDetail"
+                />
+              </div>
+            </div>
+            <div style="border-radius: 10px; border: 1px solid #f0f0f0; margin-top: 15px">
+              <p>清除报警规则</p>
+              <div style="margin-left: 15px">
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3ClearRuleAlarm"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3ClearCondition"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3ClearEnable"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3ClearTemplateDetail"
+                />
+              </div>
+            </div>
           </div>
         </TabPane>
         <TabPane key="4" tab="告警管理">
@@ -84,6 +113,10 @@
   import { formSchema as enableSchema } from './step/cpns/enablerule/config';
   import { formSchema as detailSchema } from './step/cpns/detailtemplate/config';
   import { formSchema as echoFormSchema } from './step/cpns/alarmruleconditions/cpns/config';
+  import { formSchema as conditionFormClearschema } from './step/cpns/alarmruleconditions/config';
+  import { formSchema as enableClearSchema } from './step/cpns/enablerule/config';
+  import { formSchema as detailClearSchema } from './step/cpns/detailtemplate/config';
+  import { formSchema as echoFormClearSchema } from './step/cpns/alarmruleconditions/cpns/config';
 
   export default defineComponent({
     name: 'ConfigDrawer',
@@ -156,6 +189,37 @@
           },
         });
 
+      //清除报警
+      const [registerStep3ClearRuleAlarm, { setFieldsValue: setRegisterStep3ClearRuleAlarm }] =
+        useForm({
+          schemas: echoFormClearSchema,
+          actionColOptions: {
+            span: 24,
+          },
+        });
+      const [registerStep3ClearCondition, { setFieldsValue: setRegisterStep3ClearCondition }] =
+        useForm({
+          schemas: conditionFormClearschema,
+          actionColOptions: {
+            span: 24,
+          },
+        });
+      const [registerStep3ClearEnable, { setFieldsValue: setRegisterStep3ClearEnable }] = useForm({
+        schemas: enableClearSchema,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+      const [
+        registerStep3ClearTemplateDetail,
+        { setFieldsValue: setRegisterStep3ClearTemplateDetail },
+      ] = useForm({
+        schemas: detailClearSchema,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+
       const [register] = useModalInner(async (data) => {
         activeKey.value = '1';
         isUpdate.value = !!data?.isUpdate;
@@ -178,45 +242,74 @@
               });
               break;
             case '3':
-              setRegisterStep3Schemas({
-                alarmType: descInfo.value.profileData?.alarms[0].alarmType,
-              });
-              setRegisterStep3HighSetting({
-                propagate: descInfo.value.profileData?.alarms[0].propagate,
-                propagateRelationTypes:
-                  descInfo.value.profileData?.alarms[0].propagateRelationTypes,
-              });
-              const getKey = Object.keys(descInfo.value.profileData?.alarms[0].createRules);
-              setRegisterStep3CreateAlarm({
-                default: getKey[0],
-              });
-              setRegisterStep3RuleAlarm({
-                type: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
-                  .condition[0].key.type,
-                key: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
-                  .condition[0].key.key,
-                valueType:
-                  descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
-                    .condition[0].valueType,
-                value:
-                  descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
-                    .condition[0].value,
-                operation:
-                  descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
-                    .condition[0].predicate.operation,
-              });
-              setRegisterStep3Condition({
-                conditionType:
-                  descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition.spec.type,
-              });
-              setRegisterStep3Enable({
-                schedule: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].schedule,
-              });
-              setRegisterStep3TemplateDetail({
-                alarmDetails:
-                  descInfo.value.profileData?.alarms[0].createRules[getKey[0]].alarmDetails,
-              });
-              break;
+              setTimeout(() => {
+                setRegisterStep3Schemas({
+                  alarmType: descInfo.value.profileData?.alarms[0].alarmType,
+                });
+                setRegisterStep3HighSetting({
+                  propagate: descInfo.value.profileData?.alarms[0].propagate,
+                  propagateRelationTypes:
+                    descInfo.value.profileData?.alarms[0].propagateRelationTypes,
+                });
+                const getKey = Object.keys(descInfo.value.profileData?.alarms[0].createRules);
+                setRegisterStep3CreateAlarm({
+                  default: getKey[0],
+                });
+                setRegisterStep3RuleAlarm({
+                  type: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                    .condition[0].key.type,
+                  key1: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                    .condition[0].key.key,
+                  type1:
+                    descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                      .condition[0].valueType,
+                  value1:
+                    descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                      .condition[0].predicate.value.defaultValue,
+                  operation:
+                    descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                      .condition[0].predicate.operation,
+                });
+                setRegisterStep3Condition({
+                  conditionType:
+                    descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition.spec
+                      .type,
+                });
+                setRegisterStep3Enable({
+                  schedule:
+                    descInfo.value.profileData?.alarms[0].createRules[getKey[0]].schedule.type,
+                });
+                setRegisterStep3TemplateDetail({
+                  alarmDetails:
+                    descInfo.value.profileData?.alarms[0].createRules[getKey[0]].alarmDetails,
+                });
+                //清除报警
+                setRegisterStep3ClearRuleAlarm({
+                  type: descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].key
+                    .type,
+                  key1: descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].key
+                    .key,
+                  type1:
+                    descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0]
+                      .valueType,
+                  value1:
+                    descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].predicate
+                      .value.defaultValue,
+                  operation:
+                    descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].predicate
+                      .operation,
+                });
+                setRegisterStep3ClearCondition({
+                  conditionType:
+                    descInfo.value.profileData?.alarms[0].clearRule.condition.spec.type,
+                });
+                setRegisterStep3ClearEnable({
+                  schedule: descInfo.value.profileData?.alarms[0].clearRule.schedule.type,
+                });
+                setRegisterStep3ClearTemplateDetail({
+                  alarmDetails: descInfo.value.profileData?.alarms[0].clearRule.alarmDetails,
+                });
+              }, 1000);
             case '4':
               setRegisterContact({
                 alarmContactId: descInfo.value.alarmProfile.alarmContactId,
@@ -240,6 +333,10 @@
       });
 
       return {
+        registerStep3ClearTemplateDetail,
+        registerStep3ClearEnable,
+        registerStep3ClearCondition,
+        registerStep3ClearRuleAlarm,
         handleChange,
         registerStep3TemplateDetail,
         registerStep3Enable,

@@ -31,7 +31,7 @@
         <template v-for="(childItem, createIndex) in item.alarms" :key="childItem.id">
           <div class="aic" style="border: 1px solid #bfbfbf">
             <div class="w-3/4">
-              <div style="margin-left: -30px; margin-top: 20px"
+              <div style="margin-left: -33px; margin-top: 20px"
                 ><BasicForm @register="registerFormCreateAlarm" />
               </div>
               <div style="margin-left: 5px; margin-top: -50px">
@@ -78,7 +78,7 @@
         <div style="height: 20px"></div>
         <p>清除报警规则</p>
         <template
-          v-for="(childClearItem, clearIndexItem) in item.alarms[clearIndex].clearRule"
+          v-for="(childClearItem, clearIndexItem) in item.clearRule"
           :key="childClearItem.id"
         >
           <div class="aic mb-1" style="border: 1px solid #bfbfbf">
@@ -222,12 +222,18 @@
       const ruleClearTemplateData: any = ref(null);
       const enableClearTemplateData: any = ref(null);
       const detailClearTemplateData: any = ref(null);
+      const scheduleCustomValue: any = ref({});
       const clearIndex = ref(-1);
+      const getSchduleCustomValue: any = ref([]);
       //告警列表
       let profileData = ref<IProfileData[]>([]);
       const log = (e) => {
         console.log(e);
       };
+      //编辑清空操作
+      const clearProfileDataFunc = () => {
+        unref(profileData).splice(0, 1);
+      };
       //删除告警配置
       const deleteAlarmRule = (index: number) => {
         unref(profileData).splice(index, 1);
@@ -254,26 +260,27 @@
               id: Date.now() + Math.random() + '',
               alarmType: '',
               createRules: {},
-              clearRule: [
-                {
-                  id: Date.now() + Math.random() + '',
-                  alarmDetails: '',
-                  dashboardId: {
-                    id: '',
-                    entityType: '',
-                  },
-                  propagate: '',
-                  propagateRelationTypes: [''],
-                  schedule: {
-                    type: 'string',
-                  },
-                  condition: {},
-                },
-              ],
+
               propagate: false,
               propagateRelationTypes: [''],
             },
           ],
+          clearRule: [
+            {
+              id: Date.now() + Math.random() + '',
+              alarmDetails: '',
+              dashboardId: {
+                id: '',
+                entityType: '',
+              },
+              propagate: '',
+              propagateRelationTypes: [''],
+              schedule: {
+                type: 'string',
+              },
+              condition: {},
+            },
+          ],
         });
       };
       //TODO Mobile dashboard:
@@ -342,6 +349,25 @@
       const resetRegisterFormCreateAlarmFunc = () => {
         resetRegisterFormCreateAlarm();
       };
+      const resetRulesFormDataFunc = () => {
+        ruleTemplateData.value = ``;
+      };
+      const resetEnableFormDataFunc = () => {
+        enableTemplateData.value = ``;
+      };
+      const resetTemplateFormDataFunc = () => {
+        detailTemplateData.value = ``;
+      };
+      const resetRulesClearFormDataFunc = () => {
+        ruleClearTemplateData.value = ``;
+      };
+      const resetEnableClearFormDataFunc = () => {
+        enableClearTemplateData.value = ``;
+      };
+      const resetTemplateClearFormDataFunc = () => {
+        detailClearTemplateData.value = ``;
+      };
+
       //回显表单数据
       const retryRegisterFormFunc = (v) => {
         setRegisterForm(v);
@@ -352,6 +378,25 @@
       const retryRegisterFormCreateAlarmFunc = (v) => {
         setRegisterFormCreateAlarm(v);
       };
+      const retryRulesFormDataFunc = (v) => {
+        ruleTemplateData.value = v;
+      };
+      const retryEnableFormDataFunc = (v) => {
+        enableTemplateData.value = v;
+      };
+      const retryTemplateFormDataFunc = (v) => {
+        detailTemplateData.value = v;
+      };
+      const retryRulesClearFormDataFunc = (v) => {
+        ruleClearTemplateData.value = v;
+      };
+      const retryEnableClearFormDataFunc = (v) => {
+        enableClearTemplateData.value = v;
+      };
+      const retryTemplateClearFormDataFunc = (v) => {
+        detailClearTemplateData.value = v;
+      };
+
       const tempValue1: string = ref<string>('');
       // 添加‘创建条件’
       const addCreateRole = (index: number) => {
@@ -400,27 +445,26 @@
             };
           },
         });
-
         unref(profileData)[index].alarms.push({
           id: Date.now() + Math.random() + '',
           alarmType: '',
           createRules: {},
-          clearRule: [
-            {
-              id: Date.now() + Math.random() + '',
-              alarmDetails: '',
-              dashboardId: {
-                id: '',
-                entityType: '',
-              },
-              propagate: '',
-              propagateRelationTypes: [''],
-              schedule: {
-                type: 'string',
-              },
-              condition: {},
-            },
-          ],
+          // clearRule: [
+          //   {
+          //     id: Date.now() + Math.random() + '',
+          //     alarmDetails: '',
+          //     dashboardId: {
+          //       id: '',
+          //       entityType: '',
+          //     },
+          //     propagate: '',
+          //     propagateRelationTypes: [''],
+          //     schedule: {
+          //       type: 'string',
+          //     },
+          //     condition: {},
+          //   },
+          // ],
           propagate: false,
           propagateRelationTypes: [''],
         });
@@ -516,7 +560,7 @@
           }
         });
         ruleTemplateData.value = `
-           键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
+           键名:${v.key1}  操作:${findRuleByValue?.label}  值:${v.value1}
            `;
 
         ruleLastObj.value = v1;
@@ -636,7 +680,7 @@
           }
         });
         ruleClearTemplateData.value = `
-           键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
+           键名:${v.key1}  操作:${findRuleByValue?.label}  值:${v.value1}
            `;
 
         ruleLastObj.value = v1;
@@ -677,7 +721,7 @@
         };
         Object.assign(addClearitionalObj.value, getValueConditon);
       };
-      //用于生成uuid
+      //生成uuid
       function generateUUID() {
         let d = new Date().getTime();
         if (window.performance && typeof window.performance.now === 'function') {
@@ -692,11 +736,45 @@
       }
       const handleFormStep3toStep4Next = async () => {
         try {
+          if (enableObj.value.schedule == 'CUSTOM') {
+            console.log(enableObj.value);
+            switch (enableObj.value.daysOfWeek1[0]) {
+              case '1':
+                getSchduleCustomValue.value.push({
+                  enabled: true,
+                  dayOfWeek: enableObj.value.daysOfWeek1[0],
+                  startsOn: enableObj.value.startsOn1,
+                  endsOn: enableObj.value.endsOn1,
+                });
+                break;
+              case '2':
+                getSchduleCustomValue.value.push({
+                  enabled: true,
+                  dayOfWeek: enableObj.value.daysOfWeek2[0],
+                  startsOn: enableObj.value.startsOn2,
+                  endsOn: enableObj.value.endsOn2,
+                });
+                break;
+              case '3':
+                getSchduleCustomValue.value.push({
+                  enabled: true,
+                  dayOfWeek: enableObj.value.daysOfWeek3[0],
+                  startsOn: enableObj.value.startsOn3,
+                  endsOn: enableObj.value.endsOn3,
+                });
+                break;
+            }
+            scheduleCustomValue.value = {
+              type: enableObj.value.schedule,
+              timezone: enableObj.value.timezone,
+              items: getSchduleCustomValue.value,
+            };
+          }
           const scheduleClearValue = {
             type: enableClearObj.value.schedule,
             daysOfWeek: enableClearObj.value.daysOfWeek,
-            // endsOn: enableClearObj.value.endsOn,
-            // startsOn: enableClearObj.value.startOn,
+            endsOn: enableClearObj.value.endsOn,
+            startsOn: enableClearObj.value.startOn,
             timezone: enableClearObj.value.timezone,
           };
           const getClearSchedule = {
@@ -706,13 +784,15 @@
           const scheduleValue = {
             type: enableObj.value.schedule,
             daysOfWeek: enableObj.value.daysOfWeek,
-            // endsOn: enableObj.value.endsOn,
-            // startsOn: enableObj.value.startOn,
+            endsOn: enableObj.value.endsOn,
+            startsOn: enableObj.value.startOn,
             timezone: enableObj.value.timezone,
           };
           const getSchedule = {
-            schedule: scheduleValue,
+            schedule:
+              enableObj.value.schedule == 'CUSTOM' ? scheduleCustomValue.value : scheduleValue,
           };
+
           const getAdditionalProp = Object.assign({}, detailObj.value, getSchedule);
           const getScheduleAndAlarmDetails = Object.assign(
             {},
@@ -756,7 +836,9 @@
             getClearRulesAllObj,
             objectId
           );
-          alarmss.value.push(emptyObj.value);
+          if (alarmss.value.length == 0) {
+            alarmss.value.push(emptyObj.value);
+          }
           const getAlarms = {
             alarms: alarmss.value,
           };
@@ -814,6 +896,19 @@
       };
 
       return {
+        resetEnableClearFormDataFunc,
+        resetTemplateClearFormDataFunc,
+        resetRulesClearFormDataFunc,
+        resetEnableFormDataFunc,
+        resetTemplateFormDataFunc,
+        resetRulesFormDataFunc,
+        retryEnableClearFormDataFunc,
+        retryTemplateClearFormDataFunc,
+        retryRulesClearFormDataFunc,
+        retryEnableFormDataFunc,
+        retryTemplateFormDataFunc,
+        retryRulesFormDataFunc,
+        clearProfileDataFunc,
         clearIndex,
         retryRegisterFormFunc,
         retryRegisterFormHighSettingmFunc,

@@ -99,7 +99,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'conditionType',
     label: '条件类型',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Select',
     componentProps: {
       placeholder: '请选择报警日程表',
@@ -177,7 +177,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'defaultValue',
     label: '持续时间值',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Input',
     componentProps: {
       placeholder: '请输入持续时间值（请输入数字）',
@@ -210,7 +210,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'unit',
     label: '时间单位',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Select',
     componentProps: {
       placeholder: '请选择时间单位',
@@ -226,7 +226,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'defaultValue',
     label: '事件计数值必填',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Input',
     componentProps: {
       placeholder: '请输入事件计数值（应在1到2147483637之间）',
@@ -240,6 +240,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'inherit',
     label: '',
+    colProps: { span: 13 },
     component: 'Checkbox',
     renderComponentContent: 'Inherit from owner',
     ifShow: ({ values }) =>

@@ -48,7 +48,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'type',
     label: '键类型',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Select',
     componentProps: {
       placeholder: '请选择键类型',
@@ -62,7 +62,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'key1',
     label: '键名',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Input',
     componentProps: {
       placeholder: '请输入键名',
@@ -79,7 +79,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'key1',
     label: '键名',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Input',
     componentProps: {
       placeholder: '请输入键名',
@@ -94,7 +94,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'key1',
     label: '键名',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Input',
     componentProps: {
       placeholder: '请输入键名',
@@ -104,7 +104,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'type1',
     label: '值类型',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Select',
     componentProps: {
       placeholder: '请选择值类型',
@@ -122,7 +122,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'operation',
     label: '操作',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Select',
     componentProps: {
       placeholder: '请选择操作',
@@ -141,7 +141,7 @@ export const formSchema: FormSchema[] = [
     field: '',
     label: '大小写',
     component: 'Checkbox',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     renderComponentContent: '忽略大小写',
     ifShow: ({ values }) => isString(Reflect.get(values, 'type1')),
   },
@@ -180,7 +180,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'value1',
     label: '默认值',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Input',
     componentProps: {
       placeholder: '请输入默认值(数字)',
@@ -203,7 +203,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'operation',
     label: '操作',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Select',
     componentProps: {
       placeholder: '请选择操作',
@@ -254,7 +254,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'value1',
     label: '值',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Input',
     componentProps: {
       placeholder: '请输入值(数字)',
@@ -278,7 +278,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'operation',
     label: '操作',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Select',
     componentProps: {
       placeholder: '请选择操作',
@@ -292,6 +292,7 @@ export const formSchema: FormSchema[] = [
   {
     field: '',
     label: '默认值',
+    colProps: { span: 13 },
     component: 'Checkbox',
     renderComponentContent: '真',
     ifShow: ({ values }) => isBoolean(Reflect.get(values, 'type1')),
@@ -344,7 +345,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'operation',
     label: '操作',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Select',
     componentProps: {
       placeholder: '请选择操作',
@@ -364,7 +365,7 @@ export const formSchema: FormSchema[] = [
     component: 'DatePicker',
     label: '请选择日期',
     colProps: {
-      span: 12,
+      span: 13,
     },
     ifShow: ({ values }) => isComplex(Reflect.get(values, 'type1')),
     show: ({ values }) => {
@@ -376,7 +377,7 @@ export const formSchema: FormSchema[] = [
     component: 'TimePicker',
     label: '请选择时间',
     colProps: {
-      span: 8,
+      span: 13,
     },
     ifShow: ({ values }) => isComplex(Reflect.get(values, 'type1')),
     show: ({ values }) => {

@@ -4,7 +4,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'alarmDetails',
     label: '报警详细信息',
-    colProps: { span: 12 },
+    colProps: { span: 13 },
     required: true,
     component: 'Input',
     componentProps: {

@@ -60,12 +60,19 @@ export const formSchema: FormSchema[] = [
 
   {
     field: 'daysOfWeek1',
-    component: 'Checkbox',
-    label: '星期一',
+    component: 'CheckboxGroup',
+    label: '天',
     colProps: {
       span: 8,
     },
-    renderComponentContent: '',
+    componentProps: {
+      options: [
+        {
+          label: '星期一',
+          value: '1',
+        },
+      ],
+    },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
@@ -89,12 +96,19 @@ export const formSchema: FormSchema[] = [
 
   {
     field: 'daysOfWeek2',
-    component: 'Checkbox',
-    label: '星期二',
+    component: 'CheckboxGroup',
+    label: '天',
     colProps: {
       span: 8,
     },
-    renderComponentContent: '',
+    componentProps: {
+      options: [
+        {
+          label: '星期二',
+          value: '2',
+        },
+      ],
+    },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
@@ -117,12 +131,19 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'daysOfWeek3',
-    component: 'Checkbox',
-    label: '星期三',
+    component: 'CheckboxGroup',
+    label: '天',
     colProps: {
       span: 8,
     },
-    renderComponentContent: '',
+    componentProps: {
+      options: [
+        {
+          label: '星期三',
+          value: '3',
+        },
+      ],
+    },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
@@ -145,12 +166,19 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'daysOfWeek4',
-    component: 'Checkbox',
-    label: '星期四',
+    component: 'CheckboxGroup',
+    label: '天',
     colProps: {
       span: 8,
     },
-    renderComponentContent: '',
+    componentProps: {
+      options: [
+        {
+          label: '星期四',
+          value: '4',
+        },
+      ],
+    },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
@@ -173,12 +201,19 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'daysOfWeek5',
-    component: 'Checkbox',
-    label: '星期五',
+    component: 'CheckboxGroup',
+    label: '天',
     colProps: {
       span: 8,
     },
-    renderComponentContent: '',
+    componentProps: {
+      options: [
+        {
+          label: '星期五',
+          value: '5',
+        },
+      ],
+    },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
@@ -201,12 +236,19 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'daysOfWeek6',
-    component: 'Checkbox',
-    label: '星期六',
+    component: 'CheckboxGroup',
+    label: '天',
     colProps: {
       span: 8,
     },
-    renderComponentContent: '',
+    componentProps: {
+      options: [
+        {
+          label: '星期六',
+          value: '6',
+        },
+      ],
+    },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
@@ -229,12 +271,19 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'daysOfWeek7',
-    component: 'Checkbox',
-    label: '星期七',
+    component: 'CheckboxGroup',
+    label: '天',
     colProps: {
       span: 8,
     },
-    renderComponentContent: '',
+    componentProps: {
+      options: [
+        {
+          label: '星期七',
+          value: '7',
+        },
+      ],
+    },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {

@@ -26,7 +26,7 @@ interface IAlarms {
   id: string;
   alarmType: string;
   createRules: ICreateRule;
-  clearRule?: IClearRule[];
+  // clearRule?: IClearRule[];
   propagate: boolean;
   propagateRelationTypes: string[];
 }
@@ -36,4 +36,5 @@ export interface IProfileData {
   transportConfiguration?: ITansportConfiguration;
   provisionConfiguration?: provisionConfigurationD;
   alarms?: IAlarms[];
+  clearRule?: IClearRule[];
 }

@@ -54,7 +54,14 @@
       const getValueData: any = ref({});
       const [
         registerCondition,
-        { resetFields, updateSchema, appendSchemaByField, removeSchemaByFiled, getFieldsValue },
+        {
+          setFieldsValue,
+          resetFields,
+          updateSchema,
+          appendSchemaByField,
+          removeSchemaByFiled,
+          getFieldsValue,
+        },
       ] = useForm({
         labelWidth: 100,
         schemas: useConditionDrawerSchema,
@@ -79,7 +86,10 @@
           });
         }
       );
-
+      //回显数据
+      const setFieldsFormValue = (v) => {
+        setFieldsValue(v);
+      };
       function getAllFields(getV) {
         const values = getFieldsValue();
         getValueData.value = values;
@@ -301,7 +311,7 @@
         ]);
         n.value--;
       }
-      return { registerCondition, add, del, getAllFields, funcResetFields };
+      return { setFieldsFormValue, registerCondition, add, del, getAllFields, funcResetFields };
     },
   });
 </script>

@@ -48,7 +48,14 @@
       const getValueData: any = ref({});
       const [
         registerAction,
-        { resetFields, updateSchema, appendSchemaByField, getFieldsValue, removeSchemaByFiled },
+        {
+          setFieldsValue,
+          resetFields,
+          updateSchema,
+          appendSchemaByField,
+          getFieldsValue,
+          removeSchemaByFiled,
+        },
       ] = useForm({
         labelWidth: 100,
         schemas: useActionDrawerSchema,
@@ -73,6 +80,10 @@
           });
         }
       );
+      //回显数据
+      const setFieldsFormValue = (v) => {
+        setFieldsValue(v);
+      };
       function getAllFields(getV) {
         const values = getFieldsValue();
         getValueData.value = values;
@@ -225,7 +236,7 @@
         n.value--;
       }
 
-      return { registerAction, add, del, getAllFields, funcResetFields };
+      return { setFieldsFormValue, registerAction, add, del, getAllFields, funcResetFields };
     },
   });
 </script>

@@ -61,9 +61,18 @@
     props: ['deviceInfo'],
     setup(props) {
       const getValueData: any = ref({});
+      const getPushValueData: any = ref([]);
+      // const newMapGetPushValueData: any = ref([]);
       const [
         registerTrigger,
-        { resetFields, appendSchemaByField, removeSchemaByFiled, getFieldsValue, updateSchema },
+        {
+          setFieldsValue,
+          resetFields,
+          appendSchemaByField,
+          removeSchemaByFiled,
+          getFieldsValue,
+          updateSchema,
+        },
       ] = useForm({
         labelWidth: 100,
         schemas: useTriggerDrawerSchema,
@@ -88,19 +97,42 @@
           });
         }
       );
+      //回显数据
+      const setFieldsFormValue = (v) => {
+        setFieldsValue(v);
+      };
+      // //去除字符串的数字
+      // function trimNumber(str) {
+      //   return str.replace(/\d+/g, '');
+      // }
+      // function unique(arr) {
+      //   return Array.from(new Set(arr));
+      // }
       function getAllFields(getV) {
         const values = getFieldsValue();
         getValueData.value = values;
-        console.log(getValueData.value);
         getV = getValueData.value;
+        getPushValueData.value.push(getV);
+        console.log(getPushValueData.value);
         return getV;
       }
       function funcResetFields() {
         resetFields();
       }
+      const addString: any = ref('tiggerEvent1') || ref('tiggerEvent2') || ref('tiggerEvent3');
 
       const n = ref(1);
       function add() {
+        const values = getFieldsValue();
+        getPushValueData.value.push(values);
+        console.log(getPushValueData.value);
+        // newMapGetPushValueData.value = getPushValueData.value.map((m) => {
+        //   const getKeys = Object.keys(m);
+        //   getKeys.map((f) => {
+        //     return unique(trimNumber(f));
+        //   });
+        // });
+        // console.log(newMapGetPushValueData.value);
         appendSchemaByField(
           {
             field: `kong${n.value}`,
@@ -137,9 +169,9 @@
               placeholder: '请选择设备',
             },
             ifShow: ({ values }) =>
-              !isTime(Reflect.get(values, `tiggerEvent${n.value}`)) &&
-              !isScene(Reflect.get(values, `tiggerEvent${n.value}`)) &&
-              !isHand(Reflect.get(values, `tiggerEvent${n.value}`)),
+              !isTime(Reflect.get(values, addString.value)) &&
+              !isScene(Reflect.get(values, addString.value)) &&
+              !isHand(Reflect.get(values, addString.value)),
             colProps: {
               span: 12,
             },
@@ -157,7 +189,7 @@
             colProps: {
               span: 12,
             },
-            ifShow: ({ values }) => isTime(Reflect.get(values, `tiggerEvent${n.value}`)),
+            ifShow: ({ values }) => isTime(Reflect.get(values, addString.value)),
           },
           ''
         );
@@ -174,9 +206,9 @@
               ],
             },
             ifShow: ({ values }) =>
-              !isTime(Reflect.get(values, `tiggerEvent${n.value}`)) &&
-              !isScene(Reflect.get(values, `tiggerEvent${n.value}`)) &&
-              !isHand(Reflect.get(values, `tiggerEvent${n.value}`)),
+              !isTime(Reflect.get(values, addString.value)) &&
+              !isScene(Reflect.get(values, addString.value)) &&
+              !isHand(Reflect.get(values, addString.value)),
             colProps: { span: 12 },
           },
           ''
@@ -197,9 +229,9 @@
             colProps: { span: 12 },
             ifShow: ({ values }) =>
               isUpAndDown(Reflect.get(values, `touchWay${n.value}`)) &&
-              !isTime(Reflect.get(values, `tiggerEvent${n.value}`)) &&
-              !isScene(Reflect.get(values, `tiggerEvent${n.value}`)) &&
-              !isHand(Reflect.get(values, `tiggerEvent${n.value}`)),
+              !isTime(Reflect.get(values, addString.value)) &&
+              !isScene(Reflect.get(values, addString.value)) &&
+              !isHand(Reflect.get(values, addString.value)),
           },
           ''
         );
@@ -217,9 +249,9 @@
             },
             colProps: { span: 12 },
             ifShow: ({ values }) =>
-              !isTime(Reflect.get(values, `tiggerEvent${n.value}`)) &&
-              !isScene(Reflect.get(values, `tiggerEvent${n.value}`)) &&
-              !isHand(Reflect.get(values, `tiggerEvent${n.value}`)) &&
+              !isTime(Reflect.get(values, addString.value)) &&
+              !isScene(Reflect.get(values, addString.value)) &&
+              !isHand(Reflect.get(values, addString.value)) &&
               !isUpAndDown(Reflect.get(values, `touchWay${n.value}`)),
           },
           ''
@@ -242,9 +274,9 @@
             ifShow: ({ values }) =>
               isWenDu(Reflect.get(values, 'attributeChoose')) &&
               !isUpAndDown(Reflect.get(values, `touchWay${n.value}`)) &&
-              !isTime(Reflect.get(values, `tiggerEvent${n.value}`)) &&
-              !isScene(Reflect.get(values, `tiggerEvent${n.value}`)) &&
-              !isHand(Reflect.get(values, `tiggerEvent${n.value}`)),
+              !isTime(Reflect.get(values, addString.value)) &&
+              !isScene(Reflect.get(values, addString.value)) &&
+              !isHand(Reflect.get(values, addString.value)),
             colProps: { span: 12 },
           },
           ''
@@ -260,9 +292,9 @@
             ifShow: ({ values }) =>
               isWenDu(Reflect.get(values, 'attributeChoose')) &&
               !isUpAndDown(Reflect.get(values, `touchWay${n.value}`)) &&
-              !isTime(Reflect.get(values, `tiggerEvent${n.value}`)) &&
-              !isScene(Reflect.get(values, `tiggerEvent${n.value}`)) &&
-              !isHand(Reflect.get(values, `tiggerEvent${n.value}`)),
+              !isTime(Reflect.get(values, addString.value)) &&
+              !isScene(Reflect.get(values, addString.value)) &&
+              !isHand(Reflect.get(values, addString.value)),
             colProps: {
               span: 12,
             },
@@ -277,7 +309,7 @@
             colProps: {
               span: 12,
             },
-            ifShow: ({ values }) => isScene(Reflect.get(values, `tiggerEvent${n.value}`)),
+            ifShow: ({ values }) => isScene(Reflect.get(values, addString.value)),
             componentProps: {
               placeholder: '请输入场景触发器',
               options: [
@@ -300,7 +332,7 @@
             componentProps: {
               placeholder: '暂不实现',
             },
-            ifShow: ({ values }) => isHand(Reflect.get(values, `tiggerEvent${n.value}`)),
+            ifShow: ({ values }) => isHand(Reflect.get(values, addString.value)),
           },
           ''
         );
@@ -336,7 +368,7 @@
         ]);
         n.value--;
       }
-      return { registerTrigger, add, del, getAllFields, funcResetFields };
+      return { setFieldsFormValue, registerTrigger, add, del, getAllFields, funcResetFields };
     },
   });
 </script>

@@ -399,7 +399,7 @@ export const useTriggerDrawerSchema: FormSchema[] = [
   },
 
   {
-    field: '',
+    field: 'no3',
     label: '',
     component: 'ApiSelect',
     colProps: {

@@ -71,6 +71,34 @@
           await setFieldsValue({
             ...data.record,
           });
+          try {
+            proxy.$refs.getTriggerChildData.setFieldsFormValue({
+              triggerEvent: data.record.triggers[0].triggerEvent,
+              attributeChoose: data.record?.triggers[0].attributeChoose,
+              touchWay: data.record?.triggers[0].touchWay,
+              deviceId: data.record?.triggers[0].deviceId,
+              compare: data.record?.triggers[0].compare,
+              value: data.record?.triggers[0].value,
+              sceneLinkageId: data.record?.triggers[0].sceneLinkageId,
+            });
+            proxy.$refs.getConditionChildData.setFieldsFormValue({
+              status: data.record?.doConditions[0].status,
+              deviceId: data.record?.doConditions[0].deviceId,
+              createTime: data.record?.doConditions[0].createTime,
+              updateTime: data.record?.doConditions[0].updateTime,
+              property: data.record?.doConditions[0].property,
+              compare: data.record?.doConditions[0].compare,
+              value: data.record?.doConditions[0].value,
+            });
+            proxy.$refs.getChildData.setFieldsFormValue({
+              outTarget: data.record?.doActions[0].outTarget,
+              deviceId: data.record?.doActions[0].deviceId,
+              command: data.record?.doActions[0].command,
+              sceneLinkageId: data.record?.doActions[0].sceneLinkageId,
+            });
+          } catch (e) {
+            return e;
+          }
         } else {
           await resetFields();
         }
@@ -88,7 +116,6 @@
           triggersArray.push(getTriggerChildValues);
           doConditionsArray.push(getconditionChildValues);
           getValuesFormData = getFieldsValue();
-          console.log('触发器',triggersArray)
           Object.assign(getAllFormData, getValuesFormData);
           getAllFormData.triggers = triggersArray;
           getAllFormData.doConditions = doConditionsArray;