@ebuilding/biz-comm 2.5.12 → 2.6.1

package/fesm2022/other.rule.mjs

@@ -494,21 +494,11 @@ class SettingRoleComponent {
                 if (rule && rule.success && rule.result) {
                     if (rule.result.listItem) {
                         rule.result.listItem.forEach((item) => {
-                            this.fieldChange(item);
+                            this.hydrateRuleItem(item);
+                            this.fieldChange(item, true);
                             if (item.changeFieldType == 'ITEM') {
-                                if (item.changeValue) {
-                                    let type = null;
-                                    if (this.configSrv.sourceFieldData) {
-                                        this.configSrv.sourceFieldData.forEach((i) => {
-                                            if (i.itemKey == item.changeFieldKey) {
-                                                type = i.fieldType;
-                                            }
-                                        });
-                                    }
-                                    if (type == 'REF' || item.changeType == 'CHANGE') {
-                                        item.changeValue = item.changeValue;
-                                    }
-                                    else {
+                                if (item.changeValue && ['HIDE_SELECT', 'SHOW_SELECT'].includes(item.changeType)) {
+                                    if (!Array.isArray(item.changeValue)) {
                                         item.changeValue = item.changeValue.split(',');
                                     }
                                 }
@@ -536,6 +526,49 @@ class SettingRoleComponent {
     btnAdd() {
         this.pageData = [...this.pageData, {}];
     }
+    hydrateRuleItem(item) {
+        if (!item) {
+            return;
+        }
+        item.changeTypeData = this.arrayData(item.changeTypeData);
+        item.options = this.arrayData(item.options);
+        if (item.triggerValueInfo == null && item.triggerValue != null) {
+            item.triggerValueInfo = this.optionInfo(this.configSrv.itemOptions, item.triggerValue);
+        }
+        if (item.changeValueInfo == null && item.changeValue != null) {
+            item.changeValueInfo = this.optionInfo(item.options, item.changeValue);
+        }
+    }
+    arrayData(value) {
+        if (Array.isArray(value)) {
+            return value;
+        }
+        if (typeof value === 'string' && value.trim().length > 0) {
+            try {
+                const parsed = JSON.parse(value);
+                return Array.isArray(parsed) ? parsed : [];
+            }
+            catch (e) {
+                return [];
+            }
+        }
+        return [];
+    }
+    optionInfo(options, value) {
+        if (value == null || !Array.isArray(options)) {
+            return null;
+        }
+        const found = options.find((option) => this.optionValue(option) == value);
+        if (found) {
+            return found;
+        }
+        return {
+            id: value,
+            value,
+            label: value,
+            name: value,
+        };
+    }
     btnDelete(e, i) {
         this.pageData = this.pageData.filter((item, index, object) => {
             return i != index;
@@ -611,7 +644,7 @@ class SettingRoleComponent {
             this.loading = false;
         });
     }
-    fieldChange(e) {
+    fieldChange(e, keepExisting = false) {
         let field = null;
         let arr = [
             { value: 'CHANGE', label: '变更值' },
@@ -620,7 +653,7 @@ class SettingRoleComponent {
             { value: 'REQUIRED', label: '变更必填' },
         ];
         this.configSrv.sourceFieldData.forEach((item) => {
-            if (item.itemKey == e.changeFieldKey) {
+            if (this.fieldKey(item) == e.changeFieldKey) {
                 field = item;
             }
         });
@@ -649,12 +682,27 @@ class SettingRoleComponent {
                 default:
                     break;
             }
-            e['changeFieldType'] = field.fieldType;
+            if (!keepExisting || !e['changeFieldType']) {
+                e['changeFieldType'] = field.fieldType;
+            }
         }
         arr.push({ value: 'FORMULA', label: '已有表达式' });
         arr.push({ value: 'SCRIPT', label: 'Python代码片段' });
-        e['changeTypeData'] = arr;
-        e['options'] = field?.options;
+        if (!keepExisting || !e['changeTypeData']) {
+            e['changeTypeData'] = arr;
+        }
+        if (!keepExisting || !e['options']) {
+            e['options'] = field?.options;
+        }
+        if (e.changeValueInfo == null && e.changeValue != null) {
+            e.changeValueInfo = this.optionInfo(e.options, e.changeValue);
+        }
+    }
+    fieldKey(item) {
+        return item?.itemKey ?? item?.fieldKey ?? item?.key ?? item?.id;
+    }
+    optionValue(option) {
+        return option?.value ?? option?.id ?? option?.code;
     }
     initText(arr) {
         arr.push({ value: 'LENGTH', label: '变更长度限制' });