cnhis-design-vue 3.1.23-beta.14 → 3.1.23-beta.15

package/es/components/form-render/src/components/renderer/levelSearchCascade.js

@@ -71,11 +71,18 @@ const script = defineComponent({
     async function fetchData(node, keyword) {
       try {
         if (node && !node.__keyword && node.isLeaf) {
-          valueRef.value = createOptionValue(node);
-          showRef.value = false;
-          return Promise.reject();
+          return updateValue(node);
         }
-        if (node == null ? void 0 : node.__keyword) {
+        if (!(node == null ? void 0 : node.__keyword)) {
+          const result = await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, field.value, node, fieldKey.value));
+          if (!node) {
+            optionsRef.value = result.map((option) => enrichKeywordOption(option, keyword));
+          } else {
+            if (!result.length)
+              return updateValue(node);
+            node.children = result.map((option) => enrichChildOption(option, node, depth.value));
+          }
+        } else {
           if (!isString(node.id_link))
             return Promise.reject();
           const linkList = parseLinkFromString2List(node.id_link);
@@ -89,31 +96,33 @@ const script = defineComponent({
           await fetchData(lastOption);
           if (isEmpty(lastOption.children)) {
             valueRef.value = sortOptionWithIdList(primaryKeyOptions, linkList);
+            showRef.value = false;
+            return Promise.reject();
           } else {
             optionsRef.value = options;
             return lastOption;
           }
-        } else {
-          const result = await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, field.value, node, fieldKey.value));
-          if (!node) {
-            optionsRef.value = result.map((option) => {
-              option.__keyword = !!keyword;
-              option.isLeaf = !!keyword;
-              return option;
-            });
-          } else {
-            node.children = result.map((option) => {
-              return {
-                ...option,
-                parent: node,
-                isLeaf: getNodeDepth(node) + 1 >= depth.value
-              };
-            });
-          }
         }
       } catch (e) {
         isString(e) && formRenderLog(e);
       }
+      function enrichChildOption(option, parent, depth2) {
+        return {
+          ...option,
+          parent,
+          isLeaf: getNodeDepth(parent) + 1 >= depth2
+        };
+      }
+      function enrichKeywordOption(option, keyword2) {
+        option.__keyword = !!keyword2;
+        option.isLeaf = !!keyword2;
+        return option;
+      }
+      function updateValue(node2) {
+        valueRef.value = createOptionValue(node2);
+        showRef.value = false;
+        return Promise.reject();
+      }
       function sortOptionWithIdList(options, idList) {
         return idList.map((id) => {
           return options.find((option) => option[valueKey.value] === id);
@@ -127,12 +136,12 @@ const script = defineComponent({
             lastOption = option;
             return [option];
           }
-          lastOption = option;
           Object.assign(option, {
-            parent: res[0],
+            parent: lastOption,
             isLeaf: index + 1 >= depth.value
           });
-          res[0].children = [option];
+          lastOption.children = [option];
+          lastOption = option;
           return res;
         }, []);
         return {
@@ -161,7 +170,7 @@ const script = defineComponent({
           wordbookId: "id",
           wordbookType: "type",
           fieldKeys: () => wordbook.search_key ? JSON.stringify(wordbook.search_key) : void 0,
-          conObj: () => JSON.stringify(createConfigObject(wordbook, node2)),
+          conObj: () => JSON.stringify(createConfigObject(wordbook, keyword, node2)),
           primaryKey: "primary_key",
           levelKey: "level_key",
           keyword: () => keyword,
@@ -177,7 +186,9 @@ const script = defineComponent({
           key: key2
         };
       }
-      function createConfigObject(wordbook, node2) {
+      function createConfigObject(wordbook, keyword2, node2) {
+        if (keyword2)
+          return wordbook.conObj || [];
         if (!node2)
           return wordbook.conObjFirstLevel || [];
         return [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.23-beta.14",
+  "version": "3.1.23-beta.15",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "112bf14c5aaabbb89b6c5d96e1d89bbbd4158e19"
+  "gitHead": "db833e188fcf7242cf2b7cc7816e113a66fee0f7"
 }