Merge branch 'fix/product-objcet-model' into 'main_dev'

fix: 修复产品物模型编辑时未校验标识符是否已存在

See merge request yunteng/thingskit-front!1234

 <script setup lang="ts">
 <script setup lang="ts">
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { ref, toRaw, unref } from 'vue';
+  import { ref, 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,11 +20,14 @@
   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 currentEditIndex = ref<number>(-1);
   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;
+    currentEditIndex.value = props.value.findIndex(
+      (item) => item.identifier === record?.identifier
+    );
+
     if (mode === DataActionModeEnum.UPDATE) {
     if (mode === DataActionModeEnum.UPDATE) {
       unref(dataTypeFormRef)?.setFieldsValue?.(record);
       unref(dataTypeFormRef)?.setFieldsValue?.(record);
     }
     }
@@ -34,13 +37,19 @@
 
 
   const handleValidateHasSameIdentifier = (formValue?: StructJSON) => {
   const handleValidateHasSameIdentifier = (formValue?: StructJSON) => {
     const { identifier } = formValue || {};
     const { identifier } = formValue || {};
-    if (
-      unref(currentMode) === DataActionModeEnum.CREATE &&
-      props.value.filter((item) => item.identifier === identifier).length >= 1
-    ) {
-      const message = '存在一致的标识符';
-      createMessage.warn(message);
-      return Promise.reject(message);
+    const message = '存在一致的标识符';
+
+    if (unref(currentMode) === DataActionModeEnum.CREATE) {
+      if (props.value.filter((item) => item.identifier === identifier).length >= 1) {
+        createMessage.warn(message);
+        return Promise.reject(message);
+      }
+    } else {
+      const index = props.value.findIndex((item) => item.identifier === formValue?.identifier);
+      if (index !== unref(currentEditIndex)) {
+        createMessage.warn(message);
+        return Promise.reject(message);
+      }
     }
     }
 
 
     return Promise.resolve();
     return Promise.resolve();
@@ -50,7 +59,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, toRaw(unref(currentRecord)));
+    emits('complete', value, unref(currentEditIndex));
   };
   };
 </script>
 </script>
 
 

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