Commit d43a6e0bf009e2344c92ead2b571347323c46704

Authored by xp.Huang
2 parents 4d45610f 919039c6

Merge branch 'fix/DEFECT-2073' into 'main_dev'

fix: 修复物模型标识符验证错误

See merge request yunteng/thingskit-front!1336
@@ -38,15 +38,16 @@ @@ -38,15 +38,16 @@
38 const handleValidateHasSameIdentifier = (formValue?: StructJSON) => { 38 const handleValidateHasSameIdentifier = (formValue?: StructJSON) => {
39 const { identifier } = formValue || {}; 39 const { identifier } = formValue || {};
40 const message = '存在一致的标识符'; 40 const message = '存在一致的标识符';
41 -  
42 if (unref(currentMode) === DataActionModeEnum.CREATE) { 41 if (unref(currentMode) === DataActionModeEnum.CREATE) {
43 if (props.value.filter((item) => item.identifier === identifier).length >= 1) { 42 if (props.value.filter((item) => item.identifier === identifier).length >= 1) {
44 createMessage.warn(message); 43 createMessage.warn(message);
45 return Promise.reject(message); 44 return Promise.reject(message);
46 } 45 }
47 } else { 46 } else {
48 - const index = props.value.findIndex((item) => item.identifier === formValue?.identifier);  
49 - if (index !== unref(currentEditIndex)) { 47 + const list = [...props.value];
  48 + list.splice(unref(currentEditIndex), 1, formValue!);
  49 + const existLength = list.filter((item) => item?.identifier === formValue?.identifier).length;
  50 + if (existLength > 1) {
50 createMessage.warn(message); 51 createMessage.warn(message);
51 return Promise.reject(message); 52 return Promise.reject(message);
52 } 53 }