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

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 { 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 { 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 * 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/select.js

@@ -1,12 +1,12 @@
 import { defineComponent, computed, inject, createVNode } from 'vue';
-import { cloneDeep } from 'lodash-es';
+import { useDebounceFn } from '@vueuse/core';
+import { cloneDeep, isString } 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 } from '../../hooks/useFormRenderOptions.js';
+import { useUrlConfigOptions, useAutographOptions, useRecommendOptions, optionMatcherCache } 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, valueKey);
+    } = useRecommendOptions(props, options, emit, labelKey, valueKey);
     const {
       field,
       fieldKey
@@ -115,10 +115,10 @@ const script = defineComponent({
         return sortedOptions.value.find((option) => option[valueKey.value] === v2);
       }
     });
-    async function fetchData(content = "") {
+    const fetchData = useDebounceFn(async (content = "") => {
       fetchOptions(content);
-      getRecommend();
-    }
+      getRecommend(content);
+    }, 400);
     const {
       injectValueValidate,
       injectValueWatchFromEmpty,
@@ -131,6 +131,23 @@ 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,
@@ -144,7 +161,8 @@ const script = defineComponent({
       "options": sortedOptions.value,
       "onSearch": fetchData,
       "onUpdate:show": (show) => show && fetchData(),
-      "onFocus": createVisitedSetter(field)
+      "onFocus": createVisitedSetter(field),
+      "renderLabel": renderLabel
     }, 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 { useAutographOptions, useRecommendOptions, useUrlConfigOptions } from './useFormRenderOptions.js';
+export { optionMatcherCache, useAutographOptions, useRecommendOptions, useUrlConfigOptions } from './useFormRenderOptions.js';

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

@@ -2,6 +2,7 @@ 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[];
@@ -9,10 +10,10 @@ export declare function useRecommendOptions(props: {
     getRecommendInfo?: () => RecommendIds;
     recommendCache: boolean;
     recommendNum: number;
-}, options: Ref<AnyObject[]>, emit: Func, valueKey: Ref<string>): {
+}, options: Ref<AnyObject[]>, emit: Func, labelKey: Ref<string>, valueKey: Ref<string>): {
     postRecommend: (value: unknown) => Promise<void>;
-    getRecommend: () => Promise<void>;
-    sortedOptions: import("vue").ComputedRef<any[]>;
+    getRecommend: (content?: string) => Promise<void>;
+    sortedOptions: import("vue").ComputedRef<AnyObject[]>;
 };
 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, optionMatcherWithKeyword } from '../utils/index.js';
+import { createUrlConfigParams, formRenderLog, keywordMatcher } from '../utils/index.js';
 import { useFormField } from './useFormField.js';
 import { useFormRequest } from './useFormRequest.js';
 
@@ -21,9 +21,44 @@ function createPropRef(props, key) {
     }
   });
 }
-function useRecommendOptions(props, options, emit, valueKey) {
+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) {
   const commonListRef = createPropRef(props, "commonList");
   const recentListRef = createPropRef(props, "recentList");
+  const { searchContent, optionSearchFilter } = useSearchContent();
   function getRecommendOption(item) {
     return jsonParse(item.itemObj);
   }
@@ -44,7 +79,11 @@ function useRecommendOptions(props, options, emit, valueKey) {
         return item[valueKey.value] !== option[valueKey.value];
       }
     });
-    return [...commonOptions.value, ...recentOptions.value, ...optionWithoutRecommend];
+    return [
+      ...optionSearchFilter(commonOptions.value, labelKey.value),
+      ...optionSearchFilter(recentOptions.value, labelKey.value),
+      ...optionWithoutRecommend
+    ];
   });
   const { getRecommendRequestInfo, getHttpInstance } = useFormRequest();
   function getRecommendConfig(type) {
@@ -55,9 +94,10 @@ function useRecommendOptions(props, options, emit, valueKey) {
   }
   const { fieldKey } = useFormField();
   const asyncQueue = inject(InjectionAsyncQueue);
-  async function getRecommend() {
+  async function getRecommend(content) {
     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));
@@ -125,11 +165,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) {
-    lastSearch.value = content || "";
+    searchContent.value = content || "";
     if (!props.urlConfig) {
       return remoteOptions.value = null;
     }
@@ -147,10 +187,10 @@ function useUrlConfigOptions(props, valueRef) {
   }, 300);
   const options = computed(() => {
     if (remoteOptions.value)
-      return optionMatcherWithKeyword(remoteOptions.value, lastSearch.value, labelKey.value);
+      return optionSearchFilter(remoteOptions.value, labelKey.value);
     if (!Array.isArray(props.options))
       return [];
-    return optionMatcherWithKeyword(props.options, lastSearch.value, labelKey.value);
+    return optionSearchFilter(props.options, labelKey.value);
   });
   const formItemDepsCollector = inject(InjectionFormItemDepsCollector);
   watch(
@@ -183,12 +223,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) {
-    lastSearch.value = content || "";
+    searchContent.value = content || "";
     if (!props.autograph || !props.wordbook) {
       return remoteOptions.value = null;
     }
@@ -211,10 +251,10 @@ function useAutographOptions(props, valueRef) {
   }, 300);
   const options = computed(() => {
     if (remoteOptions.value)
-      return optionMatcherWithKeyword(remoteOptions.value, lastSearch.value, labelKey.value);
+      return optionSearchFilter(remoteOptions.value, labelKey.value);
     if (!Array.isArray(props.options))
       return [];
-    return optionMatcherWithKeyword(props.options, lastSearch.value, labelKey.value);
+    return optionSearchFilter(props.options, labelKey.value);
   });
   watch(
     () => props.wordbook,
@@ -231,4 +271,4 @@ function useAutographOptions(props, valueRef) {
   return { labelKey, valueKey, options, fetchData };
 }
 
-export { useAutographOptions, useRecommendOptions, useUrlConfigOptions };
+export { optionMatcherCache, useAutographOptions, useRecommendOptions, useUrlConfigOptions };

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

@@ -1,4 +1,4 @@
-import { AnyObject, ArrayAble, Nullable } from '../../../../../es/shared/types';
+import { AnyObject, ArrayAble } from '../../../../../es/shared/types';
 import { GeneralField } from '@formily/core';
 import { FunctionalComponent, InjectionKey, VNode } from 'vue';
 import { FieldItem, UrlConfig } from '../types';
@@ -14,9 +14,7 @@ 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 function optionMatcherWithKeyword(options: AnyObject[], input: Nullable<string>, key: string, matcherOption?: {
-    keyword?: string;
-}): AnyObject[];
+export declare const keywordMatcher: import("@vueuse/core").UseMemoizedFn<boolean, [text: unknown, keyword: unknown]>;
 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,20 +138,6 @@ 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 "";
@@ -252,4 +238,4 @@ async function createUrlConfigParams({
   };
 }
 
-export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, mergeDeepProperties, optionMatcherWithKeyword, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser };
+export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, keywordMatcher, mergeDeepProperties, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser };

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/dateRendererPlugin/index.js

