cnhis-design-vue 3.1.21-beta.7 → 3.1.21-beta.8

package/es/components/form-config/index.d.ts

@@ -927,6 +927,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             option?: {
                 text: string;
                 value: any;
+                keyword?: string | undefined;
                 children?: any[] | undefined;
             }[] | undefined;
             multi_select?: import("..").FormCommonState | undefined;

package/es/components/form-config/src/FormConfig.vue.d.ts

@@ -929,6 +929,7 @@ declare const _default: import("vue").DefineComponent<{
             option?: {
                 text: string;
                 value: any;
+                keyword?: string | undefined;
                 children?: any[] | undefined;
             }[] | undefined;
             multi_select?: import("../..").FormCommonState | undefined;

package/es/components/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -56,6 +56,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         option?: {
             text: string;
             value: any;
+            keyword?: string | undefined;
             children?: any[] | undefined;
         }[] | undefined;
         multi_select?: import("../../../../../es/components/form-render").FormCommonState | undefined;

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

@@ -3,13 +3,9 @@ import { safeComponentRegister } from '../../shared/utils/index2.js';
 import script from './src/FormRender.js';
 import '@vueuse/core';
 import 'lodash-es';
-import 'vue';
-import '@formily/path';
-import '@vue/shared';
-import 'pinyin-match';
-import 'date-fns';
-export * from '@formily/core';
+import './src/utils/index.js';
 import '@formily/vue';
+import 'vue';
 import '../../shared/utils/tapable/SyncHook.js';
 import '../../shared/utils/tapable/SyncBailHook.js';
 import '../../shared/utils/tapable/SyncWaterfallHook.js';
@@ -20,6 +16,8 @@ import '../../shared/utils/tapable/AsyncSeriesHook.js';
 import '../../shared/utils/tapable/AsyncSeriesBailHook.js';
 import '../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
+export * from '@formily/core';
+import '@vue/shared';
 import './src/components/renderer/input.js';
 import './src/components/renderer/select.js';
 import './src/components/renderer/formItem.js';

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

@@ -5,11 +5,7 @@ import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { InjectAsyncQueue } from '../../constants/index2.js';
 import '@vueuse/core';
 import '../../../index2.js';
-import '@formily/path';
-import '@vue/shared';
-import 'pinyin-match';
-import 'date-fns';
-import { assignUpdateValue, assignValueBindKey, traverseDependKey } from '../../utils/schema2.js';
+import '../../utils/index.js';
 import { useFormField } from '../../hooks/useFormField2.js';
 import '../../../../../shared/utils/tapable/SyncHook.js';
 import '../../../../../shared/utils/tapable/SyncBailHook.js';
@@ -21,6 +17,7 @@ import '../../../../../shared/utils/tapable/AsyncSeriesHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesBailHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
+import '@vue/shared';
 import { connect, mapProps } from '@formily/vue';
 import './input.js';
 import './select.js';
@@ -41,6 +38,7 @@ import './complex.js';
 import './simpleComponent.js';
 import './search.js';
 import { NCascader } from 'naive-ui';
+import { assignUpdateValue, assignValueBindKey, traverseDependKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormCascader",

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

@@ -1,12 +1,8 @@
 import { defineComponent, createVNode } from 'vue';
-import '@formily/path';
-import '@vue/shared';
-import 'lodash-es';
-import 'pinyin-match';
-import 'date-fns';
-import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
+import '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCheckboxGroup, NSpace, NCheckbox } from 'naive-ui';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormCheckbox",

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

@@ -4,13 +4,10 @@ import '../../../index2.js';
 import { useField, RecursionField, connect } from '@formily/vue';
 import { NButton, NIcon } from 'naive-ui';
 import { InjectionBusinessCollector } from '../../constants/index2.js';
-import '@formily/path';
-import '@vue/shared';
-import 'pinyin-match';
-import 'date-fns';
-import { createObjSchema } from '../../utils/schema2.js';
+import '../../utils/index.js';
 import { AddCircleOutline, RemoveCircle } from '@vicons/ionicons5';
 import { useFieldListAdaptor } from '../../hooks/useFieldListAdaptor2.js';
+import { createObjSchema } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormCombination",

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

@@ -1,10 +1,6 @@
 import { defineComponent, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
-import '@formily/path';
-import '@vue/shared';
-import 'lodash-es';
-import 'pinyin-match';
-import 'date-fns';
+import '../../utils/index.js';
 import { assignUpdateValue } from '../../utils/schema2.js';
 
 const script = defineComponent({

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

@@ -5,10 +5,7 @@ import { isObject } from '@vueuse/core';
 import { format } from 'date-fns';
 import { NDatePicker } from 'naive-ui';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
-import '@formily/path';
-import '@vue/shared';
-import 'lodash-es';
-import 'pinyin-match';
+import '../../utils/index.js';
 import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 
 const script = defineComponent({

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

@@ -4,11 +4,7 @@ import { useField, connect, mapProps } from '@formily/vue';
 import { NFormItem } from 'naive-ui';
 import Annotation from '../../../../annotation-edit/index2.js';
 import { InjectionAnnotation, InjectionFormUUID } from '../../constants/index2.js';
-import '@formily/path';
-import '@vue/shared';
-import 'lodash-es';
-import 'pinyin-match';
-import 'date-fns';
+import '../../utils/index.js';
 import { dotEscape } from '../../utils/schema2.js';
 
 const script = defineComponent({

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

@@ -2,10 +2,7 @@ import { defineComponent, computed, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { isNumber } from 'lodash-es';
 import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
-import '@formily/path';
-import '@vue/shared';
-import 'pinyin-match';
-import 'date-fns';
+import '../../utils/index.js';
 import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 
 const script = defineComponent({

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

@@ -27,10 +27,6 @@ export declare const SEARCH: import("vue").DefineComponent<{
     onFocus: {
         type: PropType<Func<any[], any>>;
     };
-    pinyin: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     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<{
     value: {
@@ -59,14 +55,9 @@ export declare const SEARCH: import("vue").DefineComponent<{
     onFocus: {
         type: PropType<Func<any[], any>>;
     };
-    pinyin: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     onChange: {};
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {
     lazyRequest: boolean;
-    pinyin: boolean;
 }>;

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

@@ -1,10 +1,10 @@
 import { defineComponent, computed, ref, inject, watch, createVNode } from 'vue';
-import { cloneDeep, isEqual, isString } from 'lodash-es';
+import { useDebounceFn } from '@vueuse/core';
+import { isString, cloneDeep, isEqual } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { InjectAsyncQueue, InjectionChangeContextCollector } from '../../constants/index2.js';
-import '@vueuse/core';
 import '../../../index2.js';
-import { stringMatcher, formRenderLog } from '../../utils/index.js';
+import { formRenderLog, optionMatcher } from '../../utils/index.js';
 import { useFormRequest } from '../../hooks/useFormRequest2.js';
 import { useFormField } from '../../hooks/useFormField2.js';
 import '../../../../../shared/utils/tapable/SyncHook.js';
@@ -62,10 +62,6 @@ const script = defineComponent({
     onFocus: {
       type: Function
     },
-    pinyin: {
-      type: Boolean,
-      default: true
-    },
     onChange: {}
   },
   emits: ["update:value"],
@@ -95,7 +91,7 @@ const script = defineComponent({
     const {
       getSearchRequestInfo
     } = useFormRequest();
-    async function fetchData(content) {
+    const fetchData = useDebounceFn(async function(content) {
       lastSearch.value = content || "";
       if (remoteOptions.value)
         return;
@@ -119,16 +115,9 @@ const script = defineComponent({
           key: key2
         };
       }
-    }
+    }, 300);
     const parsedOptions = computed(() => {
-      return remoteOptions.value ? filterOption(remoteOptions.value, lastSearch.value) : [];
-      function filterOption(options, searchContent) {
-        return options.filter((option) => {
-          return !searchContent || stringMatcher(searchContent, option[labelKey.value], {
-            pinyin: props.pinyin
-          });
-        });
-      }
+      return remoteOptions.value ? optionMatcher(remoteOptions.value, lastSearch.value, labelKey.value) : [];
     });
     const changeContextCollector = inject(InjectionChangeContextCollector);
     changeContextCollector.setContext(fieldKey.value, (v) => {

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

@@ -19,10 +19,6 @@ export declare const SELECT: import("vue").DefineComponent<{
     onFocus: {
         type: PropType<Func<any[], any>>;
     };
-    pinyin: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     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<{
     value: {
@@ -42,15 +38,10 @@ export declare const SELECT: import("vue").DefineComponent<{
     onFocus: {
         type: PropType<Func<any[], any>>;
     };
-    pinyin: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     onChange: {};
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {
     options: AnyObject[];
     lazyRequest: boolean;
-    pinyin: boolean;
 }>;

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

@@ -1,11 +1,11 @@
 import { defineComponent, computed, ref, inject, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
-import { cloneDeep, isEqual, isString } from 'lodash-es';
+import { useDebounceFn } from '@vueuse/core';
+import { isString, cloneDeep, isEqual } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { InjectAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index2.js';
-import '@vueuse/core';
 import '../../../index2.js';
-import { stringMatcher, formRenderLog } from '../../utils/index.js';
+import { formRenderLog, optionMatcher } from '../../utils/index.js';
 import { useFormField } from '../../hooks/useFormField2.js';
 import '../../../../../shared/utils/tapable/SyncHook.js';
 import '../../../../../shared/utils/tapable/SyncBailHook.js';
@@ -38,7 +38,7 @@ import './complex.js';
 import './simpleComponent.js';
 import './search.js';
 import { NSelect } from 'naive-ui';
-import { focusDecorator, assignUpdateValue, traverseDependKey } from '../../utils/schema2.js';
+import { traverseDependKey, focusDecorator, assignUpdateValue } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormSelect",
@@ -60,10 +60,6 @@ const script = defineComponent({
     onFocus: {
       type: Function
     },
-    pinyin: {
-      type: Boolean,
-      default: true
-    },
     onChange: {}
   },
   emits: ["update:value"],
@@ -90,7 +86,7 @@ const script = defineComponent({
       fieldKey
     } = useFormField();
     const asyncQueue = inject(InjectAsyncQueue);
-    async function fetchData(content) {
+    const fetchData = useDebounceFn(async function(content) {
       lastSearch.value = content || "";
       if (!configFor(props)) {
         return remoteOptions.value = null;
@@ -126,20 +122,13 @@ const script = defineComponent({
       function configFor(target) {
         return target.urlConfig;
       }
-    }
+    }, 300);
     const parsedOptions = computed(() => {
       if (remoteOptions.value)
-        return filterOption(remoteOptions.value, lastSearch.value);
+        return optionMatcher(remoteOptions.value, lastSearch.value, labelKey.value);
       if (!Array.isArray(props.options))
         return [];
-      return filterOption(props.options, lastSearch.value);
-      function filterOption(options, searchContent) {
-        return options.filter((option) => {
-          return !searchContent || stringMatcher(searchContent, option[labelKey.value], {
-            pinyin: props.pinyin
-          });
-        });
-      }
+      return optionMatcher(props.options, lastSearch.value, labelKey.value);
     });
     const changeContextCollector = inject(InjectionChangeContextCollector);
     changeContextCollector.setContext(fieldKey.value, (v) => {

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

@@ -1,12 +1,8 @@
 import { defineComponent, computed, createVNode, createTextVNode } from 'vue';
 import { NSwitch } from 'naive-ui';
-import '@formily/path';
-import '@vue/shared';
-import 'lodash-es';
-import 'pinyin-match';
-import 'date-fns';
-import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
+import '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormSwitch",

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

@@ -1,13 +1,9 @@
 import { defineComponent, computed, createVNode } from 'vue';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
-import '@formily/path';
-import '@vue/shared';
-import 'lodash-es';
-import 'pinyin-match';
-import 'date-fns';
-import { assignUpdateValue } from '../../utils/schema2.js';
+import '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
+import { assignUpdateValue } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormTextarea",

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

@@ -3,10 +3,7 @@ import { useDebounceFn } from '@vueuse/core';
 import { isNumber } from 'lodash-es';
 import { ref, computed, watch, nextTick } from 'vue';
 import { FormItemLineBarDepKeyPrepend } from '../constants/index2.js';
-import '@formily/path';
-import '@vue/shared';
-import 'pinyin-match';
-import 'date-fns';
+import '../utils/index.js';
 import { createLinebarId, traverseSchema } from '../utils/schema2.js';
 
 function useAnchor(props, scrollbarRef, collector) {

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

@@ -2,10 +2,7 @@ import { isField } from '@formily/core';
 import { isString } from '@vueuse/core';
 import { isFunction, isNumber } from 'lodash-es';
 import { FIELD_BUSINESS_TYPE } from '../constants/index2.js';
-import 'vue';
-import '@formily/path';
-import '@vue/shared';
-import 'pinyin-match';
+import '../utils/index.js';
 import { isIdCard, parseIdCard, parseAge2FromContext, parseBirthday, parseAge2Birthday } from '../utils/business2.js';
 
 class BusinessCollector {

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

@@ -1,9 +1,5 @@
 import { isFunction } from 'lodash-es';
-import 'vue';
-import '@formily/path';
-import '@vue/shared';
-import 'pinyin-match';
-import 'date-fns';
+import '../utils/index.js';
 import { traverseDependKey } from '../utils/schema2.js';
 
 class FormItemDepsCollector {

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

@@ -1,10 +1,6 @@
 import { isString } from 'lodash-es';
-import 'vue';
-import '@formily/path';
-import '@vue/shared';
-import 'pinyin-match';
+import '../utils/index.js';
 import { isIdCard, isMobile } from '../utils/business2.js';
-import '@formily/core';
 
 function usePresetScope() {
   return {

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

@@ -25,6 +25,7 @@ export declare type ValidateItem = Partial<{
 interface OptionItem {
     text: string;
     value: any;
+    keyword?: string;
     children?: OptionItem[];
 }
 interface FormRendererPayload {

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 { FunctionalComponent, InjectionKey, VNode } from 'vue';
 import { FieldItem } from '../types';
 export * from './business';
@@ -15,6 +15,6 @@ export declare function createSlot(renderer: unknown, props: AnyObject): Record<
 };
 export declare function createInputSlot(props: AnyObject): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}>>>;
 export declare function presetRequestHandler(res: unknown): any;
-export declare function stringMatcher(input: unknown, target: unknown, options?: {
-    pinyin?: boolean;
-}): boolean | [number, number];
+export declare function optionMatcher(options: AnyObject[], input: Nullable<string>, key: string, matcherOption?: {
+    keyword?: string;
+}): AnyObject[];

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

@@ -1,8 +1,8 @@
 import { computed, createVNode, Fragment, inject, provide } from 'vue';
 import { Path } from '@formily/path';
 import { isObject } from '@vue/shared';
+import { useMemoize } from '@vueuse/core';
 import { isString, isFunction } from 'lodash-es';
-import PinyinMatch from 'pinyin-match';
 import 'date-fns';
 import '@formily/core';
 
@@ -112,12 +112,30 @@ function presetRequestHandler(res) {
     return map.rows;
   }
 }
-function stringMatcher(input, target, options = {}) {
-  if (!isString(input) || !isString(target))
-    return true;
-  if (options.pinyin)
-    return PinyinMatch.match(target, input);
-  return target.includes(input);
+const keywordMatcher = useMemoize(function(text, keyword) {
+  if (!isString(keyword) || !isString(text))
+    return false;
+  return keyword.split(",").some((k) => k.trim().includes(text));
+}, {
+  getKey(...args) {
+    return args.reduce((res, arg) => {
+      return String(res) + "_" + String(arg);
+    }, "");
+  }
+});
+function optionMatcher(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];
+  }
 }
 
-export { arrayed, createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, parseNumberFromMaybeString, presetRequestHandler, stringMatcher, uuidGenerator };
+export { arrayed, createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, uuidGenerator };

package/es/components/shortcut-setter/index.d.ts

@@ -87,6 +87,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         option?: {
             text: string;
             value: any;
+            keyword?: string | undefined;
             children?: any[] | undefined;
         }[] | undefined;
         multi_select?: import("..").FormCommonState | undefined;

package/es/components/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -89,6 +89,7 @@ declare const _default: import("vue").DefineComponent<{
         option?: {
             text: string;
             value: any;
+            keyword?: string | undefined;
             children?: any[] | undefined;
         }[] | undefined;
         multi_select?: import("../../../../es/components/form-render").FormCommonState | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.21-beta.7",
+  "version": "3.1.21-beta.8",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -44,7 +44,6 @@
     "min-dom": "^3.2.1",
     "moment": "^2.29.1",
     "naive-ui": "^2.30.0",
-    "pinyin-match": "^1.2.2",
     "rimraf": "^3.0.2",
     "spark-md5": "^3.0.2",
     "tiny-svg": "^2.2.4",
@@ -67,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "23a26386967f38d02eb9cc3a3423d3582bf52ed2"
+  "gitHead": "693beb4f15ef0b49a98376bb468940be246540ff"
 }