cnhis-design-vue 3.1.12-beta.0 → 3.1.12-beta.3

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="lodash" />
 import { AnyObject } from '../../../../es/src/types';
 import { Component, FunctionalComponent, PropType } from 'vue';
-import { FieldItem, FieldVisitor } from './types';
+import { FieldItem, FieldVisitor, FormBusinessFilter } from './types';
 declare const _default: import("vue").DefineComponent<{
     fieldList: {
         type: PropType<FieldItem[]>;
@@ -92,6 +92,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | FunctionalComponent<{}, {}>>>;
         default: () => {};
     };
+    businessFilter: {
+        type: PropType<FormBusinessFilter>;
+    };
     scope: {
         type: PropType<AnyObject>;
         default: () => {};
@@ -194,6 +197,9 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | FunctionalComponent<{}, {}>>>;
             default: () => {};
         };
+        businessFilter: {
+            type: PropType<FormBusinessFilter>;
+        };
         scope: {
             type: PropType<AnyObject>;
             default: () => {};
@@ -657,14 +663,65 @@ declare const _default: import("vue").DefineComponent<{
             labelTextAlignHorizontal: string;
         }, any>>>;
     }>>, {
-        inline: boolean;
-        disabled: boolean;
-        onSubmit: (e: Event) => void;
-        labelPlacement: import("naive-ui/es/form/src/interface").LabelPlacement;
-        model: Record<string, any>;
-        showRequireMark: boolean | undefined;
-        showFeedback: boolean;
-        showLabel: boolean | undefined;
+        readonly inline: boolean;
+        readonly disabled: boolean;
+        readonly onSubmit: (e: Event) => void;
+        readonly labelPlacement: import("naive-ui/es/form/src/interface").LabelPlacement;
+        readonly model: Record<string, any>;
+        readonly showRequireMark: boolean | undefined;
+        readonly showFeedback: boolean;
+        readonly showLabel: boolean | undefined;
+    }>;
+    NTabPane: import("vue").DefineComponent<{
+        readonly tab: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }> | (() => import("vue").VNodeChild)>;
+        readonly name: {
+            readonly type: PropType<string | number>;
+            readonly required: true;
+        };
+        readonly disabled: BooleanConstructor;
+        readonly displayDirective: {
+            readonly type: PropType<"show" | "if" | "show:lazy">;
+            readonly default: "if";
+        };
+        readonly closable: {
+            readonly type: PropType<boolean | undefined>;
+            readonly default: undefined;
+        };
+        readonly tabProps: PropType<import("vue").HTMLAttributes>;
+        readonly label: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }> | (() => import("vue").VNodeChild)>;
+    }, {
+        style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
+        class: import("vue").Ref<string | undefined>;
+        mergedClsPrefix: import("vue").Ref<string>;
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        readonly tab: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }> | (() => import("vue").VNodeChild)>;
+        readonly name: {
+            readonly type: PropType<string | number>;
+            readonly required: true;
+        };
+        readonly disabled: BooleanConstructor;
+        readonly displayDirective: {
+            readonly type: PropType<"show" | "if" | "show:lazy">;
+            readonly default: "if";
+        };
+        readonly closable: {
+            readonly type: PropType<boolean | undefined>;
+            readonly default: undefined;
+        };
+        readonly tabProps: PropType<import("vue").HTMLAttributes>;
+        readonly label: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }> | (() => import("vue").VNodeChild)>;
+    }>>, {
+        readonly disabled: boolean;
+        readonly closable: boolean | undefined;
+        readonly displayDirective: "show" | "if" | "show:lazy";
     }>;
     NTabs: import("vue").DefineComponent<{
         readonly value: PropType<string | number>;
@@ -721,9 +778,12 @@ declare const _default: import("vue").DefineComponent<{
             tabTextColorActiveCard: string;
             tabTextColorDisabledCard: string;
             barColor: string;
-            closeColor: string;
+            closeIconColor: string;
+            closeIconColorHover: string;
+            closeIconColorPressed: string;
             closeColorHover: string;
             closeColorPressed: string;
+            closeBorderRadius: string;
             tabColor: string;
             tabColorSegment: string;
             tabBorderColor: string;
@@ -762,6 +822,8 @@ declare const _default: import("vue").DefineComponent<{
             panePaddingSmall: string;
             panePaddingMedium: string;
             panePaddingLarge: string;
+            closeSize: string;
+            closeIconSize: string;
         }, any>>;
         readonly themeOverrides: PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Tabs", {
             colorSegment: string;
@@ -783,9 +845,12 @@ declare const _default: import("vue").DefineComponent<{
             tabTextColorActiveCard: string;
             tabTextColorDisabledCard: string;
             barColor: string;
-            closeColor: string;
+            closeIconColor: string;
+            closeIconColorHover: string;
+            closeIconColorPressed: string;
             closeColorHover: string;
             closeColorPressed: string;
+            closeBorderRadius: string;
             tabColor: string;
             tabColorSegment: string;
             tabBorderColor: string;
@@ -824,6 +889,8 @@ declare const _default: import("vue").DefineComponent<{
             panePaddingSmall: string;
             panePaddingMedium: string;
             panePaddingLarge: string;
+            closeSize: string;
+            closeIconSize: string;
         }, any>>>;
         readonly builtinThemeOverrides: PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Tabs", {
             colorSegment: string;
@@ -845,9 +912,12 @@ declare const _default: import("vue").DefineComponent<{
             tabTextColorActiveCard: string;
             tabTextColorDisabledCard: string;
             barColor: string;
-            closeColor: string;
+            closeIconColor: string;
+            closeIconColorHover: string;
+            closeIconColorPressed: string;
             closeColorHover: string;
             closeColorPressed: string;
+            closeBorderRadius: string;
             tabColor: string;
             tabColorSegment: string;
             tabBorderColor: string;
@@ -886,12 +956,15 @@ declare const _default: import("vue").DefineComponent<{
             panePaddingSmall: string;
             panePaddingMedium: string;
             panePaddingLarge: string;
+            closeSize: string;
+            closeIconSize: string;
         }, any>>>;
     }, {
         syncBarPosition: () => void;
         mergedClsPrefix: import("vue").ComputedRef<string>;
         mergedValue: import("vue").ComputedRef<string | number | null>;
         renderedNames: Set<string | number>;
+        tabsRailElRef: import("vue").Ref<HTMLElement | null>;
         tabsPaneWrapperRef: import("vue").Ref<HTMLElement | null>;
         tabsElRef: import("vue").Ref<HTMLElement | null>;
         barElRef: import("vue").Ref<HTMLElement | null>;
@@ -956,9 +1029,14 @@ declare const _default: import("vue").DefineComponent<{
             '--n-pane-text-color': string;
             '--n-tab-border-color': string;
             '--n-tab-border-radius': string;
-            '--n-close-color': string;
+            '--n-close-size': string;
+            '--n-close-icon-size': string;
             '--n-close-color-hover': string;
             '--n-close-color-pressed': string;
+            '--n-close-border-radius': string;
+            '--n-close-icon-color': string;
+            '--n-close-icon-color-hover': string;
+            '--n-close-icon-color-pressed': string;
             '--n-tab-color': string;
             '--n-tab-font-weight': string;
             '--n-tab-font-weight-active': string;
@@ -973,7 +1051,7 @@ declare const _default: import("vue").DefineComponent<{
         renderNameListRef: {
             value: (string | number)[];
         };
-        onAnimationBeforeLeave: () => void;
+        onAnimationBeforeLeave: (el: HTMLElement) => void;
         onAnimationEnter: (el: HTMLElement) => void;
         onAnimationAfterEnter: () => void;
         onRender: (() => void) | undefined;
@@ -1032,9 +1110,12 @@ declare const _default: import("vue").DefineComponent<{
             tabTextColorActiveCard: string;
             tabTextColorDisabledCard: string;
             barColor: string;
-            closeColor: string;
+            closeIconColor: string;
+            closeIconColorHover: string;
+            closeIconColorPressed: string;
             closeColorHover: string;
             closeColorPressed: string;
+            closeBorderRadius: string;
             tabColor: string;
             tabColorSegment: string;
             tabBorderColor: string;
@@ -1073,6 +1154,8 @@ declare const _default: import("vue").DefineComponent<{
             panePaddingSmall: string;
             panePaddingMedium: string;
             panePaddingLarge: string;
+            closeSize: string;
+            closeIconSize: string;
         }, any>>;
         readonly themeOverrides: PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Tabs", {
             colorSegment: string;
@@ -1094,9 +1177,12 @@ declare const _default: import("vue").DefineComponent<{
             tabTextColorActiveCard: string;
             tabTextColorDisabledCard: string;
             barColor: string;
-            closeColor: string;
+            closeIconColor: string;
+            closeIconColorHover: string;
+            closeIconColorPressed: string;
             closeColorHover: string;
             closeColorPressed: string;
+            closeBorderRadius: string;
             tabColor: string;
             tabColorSegment: string;
             tabBorderColor: string;
@@ -1135,6 +1221,8 @@ declare const _default: import("vue").DefineComponent<{
             panePaddingSmall: string;
             panePaddingMedium: string;
             panePaddingLarge: string;
+            closeSize: string;
+            closeIconSize: string;
         }, any>>>;
         readonly builtinThemeOverrides: PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Tabs", {
             colorSegment: string;
@@ -1156,9 +1244,12 @@ declare const _default: import("vue").DefineComponent<{
             tabTextColorActiveCard: string;
             tabTextColorDisabledCard: string;
             barColor: string;
-            closeColor: string;
+            closeIconColor: string;
+            closeIconColorHover: string;
+            closeIconColorPressed: string;
             closeColorHover: string;
             closeColorPressed: string;
+            closeBorderRadius: string;
             tabColor: string;
             tabColorSegment: string;
             tabBorderColor: string;
@@ -1197,65 +1288,16 @@ declare const _default: import("vue").DefineComponent<{
             panePaddingSmall: string;
             panePaddingMedium: string;
             panePaddingLarge: string;
+            closeSize: string;
+            closeIconSize: string;
         }, any>>>;
     }>>, {
-        type: import("naive-ui/es/tabs/src/interface").TabsType;
-        size: "small" | "medium" | "large";
-        closable: boolean;
-        trigger: "click" | "hover";
-        animated: boolean;
-        tabsPadding: number;
-    }>;
-    NTabPane: import("vue").DefineComponent<{
-        readonly tab: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | (() => import("vue").VNodeChild)>;
-        readonly name: {
-            readonly type: PropType<string | number>;
-            readonly required: true;
-        };
-        readonly disabled: BooleanConstructor;
-        readonly displayDirective: {
-            readonly type: PropType<"show" | "if" | "show:lazy">;
-            readonly default: "if";
-        };
-        readonly closable: {
-            readonly type: PropType<boolean | undefined>;
-            readonly default: undefined;
-        };
-        readonly tabProps: PropType<import("vue").HTMLAttributes>;
-        readonly label: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | (() => import("vue").VNodeChild)>;
-    }, {
-        style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
-        class: import("vue").Ref<string | undefined>;
-        mergedClsPrefix: import("vue").Ref<string>;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-        readonly tab: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | (() => import("vue").VNodeChild)>;
-        readonly name: {
-            readonly type: PropType<string | number>;
-            readonly required: true;
-        };
-        readonly disabled: BooleanConstructor;
-        readonly displayDirective: {
-            readonly type: PropType<"show" | "if" | "show:lazy">;
-            readonly default: "if";
-        };
-        readonly closable: {
-            readonly type: PropType<boolean | undefined>;
-            readonly default: undefined;
-        };
-        readonly tabProps: PropType<import("vue").HTMLAttributes>;
-        readonly label: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | (() => import("vue").VNodeChild)>;
-    }>>, {
-        disabled: boolean;
-        closable: boolean | undefined;
-        displayDirective: "show" | "if" | "show:lazy";
+        readonly type: import("naive-ui/es/tabs/src/interface").TabsType;
+        readonly size: "small" | "medium" | "large";
+        readonly closable: boolean;
+        readonly trigger: "click" | "hover";
+        readonly animated: boolean;
+        readonly tabsPadding: number;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fieldList: {
@@ -1347,6 +1389,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | FunctionalComponent<{}, {}>>>;
         default: () => {};
     };
+    businessFilter: {
+        type: PropType<FormBusinessFilter>;
+    };
     scope: {
         type: PropType<AnyObject>;
         default: () => {};

package/es/packages/form-render/src/FormRender.vue_vue_type_script_setup_true_lang.js

@@ -3,14 +3,11 @@ import { createForm, onFieldValueChange, isField } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
 import { cloneDeep } from 'lodash-es';
 import { NForm, NTabs, NTabPane } from 'naive-ui';
-import { useFieldListAdaptor } from './hooks/useFieldListAdaptor2.js';
-import '../../../../packages/form-render';
-import { useFieldVisitor } from './hooks/useFieldVisitor2.js';
-import '@vueuse/core';
-import '../../../../packages/form-render/src/utils';
-import { useInitialData } from './hooks/useInitialData2.js';
-import { useAnchor } from './hooks/useAnchor2.js';
-import { useFormContext } from './hooks/useFormContext2.js';
+import { useFormContext } from './hooks/useFormContext.js';
+import { useInitialData } from './hooks/useInitialData.js';
+import { useFieldListAdaptor } from './hooks/useFieldListAdaptor.js';
+import { useFieldVisitor } from './hooks/useFieldVisitor.js';
+import { useAnchor } from './hooks/useAnchor.js';
 
 const _hoisted_1 = {
   key: 0,
@@ -18,6 +15,7 @@ const _hoisted_1 = {
 };
 const _hoisted_2 = { style: { "white-space": "pre" } };
 var script = /* @__PURE__ */ defineComponent({
+  __name: "FormRender",
   props: {
     fieldList: { type: Array },
     initialData: { type: Object, default: () => ({}) },
@@ -31,6 +29,7 @@ var script = /* @__PURE__ */ defineComponent({
       type: Object,
       default: () => ({})
     },
+    businessFilter: { type: Function },
     scope: { type: Object, default: () => ({}) },
     consumer: { type: Boolean, default: false },
     uuid: { type: String }
@@ -65,9 +64,7 @@ var script = /* @__PURE__ */ defineComponent({
       }
       if (props.fieldList) {
         const _fieldList = useFieldVisitor().traverse(cloneDeep(props.fieldList), props.fieldVisitor);
-        const result = { type: "object", properties: schemaAdaptor(_fieldList) };
-        console.log(result);
-        return result;
+        return { type: "object", properties: schemaAdaptor(_fieldList) };
       }
       return { type: "object", properties: {} };
     });

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

@@ -1 +1,162 @@
-export { SEARCH_CASCADE } from './cascader2.js';
+import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
+import { isObject, isString } from 'lodash-es';
+import { InjectAsyncQueue } from '../../constants/index.js';
+import { assignUpdateValue, formRenderLog, arrayed } from '../../utils/index.js';
+import { connect, mapProps } from '@formily/vue';
+import { NCascader } from 'naive-ui';
+import { useFormField } from '../../hooks/useFormField.js';
+
+const script = defineComponent({
+  name: "FormCascader",
+  props: {
+    options: {
+      type: Array,
+      default: () => []
+    },
+    deep: {
+      type: [Number, String],
+      required: true
+    },
+    urlConfig: {
+      type: Object
+    },
+    onChange: {},
+    value: {}
+  },
+  emits: ["update:value"],
+  setup(props, {
+    slots,
+    emit
+  }) {
+    const _options = ref(null);
+    const {
+      title
+    } = useFormField();
+    const asyncQueue = inject(InjectAsyncQueue);
+    async function fetchData(option) {
+      var _a;
+      if (!option && _options.value)
+        return;
+      const config = props.urlConfig;
+      if (!config)
+        return;
+      if (!isObject(config)) {
+        formRenderLog(`invalid urlConfig (${config}) in CASCADER => ${title.value}`, "warn");
+        return;
+      }
+      if ((option == null ? void 0 : option.depth) + 1 >= props.deep)
+        return;
+      const parentDepth = (_a = option == null ? void 0 : option.depth) != null ? _a : -1;
+      const params = {
+        lvlnr: parentDepth + 1 + ""
+      };
+      if (option) {
+        if (!config.dependKey) {
+          formRenderLog(`invalid urlConfig.dependKey ${config.dependKey} in CASCADER => ${title.value}`, "warn");
+          return;
+        }
+        arrayed(config.dependKey).forEach((key) => {
+          if (isString(key)) {
+            params[key] = option[valueKey.value];
+          } else if (isObject(key)) {
+            params[key.paramName] = option[key.paramValue];
+          }
+        });
+      }
+      let data = await asyncQueue.addAsync({
+        ...config,
+        key: title.value,
+        params
+      });
+      if (!Array.isArray(data)) {
+        data = [];
+      }
+      if (!data.length && isObject(option)) {
+        option.isLeaf = true;
+        let currentOption = option;
+        const result2 = [option];
+        while (currentOption.parent) {
+          result2.unshift(currentOption.parent);
+          currentOption = currentOption.parent;
+        }
+        updateValue(null, null, result2);
+        show.value = false;
+        return;
+      }
+      const result = data.reduce((res, d) => {
+        res.push({
+          [labelKey.value]: d[labelKey.value],
+          [valueKey.value]: d[valueKey.value],
+          depth: parentDepth + 1,
+          parent: option,
+          isLeaf: parentDepth + 2 >= props.deep
+        });
+        return res;
+      }, []);
+      option ? option.children = result : _options.value = result;
+    }
+    const renderOptions = computed(() => {
+      return _options.value || props.options || [];
+    });
+    watch(() => props.value, (n, o) => {
+      if (n != null && o == null) {
+        fetchData();
+      }
+    }, {
+      immediate: true
+    });
+    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)) {
+          return parsed.map((option) => option[labelKey.value]).join(" / ");
+        } else {
+          return [];
+        }
+      } catch (e) {
+        return "";
+      }
+    });
+    function updateValue(_, __, options) {
+      const payload = Array.isArray(options) ? options.map((option) => ({
+        ...option,
+        label: option[labelKey.value],
+        children: void 0,
+        parent: void 0
+      })) : options;
+      emit("update:value", payload);
+    }
+    const show = ref(false);
+    function updateShow(v) {
+      show.value = !!v;
+      v && fetchData();
+    }
+    return () => {
+      return createVNode(NCascader, {
+        "value": _value.value,
+        "show": !!show.value,
+        "onUpdate:value": updateValue,
+        "remote": true,
+        "labelField": labelKey.value,
+        "valueField": valueKey.value,
+        "options": renderOptions.value,
+        "checkStrategy": "child",
+        "onLoad": fetchData,
+        "onUpdate:show": updateShow
+      }, slots);
+    };
+  }
+});
+const SEARCH_CASCADE = connect(script, mapProps({
+  dataSource: "options"
+}, assignUpdateValue));
+
+export { SEARCH_CASCADE };

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

@@ -1 +1,42 @@
-export { CHECKBOX } from './checkbox2.js';
+import { defineComponent, createVNode } from 'vue';
+import { assignUpdateValue } from '../../utils/index.js';
+import { connect, mapProps } from '@formily/vue';
+import { NCheckboxGroup, NSpace, NCheckbox } from 'naive-ui';
+
+const script = defineComponent({
+  name: "FormCheckbox",
+  props: {
+    options: {
+      type: Array,
+      default: () => []
+    },
+    vertical: {
+      type: Boolean,
+      default: false
+    }
+  },
+  setup(props, {
+    attrs
+  }) {
+    return () => createVNode(NCheckboxGroup, attrs, {
+      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
+          }, {
+            default: () => [option.text]
+          }))];
+        }
+      })]
+    });
+  }
+});
+const CHECKBOX = connect(script, mapProps({
+  dataSource: "options"
+}, assignUpdateValue));
+
+export { CHECKBOX };