cnhis-design-vue 3.1.40-beta.0 → 3.1.40-release.1

package/es/components/button-print/index.d.ts

@@ -64,10 +64,6 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    directPrint: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
 }, {
     $message: import("naive-ui").MessageApi;
     printInstance: import("./src/utils").Print | null;
@@ -134,10 +130,6 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
             type: StringConstructor;
             default: string;
         };
-        directPrint: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
     }>> & {
         onError?: ((...args: any[]) => any) | undefined;
         onSuccess?: ((...args: any[]) => any) | undefined;
@@ -162,7 +154,6 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
     currentFormatItem: import("vue").ComputedRef<{} | undefined>;
     formatTitle: import("vue").ComputedRef<any>;
     getTemplateIdByFormatId: import("vue").ComputedRef<any>;
-    buttonClick: (origin: string) => Promise<false | undefined>;
     renderLabel: (option: import("naive-ui").MenuOption) => JSX.Element;
     callLocalServicesSuccessCb: (res: any, type: any) => void;
     callLocalServicesErrorCb: (res: unknown) => void;
@@ -188,10 +179,9 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
     }, params?: any[]) => any;
     initCRM: (formatListResult: any) => Promise<boolean | undefined>;
     init: () => Promise<boolean>;
-    handleClickBtn: (visible?: boolean) => Promise<false | undefined>;
+    handleClickBtn: () => Promise<false | undefined>;
     reformatPrintParams: () => void;
     verifiySuccess: (token: string) => void;
-    directPrint: () => Promise<void>;
     NDropdown: any;
     NButton: any;
     NIcon: any;
@@ -1888,10 +1878,6 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    directPrint: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
 }>> & {
     onError?: ((...args: any[]) => any) | undefined;
     onSuccess?: ((...args: any[]) => any) | undefined;
@@ -1911,6 +1897,5 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
     noDataMsg: string;
     printdlgshow: string;
     btnprint: string;
-    directPrint: boolean;
 }>>;
 export default ButtonPrint;

package/es/components/button-print/src/ButtonPrint.vue.d.ts

@@ -69,10 +69,6 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    directPrint: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
 }, {
     $message: import("naive-ui").MessageApi;
     printInstance: Print | null;
@@ -142,10 +138,6 @@ declare const _default: import("vue").DefineComponent<{
             type: StringConstructor;
             default: string;
         };
-        directPrint: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
     }>> & {
         onError?: ((...args: any[]) => any) | undefined;
         onSuccess?: ((...args: any[]) => any) | undefined;
@@ -170,7 +162,6 @@ declare const _default: import("vue").DefineComponent<{
     currentFormatItem: import("vue").ComputedRef<{} | undefined>;
     formatTitle: import("vue").ComputedRef<any>;
     getTemplateIdByFormatId: import("vue").ComputedRef<any>;
-    buttonClick: (origin: string) => Promise<false | undefined>;
     renderLabel: (option: DropdownOption) => JSX.Element;
     callLocalServicesSuccessCb: (res: any, type: any) => void;
     callLocalServicesErrorCb: (res: unknown) => void;
@@ -196,10 +187,9 @@ declare const _default: import("vue").DefineComponent<{
     }, params?: any[]) => any;
     initCRM: (formatListResult: any) => Promise<boolean | undefined>;
     init: () => Promise<boolean>;
-    handleClickBtn: (visible?: boolean) => Promise<false | undefined>;
+    handleClickBtn: () => Promise<false | undefined>;
     reformatPrintParams: () => void;
     verifiySuccess: (token: string) => void;
-    directPrint: () => Promise<void>;
     NDropdown: any;
     NButton: any;
     NIcon: any;
@@ -1899,10 +1889,6 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    directPrint: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
 }>> & {
     onError?: ((...args: any[]) => any) | undefined;
     onSuccess?: ((...args: any[]) => any) | undefined;
@@ -1922,6 +1908,5 @@ declare const _default: import("vue").DefineComponent<{
     noDataMsg: string;
     printdlgshow: string;
     btnprint: string;
-    directPrint: boolean;
 }>;
 export default _default;

package/es/components/button-print/src/ButtonPrint.vue2.js

@@ -71,15 +71,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     btnprint: {
       type: String,
       default: "1"
-    },
-    directPrint: {
-      type: Boolean,
-      default: false
     }
   },
   emits: ["success", "error", "clickoutside"],
   setup(__props, {
-    expose,
     emit
   }) {
     const props = __props;
@@ -123,19 +118,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       let find = state.formatList.find((item) => item.id === state.currentFormatId);
       return find == null ? void 0 : find.templateId;
     });
