cnhis-design-vue 3.1.23-beta.0 → 3.1.23-beta.11

package/es/components/form-render/index2.js

@@ -26,7 +26,7 @@ import './src/components/renderer/inputNumber.js';
 import './src/components/renderer/linebar.js';
 import './src/components/renderer/inputGroup2.js';
 import './src/components/renderer/date.js';
-import './src/components/renderer/cascader.js';
+import './src/components/renderer/levelSearchCascade.js';
 import './src/components/renderer/jsonCombination/index.js';
 import './src/components/renderer/combination.js';
 import './src/components/renderer/checkbox.js';
@@ -37,6 +37,7 @@ import './src/components/renderer/slider.js';
 import './src/components/renderer/complex.js';
 import './src/components/renderer/simpleComponent.js';
 import './src/components/renderer/search.js';
+import './src/components/renderer/searchCascade.js';
 
 const FormRender = script;
 FormRender.install = function(app) {

package/es/components/form-render/src/components/renderer/index.d.ts

@@ -6,7 +6,7 @@ export * from './inputNumber';
 export * from './linebar';
 export * from './inputGroup';
 export * from './date';
-export * from './cascader';
+export * from './levelSearchCascade';
 export * from './jsonCombination';
 export * from './combination';
 export * from './checkbox';
@@ -17,3 +17,4 @@ export * from './slider';
 export * from './complex';
 export * from './simpleComponent';
 export * from './search';
+export * from './searchCascade';

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

@@ -6,7 +6,7 @@ export { INPUT_NUMBER } from './inputNumber.js';
 export { LINEBAR } from './linebar.js';
 export { INPUT_GROUP } from './inputGroup2.js';
 export { DATE } from './date.js';
-export { SEARCH_CASCADE } from './cascader.js';
+export { LEVEL_SEARCH_CASCADE } from './levelSearchCascade.js';
 export { JSON_COMBINATION } from './jsonCombination/index.js';
 export { COMBINATION } from './combination.js';
 export { CHECKBOX } from './checkbox.js';
@@ -17,3 +17,4 @@ export { SLIDER } from './slider.js';
 export { COMPLEX } from './complex.js';
 export { BUTTON, LINE_BREAKS, TEXT } from './simpleComponent.js';
 export { SEARCH } from './search.js';
+export { SEARCH_CASCADE } from './searchCascade.js';

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

@@ -6,7 +6,7 @@ export { INPUT_NUMBER } from './inputNumber.js';
 export { LINEBAR } from './linebar.js';
 export { INPUT_GROUP } from './inputGroup2.js';
 export { DATE } from './date.js';
-export { SEARCH_CASCADE } from './cascader.js';
+export { LEVEL_SEARCH_CASCADE } from './levelSearchCascade.js';
 export { JSON_COMBINATION } from './jsonCombination/index.js';
 export { COMBINATION } from './combination.js';
 export { CHECKBOX } from './checkbox.js';
@@ -17,3 +17,4 @@ export { SLIDER } from './slider.js';
 export { COMPLEX } from './complex.js';
 export { BUTTON, LINE_BREAKS, TEXT } from './simpleComponent.js';
 export { SEARCH } from './search.js';
+export { SEARCH_CASCADE } from './searchCascade.js';

package/es/components/form-render/src/components/renderer/levelSearchCascade.d.ts

@@ -0,0 +1,86 @@
+import { AnyObject, Func } from '../../../../../../es/shared/types';
+import { PropType } from 'vue';
+declare type ValueType = string | AnyObject[];
+export declare const LEVEL_SEARCH_CASCADE: import("vue").DefineComponent<{
+    options: {
+        type: PropType<AnyObject[]>;
+        default: () => never[];
+    };
+    onFocus: {
+        type: PropType<Func<any[], any>>;
+    };
+    autograph: {
+        type: StringConstructor;
+        required: true;
+    };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    wordbook: {
+        type: PropType<Partial<{
+            level_num: number;
+            id: string;
+            name: string;
+            render_key: string[];
+            search_key: string[];
+            type: string;
+            value_key: string;
+            level_key: string;
+            link_key: string;
+            link_key_split: string;
+            show_key: string[];
+            conObj: AnyObject[];
+            conObjFirstLevel: AnyObject[];
+        }>>;
+        required: true;
+    };
+    onChange: {};
+    value: {
+        type: PropType<ValueType>;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    options: {
+        type: PropType<AnyObject[]>;
+        default: () => never[];
+    };
+    onFocus: {
+        type: PropType<Func<any[], any>>;
+    };
+    autograph: {
+        type: StringConstructor;
+        required: true;
+    };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    wordbook: {
+        type: PropType<Partial<{
+            level_num: number;
+            id: string;
+            name: string;
+            render_key: string[];
+            search_key: string[];
+            type: string;
+            value_key: string;
+            level_key: string;
+            link_key: string;
+            link_key_split: string;
+            show_key: string[];
+            conObj: AnyObject[];
+            conObjFirstLevel: AnyObject[];
+        }>>;
+        required: true;
+    };
+    onChange: {};
+    value: {
+        type: PropType<ValueType>;
+    };
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {
+    options: AnyObject[];
+    lazyRequest: boolean;
+}>;
+export {};

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

@@ -0,0 +1,229 @@
+import { defineComponent, computed, ref, inject, watch, createVNode } from 'vue';
+import { arrayed } from '../../../../../shared/utils/index2.js';
+import { isEqual, isString, isEmpty } from 'lodash-es';
+import '../../../index2.js';
+import { InjectAsyncQueue } from '../../constants/index2.js';
+import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
+import { formRenderLog } from '../../utils/index.js';
+import { connect, mapProps } from '@formily/vue';
+import SearchCascader from '../../../../search-cascader/index2.js';
+import script$1 from '../../../../../shared/components/no-data/NoData.js';
+import { useFormField } from '../../hooks/useFormField2.js';
+import { visitedDecorator, assignUpdateValue } from '../../utils/schema2.js';
+import { useFormRequest } from '../../hooks/useFormRequest2.js';
+
+const script = defineComponent({
+  name: "FormSearchCascade",
+  props: {
+    options: {
+      type: Array,
+      default: () => []
+    },
+    onFocus: {
+      type: Function
+    },
+    autograph: {
+      type: String,
+      required: true
+    },
+    lazyRequest: {
+      type: Boolean,
+      default: true
+    },
+    wordbook: {
+      type: Object,
+      required: true
+    },
+    onChange: {},
+    value: {
+      type: [String, Array]
+    }
+  },
+  emits: ["update:value"],
+  setup(props, {
+    emit
+  }) {
+    const valueRef = computed({
+      get: () => props.value,
+      set: (v) => emit("update:value", v)
+    });
+    const optionsRef = ref([]);
+    const {
+      field,
+      fieldKey
+    } = useFormField();
+    const labelKey = computed(() => {
+      var _a, _b, _c;
+      return (_c = (_b = (_a = props.wordbook) == null ? void 0 : _a.render_key) == null ? void 0 : _b[0]) != null ? _c : "text";
+    });
+    const valueKey = computed(() => {
+      var _a, _b;
+      return (_b = (_a = props.wordbook) == null ? void 0 : _a.value_key) != null ? _b : "value";
+    });
+    computed(() => {
+      var _a;
+      return ((_a = props.wordbook) == null ? void 0 : _a.level_num) || Infinity;
+    });
+    const asyncQueue = inject(InjectAsyncQueue);
+    const {
+      getSearchRequestInfo
+    } = useFormRequest();
+    async function fetchData(node, keyword) {
+      try {
+        if (node && !node.__keyword && node.isLeaf) {
+          valueRef.value = createOptionValue(node);
+          return;
+        }
+        const result = await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, field.value, fieldKey.value));
+        if (!node) {
+          optionsRef.value = result.map((option) => {
+            option.__keyword = !!keyword;
+            option.isLeaf = !!keyword;
+            return option;
+          });
+          return;
+        }
+        if (node == null ? void 0 : node.__keyword) {
+          if (!isString(node.id_link))
+            return;
+          const linkList = parseLinkFromString2List(node.id_link);
+          const primaryKeyOptions = await fetchPrimaryKeyValue(linkList);
+          if (!primaryKeyOptions)
+            return;
+          const {
+            lastOption,
+            options
+          } = generateOptionWithIdList(primaryKeyOptions, linkList);
+          await fetchData(lastOption);
+          if (isEmpty(lastOption.children)) {
+            valueRef.value = sortOptionWithIdList(primaryKeyOptions, linkList);
+          } else {
+            optionsRef.value = options;
+          }
+        } else {
+          node.children = result.map((option) => {
+            return {
+              ...option,
+              parent: node
+            };
+          });
+        }
+      } catch (e) {
+        isString(e) && formRenderLog(e);
+      }
+      function sortOptionWithIdList(options, idList) {
+        return idList.map((id) => {
+          return options.find((option) => option[valueKey.value] === id);
+        });
+      }
+      function generateOptionWithIdList(options, idList) {
+        let lastOption = options[0];
+        const resultOption = idList.reduce((res, id, index) => {
+          const option = getTargetOption(options, id);
+          if (index === 0)
+            return [option];
+          lastOption = option;
+          res[0].children = [option];
+          return res;
+        }, []);
+        return {
+          options: resultOption,
+          lastOption
+        };
+        function getTargetOption(options2, value) {
+          return options2.find((o) => o[valueKey.value] === value);
+        }
+      }
+      function parseLinkFromString2List(linkString) {
+        return linkString.split("_").filter((s) => s);
+      }
+      function createParams(wordbook, autograph, field2, key2) {
+        const params = {
+          autograph,
+          wordbookId: wordbook.id,
+          wordbookType: wordbook.type,
+          fieldKeys: wordbook.search_key ? JSON.stringify(wordbook.search_key) : void 0,
+          conObj: wordbook.conObj ? JSON.stringify(enrichConObj(wordbook.conObj, node)) : void 0,
+          keyword,
+          page: 1
+        };
+        return {
+          ...getSearchRequestInfo(),
+          params,
+          key: key2
+        };
+        function enrichConObj(conObj, node2) {
+          return arrayed(conObj).map((item) => ({
+            ...item,
+            value: node2 == null ? void 0 : node2[valueKey.value]
+          }));
+        }
+      }
+    }
+    async function fetchPrimaryKeyValue(primaryKeys) {
+      if (!getSearchRequestInfo().primaryKeyUrl)
+        return [];
+      try {
+        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();
+        return {
+          key: key2,
+          autograph,
+          tableId: wordbook.id,
+          primaryKeyValue: primaryKeys2.join(","),
+          page: 1,
+          ...requestInfo,
+          url: requestInfo.primaryKeyUrl
+        };
+      }
+    }
+    function createOptionValue(node) {
+      const result = [];
+      let current = node;
+      while (current) {
+        result.unshift(node);
+        current = node.parent;
+      }
+      return result;
+    }
+    watch(() => props.wordbook, (wordbook, oldWordbook) => {
+      if (isEqual(wordbook, oldWordbook))
+        return;
+      optionsRef.value = [];
+      if (!wordbook)
+        return;
+      (valueRef.value || !props.lazyRequest) && fetchData();
+    }, {
+      immediate: true
+    });
+    const {
+      injectValueValidate,
+      injectValueWatchFromEmpty,
+      injectValueBindKey
+    } = useCommonInjection();
+    injectValueWatchFromEmpty(valueRef, fetchData);
+    injectValueValidate(valueRef);
+    const key = injectValueBindKey(valueRef);
+    return () => createVNode(SearchCascader, {
+      "value": valueRef.value,
+      "onUpdate:value": ($event) => valueRef.value = $event,
+      "options": optionsRef.value,
+      "key": key.value,
+      "labelKey": labelKey.value,
+      "valueKey": valueKey.value,
+      "search": fetchData,
+      "onFocus": visitedDecorator(field, props.onFocus)
+    }, {
+      empty: () => createVNode(script$1, null, null)
+    });
+  }
+});
+const LEVEL_SEARCH_CASCADE = connect(script, mapProps({
+  dataSource: "options"
+}, assignUpdateValue));
+
+export { LEVEL_SEARCH_CASCADE };

package/es/components/form-render/src/components/renderer/search.d.ts

@@ -1,4 +1,4 @@
-import { Func } from '../../../../../../es/shared/types';
+import { AnyObject, Func } from '../../../../../../es/shared/types';
 import { PropType } from 'vue';
 export declare const SEARCH: import("vue").DefineComponent<{
     value: {
@@ -21,6 +21,12 @@ export declare const SEARCH: import("vue").DefineComponent<{
             search_key: string[];
             type: string;
             value_key: string;
+            level_key: string;
+            link_key: string;
+            link_key_split: string;
+            show_key: string[];
+            conObj: AnyObject[];
+            conObjFirstLevel: AnyObject[];
         }>>;
         required: true;
     };
@@ -49,6 +55,12 @@ export declare const SEARCH: import("vue").DefineComponent<{
             search_key: string[];
             type: string;
             value_key: string;
+            level_key: string;
+            link_key: string;
+            link_key_split: string;
+            show_key: string[];
+            conObj: AnyObject[];
+            conObjFirstLevel: AnyObject[];
         }>>;
         required: true;
     };

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

@@ -28,7 +28,7 @@ import './inputNumber.js';
 import './linebar.js';
 import './inputGroup2.js';
 import './date.js';
-import './cascader.js';
+import './levelSearchCascade.js';
 import './jsonCombination/index.js';
 import './combination.js';
 import './checkbox.js';
@@ -38,6 +38,7 @@ import './labelSelect.js';
 import './slider.js';
 import './complex.js';
 import './simpleComponent.js';
+import './searchCascade.js';
 import { NSelect } from 'naive-ui';
 import { visitedDecorator, assignUpdateValue, assignClearBindVisited } from '../../utils/schema2.js';
 

package/es/components/form-render/src/components/renderer/{cascader.js → searchCascade.js}

@@ -27,6 +27,7 @@ import './inputNumber.js';
 import './linebar.js';
 import './inputGroup2.js';
 import './date.js';
+import './levelSearchCascade.js';
 import './jsonCombination/index.js';
 import './combination.js';
 import './checkbox.js';

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

@@ -26,7 +26,7 @@ import './inputNumber.js';
 import './linebar.js';
 import './inputGroup2.js';
 import './date.js';
-import './cascader.js';
+import './levelSearchCascade.js';
 import './jsonCombination/index.js';
 import './combination.js';
 import './checkbox.js';
@@ -37,6 +37,7 @@ import './slider.js';
 import './complex.js';
 import './simpleComponent.js';
 import './search.js';
+import './searchCascade.js';
 import { NSelect } from 'naive-ui';
 import { traverseDependKey, visitedDecorator, assignUpdateValue, assignClearBindVisited } from '../../utils/schema2.js';
 

package/es/components/form-render/src/hooks/useAsyncQueue2.js

@@ -1,4 +1,4 @@
-import { isFunction } from 'lodash-es';
+import { cloneDeep, isFunction } from 'lodash-es';
 import '../../index2.js';
 import { useCommonLog } from './useCommonLog2.js';
 import { useFormRequest } from './useFormRequest2.js';
@@ -42,7 +42,7 @@ class AsyncQueue {
       const entry = this._entries.get(key);
       if (entry.state === 1 /* DONE */) {
         setTimeout(() => {
-          callback && callback(entry.error, entry.result);
+          callback && callback(cloneDeep(entry.error), cloneDeep(entry.result));
         });
       } else if (!entry.callbacks) {
         entry.callbacks = [callback];
@@ -91,8 +91,8 @@ class AsyncQueue {
     const callback = entry.callback;
     entry.state = 1 /* DONE */;
     entry.callback = void 0;
-    entry.result = r;
-    entry.error = e;
+    entry.result = cloneDeep(r);
+    entry.error = cloneDeep(e);
     this._activeTasks--;
     callback && callback(e, r);
     if (entry.callbacks) {

package/es/components/form-render/src/hooks/useFieldListAdaptor2.js

@@ -79,8 +79,7 @@ function useFieldListAdaptor(collector) {
     function bindAutoGraphProps(schema2, item2) {
       schema2["x-component"] = "SEARCH";
       Object.assign(schema2["x-component-props"], {
-        ...pick(item2, ["wordbook", "lazyRequest"]),
-        autograph: item2.autograph
+        ...pick(item2, ["wordbook", "lazyRequest", "autograph"])
       });
     }
     function bindUrlProps(schema2, item2) {
@@ -106,7 +105,7 @@ function useFieldListAdaptor(collector) {
     });
     return schema;
   };
-  const createCascaderSchema = (item) => {
+  const createSearchCascadeSchema = (item) => {
     var _a;
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
@@ -116,6 +115,13 @@ function useFieldListAdaptor(collector) {
     });
     return schema;
   };
+  const createLevelSearchCascadeSchema = (item) => {
+    const schema = createStandardSchema(item);
+    Object.assign(schema["x-component-props"], {
+      ...pick(item, ["wordbook", "lazyRequest", "autograph"])
+    });
+    return schema;
+  };
   const createSwitchSchema = (item) => {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
@@ -210,7 +216,8 @@ function useFieldListAdaptor(collector) {
     ["INPUT_NUMBER", createInputNumberSchema],
     ["SELECT", createSelectSchema],
     ["DATE", createDateSchema],
-    ["SEARCH_CASCADE", createCascaderSchema],
+    ["LEVEL_SEARCH_CASCADE", createLevelSearchCascadeSchema],
+    ["SEARCH_CASCADE", createSearchCascadeSchema],
     ["COMBINATION", createCombinationSchema],
     ["RADIO", createRadioSchema],
     ["CHECKBOX", createRadioSchema],

package/es/components/form-render/src/hooks/useFormRequest.d.ts

@@ -4,6 +4,7 @@ declare type RequestInstance = Record<string, Func>;
 declare type SearchRequestInfo = {
     method: FormRequestType;
     url: string;
+    primaryKeyUrl?: string;
 };
 export declare function useFormRequest(): {
     getHttpInstance: () => Nullable<RequestInstance>;
@@ -11,6 +12,7 @@ export declare function useFormRequest(): {
     getSearchRequestInfo: () => {
         method: FormRequestType;
         url: string;
+        primaryKeyUrl?: string | undefined;
     };
     registGlobSearchInfo: (info: SearchRequestInfo) => void;
 };

package/es/components/form-render/src/hooks/useFormRequest2.js

@@ -1,5 +1,5 @@
 let http = null;
-const searchRequestInfo = { method: "post", url: "" };
+const searchRequestInfo = { method: "post", url: "", primaryKeyUrl: "" };
 function useFormRequest() {
   function getHttpInstance() {
     return http;

package/es/components/form-render/src/types/fieldItem.d.ts

@@ -74,6 +74,12 @@ export declare type FormWordbook = Partial<{
     search_key: string[];
     type: string;
     value_key: string;
+    level_key: string;
+    link_key: string;
+    link_key_split: string;
+    show_key: string[];
+    conObj: AnyObject[];
+    conObjFirstLevel: AnyObject[];
 }>;
 export declare type FieldItem = {
     /**

package/es/components/form-render/src/utils/schema2.js

@@ -27,16 +27,13 @@ function traverseDependKey(dependKeys, handler) {
       return handler(dependKey, valueKey);
     handler(dependKey, valueKey.key, valueKey.required);
   });
-  Object.entries(createDependKeyMap()).forEach(([dependKey, valueKey]) => {
-    handler(dependKey, valueKey);
-  });
   function createDependKeyMap() {
     const result = /* @__PURE__ */ new Map();
     if (isArray(dependKeys)) {
       dependKeys.forEach((k) => {
         var _a;
         if (isObject(k)) {
-          result.set(k.paramName, { key: (_a = k.paramName) != null ? _a : k.paramValue, required: k.required });
+          result.set(k.paramName, { key: (_a = k.paramValue) != null ? _a : k.paramName, required: k.required });
         } else {
           result.set(k, k);
         }