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

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

@@ -1,5 +1,5 @@
 import { defineComponent, computed, ref, inject, watch, createVNode } from 'vue';
-import { isEqual, isString, isEmpty } from 'lodash-es';
+import { isEqual, isString, isEmpty, isFunction, omit } from 'lodash-es';
 import '../../../index2.js';
 import { InjectAsyncQueue } from '../../constants/index2.js';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
@@ -46,6 +46,7 @@ const script = defineComponent({
       get: () => props.value,
       set: (v) => emit("update:value", v)
     });
+    const showRef = ref(false);
     const optionsRef = ref([]);
     const {
       field,
@@ -59,7 +60,7 @@ const script = defineComponent({
       var _a, _b;
       return (_b = (_a = props.wordbook) == null ? void 0 : _a.value_key) != null ? _b : "value";
     });
-    computed(() => {
+    const depth = computed(() => {
       var _a;
       return ((_a = props.wordbook) == null ? void 0 : _a.level_num) || Infinity;
     });
@@ -71,24 +72,16 @@ const script = defineComponent({
       try {
         if (node && !node.__keyword && node.isLeaf) {
           valueRef.value = createOptionValue(node);
-          return;
-        }
-        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;
-          });
-          return;
+          showRef.value = false;
+          return Promise.reject();
         }
         if (node == null ? void 0 : node.__keyword) {
           if (!isString(node.id_link))
-            return;
+            return Promise.reject();
           const linkList = parseLinkFromString2List(node.id_link);
           const primaryKeyOptions = await fetchPrimaryKeyValue(linkList);
           if (!primaryKeyOptions)
-            return;
+            return Promise.reject();
           const {
             lastOption,
             options
@@ -98,14 +91,25 @@ const script = defineComponent({
             valueRef.value = sortOptionWithIdList(primaryKeyOptions, linkList);
           } else {
             optionsRef.value = options;
+            return lastOption;
           }
         } else {
-          node.children = result.map((option) => {
-            return {
-              ...option,
-              parent: node
-            };
-          });
+          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);
@@ -119,9 +123,15 @@ const script = defineComponent({
         let lastOption = options[0];
         const resultOption = idList.reduce((res, id, index) => {
           const option = getTargetOption(options, id);
-          if (index === 0)
+          if (index === 0) {
+            lastOption = option;
             return [option];
+          }
           lastOption = option;
+          Object.assign(option, {
+            parent: res[0],
+            isLeaf: index + 1 >= depth.value
+          });
           res[0].children = [option];
           return res;
         }, []);
@@ -133,21 +143,34 @@ const script = defineComponent({
           return options2.find((o) => o[valueKey.value] === value);
         }
       }
+      function getNodeDepth(node2) {
+        let result = 1;
+        let parent = node2.parent;
+        while (parent) {
+          result++;
+          parent = parent.parent;
+        }
+        return result;
+      }
       function parseLinkFromString2List(linkString) {
         return linkString.split("_").filter((s) => s);
       }
       function createParams(wordbook, autograph, field2, node2, key2) {
-        const params = {
-          autograph,
-          wordbookId: wordbook.id,
-          wordbookType: wordbook.type,
-          fieldKeys: wordbook.search_key ? JSON.stringify(wordbook.search_key) : void 0,
-          conObj: JSON.stringify(createConfigObject(wordbook), node2),
-          primaryKey: wordbook.primary_key,
-          levelKey: wordbook.level_key,
-          keyword,
-          page: 1
+        const paramsAdaptorMap = {
+          autograph: () => autograph,
+          wordbookId: "id",
+          wordbookType: "type",
+          fieldKeys: () => wordbook.search_key ? JSON.stringify(wordbook.search_key) : void 0,
+          conObj: () => JSON.stringify(createConfigObject(wordbook, node2)),
+          primaryKey: "primary_key",
+          levelKey: "level_key",
+          keyword: () => keyword,
+          page: () => 1
         };
+        const params = Object.entries(paramsAdaptorMap).reduce((res, [k, v]) => {
+          res[k] = isString(v) ? wordbook[v] : isFunction(v) ? v() : void 0;
+          return res;
+        }, {});
         return {
           ...getSearchRequestInfo(),
           params,
@@ -169,21 +192,21 @@ const script = defineComponent({
       if (!getSearchRequestInfo().primaryKeyUrl)
         return [];
       try {
-        const params = createParams(props.wordbook, props.autograph, primaryKeys, fieldKey.value);
-        return await asyncQueue.addAsync(params);
+        return await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, primaryKeys, fieldKey.value));
       } catch (e) {
         isString(e) && formRenderLog(e);
       }
       function createParams(wordbook, autograph, primaryKeys2, key2) {
         const requestInfo = getSearchRequestInfo();
+        const params = {
+          autograph,
+          tableId: wordbook.id,
+          primaryKeyValue: primaryKeys2.join(","),
+          page: 1
+        };
         return {
           key: key2,
-          params: {
-            autograph,
-            tableId: wordbook.id,
-            primaryKeyValue: primaryKeys2.join(","),
-            page: 1
-          },
+          params,
           ...requestInfo,
           url: requestInfo.primaryKeyUrl
         };
@@ -193,8 +216,8 @@ const script = defineComponent({
       const result = [];
       let current = node;
       while (current) {
-        result.unshift(node);
-        current = node.parent;
+        result.unshift(omit(current, ["parent", "isLeaf", "__keyword", "children"]));
+        current = current.parent;
       }
       return result;
     }
@@ -219,6 +242,8 @@ const script = defineComponent({
     return () => createVNode(SearchCascader, {
       "value": valueRef.value,
       "onUpdate:value": ($event) => valueRef.value = $event,
+      "show": showRef.value,
+      "onUpdate:show": ($event) => showRef.value = $event,
       "options": optionsRef.value,
       "key": key.value,
       "labelKey": labelKey.value,