cnhis-design-vue 3.1.32 → 3.1.33-beta.0

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

@@ -13,9 +13,9 @@ export { BusinessCollector, useBusinessBinding } from './src/hooks/useBusinessBi
 export { ContextCollector, useChangeContext } from './src/hooks/useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './src/hooks/useFormItemDeps.js';
 export { useAnchor } from './src/hooks/useAnchor.js';
-export { useAutographOptions } from './src/hooks/useAutographOptions.js';
 export { useFormContext } from './src/hooks/useFormContext.js';
 export { useCommonInjection, useSelectOptionProps } from './src/hooks/useCommonInjection.js';
+export { useAutographOptions, useRecommendOptions, useUrlConfigOptions } from './src/hooks/useFormRenderOptions.js';
 export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, mergeDeepProperties, optionMatcherWithKeyword, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser } from './src/utils/index.js';
 export * from '@formily/core';
 export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './src/utils/business.js';

package/es/components/form-render/src/FormRender.vue.js

@@ -25,6 +25,7 @@ import '../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
 import { validateMessageLocale } from './hooks/useFormValidator.js';
 import '@vueuse/core';
+import 'date-fns';
 import { useAnchor } from './hooks/useAnchor.js';
 import { useFormContext } from './hooks/useFormContext.js';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';

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

@@ -4,7 +4,7 @@ import '../../../index.js';
 import '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCheckboxGroup, NSpace, NCheckbox } from 'naive-ui';
-import { useAutographOptions } from '../../hooks/useAutographOptions.js';
+import { useAutographOptions } from '../../hooks/useFormRenderOptions.js';
 import { assignUpdateValue } from '../../utils/schema.js';
 import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 

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

@@ -7,13 +7,10 @@ import * as input from './input.js';
 import * as inputGroup from './inputGroup.js';
 import * as inputNumber from './inputNumber.js';
 import * as index from './jsonCombination/index.js';
-import * as labelSelect from './labelSelect.js';
 import * as levelSearchCascader from './levelSearchCascader.js';
 import * as index$1 from './lineBar/index.js';
 import * as radio from './radio.js';
-import * as recommendSelect from './recommendSelect.js';
 import * as remoteSearch from './remoteSearch.js';
-import * as search from './search.js';
 import * as searchCascade from './searchCascade.js';
 import * as select from './select.js';
 import * as simpleComponent from './simpleComponent.js';
@@ -32,13 +29,10 @@ const modules = Object.assign({
   "./inputGroup.ts": inputGroup,
   "./inputNumber.tsx": inputNumber,
   "./jsonCombination/index.tsx": index,
-  "./labelSelect.tsx": labelSelect,
   "./levelSearchCascader.tsx": levelSearchCascader,
   "./lineBar/index.ts": index$1,
   "./radio.tsx": radio,
-  "./recommendSelect.tsx": recommendSelect,
   "./remoteSearch.tsx": remoteSearch,
-  "./search.tsx": search,
   "./searchCascade.tsx": searchCascade,
   "./select.tsx": select,
   "./simpleComponent.tsx": simpleComponent,

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

@@ -4,7 +4,7 @@ import { isNumber } from 'lodash-es';
 import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
 import '../../../index.js';
 import '../../utils/index.js';
-import { useAutographOptions } from '../../hooks/useAutographOptions.js';
+import { useAutographOptions } from '../../hooks/useFormRenderOptions.js';
 import { assignUpdateValue } from '../../utils/schema.js';
 import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 

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

@@ -1,7 +1,7 @@
 import { AnyObject, Func } from '../../../../../../es/shared/types';
 import { UrlConfig } from '../../../../../../es/components/form-render';
 import { PropType } from 'vue';
-export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
+export declare const SEARCH_CASCADER: import("vue").DefineComponent<{
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];

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

@@ -19,6 +19,7 @@ import '../../../../../shared/utils/tapable/AsyncSeriesBailHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
 import '../../hooks/useFormValidator.js';
+import 'date-fns';
 import '@vue/shared';
 import { connect, mapProps } from '@formily/vue';
 import './index.js';
@@ -242,8 +243,8 @@ const script = defineComponent({
     };
   }
 });
