cnhis-design-vue 3.4.0-beta.33 → 3.4.0-beta.34

package/es/components/field-set/src/FieldColor.vue.d.ts

@@ -553,9 +553,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
+        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/FieldFilter.vue.d.ts

@@ -594,9 +594,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
+        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/FieldSet.vue.d.ts

@@ -773,9 +773,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
+        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/components/table-row.vue.d.ts

@@ -384,9 +384,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         hide: boolean;
     }>;
     draggable: boolean;
-    isHighlightRow: boolean;
     idx: number;
     isHighlight: boolean;
+    isHighlightRow: boolean;
     isFieldSet: boolean;
     fieldDescribeMode: "column" | "tooltip";
     hideExpressionOption: AnyObject[];

package/es/components/scale-view/src/hooks/use-event.js

@@ -13,16 +13,17 @@ const useEvent = (props, state) => {
   };
   const handleLogicList = (formItem, formArray) => {
     const { seq } = formItem;
-    let list = formArray.map((item2) => {
+    const list = formArray.map((item2) => {
       if (item2.seq > seq && item2.isShow && item2.__isLogic__)
         return item2;
       return false;
     });
     let nextItemMax = 0;
-    let i = 0, len = list.length, item;
+    const len = list.length;
+    let i = 0, item;
     for (; i < len; i++) {
       item = list[i];
-      let curVal = state.form[formKey(item)];
+      const curVal = state.form[formKey(item)];
       if (!curVal)
         continue;
       if (Array.isArray(curVal)) {
@@ -83,7 +84,7 @@ const useEvent = (props, state) => {
             });
           }
         } else if (nextLogic.next_logic == "uncondition") {
-          let res = vexutilsExpand.isEmpty(choiceValue);
+          const res = vexutilsExpand.isEmpty(choiceValue);
           formItem.__isLogic__ = !res;
           formItem.__lastSeq__ = seq + 1;
           formArray.forEach((item) => {
@@ -99,27 +100,60 @@ const useEvent = (props, state) => {
       });
     }
   };
+  const processFieldValue = (value, isNumberType) => {
+    const defaultValue = isNumberType ? null : "/";
+    if (value == null || value === "") {
+      return defaultValue;
+    }
+    if (isNumberType) {
+      if (typeof value !== "number" && isNaN(+value)) {
+        return null;
+      }
+      return +value;
+    }
+    return value;
+  };
+  const createFormElementMap = (formArray) => {
+    const elementMap = /* @__PURE__ */ new Map();
+    formArray.forEach((element) => {
+      if (element.seq != null) {
+        elementMap.set(element.seq, element);
+      }
+    });
+    return elementMap;
+  };
+  const processRelationFieldList = (dataList, relationField, isNumberType) => {
+    return dataList.map((dataItem) => processFieldValue(dataItem[relationField], isNumberType)).filter(Boolean) || [];
+  };
   const handleDynamicDataRelation = (list, formItem, formArray) => {
-    let { targetSource } = formItem;
-    if (!targetSource || !Object.keys(targetSource).length)
-      return;
-    if (!targetSource.target_id)
-      return;
-    let { relationParam = [] } = targetSource;
-    if (!relationParam.length)
+    var _a;
+    const { targetSource } = formItem;
+    if (!targetSource || !Object.keys(targetSource).length || !targetSource.target_id || !((_a = targetSource.relationParam) == null ? void 0 : _a.length)) {
       return;
-    relationParam.forEach((item) => {
-      let matchEle = formArray.find((v) => v.seq === item.relationElement);
-      const key = matchEle.val_key;
-      if (matchEle) {
-        if (!list.length) {
-          state.form[key] = "";
-        } else {
-          let relationFieldList = list.map((v) => v[item.relationField] || "/") || "";
-          state.form[key] = relationFieldList.join(",");
-        }
+    }
+    const { relationParam } = targetSource;
+    const formElementMap = createFormElementMap(formArray);
+    const len = relationParam.length;
+    let i = 0, item;
+    for (; i < len; i++) {
+      item = relationParam[i];
+      const { relationElement, relationField } = item;
+      if (relationElement == null || !relationField)
+        continue;
+      const targetElement = formElementMap.get(item.relationElement);
+      if (!targetElement)
+        continue;
+      const { val_key: formKey2, valueType } = targetElement;
+      const isNumberType = valueType === "number";
+      if (!formKey2)
+        continue;
+      if (!list.length) {
+        state.form[formKey2] = null;
+        continue;
       }
-    });
+      const relationFieldList = processRelationFieldList(list, item.relationField, isNumberType);
+      state.form[formKey2] = relationFieldList.length > 0 ? relationFieldList.join(",") : null;
+    }
   };
   return {
     nextLogicEvent,

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.4.0-beta.33";
+var version = "3.4.0-beta.34";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.4.0-beta.33",
+	"version": "3.4.0-beta.34",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "8354c1494663058951b0f3ec155d0d7032eaa938"
+	"gitHead": "d428050c11e691f5de5f8d8992e774e735b8514b"
 }