Merge branch 'fix/object-model-edit' into 'main_dev'

fix: 修复物模型结构体编辑时会新增

See merge request yunteng/thingskit-front!1227

 <script setup lang="ts">
 <script setup lang="ts">
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { ref, unref } from 'vue';
+  import { ref, toRaw, unref } from 'vue';
   import { StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { DataActionModeEnum } from '/@/enums/toolEnum';
   import { DataActionModeEnum } from '/@/enums/toolEnum';
   import { DataTypeForm } from '../DataTypeForm';
   import { DataTypeForm } from '../DataTypeForm';
@@ -20,9 +20,11 @@
   const emits = defineEmits(['register', 'complete']);
   const emits = defineEmits(['register', 'complete']);
 
 
   const currentMode = ref(DataActionModeEnum.CREATE);
   const currentMode = ref(DataActionModeEnum.CREATE);
+  const currentRecord = ref<StructJSON>();
   const [registerModal] = useModalInner(({ mode, record }: ModalParamsType<StructJSON>) => {
   const [registerModal] = useModalInner(({ mode, record }: ModalParamsType<StructJSON>) => {
     unref(dataTypeFormRef)?.resetFieldsValue?.();
     unref(dataTypeFormRef)?.resetFieldsValue?.();
     currentMode.value = mode;
     currentMode.value = mode;
+    currentRecord.value = record;
     if (mode === DataActionModeEnum.UPDATE) {
     if (mode === DataActionModeEnum.UPDATE) {
       unref(dataTypeFormRef)?.setFieldsValue?.(record);
       unref(dataTypeFormRef)?.setFieldsValue?.(record);
     }
     }
@@ -48,7 +50,7 @@
     await unref(dataTypeFormRef)?.validate?.();
     await unref(dataTypeFormRef)?.validate?.();
     const value = unref(dataTypeFormRef)?.getFieldsValue?.();
     const value = unref(dataTypeFormRef)?.getFieldsValue?.();
     await handleValidateHasSameIdentifier(value);
     await handleValidateHasSameIdentifier(value);
-    emits('complete', value);
+    emits('complete', value, toRaw(unref(currentRecord)));
   };
   };
 </script>
 </script>
 
 

@@ -50,10 +50,15 @@
     }
     }
   };
   };
 
 
-  const handleEditComplete = (value: StructJSON) => {
+  const handleEditComplete = (value: StructJSON, prevValue: StructJSON) => {
     const _value = cloneDeep(toRaw(unref(props.value)));
     const _value = cloneDeep(toRaw(unref(props.value)));
-    const index = _value.findIndex((item) => item.identifier === value.identifier);
-    ~index ? _value.splice(index, 1, value) : _value.push(value);
+
+    if (prevValue) {
+      const index = _value.findIndex((item) => item.identifier === prevValue.identifier);
+      ~index && _value.splice(index, 1, value);
+    } else {
+      _value.push(value);
+    }
     emits('update:value', _value);
     emits('update:value', _value);
     closeModal();
     closeModal();
   };
   };