cnhis-design-vue 3.1.14-beta.16 → 3.1.14-beta.17

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
+import { defineComponent, ref, computed, inject, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { isEqual } from 'lodash-es';
 import { InjectAsyncQueue } from '../../constants/index.js';
@@ -32,18 +32,43 @@ const script = defineComponent({
     slots,
     emit
   }) {
-    const remoteOptions = ref(null);
-    const asyncQueue = inject(InjectAsyncQueue);
+    const remoteOptions = ref();
     const {
       field,
       title
     } = useFormField();
+    const labelKey = computed(() => {
+      var _a, _b;
+      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text";
+    });
+    const valueKey = computed(() => {
+      var _a, _b;
+      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
+    });
+    const _value = computed(() => {
+      try {
+        const parsed = Array.isArray(props.value) ? props.value : JSON.parse(props.value || "");
+        if (!Array.isArray(parsed) || !parsed.length)
+          return null;
+        return parsed.map((option) => option[labelKey.value]).join(" / ");
+      } catch (e) {
+        return null;
+      }
+    });
+    function updateValue(_, __, options) {
+      emit("update:value", options.map(optionSimplify));
+      function optionSimplify(option) {
+        return {
+          ...option,
+          label: option[labelKey.value],
+          children: void 0,
+          parent: void 0
+        };
+      }
+    }
+    const asyncQueue = inject(InjectAsyncQueue);
     async function fetchData(option) {
-      if (!option && remoteOptions.value)
-        return;
-      if (!configFor(props))
-        return;
-      if (deepFor(option) + 1 >= deepFor(props))
+      if (notNeedToFetchData(props, option))
         return;
       const data = await asyncQueue.addAsync(createRequestParams(deepFor(option), configFor(props), title.value, option));
       if (!data.length && option) {
@@ -54,6 +79,9 @@ const script = defineComponent({
       }
       const result = data.map((item) => optionNormalize(item, deepFor(option)));
       option ? option.children = result : remoteOptions.value = result;
+      function notNeedToFetchData(props2, option2) {
+        return !configFor(props2) || !option2 && remoteOptions.value || deepFor(option2) >= deepFor(props2) - 1;
+      }
       function createRequestParams(deep, config, key, option2) {
         const params = {
           lvlnr: deep + 1 + ""
@@ -95,9 +123,6 @@ const script = defineComponent({
         return (_a = target == null ? void 0 : target.depth) != null ? _a : -1;
       }
     }
-    const parsedOptions = computed(() => {
-      return remoteOptions.value || props.options || [];
-    });
     watch(() => props.value, (n, o) => {
       var _a, _b;
       n != null && o == null && fetchData();
@@ -111,40 +136,14 @@ const script = defineComponent({
       remoteOptions.value = null;
       await fetchData();
     });
-    const labelKey = computed(() => {
-      var _a, _b;
-      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text";
-    });
-    const valueKey = computed(() => {
-      var _a, _b;
-      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
-    });
-    const _value = computed(() => {
-      try {
-        const parsed = Array.isArray(props.value) ? props.value : JSON.parse(props.value || "");
-        if (!Array.isArray(parsed) || !parsed.length)
-          return null;
-        return parsed.map((option) => option[labelKey.value]).join(" / ");
-      } catch (e) {
-        return null;
-      }
-    });
-    function updateValue(_, __, options) {
-      emit("update:value", options.map(optionSimplify));
-      function optionSimplify(option) {
-        return {
-          ...option,
-          label: option[labelKey.value],
-          children: void 0,
-          parent: void 0
-        };
-      }
-    }
     const show = ref(false);
     function updateShow(v) {
       show.value = !!v;
       v && fetchData();
     }
+    const parsedOptions = computed(() => {
+      return remoteOptions.value || props.options || [];
+    });
     function focusDecorator(onFocus) {
       return (...args) => {
         if (isField(field.value)) {
@@ -155,17 +154,17 @@ const script = defineComponent({
     }
     return () => {
       return createVNode(NCascader, {
-        "value": _value.value,
+        "remote": true,
+        "checkStrategy": "child",
         "show": !!show.value,
+        "onUpdate:show": updateShow,
+        "value": _value.value,
         "onUpdate:value": updateValue,
-        "remote": true,
         "labelField": labelKey.value,
         "valueField": valueKey.value,
         "options": parsedOptions.value,
-        "checkStrategy": "child",
         "onLoad": fetchData,
-        "onFocus": focusDecorator(props.onFocus),
-        "onUpdate:show": updateShow
+        "onFocus": focusDecorator(props.onFocus)
       }, slots);
     };
   }

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

@@ -42,15 +42,6 @@ const script = defineComponent({
         return 0;
       return ~~props.maxGroupNum;
     });
-    watch(maxGroupNum, (value) => {
-      if (groupNum.value <= value)
-        return;
-      groupNum.value = value;
-      _values.value.splice(groupNum.value);
-      emitChange();
-    }, {
-      immediate: true
-    });
     function add() {
       groupNum.value++;
       _values.value.push({});
@@ -61,6 +52,15 @@ const script = defineComponent({
       _values.value.splice(idx, 1);
       emitChange();
     }
+    watch(maxGroupNum, (value) => {
+      if (groupNum.value <= value)
+        return;
+      groupNum.value = value;
+      _values.value.splice(groupNum.value);
+      emitChange();
+    }, {
+      immediate: true
+    });
     const _values = ref([{}]);
     function initValues(data) {
       if (!data)

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

@@ -60,7 +60,7 @@ const FORM_ITEM = connect(script, mapProps({
   const feedback = !isVoidField(field) ? field.selfErrors.length ? field.selfErrors.join(",") : void 0 : void 0;
   return {
     ...props,
-    required: field.required,
+    required: isVoidField(field) ? void 0 : field.required,
     class: "form-render__formItem",
     style: {
       "--form-item-column": (_a = props.span) != null ? _a : 3

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

@@ -1,7 +1,9 @@
 import { AnyObject } from '../../../../../../es/src/types';
 import { PropType } from 'vue';
 export declare const RADIO: import("vue").DefineComponent<{
-    value: {};
+    value: {
+        type: (NumberConstructor | StringConstructor)[];
+    };
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -10,8 +12,11 @@ export declare const RADIO: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    value: {};
+    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: {
+        type: (NumberConstructor | StringConstructor)[];
+    };
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -20,7 +25,10 @@ export declare const RADIO: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-}>>, {
+    onChange: {};
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {
     options: AnyObject[];
     vertical: boolean;
 }>;

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

@@ -1,11 +1,13 @@
-import { defineComponent, createVNode } from 'vue';
+import { defineComponent, computed, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
 import { assignUpdateValue } from '../../utils/index.js';
 
 const script = defineComponent({
   props: {
-    value: {},
+    value: {
+      type: [String, Number]
+    },
     options: {
       type: Array,
       default: () => []
@@ -13,12 +15,28 @@ const script = defineComponent({
     vertical: {
       type: Boolean,
       default: false
-    }
+    },
+    onChange: {}
   },
-  setup(props) {
+  emits: ["update:value"],
+  setup(props, {
+    emit
+  }) {
+    function dangerousTypeTransform(value) {
+      return value + "";
+    }
+    const valueRef = computed({
+      get() {
+        return dangerousTypeTransform(props.value);
+      },
+      set(v) {
+        emit("update:value", v);
+      }
+    });
     return () => {
       return createVNode(NRadioGroup, {
-        "value": props.value
+        "value": valueRef.value,
+        "onUpdate:value": ($event) => valueRef.value = $event
       }, {
         default: () => [createVNode(NSpace, {
           "vertical": props.vertical

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

@@ -1,7 +1,7 @@
-import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
+import { defineComponent, ref, computed, inject, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { isEqual, cloneDeep } from 'lodash-es';
-import { InjectAsyncQueue, InjectionFormItemDepsCollector, InjectionChangeContextCollector } from '../../constants/index.js';
+import { InjectionChangeContextCollector, InjectAsyncQueue, InjectionFormItemDepsCollector } from '../../constants/index.js';
 import { assignUpdateValue, traverseDependKey } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NSelect } from 'naive-ui';
@@ -32,46 +32,52 @@ const script = defineComponent({
   }) {
     const remoteOptions = ref(null);
     const lastSearch = ref("");
-    const asyncQueue = inject(InjectAsyncQueue);
+    const labelKey = computed(() => {
+      var _a, _b;
+      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text";
+    });
+    const valueKey = computed(() => {
+      var _a, _b;
+      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
+    });
+    const changeContextCollector = inject(InjectionChangeContextCollector);
+    function update(v, option) {
+      changeContextCollector == null ? void 0 : changeContextCollector.setContext(fieldKey.value, "currentOption", cloneDeep(option));
+      emit("update:value", v);
+    }
     const {
       title,
       field,
       fieldKey
     } = useFormField();
-    function filterOption(options, searchContent) {
-      return options.filter((option) => {
-        return !searchContent || String(option[labelKey.value]).includes(searchContent);
-      });
-    }
+    const asyncQueue = inject(InjectAsyncQueue);
     async function fetchData(content) {
       lastSearch.value = content || "";
-      if (remoteOptions.value)
-        return;
-      const config = props.urlConfig;
-      if (!config) {
+      if (!configFor(props)) {
         return remoteOptions.value = null;
       }
-      try {
-        remoteOptions.value = await asyncQueue.addAsync({
-          ...createParams(config, field.value),
-          key: title.value
-        });
-      } catch (e) {
-        remoteOptions.value = null;
-      }
-      function createParams(config2, field2) {
+      if (remoteOptions.value)
+        return;
+      remoteOptions.value = await asyncQueue.addAsync({
+        ...createParams(configFor(props), field.value, title.value)
+      });
+      function createParams(config, field2, key) {
         const _params = {};
-        traverseDependKey(config2.dependKey, (dependKey, valueKey2) => {
+        traverseDependKey(config.dependKey, (dependKey, valueKey2) => {
           const _field = field2.query(dependKey).take();
           if (isField(_field)) {
             _params[valueKey2] = _field.value;
           }
         });
         return {
-          ...config2,
-          params: Object.assign({}, config2.params, _params)
+          ...config,
+          params: Object.assign({}, config.params, _params),
+          key
         };
       }
+      function configFor(target) {
+        return target.urlConfig;
+      }
     }
     const parsedOptions = computed(() => {
       if (remoteOptions.value)
@@ -79,44 +85,34 @@ const script = defineComponent({
       if (!Array.isArray(props.options))
         return [];
       return filterOption(props.options, lastSearch.value);
+      function filterOption(options, searchContent) {
+        return options.filter((option) => {
+          return !searchContent || String(option[labelKey.value]).includes(searchContent);
+        });
+      }
     });
     const formItemDepsCollector = inject(InjectionFormItemDepsCollector);
     watch(() => props.urlConfig, (config, oldConfig) => {
       if (isEqual(config, oldConfig))
         return;
       remoteOptions.value = null;
-      config && formItemDepsCollector.setDeps(fieldKey.value, config.dependKey || [], async () => {
+      if (!config)
+        return;
+      formItemDepsCollector.setDeps(fieldKey.value, config.dependKey || [], async () => {
         remoteOptions.value = null;
         emit("update:value", null);
       });
-      config && fetchData();
+      props.value && fetchData();
     }, {
       immediate: true
     });
     watch(() => props.value, (n, o) => {
       var _a, _b;
-      if (o == null && n != null) {
-        fetchData();
-      }
-      if (isField(field.value) && field.value.visited) {
-        (_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a);
-      }
+      o == null && n != null && fetchData();
+      isField(field.value) && field.value.visited && ((_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a));
     }, {
       immediate: true
     });
-    const changeContextCollector = inject(InjectionChangeContextCollector);
-    function update(v, option) {
-      changeContextCollector == null ? void 0 : changeContextCollector.setContext(fieldKey.value, "currentOption", cloneDeep(option));
-      emit("update:value", v);
-    }
-    const labelKey = computed(() => {
-      var _a, _b;
-      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text";
-    });
-    const valueKey = computed(() => {
-      var _a, _b;
-      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
-    });
     function focusDecorator(onFocus) {
       return (...args) => {
         if (isField(field.value)) {
@@ -126,16 +122,16 @@ const script = defineComponent({
       };
     }
     return () => createVNode(NSelect, {
-      "value": props.value,
-      "onUpdate:value": update,
       "remote": true,
       "filterable": true,
+      "value": props.value,
+      "onUpdate:value": update,
       "labelField": labelKey.value,
       "valueField": valueKey.value,
+      "options": parsedOptions.value,
       "onSearch": fetchData,
       "onUpdate:show": (show) => show && fetchData(),
-      "onFocus": focusDecorator(props.onFocus),
-      "options": parsedOptions.value
+      "onFocus": focusDecorator(props.onFocus)
     }, slots);
   }
 });

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

@@ -1,5 +1,6 @@
+import { AnyObject } from '../../../../../../es/src/types';
 export declare const TEXT: {
-    (props: any): JSX.Element;
+    (props: AnyObject): JSX.Element;
     props: {
         content: {};
         fieldItem: {};
@@ -7,7 +8,7 @@ export declare const TEXT: {
     };
 };
 export declare const BUTTON: {
-    (props: any): JSX.Element;
+    (props: AnyObject): JSX.Element;
     props: {
         onClick: {};
         fieldItem: {};

package/es/packages/form-render/src/hooks/useAsyncQueue.d.ts

@@ -34,7 +34,7 @@ export declare class AsyncQueue<T = any, K = any, R = any> {
 export declare function useAsyncQueue(): {
     create: (parallelism?: number) => AsyncQueue<FormAsyncQueueItem, any, {
         label: string;
-        value: any;
+        value: unknown;
     }[]>;
 };
 export {};

package/es/packages/form-render/src/hooks/useChangeContext.d.ts

@@ -1,7 +1,7 @@
 import { FormChangeContext } from '../types';
 export declare class ContextCollector {
     private readonly contextMap;
-    setContext(key: string, prop: keyof FormChangeContext, value: any): void;
+    setContext<T extends keyof FormChangeContext>(key: string, prop: T, value: FormChangeContext[T]): void;
     getContext(key: string): Partial<{
         currentOption: import("../../../../src/types").AnyObject;
     }>;

package/es/packages/form-render/src/hooks/useChangeContext.js

@@ -4,7 +4,7 @@ class ContextCollector {
   }
   setContext(key, prop, value) {
     const context = this.contextMap.get(key) || {};
-    Reflect.set(context, prop, value);
+    context[prop] = value;
     this.contextMap.set(key, context);
   }
   getContext(key) {

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

@@ -6,9 +6,10 @@ import { fieldKeyEscape, arrayed, createLinebarId, transformDateFormat } from '.
 function useFieldListAdaptor(collector, uuid) {
   const { createValidatorSchema } = useFormValidator();
   const createStandardSchema = (item) => {
+    var _a;
     const result = {
       name: item.val_key,
-      type: "string",
+      type: (_a = item.fieldType) != null ? _a : "string",
       title: item.alias || item.name,
       "x-component": item.html_type,
       "x-component-props": {
@@ -127,7 +128,6 @@ function useFieldListAdaptor(collector, uuid) {
   };
   const createCustomSchema = (item) => {
     const schema = createStandardSchema(item);
-    item.fieldType && (schema.type = item.fieldType);
     Object.assign(schema["x-component-props"], {
       fieldItem: item
     });

package/es/packages/form-render/src/hooks/useFormItemDeps.d.ts

@@ -1,8 +1,9 @@
-import { ArrayAble, Func } from '../../../../../es/src/types';
+import { Func } from '../../../../../es/src/types';
+import { DependKeyType } from '../../../../../es/packages/form-render';
 export declare class FormItemDepsCollector {
     private readonly collector;
-    setDeps(key: string, dependKeys: ArrayAble<string> | Record<string, string> | ArrayAble<Record<'paramName' | 'paramValue', string>>, callback: Func): void;
-    trigger(dependKey: string, payload?: any): void;
+    setDeps(key: string, dependKeys: DependKeyType, callback: Func): void;
+    trigger(dependKey: string, payload?: unknown): void;
 }
 export declare function useFormItemDeps(): {
     create: () => FormItemDepsCollector;

package/es/packages/form-render/src/hooks/useFormRequest.d.ts

@@ -1,7 +1,7 @@
-import { Func } from '../../../../../es/src/types';
+import { Func, WithNull } from '../../../../../es/src/types';
 declare type RequestInstance = Record<string, Func>;
 export declare function useFormRequest(): {
-    getHttpInstance: () => RequestInstance | null;
+    getHttpInstance: () => WithNull<RequestInstance>;
     registGlobHttpInstance: (instance: RequestInstance) => void;
 };
 export {};