@@ -22,7 +22,10 @@ function dateRendererPlugin() {
         }) => {
           return [createVNode(EditDate, mergeProps({
             "value": row[column.field],
-            "onUpdate:value": ($event) => row[column.field] = $event
+            "onUpdate:value": ($event) => row[column.field] = $event,
+            "isStartDate": fieldItem.isStartDate,
+            "isEndDate": fieldItem.isEndDate,
+            "connectField": fieldItem.connectField
           }, fieldItem.componentProps, {
             "column": column,
             "row": row,

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/numberRendererPlugin.js

@@ -69,7 +69,7 @@ function numberRendererPlugin() {
           return [createVNode(IhoTableInputNumber, mergeProps({
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event
-          }, fieldItem.componentProps, config), null)];
+          }, config, fieldItem.componentProps), null)];
         })
       });
     }

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/index.js

@@ -42,14 +42,15 @@ function separateRendererPlugins() {
           row,
           emitFormClick
         }) => {
-          var _a;
+          var _a, _b, _c;
           const uuid = inject(InjectionIhoTableUUID);
           const separateRow = getSeparateRowData(uuid, row);
           const height = getRowHeight();
           const slots = {};
-          if (fieldItem.separateSlot) {
-            const separate = toRaw(fieldItem.separateSlot);
-            slots.menu = isFunction(separate) ? separate : isObject(separate) ? (props) => h(separate, props) : void 0;
+          let separateSlot = (_b = (_a = fieldItem.componentProps) == null ? void 0 : _a.separateSlot) != null ? _b : fieldItem.separateSlot;
+          if (separateSlot) {
+            separateSlot = toRaw(separateSlot);
+            slots.menu = isFunction(separateSlot) ? separateSlot : isObject(separateSlot) ? (props) => h(separateSlot, props) : void 0;
           }
           return [createVNode(EditSeparate, {
             "value": row[column.field],
@@ -58,7 +59,7 @@ function separateRendererPlugins() {
             "height": height,
             "column": column,
             "row": row,
-            "display-content": (_a = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _a[column.field],
+            "display-content": (_c = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _c[column.field],
             "onClick": emitFormClick
           }, slots)];
         })

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/timeRendererPlugin.js

@@ -40,7 +40,7 @@ function timeRendererPlugin() {
           return [createVNode(NTimePicker, mergeProps({
             "formattedValue": row[column.field],
             "onUpdate:formattedValue": ($event) => row[column.field] = $event
-          }, fieldItem.componentProps, config), null)];
+          }, config, fieldItem.componentProps), null)];
         })
       });
     }

package/es/components/index.js

@@ -59,11 +59,11 @@ export { FormItemDepsCollector, useFormItemDeps } from './form-render/src/hooks/
 export { useAnchor } from './form-render/src/hooks/useAnchor.js';
 export { useFormContext } from './form-render/src/hooks/useFormContext.js';
 export { useCommonInjection, useSelectOptionProps } from './form-render/src/hooks/useCommonInjection.js';
-export { useAutographOptions, useRecommendOptions, useUrlConfigOptions } from './form-render/src/hooks/useFormRenderOptions.js';
+export { optionMatcherCache, useAutographOptions, useRecommendOptions, useUrlConfigOptions } from './form-render/src/hooks/useFormRenderOptions.js';
 export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAgeFromContext, parseBirthday, parseIdCard, transformDateFormat } from './form-render/src/utils/business.js';
 export { findNextWidget, queryDecorator, queryInput } from './form-render/src/utils/dom.js';
 export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, createVisitedSetter, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema } from './form-render/src/utils/schema.js';
-export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, mergeDeepProperties, optionMatcherWithKeyword, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser } from './form-render/src/utils/index.js';
+export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, keywordMatcher, mergeDeepProperties, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser } from './form-render/src/utils/index.js';
 export * from '@formily/core';
 export { GlobalShortcutProvider, ShortcutManager, useShortcuts } from './shortcut-provider/src/hooks/useShortcuts.js';
 export { useShortcutSignature } from './shortcut-provider/src/hooks/useShortcutSignature.js';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.39-beta.7",
+	"version": "3.1.39-beta.8",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "a4f1fd4051ca92acad83cf00c7434668b760559c"
+	"gitHead": "bbaab716c36de7d6818ef5b575fb8584db89a22c"
 }