cnhis-design-vue 3.1.25-beta.5 → 3.1.25-beta.6

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

@@ -13,7 +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 * from '@formily/core';
 
 const FormRender = script;

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

@@ -1,26 +1,90 @@
 import { AnyObject } from '../../../../../../es/shared/types';
 import { PropType } from 'vue';
 export declare const CHECKBOX: import("vue").DefineComponent<{
+    value: {};
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
+    autograph: {
+        type: StringConstructor;
+    };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    requestCache: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    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[];
+        }>>;
+    };
     vertical: {
         type: BooleanConstructor;
         default: boolean;
     };
     onChange: {};
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => 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: {};
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
+    autograph: {
+        type: StringConstructor;
+    };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    requestCache: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    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[];
+        }>>;
+    };
     vertical: {
         type: BooleanConstructor;
         default: boolean;
     };
     onChange: {};
-}>>, {
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {
     options: AnyObject[];
     vertical: boolean;
+    lazyRequest: boolean;
+    requestCache: boolean;
 }>;

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

@@ -1,34 +1,72 @@
-import { defineComponent, createVNode } from 'vue';
+import { defineComponent, computed, createVNode } from 'vue';
+import '../../../index.js';
 import '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCheckboxGroup, NSpace, NCheckbox } from 'naive-ui';
-import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
+import { useAutographOptions } from '../../hooks/useAutographOptions.js';
+import { assignUpdateValue } from '../../utils/schema.js';
+import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 
 const script = defineComponent({
   name: "FormCheckbox",
   props: {
+    value: {},
     options: {
       type: Array,
       default: () => []
     },
+    autograph: {
+      type: String
+    },
+    lazyRequest: {
+      type: Boolean,
+      default: false
+    },
+    requestCache: {
+      type: Boolean,
+      default: true
+    },
+    wordbook: {
+      type: Object
+    },
     vertical: {
       type: Boolean,
       default: false
     },
     onChange: {}
   },
-  setup(props) {
-    return () => createVNode(NCheckboxGroup, null, {
+  emits: ["update:value"],
+  setup(props, {
+    emit
+  }) {
+    const valueRef = computed({
+      get: () => props.value,
+      set: (v) => emit("update:value", v)
+    });
+    const {
+      labelKey,
+      valueKey,
+      options
+    } = useAutographOptions(props, valueRef);
+    const {
+      injectValueBindKey
+    } = useCommonInjection();
+    const key = injectValueBindKey(valueRef);
+    return () => createVNode(NCheckboxGroup, {
+      "key": key.value,
+      "value": valueRef.value,
+      "onUpdate:value": ($event) => valueRef.value = $event
+    }, {
       default: () => [createVNode(NSpace, {
         "vertical": props.vertical
       }, {
         default: () => {
           var _a;
-          return [(_a = props.options) == null ? void 0 : _a.map((option) => createVNode(NCheckbox, {
-            "key": option.value,
-            "value": option.value
+          return [(_a = options.value) == null ? void 0 : _a.map((option) => createVNode(NCheckbox, {
+            "key": option[valueKey.value],
+            "value": option[valueKey.value]
           }, {
-            default: () => [option.text]
+            default: () => [option[labelKey.value]]
           }))];
         }
       })]
@@ -37,6 +75,6 @@ const script = defineComponent({
 });
 const CHECKBOX = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue, assignValueBindKey));
+}, assignUpdateValue));
 
 export { CHECKBOX };

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

@@ -8,6 +8,35 @@ export declare const RADIO: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
+    autograph: {
+        type: StringConstructor;
+    };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    requestCache: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    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[];
+        }>>;
+    };
     vertical: {
         type: BooleanConstructor;
         default: boolean;
@@ -21,6 +50,35 @@ export declare const RADIO: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
+    autograph: {
+        type: StringConstructor;
+    };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    requestCache: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    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[];
+        }>>;
+    };
     vertical: {
         type: BooleanConstructor;
         default: boolean;
@@ -31,4 +89,6 @@ export declare const RADIO: import("vue").DefineComponent<{
 }, {
     options: AnyObject[];
     vertical: boolean;
+    lazyRequest: boolean;
+    requestCache: boolean;
 }>;

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

@@ -1,10 +1,16 @@
-import { defineComponent, computed, createVNode } from 'vue';
+import { defineComponent, computed, createVNode, isVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { isNumber } from 'lodash-es';
 import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
+import '../../../index.js';
 import '../../utils/index.js';
-import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
+import { useAutographOptions } from '../../hooks/useAutographOptions.js';
+import { assignUpdateValue } from '../../utils/schema.js';
+import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
+}
 const script = defineComponent({
   props: {
     value: {
@@ -14,6 +20,20 @@ const script = defineComponent({
       type: Array,
       default: () => []
     },
+    autograph: {
+      type: String
+    },
+    lazyRequest: {
+      type: Boolean,
+      default: false
+    },
+    requestCache: {
+      type: Boolean,
+      default: true
+    },
+    wordbook: {
+      type: Object
+    },
     vertical: {
       type: Boolean,
       default: false
@@ -37,24 +57,30 @@ const script = defineComponent({
         emit("update:value", v);
       }
     });
+    const {
+      labelKey,
+      valueKey,
+      options
+    } = useAutographOptions(props, valueRef);
+    const {
+      injectValueBindKey
+    } = useCommonInjection();
+    const key = injectValueBindKey(valueRef);
     return () => {
+      let _slot;
       return createVNode(NRadioGroup, {
+        "key": key.value,
         "value": valueRef.value,
         "onUpdate:value": ($event) => valueRef.value = $event
       }, {
         default: () => [createVNode(NSpace, {
           "vertical": props.vertical
+        }, _isSlot(_slot = options.value.map((option) => createVNode(NRadio, {
+          "value": option[valueKey.value]
         }, {
-          default: () => {
-            var _a;
-            return [(_a = props.options) == null ? void 0 : _a.map((option) => {
-              return createVNode(NRadio, {
-                "value": option.value
-              }, {
-                default: () => [option.text]
-              });
-            })];
-          }
+          default: () => [option[labelKey.value]]
+        }))) ? _slot : {
+          default: () => [_slot]
         })]
       });
     };
@@ -62,6 +88,6 @@ const script = defineComponent({
 });
 const RADIO = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue, assignValueBindKey));
+}, assignUpdateValue));
 
 export { RADIO };

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

@@ -1,4 +1,4 @@
-import { AnyObject, Func } from '../../../../../../es/shared/types';
+import { Func } from '../../../../../../es/shared/types';
 import { PropType } from 'vue';
 export declare const SEARCH: import("vue").DefineComponent<{
     value: {
@@ -30,8 +30,8 @@ export declare const SEARCH: import("vue").DefineComponent<{
             link_key: string;
             link_key_split: string;
             show_key: string[];
-            conObj: AnyObject[];
-            conObjFirstLevel: AnyObject[];
+            conObj: import("../../../../../../es/shared/types").AnyObject[];
+            conObjFirstLevel: import("../../../../../../es/shared/types").AnyObject[];
         }>>;
         required: true;
     };
@@ -69,8 +69,8 @@ export declare const SEARCH: import("vue").DefineComponent<{
             link_key: string;
             link_key_split: string;
             show_key: string[];
-            conObj: AnyObject[];
-            conObjFirstLevel: AnyObject[];
+            conObj: import("../../../../../../es/shared/types").AnyObject[];
+            conObjFirstLevel: import("../../../../../../es/shared/types").AnyObject[];
         }>>;
         required: true;
     };

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

@@ -1,13 +1,11 @@
-import { defineComponent, computed, ref, inject, watch, createVNode } from 'vue';
-import { useDebounceFn } from '@vueuse/core';
-import { isString, cloneDeep, isEqual } from 'lodash-es';
-import { useCommonInjection, useSelectOptionProps } from '../../hooks/useCommonInjection.js';
-import { InjectAsyncQueue, InjectionChangeContextCollector } from '../../constants/index.js';
+import { defineComponent, computed, inject, createVNode } from 'vue';
+import { cloneDeep } from 'lodash-es';
+import { InjectionChangeContextCollector } from '../../constants/index.js';
 import '../../../../../shared/utils/index.js';
 import '../../../index.js';
-import { formRenderLog, optionMatcher } from '../../utils/index.js';
-import { useFormRequest } from '../../hooks/useFormRequest.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';
@@ -20,9 +18,11 @@ import '../../../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
 import '../../hooks/useFormValidator.js';
 import '@formily/core';
+import { useAutographOptions } from '../../hooks/useAutographOptions.js';
 import '@vue/shared';
 import { connect, mapProps } from '@formily/vue';
 import './index.js';
+import { useCommonInjection, useSelectOptionProps } from '../../hooks/useCommonInjection.js';
 import { NSelect } from 'naive-ui';
 import { visitedDecorator, assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
 
@@ -62,72 +62,25 @@ const script = defineComponent({
       get: () => props.value,
       set: (v) => emit("update:value", v)
     });
-    const remoteOptions = ref(null);
-    const lastSearch = ref("");
-    const labelKey = computed(() => {
-      var _a, _b, _c;
-      return (_c = (_b = (_a = props.wordbook) == null ? void 0 : _a.render_key) == null ? void 0 : _b[0]) != null ? _c : "text";
-    });
-    const valueKey = computed(() => {
-      var _a, _b;
-      return (_b = (_a = props.wordbook) == null ? void 0 : _a.value_key) != null ? _b : "value";
-    });
     const {
       field,
       fieldKey
     } = useFormField();
-    const asyncQueue = inject(InjectAsyncQueue);
     const {
-      getSearchRequestInfo
-    } = useFormRequest();
-    const fetchData = useDebounceFn(async function(content) {
-      lastSearch.value = content || "";
-      if (remoteOptions.value && props.requestCache)
-        return;
-      try {
-        remoteOptions.value = await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, field.value, fieldKey.value));
-      } catch (e) {
-        isString(e) && formRenderLog(e);
-      }
-      function createParams(wordbook, autograph, field2, key2) {
-        const params = {
-          autograph,
-          wordbookId: wordbook.id,
-          wordbookType: wordbook.type,
-          fieldKeys: wordbook.search_key,
-          keyword: "",
-          page: 1
-        };
-        return {
-          ...getSearchRequestInfo(),
-          params,
-          key: key2,
-          cache: props.requestCache
-        };
-      }
-    }, 300);
-    const parsedOptions = computed(() => {
-      return remoteOptions.value ? optionMatcher(remoteOptions.value, lastSearch.value, labelKey.value) : [];
-    });
+      fetchData,
+      labelKey,
+      valueKey,
+      options
+    } = useAutographOptions(props, valueRef);
     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 options.value.find((option) => option[valueKey.value] === v2);
       }
     });
-    watch(() => props.wordbook, (wordbook, oldWordbook) => {
-      if (isEqual(wordbook, oldWordbook))
-        return;
-      remoteOptions.value = null;
-      if (!wordbook)
-        return;
-      (valueRef.value || !props.lazyRequest) && fetchData();
-    }, {
-      immediate: true
-    });
     const {
       injectValueValidate,
       injectValueWatchFromEmpty,
@@ -150,7 +103,7 @@ const script = defineComponent({
       "node-props": nodeProps,
       "labelField": labelKey.value,
       "valueField": valueKey.value,
-      "options": parsedOptions.value,
+      "options": options.value,
       "onSearch": fetchData,
       "onUpdate:show": (show) => show && fetchData(),
       "onFocus": visitedDecorator(field, props.onFocus)

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

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

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

@@ -10,4 +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';

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

@@ -0,0 +1,17 @@
+import { AnyObject } from '../../../../../es/shared/types';
+import { Ref } from 'vue';
+import { FormWordbook } from '../../../../../es/components/form-render';
+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>;
+};

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

@@ -0,0 +1,70 @@
+import { useDebounceFn } from '@vueuse/core';
+import { isString, isEqual } from 'lodash-es';
+import { getCurrentInstance, inject, computed, ref, watch } from 'vue';
+import '../../index.js';
+import { InjectAsyncQueue } from '../constants/index.js';
+import { formRenderLog, optionMatcher } from '../utils/index.js';
+import { useFormField } from './useFormField.js';
+import { useFormRequest } from './useFormRequest.js';
+
+function useAutographOptions(props, valueRef) {
+  if (!getCurrentInstance())
+    throw new Error("can't use this hook out of setup environment");
+  const asyncQueue = inject(InjectAsyncQueue);
+  const labelKey = computed(() => {
+    var _a, _b, _c;
+    return (_c = (_b = (_a = props.wordbook) == null ? void 0 : _a.render_key) == null ? void 0 : _b[0]) != null ? _c : "text";
+  });
+  const valueKey = computed(() => {
+    var _a, _b;
+    return (_b = (_a = props.wordbook) == null ? void 0 : _a.value_key) != null ? _b : "value";
+  });
+  const remoteOptions = ref(null);
+  const lastSearch = ref("");
+  const { field, fieldKey } = useFormField();
+  const { getSearchRequestInfo } = useFormRequest();
+  const fetchData = useDebounceFn(async function(content) {
+    if (!props.autograph || !props.wordbook)
+      return;
+    lastSearch.value = content || "";
+    if (remoteOptions.value && props.requestCache)
+      return;
+    try {
+      remoteOptions.value = await asyncQueue.addAsync(
+        createParams(props.wordbook, props.autograph, field.value, fieldKey.value)
+      );
+    } catch (e) {
+      isString(e) && formRenderLog(e);
+    }
+    function createParams(wordbook, autograph, field2, key) {
+      const params = {
+        autograph,
+        wordbookId: wordbook.id,
+        wordbookType: wordbook.type,
+        fieldKeys: wordbook.search_key,
+        keyword: "",
+        page: 1
+      };
+      return { ...getSearchRequestInfo(), params, key, cache: props.requestCache };
+    }
+  }, 300);
+  const options = computed(() => {
+    var _a;
+    return remoteOptions.value ? optionMatcher(remoteOptions.value, lastSearch.value, labelKey.value) : (_a = props.options) != null ? _a : [];
+  });
+  watch(
+    () => props.wordbook,
+    (wordbook, oldWordbook) => {
+      if (isEqual(wordbook, oldWordbook))
+        return;
+      remoteOptions.value = null;
+      if (!wordbook)
+        return;
+      (valueRef.value || !props.lazyRequest) && fetchData();
+    },
+    { immediate: true }
+  );
+  return { valueRef, options, fetchData, labelKey, valueKey, lastSearch };
+}
+
+export { useAutographOptions };

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

@@ -7,6 +7,16 @@ import { fieldKeyEscape, createLinebarId } from '../utils/schema.js';
 import { transformDateFormat } from '../utils/business.js';
 import { useFormValidator } from './useFormValidator.js';
 
+function bindAutoGraphProps(schema, item) {
+  Object.assign(schema["x-component-props"], {
+    ...pick(item, ["wordbook", "autograph"])
+  });
+}
+function bindUrlProps(schema, item) {
+  Object.assign(schema["x-component-props"], {
+    ...pick(item, ["urlConfig"])
+  });
+}
 function useFieldListAdaptor(collector) {
   const { createValidatorSchema } = useFormValidator();
   const createStandardSchema = (item) => {
@@ -63,6 +73,7 @@ function useFieldListAdaptor(collector) {
     if (item.urlConfig) {
       bindUrlProps(schema, item);
     } else if (item.autograph) {
+      schema["x-component"] = "SEARCH";
       bindAutoGraphProps(schema, item);
     }
     bindCommonProps(schema, item);
@@ -77,17 +88,6 @@ function useFieldListAdaptor(collector) {
       });
       multiple && (schema2.type = "array");
     }
-    function bindAutoGraphProps(schema2, item2) {
-      schema2["x-component"] = "SEARCH";
-      Object.assign(schema2["x-component-props"], {
-        ...pick(item2, ["wordbook", "autograph"])
-      });
-    }
-    function bindUrlProps(schema2, item2) {
-      Object.assign(schema2["x-component-props"], {
-        ...pick(item2, ["urlConfig"])
-      });
-    }
   };
   const createRadioSchema = (item) => {
     const schema = createStandardSchema(item);
@@ -95,6 +95,7 @@ function useFieldListAdaptor(collector) {
       options: item.option,
       vertical: item.__vertical
     });
+    bindAutoGraphProps(schema, item);
     return schema;
   };
   const createDateSchema = (item) => {

package/es/components/index.js

@@ -52,7 +52,9 @@ export { BusinessCollector, useBusinessBinding } from './form-render/src/hooks/u
 export { ContextCollector, useChangeContext } from './form-render/src/hooks/useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './form-render/src/hooks/useFormItemDeps.js';
 export { useAnchor } from './form-render/src/hooks/useAnchor.js';
+export { useAutographOptions } from './form-render/src/hooks/useAutographOptions.js';
 export { useFormContext } from './form-render/src/hooks/useFormContext.js';
+export { useCommonInjection, useSelectOptionProps } from './form-render/src/hooks/useCommonInjection.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';