-const SEARCH_CASCADE = connect(script, mapProps({
+const SEARCH_CASCADER = connect(script, mapProps({
   dataSource: "options"
 }, assignUpdateValue));
 
-export { SEARCH_CASCADE };
+export { SEARCH_CASCADER };

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

@@ -1,4 +1,6 @@
 import { AnyObject, ArrayAble, Func } from '../../../../../../es/shared/types';
+import { RecommendItem } from '../../../../../../es/components/recommend-search/src/types';
+import { RecommendIds } from '../../hooks';
 import { UrlConfig } from '../../types';
 import { PropType } from 'vue';
 export declare const SELECT: import("vue").DefineComponent<{
@@ -17,14 +19,56 @@ export declare const SELECT: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
-    urlConfig: {
-        type: PropType<UrlConfig>;
-    };
     onFocus: {
         type: PropType<Func<any[], any>>;
     };
     onChange: {};
-}, () => 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<{
+    urlConfig: {
+        type: PropType<UrlConfig>;
+    };
+    autograph: {
+        type: StringConstructor;
+    };
+    wordbook: {
+        type: PropType<Partial<{
+            level_num: number;
+            id: string;
+            name: string;
+            render_key: string[];
+            search_key: string[];
+            primary_key: string;
+            type: string;
+            value_key: string;
+            level_key: string;
+            link_key: string;
+            link_key_split: string;
+            show_key: string[];
+            conObj: AnyObject[];
+            conObjFirstLevel: AnyObject[];
+        }>>;
+    };
+    recommend: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    commonList: {
+        type: PropType<RecommendItem[]>;
+    };
+    recentList: {
+        type: PropType<RecommendItem[]>;
+    };
+    getRecommendInfo: {
+        type: PropType<() => RecommendIds>;
+    };
+    recommendNum: {
+        type: NumberConstructor;
+        default: number;
+    };
+    recommendCache: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:value" | "postRecommend")[], "update:value" | "postRecommend", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     value: {
         type: PropType<ArrayAble<string> | null>;
     };
@@ -40,17 +84,63 @@ export declare const SELECT: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
-    urlConfig: {
-        type: PropType<UrlConfig>;
-    };
     onFocus: {
         type: PropType<Func<any[], any>>;
     };
     onChange: {};
+    urlConfig: {
+        type: PropType<UrlConfig>;
+    };
+    autograph: {
+        type: StringConstructor;
+    };
+    wordbook: {
+        type: PropType<Partial<{
+            level_num: number;
+            id: string;
+            name: string;
+            render_key: string[];
+            search_key: string[];
+            primary_key: string;
+            type: string;
+            value_key: string;
+            level_key: string;
+            link_key: string;
+            link_key_split: string;
+            show_key: string[];
+            conObj: AnyObject[];
+            conObjFirstLevel: AnyObject[];
+        }>>;
+    };
+    recommend: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    commonList: {
+        type: PropType<RecommendItem[]>;
+    };
+    recentList: {
+        type: PropType<RecommendItem[]>;
+    };
+    getRecommendInfo: {
+        type: PropType<() => RecommendIds>;
+    };
+    recommendNum: {
+        type: NumberConstructor;
+        default: number;
+    };
+    recommendCache: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+    onPostRecommend?: ((...args: any[]) => any) | undefined;
 }, {
     options: AnyObject[];
     lazyRequest: boolean;
     requestCache: boolean;
+    recommend: boolean;
+    recommendCache: boolean;
+    recommendNum: number;
 }>;

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

@@ -1,12 +1,12 @@
-import { defineComponent, ref, computed, inject, watch, createVNode } from 'vue';
-import { useVModel, useDebounceFn } from '@vueuse/core';
-import { isString, cloneDeep, isEqual } from 'lodash-es';
+import { defineComponent, computed, inject, createVNode } from 'vue';
+import { cloneDeep } from 'lodash-es';
 import { useCommonInjection, useSelectOptionProps } from '../../hooks/useCommonInjection.js';
-import { InjectionAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index.js';
+import { InjectionChangeContextCollector } from '../../constants/index.js';
 import '../../../../../shared/utils/index.js';
 import '../../../index.js';
-import { createUrlConfigParams, formRenderLog, optionMatcherWithKeyword } from '../../utils/index.js';
+import '../../utils/index.js';
 import { useFormField } from '../../hooks/useFormField.js';
+import '@vueuse/core';
 import '../../../../../shared/utils/tapable/SyncHook.js';
 import '../../../../../shared/utils/tapable/SyncBailHook.js';
 import '../../../../../shared/utils/tapable/SyncWaterfallHook.js';
@@ -19,9 +19,11 @@ import '../../../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
 import '../../hooks/useFormValidator.js';
 import '@formily/core';
+import 'date-fns';
 import '@vue/shared';
 import { connect, mapProps } from '@formily/vue';
 import './index.js';
+import { useUrlConfigOptions, useAutographOptions, useRecommendOptions } from '../../hooks/useFormRenderOptions.js';
 import { NSelect } from 'naive-ui';
 import { visitedDecorator, assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
 
@@ -43,82 +45,83 @@ const script = defineComponent({
       type: Array,
       default: () => []
     },
+    onFocus: {
+      type: Function
+    },
+    onChange: {},
     urlConfig: {
       type: Object
     },
-    onFocus: {
+    autograph: {
+      type: String
+    },
+    wordbook: {
+      type: Object
+    },
+    recommend: {
+      type: Boolean,
+      default: false
+    },
+    commonList: {
+      type: Array
+    },
+    recentList: {
+      type: Array
+    },
+    getRecommendInfo: {
       type: Function
     },
-    onChange: {}
+    recommendNum: {
+      type: Number,
+      default: 10
+    },
+    recommendCache: {
+      type: Boolean,
+      default: false
+    }
   },
-  emits: ["update:value"],
+  emits: ["update:value", "postRecommend"],
   setup(props, {
     slots,
     emit
   }) {
-    const valueRef = useVModel(props, "value", emit);
-    const remoteOptions = ref(null);
-    const lastSearch = ref("");
-    const labelKey = computed(() => {
-      var _a, _b;
-      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text";
-    });
-    const valueKey = computed(() => {
-      var _a, _b;
-      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
+    const valueRef = computed({
+      get() {
+        return props.value;
+      },
+      async set(value) {
+        emit("update:value", value);
+        postRecommend(value);
+      }
     });
+    const {
+      labelKey,
+      valueKey,
+      fetchData: fetchOptions,
+      options
+    } = props.urlConfig ? useUrlConfigOptions(props, valueRef) : useAutographOptions(props, valueRef);
+    const {
+      getRecommend,
+      postRecommend,
+      sortedOptions
+    } = useRecommendOptions(props, options, emit, valueKey);
     const {
       field,
       fieldKey
     } = useFormField();
-    const asyncQueue = inject(InjectionAsyncQueue);
-    const fetchData = useDebounceFn(async function(content) {
-      lastSearch.value = content || "";
-      if (!props.urlConfig) {
-        return remoteOptions.value = null;
-      }
-      try {
-        remoteOptions.value = await asyncQueue.addAsync(await createUrlConfigParams({
-          config: props.urlConfig,
-          cache: props.requestCache,
-          field: field.value
-        }));
-      } catch (e) {
-        isString(e) && formRenderLog(e);
-      }
-    }, 300);
-    const parsedOptions = computed(() => {
-      if (remoteOptions.value)
-        return optionMatcherWithKeyword(remoteOptions.value, lastSearch.value, labelKey.value);
-      if (!Array.isArray(props.options))
-        return [];
-      return optionMatcherWithKeyword(props.options, lastSearch.value, labelKey.value);
-    });
     const changeContextCollector = inject(InjectionChangeContextCollector);
     changeContextCollector.setContext(fieldKey.value, (v) => {
       return {
         currentOption: cloneDeep(getCurrentOption(v))
       };
       function getCurrentOption(v2) {
-        return parsedOptions.value.find((option) => option[valueKey.value] === v2);
+        return sortedOptions.value.find((option) => option[valueKey.value] === v2);
       }
     });
-    const formItemDepsCollector = inject(InjectionFormItemDepsCollector);
-    watch(() => props.urlConfig, (config, oldConfig) => {
-      if (isEqual(config, oldConfig))
-        return;
-      remoteOptions.value = null;
-      if (!config)
-        return;
-      formItemDepsCollector.setDeps(fieldKey.value, config.dependKey || [], async () => {
-        remoteOptions.value = null;
-        valueRef.value = null;
-        !props.lazyRequest && await fetchData();
-      });
-      (valueRef.value || !props.lazyRequest) && fetchData();
-    }, {
-      immediate: true
-    });
+    async function fetchData(content = "") {
+      fetchOptions(content);
+      getRecommend();
+    }
     const {
       injectValueValidate,
       injectValueWatchFromEmpty,
@@ -135,13 +138,13 @@ const script = defineComponent({
       "key": key.value,
       "remote": true,
       "filterable": true,
-      "menu-props": menuProps,
-      "node-props": nodeProps,
       "value": valueRef.value,
       "onUpdate:value": ($event) => valueRef.value = $event,
+      "menu-props": menuProps,
+      "node-props": nodeProps,
       "labelField": labelKey.value,
       "valueField": valueKey.value,
-      "options": parsedOptions.value,
+      "options": sortedOptions.value,
       "onSearch": fetchData,
       "onUpdate:show": (show) => show && fetchData(),
       "onFocus": visitedDecorator(field, props.onFocus)

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

@@ -10,6 +10,6 @@ export * from './useBusinessBinding';
 export * from './useChangeContext';
 export * from './useFormItemDeps';
 export * from './useAnchor';
-export * from './useAutographOptions';
 export * from './useFormContext';
 export * from './useCommonInjection';
+export * from './useFormRenderOptions';

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

@@ -10,6 +10,6 @@ export { BusinessCollector, useBusinessBinding } from './useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './useFormItemDeps.js';
 export { useAnchor } from './useAnchor.js';
-export { useAutographOptions } from './useAutographOptions.js';
 export { useFormContext } from './useFormContext.js';
 export { useCommonInjection, useSelectOptionProps } from './useCommonInjection.js';
+export { useAutographOptions, useRecommendOptions, useUrlConfigOptions } from './useFormRenderOptions.js';

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

@@ -1,5 +1,5 @@
 import { Form } from '@formily/core';
-import { FormBusinessFormatter } from '../../../../../es/components/form-render';
+import { FieldItem, FormBusinessFormatter } from '../../../../../es/components/form-render';
 import { FIELD_BUSINESS_TYPE } from '../constants';
 export declare class BusinessCollector {
     private formModel;
@@ -9,8 +9,8 @@ export declare class BusinessCollector {
     private readonly fieldNameCollector;
     constructor(formModel: Form, businessFormatter?: FormBusinessFormatter | undefined);
     private formatter;
-    collect(type: FIELD_BUSINESS_TYPE, fieldName: string): void;
-    private getField;
+    collect(type: FIELD_BUSINESS_TYPE, fieldItem: FieldItem): void;
+    getField(type: FIELD_BUSINESS_TYPE): FieldItem | undefined;
     getFieldInstanceByType(type: FIELD_BUSINESS_TYPE): import("@formily/core").GeneralField | null;
     private getType;
     private getValueByField;

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

@@ -1,5 +1,6 @@
 import { isField } from '@formily/core';
 import { isString } from '@vueuse/core';
+import { format } from 'date-fns';
 import { isFunction, isNumber } from 'lodash-es';
 import { FIELD_BUSINESS_TYPE } from '../constants/index.js';
 import '../utils/index.js';
@@ -18,16 +19,16 @@ class BusinessCollector {
   formatter(...args) {
     return isFunction(this.businessFormatter) ? this.businessFormatter(...args) : args[0].value;
   }
-  collect(type, fieldName) {
-    this.typeCollector.set(type, fieldName);
-    this.fieldNameCollector.set(fieldName, type);
+  collect(type, fieldItem) {
+    this.typeCollector.set(type, fieldItem);
+    this.fieldNameCollector.set(fieldItem.val_key, type);
   }
   getField(type) {
     return this.typeCollector.get(type);
   }
   getFieldInstanceByType(type) {
     const field = this.getField(type);
-    return field ? this.formModel.query(field).take() : null;
+    return field ? this.formModel.query(field.val_key).take() : null;
   }
   getType(fieldName) {
     return this.fieldNameCollector.get(fieldName);
@@ -38,16 +39,16 @@ class BusinessCollector {
   }
   getValueByType(type) {
     const field = this.getField(type);
-    return field ? this.getValueByField(field) : null;
+    return field ? this.getValueByField(field.val_key) : null;
   }
   setValueByType(type, value) {
     const field = this.getField(type);
-    field && this.formModel.setFieldState(field, (state) => {
+    field && this.formModel.setFieldState(field.val_key, (state) => {
       if (state.value === value)
         return;
       const lock = this.typeLockMap.get(type);
       this.typeLockMap.set(type, isNumber(lock) ? lock + 1 : 1);
-      state.value = this.formatter({ value, type, fieldKey: field });
+      state.value = this.formatter({ value, type, fieldKey: field.val_key });
     });
   }
   registerChangeBusiness(type, handler) {
@@ -73,6 +74,11 @@ class BusinessCollector {
   }
 }
 function useBusinessBinding() {
+  function getBirthdayFormat() {
+    var _a;
+    const birthdayField = this.getField(FIELD_BUSINESS_TYPE.BIRTHDAY);
+    return (_a = birthdayField == null ? void 0 : birthdayField.date_format) != null ? _a : "yyyy-MM-dd HH:mm";
+  }
   function handlerIdCardType() {
     const idCard = this.getValueByType(FIELD_BUSINESS_TYPE.ID_CARD);
     if (!idCard || !isString(idCard) || !isIdCard(idCard)) {
@@ -84,7 +90,7 @@ function useBusinessBinding() {
     this.setValueByType(FIELD_BUSINESS_TYPE.AGE_UNIT, ageUnit);
     this.setValueByType(FIELD_BUSINESS_TYPE.AGE, age);
     this.setValueByType(FIELD_BUSINESS_TYPE.SEX, info.sex);
-    this.setValueByType(FIELD_BUSINESS_TYPE.BIRTHDAY, info.birthday);
+    this.setValueByType(FIELD_BUSINESS_TYPE.BIRTHDAY, format(new Date(info.birthday), getBirthdayFormat.call(this)));
     setSexDisabled.call(this, true);
     function setSexDisabled(value) {
       const sexField = this.getFieldInstanceByType(FIELD_BUSINESS_TYPE.SEX);
@@ -106,7 +112,7 @@ function useBusinessBinding() {
       return;
     if (!isString(ageUnit) || ageUnit === "")
       return;
-    this.setValueByType(FIELD_BUSINESS_TYPE.BIRTHDAY, parseAge2Birthday(+age, ageUnit));
+    this.setValueByType(FIELD_BUSINESS_TYPE.BIRTHDAY, parseAge2Birthday(+age, ageUnit, getBirthdayFormat.call(this)));
   }
   function create(formModel, formatter) {
     return new BusinessCollector(formModel, formatter).registerChangeBusiness(FIELD_BUSINESS_TYPE.ID_CARD, handlerIdCardType).registerChangeBusiness(FIELD_BUSINESS_TYPE.AGE_UNIT, handlerAgeType).registerChangeBusiness(FIELD_BUSINESS_TYPE.AGE, handlerAgeType).registerChangeBusiness(FIELD_BUSINESS_TYPE.BIRTHDAY, handlerBirthdayType);

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

@@ -73,7 +73,6 @@ function useFieldListAdaptor(collector) {
     if (item.urlConfig) {
       bindUrlProps(schema, item);
     } else if (item.autograph) {
-      schema["x-component"] = "SEARCH";
       bindAutoGraphProps(schema, item);
     }
     bindCommonProps(schema, item);
@@ -89,12 +88,6 @@ function useFieldListAdaptor(collector) {
       multiple && (schema2.type = "array");
     }
   };
-  const createRecommendSelectSchema = (item) => {
-    const schema = createSelectSchema(item);
-    schema["x-component"] = "RECOMMEND_SELECT";
-    Object.assign(schema["x-component-props"], pick(item, ["commonList", "recentList"]));
-    return schema;
-  };
   const createRadioSchema = (item) => {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
@@ -225,11 +218,10 @@ function useFieldListAdaptor(collector) {
     ["INPUT", createInputSchema],
     ["INPUT_NUMBER", createInputNumberSchema],
     ["SELECT", createSelectSchema],
-    ["RECOMMEND_SELECT", createRecommendSelectSchema],
     ["REMOTE_SEARCH", createSelectSchema],
     ["DATE", createDateSchema],
     ["LEVEL_SEARCH_CASCADER", createLevelSearchCascadeSchema],
-    ["SEARCH_CASCADE", createSearchCascadeSchema],
+    ["SEARCH_CASCADER", createSearchCascadeSchema],
     ["COMBINATION", createCombinationSchema],
     ["RADIO", createRadioSchema],
     ["CHECKBOX", createRadioSchema],
@@ -268,7 +260,7 @@ function useFieldListAdaptor(collector) {
       var _a;
       cur = FieldNormalizeWaterfallHook.call(cloneDeep(cur));
       const obj_type = (_a = cur.validate) == null ? void 0 : _a.obj_type;
-      obj_type && collector.collect(obj_type, cur.val_key);
+      obj_type && collector.collect(obj_type, cloneDeep(cur));
       if (cur.html_type === "LINEBAR") {
         fin[createFieldName(cur)] = bindIndex(createLinebarSchema(cur), idx);
         prevLinebar = fin[createFieldName(cur)].properties = {};

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

@@ -49,7 +49,8 @@ function useFieldNormalize() {
     [["DATE-INPUT", "DATETIME-INPUT"], "DATE"],
     ["SWITCH_COMPONENT", "SWITCH"],
     ["SLIDER_COMPONENT", "SLIDER"],
-    ["LEVEL_SEARCH_CASCADE", "LEVEL_SEARCH_CASCADER"]
+    ["LEVEL_SEARCH_CASCADE", "LEVEL_SEARCH_CASCADER"],
+    ["SEARCH_CASCADE", "SEARCH_CASCADER"]
   ];
   FieldNormalizeWaterfallHook.tap("__normalize", (fieldItem) => {
     types.some(([rule, target]) => {

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

@@ -0,0 +1,41 @@
+import { AnyObject, Func } from '../../../../../es/shared/types';
+import { Ref } from 'vue';
+import { FormWordbook, RecommendIds, UrlConfig } from '../../../../../es/components/form-render';
+import { RecommendItem } from '../../../../../es/components/recommend-search/src/types';
+export declare function useRecommendOptions(props: {
+    recommend: boolean;
+    commonList?: RecommendItem[];
+    recentList?: RecommendItem[];
+    getRecommendInfo?: () => RecommendIds;
+    recommendCache: boolean;
+    recommendNum: number;
+}, options: Ref<AnyObject[]>, emit: Func, valueKey: Ref<string>): {
+    postRecommend: (value: unknown) => Promise<void>;
+    getRecommend: () => Promise<void>;
+    sortedOptions: import("vue").ComputedRef<any[]>;
+};
+export declare function useUrlConfigOptions(props: {
+    urlConfig?: UrlConfig;
+    options?: AnyObject[];
+    requestCache: boolean;
+    lazyRequest: boolean;
+}, valueRef: Ref): {
+    labelKey: import("vue").ComputedRef<string>;
+    valueKey: import("vue").ComputedRef<string>;
+    options: import("vue").ComputedRef<AnyObject[]>;
+    fetchData: (content?: string) => Promise<null | undefined>;
+};
+export declare function useAutographOptions(props: {
+    requestCache?: boolean;
+    wordbook?: FormWordbook;
+    autograph?: string;
+    lazyRequest?: boolean;
+    options?: AnyObject[];
+}, valueRef: Ref): {
+    valueRef: Ref<any>;
+    options: import("vue").ComputedRef<AnyObject[]>;
+    fetchData: (content?: string) => Promise<void>;
+    labelKey: import("vue").ComputedRef<string>;
+    valueKey: import("vue").ComputedRef<string>;
+    lastSearch: Ref<string>;
+};