fix(front): 修改设备配置BUG【待完善】

@@ -53,9 +53,7 @@
                 :DetailTemplateCpnData="!isStep3FatherAddOrEditStatus ? 1 : item"
               />
               <AlarmRuleConditionsCpn
-                :getFatherData="getConditionData"
-                :ref="`AlarmRuleConditionsRef${index}`"
-                @register="registerAlarmRuleConditionsModal"
+                :ref="conditionRefs.AlarmRuleConditionsRef"
                 @getAllFieldsRule="getAlarmRuleConditionsValFunc"
               />
               <EnableRuleCpn
@@ -290,10 +288,7 @@
     props: ['step3FatherEmitCpnData', 'step3FatherEmitCpnStatus'],
     setup(props) {
       const getConditionData = ref([]);
-      let currentAlarmCondition: any = reactive({
-        key: 0,
-        data: {},
-      });
+      const getConditionData1 = ref([{ key: 0, data: {} }]);
       const clickConditionData = ref([]);
       const { proxy } = getCurrentInstance() as any;
       const createAlarmRuleData: any = ref([1]);
@@ -308,6 +303,9 @@
       const formatEnableRule: any = ref([]);
       const formatClearEnableRule: any = ref([]);
       const formatEditClearEnableRule: any = ref([]);
+      const conditionRefs = {
+        AlarmRuleConditionsRef: ref([]),
+      };
       let alaramsObj: any = reactive({
         alarmType: null,
         propagate: null,
@@ -329,8 +327,6 @@
       let val10: any = ref(null);
       const formatEditRuleData: any = ref([]);
       const formatEditEnableData: any = ref([]);
-      const [registerAlarmRuleConditionsModal, { openModal: openModalAlarmRuleConditions }] =
-        useModal();
       const [registerEnableRuleModal, { openModal: openModalEnableRule }] = useModal();
       const [
         registerClearAlarmRuleConditionsModal,
@@ -422,23 +418,27 @@
         }
       };
       const clickAddAlarmRuleConditionsFunc = (e, i) => {
-        openModalAlarmRuleConditions(true);
+        getConditionData.value = [];
+
         //获取对应下标
-        currentAlarmCondition.key = i;
-        currentAlarmCondition.data = clickConditionData.value;
-        currentAlarmCondition = clickConditionData.value;
-        // if (e === true) {
-        //   nextTick(() => {
-        //     proxy.$refs['AlarmRuleConditionsRef' + i].resetDataFunc();
-        //   });
-        // } else {
-        //   nextTick(() => {
-        //     proxy.$refs['AlarmRuleConditionsRef' + i].resetDataFunc();
-        //   });
-        // }
-        proxy.$refs['AlarmRuleConditionsRef' + i].resetDataFunc();
+        let currentAlarmCondition = { key: 0, data: {} };
+        let isUpdate = false;
+        getConditionData1.value.forEach((obj) => {
+          if (obj.data.length != undefined && obj.key == i) {
+            currentAlarmCondition.key = i;
+            currentAlarmCondition.data = obj.data;
+            isUpdate = true;
+          }
+        });
+        getConditionData.value.push(currentAlarmCondition);
+        conditionRefs.AlarmRuleConditionsRef.value.map((item, index) => {
+          if (i === index) {
+            nextTick(() => {
+              item.resetDataFunc(index, currentAlarmCondition, isUpdate);
+            });
+          }
+        });
       };
-      console.log('data', currentAlarmCondition);
 
       const clickAddEnableRuleFunc = () => {
         nextTick(() => {
@@ -462,10 +462,17 @@
         console.log('获取condition的值', e);
         formatAlarmRuleConditions.value.push(e);
         clickConditionData.value = e;
-        currentAlarmCondition = getConditionData.value;
-        // formatEditRuleData.value.push({
-        //   condition: e,
-        // } as never);
+        let addValue = undefined;
+        getConditionData1.value.forEach((obj) => {
+          if (obj.data.length != undefined && obj.key == e.key) {
+            obj.data = e.data;
+          } else {
+            addValue = e;
+          }
+        });
+        if (addValue != undefined) {
+          getConditionData1.value.push(addValue);
+        }
       };
       const getClearAlarmRuleConditionsValFunc = (e) => {
         formatClearAlarmRuleConditions.value.push({
@@ -689,9 +696,15 @@
         );
         return formatMap;
       };
+
       const formatEnableRuleFuncData = (v) => {
         return formatEnableRuleData(formatAlarmRuleConditionsData1(v)?.schedule);
       };
+
+      const forMatAddConditionFunc = (e) => {
+        let formatMap = e.data.map((f: any) => formatAlarmRuleConditionsData(f));
+        return formatMap;
+      };
       return {
         registerForm,
         registerFormHighSetting,
@@ -703,7 +716,6 @@
         clickAddAlarmRuleConditionsFunc,
         AlarmRuleConditionsRef,
         EnableRuleRef,
-        registerAlarmRuleConditionsModal,
         registerEnableRuleModal,
         getAlarmRuleConditionsValFunc,
         formatAlarmRuleConditions,
@@ -745,6 +757,9 @@
         formatEditEnableRuleFunc,
         updateCpnSchemaSelectEnableFunc,
         getConditionData,
+        getConditionData1,
+        forMatAddConditionFunc,
+        conditionRefs,
       };
     },
   });

@@ -34,24 +34,17 @@ export const keyColumns: BasicColumn[] = [
   {
     title: '键名',
     dataIndex: 'key1',
-    width: 200,
+    width: 100,
   },
   {
     title: '键类型',
     dataIndex: 'type',
-    width: 200,
-  },
-];
-export const columnsView: BasicColumn[] = [
-  {
-    title: '键名',
-    dataIndex: 'key1',
-    width: 200,
+    width: 100,
   },
   {
     title: '操作',
     dataIndex: 'operation',
-    width: 200,
+    width: 100,
     format: (text: string, record: Recordable) => {
       const findDay = [
         { label: '等于', value: 'EQUAL' },
@@ -80,9 +73,50 @@ export const columnsView: BasicColumn[] = [
   {
     title: '值',
     dataIndex: 'value1',
-    width: 200,
+    width: 80,
   },
 ];
+// export const columnsView: BasicColumn[] = [
+//   {
+//     title: '键名',
+//     dataIndex: 'key1',
+//     width: 200,
+//   },
+//   {
+//     title: '操作',
+//     dataIndex: 'operation',
+//     width: 200,
+//     format: (text: string, record: Recordable) => {
+//       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 == record.operation) {
+//           return f.label;
+//         }
+//       });
+//       if (findRuleByValue) {
+//         return findRuleByValue.label;
+//       }
+//     },
+//   },
+//   {
+//     title: '值',
+//     dataIndex: 'value1',
+//     width: 200,
+//   },
+// ];
 
 export const DescDetailSchema: DescItem[] = [
   {

@@ -46,6 +46,12 @@ export const isComplex = (type: string) => {
 
 export const formSchema: FormSchema[] = [
   {
+    field: 'id',
+    label: '',
+    component: 'InputNumber',
+    ifShow: false,
+  },
+  {
     field: 'type',
     label: '键类型',
     colProps: { span: 13 },

@@ -47,7 +47,6 @@
       const getIsWhereType: any = ref(null);
       const isUpdate = ref(true);
       const getValue: any = ref(null);
-      const setId: any = ref(1);
       const getKeyAndValArr = ref<[]>([]);
 
       const getTitle = computed(() => (!unref(isUpdate) ? '新增键名筛选器' : '编辑键名筛选器'));
@@ -103,61 +102,38 @@
 
       const handleSubmit = () => {
         let mapGetKeyAndValArr = [];
+        getValue.value = getFieldsValue();
         if (!unref(isUpdate)) {
-          getValue.value = getFieldsValue();
           getKeyAndValArr.value.push(getValue.value);
-          mapGetKeyAndValArr = getKeyAndValArr.value.map((m: any) => {
-            return {
-              key: {
-                type: m.type,
-                key: m.key1,
-              },
-              valueType: m.type1,
-              value: m.value1,
-              predicate: {
-                type: m.type1,
-                operation: m.operation,
-                value: {
-                  defaultValue: m.value1,
-                },
-              },
-            };
-          });
-
-          setId.value += 1;
-          getValue.value.id = setId.value;
-          // emit('success', getValue.value);
-          // closeModal();
-        } else {
-          getValue.value = getFieldsValue();
-          getKeyAndValArr.value.push(getValue.value);
-          mapGetKeyAndValArr = getKeyAndValArr.value.map((m: any) => {
-            return {
-              key: {
-                type: m.type,
-                key: m.value1,
-              },
-              valueType: m.type1,
-              value: m.value1,
-              predicate: {
-                type: m.type1,
-                operation: m.operation,
-                value: {
-                  defaultValue: m.value1,
-                },
+        }
+        mapGetKeyAndValArr = getKeyAndValArr.value.map((m: any, index) => {
+          return {
+            key: {
+              id: index,
+              type: m.type,
+              key: m.key1,
+            },
+            valueType: m.type1,
+            value: m.value1,
+            predicate: {
+              type: m.type1,
+              operation: m.operation,
+              value: {
+                defaultValue: m.value1,
               },
-            };
-          });
-          setId.value += 9999;
-          getValue.value.id = setId.value;
+            },
+          };
+        });
+        if (!unref(isUpdate)) {
+          getValue.value.id = getKeyAndValArr.value.length - 1;
         }
-        emit('success', mapGetKeyAndValArr, getValue.value);
+
+        emit('success', mapGetKeyAndValArr, getValue.value, unref(isUpdate));
         closeModal();
       };
       const handleCancel = () => {
         return;
       };
-
       const n = ref(1);
 
       function add() {
@@ -205,6 +181,7 @@
         removeSchemaByFiled([`field${field}a`, `field${field}b`, `${field}`]);
         n.value--;
       }
+
       watch(isWhereType, (v) => {
         switch (v) {
           case 'STRING':

@@ -9,10 +9,12 @@
       @cancel="handleCancel"
     >
       <CollapseContainer title="键名筛选器" class="border mb-8">
-        <div class="table-style">
+        <div class="table-style"
+          >{{ currentIndex }}
+          {{ getTableApiData.value }}
           <BasicTable
             :showIndexColumn="false"
-            :dataSource="getTableApiData"
+            :dataSource="getTableApiData.value"
             @register="registerTable"
           >
             <template #toolbar>
@@ -41,24 +43,24 @@
           </BasicTable>
         </div>
       </CollapseContainer>
-      <CollapseContainer title="筛选器预览" class="border mb-8">
-        <!-- <p v-for="(item, index) in detailData" :key="index">{{ item }}</p> -->
-        <Description
-          v-for="(item, index) in detailData"
-          :key="index"
-          :column="3"
-          :data="item"
-          :schema="schema"
-        />
-      </CollapseContainer>
+      <!--      <CollapseContainer title="筛选器预览" class="border mb-8">-->
+      <!--        &lt;!&ndash; <p v-for="(item, index) in detailData" :key="index">{{ item }}</p> &ndash;&gt;-->
+      <!--        <Description-->
+      <!--          v-for="(item, index) in detailData"-->
+      <!--          :key="index"-->
+      <!--          :column="3"-->
+      <!--          :data="item"-->
+      <!--          :schema="schema"-->
+      <!--        />-->
+      <!--      </CollapseContainer>-->
       <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerForm" />
     </BasicModal>
     <KeyValueModal @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref, reactive, watch } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { defineComponent, ref, computed, unref, reactive, nextTick } from 'vue';
+  import { BasicModal } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema, keyColumns, DescDetailSchema } from './config';
   import { CollapseContainer } from '/@/components/Container/index';
@@ -119,14 +121,9 @@
     setup(props, { emit }) {
       let getKeyAndValueChildData = ref<[]>([]);
       const getTableApiData: any = ref([]);
-      const newFilterArray: any = ref([]);
-      const newFilterViewArray: any = ref([]);
-      const newFilterKeyArray: any = ref([]);
-      const newFilterKeyViewArray: any = ref([]);
       const detailData: any = ref([]);
-      const receiveData: any = ref(null);
+      const currentIndex = ref(0);
       const lastValues: any = ref(null);
-      const addOrUpdateData: any = ref(null);
       const isUpdate = ref(true);
       const watchCurrentAlarmConditionValue = reactive({
         key: 0,
@@ -139,9 +136,7 @@
       });
       const [registerModal, { openModal }] = useModal();
       const getTitle = computed(() => (!unref(isUpdate) ? '添加报警规则条件' : '编辑报警规则条件'));
-      const [register, { closeModal }] = useModalInner((data) => {
-        isUpdate.value = !!data?.isUpdate;
-      });
+      const [register, { closeModal, openModal: openCondition }] = useModal();
       const [registerTable, { reload, setTableData: setFunc }] = useTable({
         title: '键名筛选器',
         columns: keyColumns,
@@ -157,86 +152,99 @@
         },
       });
       const handleSubmit = () => {
-        if (!unref(isUpdate)) {
-          addOrUpdateData.value = getFieldsValue();
-          getTableApiData.value.push(addOrUpdateData.value);
-          detailData.value.push(addOrUpdateData.value);
-        }
         lastValues.value = getFieldsValue();
-        watchCurrentAlarmConditionValue.key =
-          props.getFatherData?.key == undefined ? 0 : props.getFatherData?.key;
-        watchCurrentAlarmConditionValue.data = getKeyAndValueChildData.value;
+        watchCurrentAlarmConditionValue.key = currentIndex.value;
+        let allTableDatas = [];
+        getTableApiData.value.forEach((tableObj) => {
+          let key = { type: tableObj.type, key: tableObj.key1 };
+          let predicate = {
+            operation: tableObj.operation,
+            type: tableObj.type1,
+            value: {
+              defaultValue: tableObj.value1,
+            },
+          };
+          allTableDatas.push({
+            key: key,
+            predicate: predicate,
+            value: tableObj.value1,
+            valueType: tableObj.type1,
+          });
+        });
+        watchCurrentAlarmConditionValue.data = allTableDatas;
         emit('getAllFieldsRule', watchCurrentAlarmConditionValue, lastValues.value);
         closeModal();
       };
-
-      // cosnt getFieldsValueFunc=()=>{
-      //   return watchCurrentAlarmConditionValue.data
-      // }
-      const resetDataFunc = () => {
+      const resetDataFunc = (j, currentAlarmCondition, update) => {
+        isUpdate.value = update;
+        openCondition(true);
+        currentIndex.value = j;
         resetFields();
         getTableApiData.value = [];
         getTableApiData.value.length = 0;
         detailData.value = [];
         detailData.value.length = 0;
-        // getKeyAndValueChildData.value.length = 0;
         console.log('father', props.getFatherData);
-        let condition = {};
-        if (props.getFatherData.length != 0) {
-          for (let i in props.getFatherData.data) {
-            getTableApiData.value = props.getFatherData.data[i].condition.condition;
-          }
-          getTableApiData.value = getTableApiData.value.map((m) => {
-            return {
-              key1: m.key.key,
-              type: m.key.type,
+        let index = 0;
+        if (currentAlarmCondition.data.length != undefined) {
+          for (let i in currentAlarmCondition.data) {
+            let obj = {
+              id: index,
+              key1: currentAlarmCondition.data[i].key.key,
+              type: currentAlarmCondition.data[i].key.type,
+              operation: currentAlarmCondition.data[i].predicate.operation,
+              value1: currentAlarmCondition.data[i].value,
             };
-          });
+            getTableApiData.value.push(obj);
+            index++;
+          }
         }
-        console.log('condition', condition);
+        nextTick(() => {
+          setFunc(getTableApiData.value);
+        });
       };
 
-      watch(
-        () => props.getFatherData,
-        (v) => {
-          console.log(1);
-          console.log(v);
-        }
-      );
-
-      const handleCancel = () => {
-        resetDataFunc();
-      };
+      const handleCancel = () => {};
       const handleAddKey = () => {
         setTimeout(() => {
           openModal(true, {
             isUpdate: false,
           });
-        }, 30);
+        }, 10);
       };
       const handleEdit = (record: Recordable) => {
         openModal(true, {
           isUpdate: true,
           record,
         });
-        newFilterArray.value = getTableApiData.value.filter((item) => item.id !== record.id);
-        getTableApiData.value = newFilterArray.value;
-        newFilterViewArray.value = detailData.value.filter((item) => item.id !== record.id);
-        detailData.value = newFilterViewArray.value;
         reload();
       };
       const handleDelete = (record: Recordable) => {
-        newFilterKeyArray.value = getTableApiData.value.filter((item) => item.id !== record.id);
-        getTableApiData.value = newFilterKeyArray.value;
-        newFilterKeyViewArray.value = detailData.value.filter((item) => item.id !== record.id);
-        detailData.value = newFilterKeyViewArray.value;
+        let newGetTableApiData = [];
+        getTableApiData.value.forEach((currentTable) => {
+          if (currentTable.id != record.id) {
+            newGetTableApiData.push(currentTable as never);
+          }
+        });
+        getTableApiData.value = newGetTableApiData;
+        setFunc(getTableApiData.value);
         reload();
       };
-      const handleSuccess = (v, v1) => {
+      const handleSuccess = (v, v1, isUpdate) => {
+        if (isUpdate) {
+          getTableApiData.value.forEach((tableValue) => {
+            if (tableValue.id == v1.id) {
+              tableValue.key1 = v1.key1;
+              tableValue.operation = v1.operation;
+              tableValue.type = v1.type;
+              tableValue.type1 = v1.type1;
+              tableValue.value1 = v1.value1;
+            }
+          });
+        } else {
+          getTableApiData.value.push(v1);
+        }
         getKeyAndValueChildData.value = v;
-        receiveData.value = v1;
-        getTableApiData.value.push(receiveData.value);
-        detailData.value.push(receiveData.value);
         setFunc(getTableApiData.value);
         reload();
       };
@@ -257,6 +265,7 @@
         handleSubmit,
         register,
         getTitle,
+        currentIndex,
       };
     },
   });