-    const buttonClick = async (origin) => {
-      if (props.directPrint) {
-        if (state.spinning)
-          return;
-        if (origin === "button") {
-          await directPrint();
-          return;
-        } else {
-          return handleClickBtn();
-        }
-      }
-      return handleClickBtn();
-    };
     const renderLabel = (option) => {
       return createVNode("span", {
         "class": {
@@ -420,7 +402,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.spinning = false;
       return true;
     };
-    const handleClickBtn = async (visible = true) => {
+    const handleClickBtn = async () => {
       var _a;
       const status = await props.clickPrevFn();
       if (!status)
@@ -434,9 +416,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         if (!result)
           return false;
       }
-      if (visible) {
-        state.visible = !state.visible;
-      }
+      state.visible = !state.visible;
     };
     const reformatPrintParams = () => {
       state.watchPrintParamsReformatFn && state.watchPrintParamsReformatFn();
@@ -477,13 +457,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }, {
       deep: true
     });
-    async function directPrint() {
-      await handleClickBtn(false);
-      handleClickPrint();
-    }
-    expose({
-      directPrint
-    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(Fragment, null, [createVNode(unref(NDropdown), {
         class: "c-dropdown",
@@ -502,21 +475,17 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           printVisible: state.visible
         }, () => [createVNode(unref(NButton), {
           class: "dropdown-button",
-          onClick: _cache[1] || (_cache[1] = withModifiers(() => buttonClick("button"), ["stop"]))
+          onClick: withModifiers(handleClickBtn, ["stop"])
         }, {
           default: withCtx(() => [createCommentVNode(' <n-spin v-show="state.spinning" size="small"></n-spin> '), createTextVNode(toDisplayString(__props.btnText) + " ", 1), createVNode(unref(NIcon), {
-            component: unref(ChevronDown),
-            style: {
-              "margin-left": "5px"
-            },
-            onClick: _cache[0] || (_cache[0] = withModifiers(() => buttonClick("icon"), ["stop"]))
+            component: unref(ChevronDown)
           }, null, 8, ["component"])]),
           _: 1
-        })])]),
+        }, 8, ["onClick"])])]),
         _: 3
       }, 8, ["show", "options"]), createVNode(IdentityVerification, mergeProps(_ctx.$attrs, {
         modelValue: state.identityVerification.visible,
-        "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => state.identityVerification.visible = $event),
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => state.identityVerification.visible = $event),
         formatId: state.currentFormatId,
         templateId: unref(getTemplateIdByFormatId),
         onSuccess: verifiySuccess

package/es/components/button-print/src/utils/print.d.ts

@@ -6,7 +6,6 @@ export declare class Print {
     private dialog;
     private dialogPreview;
     private instance;
-    private downloadPath;
     constructor();
     private readonly messageHandlerQueue;
     private messageHandler;

package/es/components/button-print/src/utils/print.js

@@ -27,7 +27,6 @@ class Print {
     this.dialog = new IdentityVerificationDialog();
     this.dialogPreview = new PreviewDialog();
     this.instance = null;
-    this.downloadPath = "";
     this.messageHandlerQueue = [];
     var _a;
     const _window = window;
@@ -36,19 +35,13 @@ class Print {
       return;
     this.currentMessageHandler = this.messageHandler.bind(this);
     this.webview.addEventListener("message", this.currentMessageHandler);
-    this.postMessage({ exec: "config", data: "" });
   }
   messageHandler(e) {
-    var _a;
     const handler = this.messageHandlerQueue.pop();
     if (!handler)
       return console.log("\u5F53\u524D\u56DE\u6267", e, "\u6CA1\u6709\u53EF\u7528\u7684handler");
     const { resolve, reject } = handler;
     try {
-      const { exec } = JSON.parse(e.data);
-      if (exec === "config") {
-        this.downloadPath = ((_a = JSON.parse(e.data).res) == null ? void 0 : _a.downloadpath) || "";
-      }
       console.log(e);
       resolve(JSON.parse(e.data).res);
     } catch (e2) {
@@ -318,9 +311,6 @@ class Print {
     return httpFn.get(PDF_URL, { params: { inputData } }).then(({ data }) => data);
   }
   downloadPDF(params, onResolve, onReject) {
-    if (this.webview && this.downloadPath) {
-      params.print.filename = this.downloadPath.replace(/\\/g, "/");
-    }
     this.printDirect(
       params,
       async (res) => {

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

@@ -15,8 +15,8 @@ export { FormItemDepsCollector, useFormItemDeps } from './src/hooks/useFormItemD
 export { useAnchor } from './src/hooks/useAnchor.js';
 export { useFormContext } from './src/hooks/useFormContext.js';
 export { useCommonInjection, useSelectOptionProps } from './src/hooks/useCommonInjection.js';
-export { optionMatcherCache, useAutographOptions, useRecommendOptions, useUrlConfigOptions } from './src/hooks/useFormRenderOptions.js';
-export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, keywordMatcher, mergeDeepProperties, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser } from './src/utils/index.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, parseAgeFromContext, parseBirthday, parseIdCard, transformDateFormat } from './src/utils/business.js';
 export { findNextWidget, queryDecorator, queryInput } from './src/utils/dom.js';

package/es/components/form-render/src/components/renderer/lineBar/FormCollapse.vue.d.ts

@@ -30,9 +30,6 @@ declare const _default: import("vue").DefineComponent<{
     }>> & {}>>;
     _show: import("vue").Ref<boolean>;
     toggleShow: () => void;
-    headerClass: import("vue").ComputedRef<(string | {
-        'form-render__linebarHeader--disabled': boolean;
-    })[]>;
     fieldKey: import("vue").ComputedRef<string>;
     formItemDepsCollector: import("../../../../../../../es/components/form-render").FormItemDepsCollector;
     TooltipMessage: import("vue").DefineComponent<{

package/es/components/form-render/src/components/renderer/lineBar/FormCollapse.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, inject, openBlock, createElementBlock, createElementVNode, normalizeClass, unref, createTextVNode, toDisplayString, createBlock, createCommentVNode, Fragment, createVNode, withCtx, renderSlot } from 'vue';
+import { defineComponent, ref, inject, openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createBlock, createCommentVNode, unref, createVNode, withCtx, renderSlot } from 'vue';
 import '../../../../index.js';
 import TooltipMessage from '../../tooltipMessage.vue.js';
 import { InjectionFormItemDepsCollector, FormItemLineBarDepKeyPrepend } from '../../../constants/index.js';
@@ -28,9 +28,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       _show.value = !_show.value;
     }
-    const headerClass = computed(() => {
-      return ["form-render__linebarHeader", { "form-render__linebarHeader--disabled": !!props.disabled }];
-    });
     const { fieldKey } = useFormField();
     const formItemDepsCollector = inject(InjectionFormItemDepsCollector);
     formItemDepsCollector.setDeps(fieldKey.value, FormItemLineBarDepKeyPrepend + fieldKey.value, (v = true) => {
@@ -39,7 +36,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("section", _hoisted_1, [
         createElementVNode("header", {
-          class: normalizeClass(unref(headerClass)),
+          class: "form-render__linebarHeader",
           onClick: toggleShow
         }, [
           createElementVNode("div", _hoisted_2, [
@@ -49,10 +46,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               message: __props.remark
             }, null, 8, ["message"])) : createCommentVNode("v-if", true)
           ]),
-          !__props.disabled ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-            _show.value ? (openBlock(), createBlock(unref(ChevronDown), { key: 0 })) : (openBlock(), createBlock(unref(ChevronUp), { key: 1 }))
-          ], 64)) : createCommentVNode("v-if", true)
-        ], 2),
+          _show.value ? (openBlock(), createBlock(unref(ChevronDown), { key: 0 })) : (openBlock(), createBlock(unref(ChevronUp), { key: 1 }))
+        ]),
         createVNode(unref(NCollapseTransition), {
           class: "form-render__linebarItem",
           show: _show.value

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

@@ -30,9 +30,6 @@ export declare const LINEBAR: import("vue").DefineComponent<{
     }>> & {}>>;
     _show: import("vue").Ref<boolean>;
     toggleShow: () => void;
-    headerClass: import("vue").ComputedRef<(string | {
-        'form-render__linebarHeader--disabled': boolean;
-    })[]>;
     fieldKey: import("vue").ComputedRef<string>;
     formItemDepsCollector: import("../../../hooks").FormItemDepsCollector;
     TooltipMessage: import("vue").DefineComponent<{

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

@@ -1,12 +1,12 @@
 import { defineComponent, computed, inject, createVNode } from 'vue';
-import { useDebounceFn } from '@vueuse/core';
-import { cloneDeep, isString } from 'lodash-es';
+import { cloneDeep } from 'lodash-es';
 import { useCommonInjection, useSelectOptionProps } from '../../hooks/useCommonInjection.js';
 import { InjectionChangeContextCollector } from '../../constants/index.js';
 import '../../../../../shared/utils/index.js';
 import '../../../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';
@@ -23,7 +23,7 @@ import 'date-fns';
 import { connect, mapProps } from '@formily/vue';
 import '@vue/shared';
 import './index.js';
-import { useUrlConfigOptions, useAutographOptions, useRecommendOptions, optionMatcherCache } from '../../hooks/useFormRenderOptions.js';
+import { useUrlConfigOptions, useAutographOptions, useRecommendOptions } from '../../hooks/useFormRenderOptions.js';
 import { NSelect } from 'naive-ui';
 import { createVisitedSetter, assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
 
@@ -101,7 +101,7 @@ const script = defineComponent({
       getRecommend,
       postRecommend,
       sortedOptions
-    } = useRecommendOptions(props, options, emit, labelKey, valueKey);
+    } = useRecommendOptions(props, options, emit, valueKey);
     const {
       field,
       fieldKey
@@ -115,10 +115,10 @@ const script = defineComponent({
         return sortedOptions.value.find((option) => option[valueKey.value] === v2);
       }
     });
-    const fetchData = useDebounceFn(async (content = "") => {
+    async function fetchData(content = "") {
       fetchOptions(content);
-      getRecommend(content);
-    }, 400);
+      getRecommend();
+    }
     const {
       injectValueValidate,
       injectValueWatchFromEmpty,
@@ -131,23 +131,6 @@ const script = defineComponent({
       menuProps,
       nodeProps
     } = useSelectOptionProps();
-    function renderLabel(option) {
-      const label = option[labelKey.value];
-      if (!label || !isString(label))
-        return "";
-      const renderLabels = optionMatcherCache.get(option);
-      if (!renderLabels)
-        return label;
-      return createVNode("section", null, [renderLabels.map((chars, idx) => {
-        if (idx === 0 || !chars)
-          return null;
-        return createVNode("span", {
-          "style": {
-            color: idx % 2 === 0 ? "var(--n-option-text-color-active)" : ""
-          }
-        }, [chars]);
-      })]);
-    }
     return () => createVNode(NSelect, {
       "key": key.value,
       "remote": true,
@@ -161,8 +144,7 @@ const script = defineComponent({
       "options": sortedOptions.value,
       "onSearch": fetchData,
       "onUpdate:show": (show) => show && fetchData(),
-      "onFocus": createVisitedSetter(field),
-      "renderLabel": renderLabel
+      "onFocus": createVisitedSetter(field)
     }, slots);
   }
 });

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

@@ -12,4 +12,4 @@ export { FormItemDepsCollector, useFormItemDeps } from './useFormItemDeps.js';
 export { useAnchor } from './useAnchor.js';
 export { useFormContext } from './useFormContext.js';
 export { useCommonInjection, useSelectOptionProps } from './useCommonInjection.js';
-export { optionMatcherCache, useAutographOptions, useRecommendOptions, useUrlConfigOptions } from './useFormRenderOptions.js';
+export { useAutographOptions, useRecommendOptions, useUrlConfigOptions } from './useFormRenderOptions.js';

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

@@ -2,7 +2,6 @@ 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 const optionMatcherCache: WeakMap<AnyObject, string[]>;
 export declare function useRecommendOptions(props: {
     recommend: boolean;
     commonList?: RecommendItem[];
@@ -10,10 +9,10 @@ export declare function useRecommendOptions(props: {
     getRecommendInfo?: () => RecommendIds;
     recommendCache: boolean;
     recommendNum: number;
-}, options: Ref<AnyObject[]>, emit: Func, labelKey: Ref<string>, valueKey: Ref<string>): {
+}, options: Ref<AnyObject[]>, emit: Func, valueKey: Ref<string>): {
     postRecommend: (value: unknown) => Promise<void>;
-    getRecommend: (content?: string) => Promise<void>;
-    sortedOptions: import("vue").ComputedRef<AnyObject[]>;
+    getRecommend: () => Promise<void>;
+    sortedOptions: import("vue").ComputedRef<any[]>;
 };
 export declare function useUrlConfigOptions(props: {
     urlConfig?: UrlConfig;

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

@@ -4,7 +4,7 @@ import { isString, isEqual, omit, isFunction } from 'lodash-es';
 import { computed, inject, ref, watch } from 'vue';
 import '../../index.js';
 import { InjectionAsyncQueue, InjectionFormItemDepsCollector } from '../constants/index.js';
-import { createUrlConfigParams, formRenderLog, keywordMatcher } from '../utils/index.js';
+import { createUrlConfigParams, formRenderLog, optionMatcherWithKeyword } from '../utils/index.js';
 import { useFormField } from './useFormField.js';
 import { useFormRequest } from './useFormRequest.js';
 
@@ -21,44 +21,9 @@ function createPropRef(props, key) {
     }
   });
 }
-const optionMatcherCache = /* @__PURE__ */ new WeakMap();
-const searchContentMatcherCache = /* @__PURE__ */ new Map();
-function useSearchContent() {
-  const searchContent = ref();
-  const searchContentMatcher = computed(() => {
-    if (!searchContent.value)
-      return /./;
-    return new RegExp(
-      `(.*)${searchContent.value.split("").map((char) => `(${char})`).join("(.*)")}(.*)`
-    );
-  });
-  function filter(option, labelKey) {
-    if (!searchContent.value)
-      return true;
-    const label = option ? option[labelKey] : "";
-    if (!isString(label))
-      return false;
-    const cacheObj = searchContentMatcherCache.get(searchContent.value) || {};
-    const matched = Reflect.has(cacheObj, label) ? cacheObj[label] : label.match(searchContentMatcher.value);
-    cacheObj[label] = matched;
-    searchContentMatcherCache.set(searchContent.value, cacheObj);
-    if (matched) {
-      optionMatcherCache.set(option, matched);
-      return true;
-    }
-    return keywordMatcher(label, option.keyword);
-  }
-  function optionSearchFilter(options, _labelKey) {
-    if (!searchContent.value)
-      return options;
-    return options.filter((option) => filter(option, _labelKey));
-  }
-  return { searchContent, searchContentMatcher, optionSearchFilter };
-}
-function useRecommendOptions(props, options, emit, labelKey, valueKey) {
+function useRecommendOptions(props, options, emit, valueKey) {
   const commonListRef = createPropRef(props, "commonList");
   const recentListRef = createPropRef(props, "recentList");
-  const { searchContent, optionSearchFilter } = useSearchContent();
   function getRecommendOption(item) {
     return jsonParse(item.itemObj);
   }
@@ -79,11 +44,7 @@ function useRecommendOptions(props, options, emit, labelKey, valueKey) {
         return item[valueKey.value] !== option[valueKey.value];
       }
     });
-    return [
-      ...optionSearchFilter(commonOptions.value, labelKey.value),
-      ...optionSearchFilter(recentOptions.value, labelKey.value),
-      ...optionWithoutRecommend
-    ];
+    return [...commonOptions.value, ...recentOptions.value, ...optionWithoutRecommend];
   });
   const { getRecommendRequestInfo, getHttpInstance } = useFormRequest();
   function getRecommendConfig(type) {
@@ -94,10 +55,9 @@ function useRecommendOptions(props, options, emit, labelKey, valueKey) {
   }
   const { fieldKey } = useFormField();
   const asyncQueue = inject(InjectionAsyncQueue);
-  async function getRecommend(content) {
+  async function getRecommend() {
     if (!props.recommend)
       return;
-    searchContent.value = content;
     if (commonListRef.value && recentListRef.value && props.recommendCache)
       return;
     const list = await asyncQueue.addAsync(createParams(fieldKey.value, props.recommendCache));
@@ -165,11 +125,11 @@ function useUrlConfigOptions(props, valueRef) {
     var _a, _b;
     return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
   });
-  const { searchContent, optionSearchFilter } = useSearchContent();
   const remoteOptions = ref(null);
+  const lastSearch = ref("");
   const { field, fieldKey } = useFormField();
   const fetchData = useDebounceFn(async function(content) {
-    searchContent.value = content || "";
+    lastSearch.value = content || "";
     if (!props.urlConfig) {
       return remoteOptions.value = null;
     }
@@ -187,10 +147,10 @@ function useUrlConfigOptions(props, valueRef) {
   }, 300);
   const options = computed(() => {
     if (remoteOptions.value)
-      return optionSearchFilter(remoteOptions.value, labelKey.value);
+      return optionMatcherWithKeyword(remoteOptions.value, lastSearch.value, labelKey.value);
     if (!Array.isArray(props.options))
       return [];
-    return optionSearchFilter(props.options, labelKey.value);
+    return optionMatcherWithKeyword(props.options, lastSearch.value, labelKey.value);
   });
   const formItemDepsCollector = inject(InjectionFormItemDepsCollector);
   watch(
@@ -223,12 +183,12 @@ function useAutographOptions(props, valueRef) {
     var _a, _b;
     return (_b = (_a = props.wordbook) == null ? void 0 : _a.value_key) != null ? _b : "value";
   });
-  const { searchContent, optionSearchFilter } = useSearchContent();
   const remoteOptions = ref(null);
+  const lastSearch = ref("");
   const { fieldKey } = useFormField();
   const { getSearchRequestInfo } = useFormRequest();
   const fetchData = useDebounceFn(async function(content) {
-    searchContent.value = content || "";
+    lastSearch.value = content || "";
     if (!props.autograph || !props.wordbook) {
       return remoteOptions.value = null;
     }
@@ -251,10 +211,10 @@ function useAutographOptions(props, valueRef) {
   }, 300);
   const options = computed(() => {
     if (remoteOptions.value)
-      return optionSearchFilter(remoteOptions.value, labelKey.value);
+      return optionMatcherWithKeyword(remoteOptions.value, lastSearch.value, labelKey.value);
     if (!Array.isArray(props.options))
       return [];
-    return optionSearchFilter(props.options, labelKey.value);
+    return optionMatcherWithKeyword(props.options, lastSearch.value, labelKey.value);
   });
   watch(
     () => props.wordbook,
@@ -271,4 +231,4 @@ function useAutographOptions(props, valueRef) {
   return { labelKey, valueKey, options, fetchData };
 }
 
-export { optionMatcherCache, useAutographOptions, useRecommendOptions, useUrlConfigOptions };
+export { useAutographOptions, useRecommendOptions, useUrlConfigOptions };

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

@@ -1,4 +1,4 @@
-import { AnyObject, ArrayAble } from '../../../../../es/shared/types';
+import { AnyObject, ArrayAble, Nullable } from '../../../../../es/shared/types';
 import { GeneralField } from '@formily/core';
 import { FunctionalComponent, InjectionKey, VNode } from 'vue';
 import { FieldItem, UrlConfig } from '../types';
@@ -14,7 +14,9 @@ export declare function createSlot(renderer: unknown, props: AnyObject, defaultR
 };
 export declare function createInputSlot(props: AnyObject, defaultRenderer?: (v: unknown) => unknown[]): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}>>>;
 export declare function presetRequestHandler(res: unknown): AnyObject[];
-export declare const keywordMatcher: import("@vueuse/core").UseMemoizedFn<boolean, [text: unknown, keyword: unknown]>;
+export declare function optionMatcherWithKeyword(options: AnyObject[], input: Nullable<string>, key: string, matcherOption?: {
+    keyword?: string;
+}): AnyObject[];
 export declare function validateMessageParser(message: string, fieldItem: Omit<FieldItem, 'reactions'>): string;
 export declare function combineExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;
 export declare function splitExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;

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

@@ -138,6 +138,20 @@ const keywordMatcher = useMemoize(function(text, keyword) {
     }, "");
   }
 });
+function optionMatcherWithKeyword(options, input, key, matcherOption = {
+  keyword: "keyword"
+}) {
+  if (!input)
+    return options;
+  return options.filter((option) => {
+    if (!isString(keyFor(option)))
+      return;
+    return keyFor(option).includes(input) || matcherOption.keyword && keywordMatcher(input, option[matcherOption.keyword]);
+  });
+  function keyFor(option) {
+    return option[key];
+  }
+}
 function validateMessageParser(message, fieldItem) {
   if (!isString(message) || !message)
     return "";
@@ -238,4 +252,4 @@ async function createUrlConfigParams({
   };
 }
 
-export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, keywordMatcher, mergeDeepProperties, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser };
+export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, mergeDeepProperties, optionMatcherWithKeyword, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser };