cnhis-design-vue 3.1.13-beta.0 → 3.1.13-beta.11

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

@@ -1,6 +1,6 @@
 /// <reference types="lodash" />
 import { AnyObject } from '../../../../es/src/types';
-import { Component, FunctionalComponent, PropType } from 'vue';
+import { Component, FunctionalComponent, nextTick, PropType } from 'vue';
 import { FieldItem, FieldVisitor, FormBusinessFilter } from './types';
 declare const _default: import("vue").DefineComponent<{
     fieldList: {
@@ -99,6 +99,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<AnyObject>;
         default: () => {};
     };
+    annotation: {
+        type: PropType<AnyObject>;
+    };
     consumer: {
         type: BooleanConstructor;
         default: boolean;
@@ -204,6 +207,9 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<AnyObject>;
             default: () => {};
         };
+        annotation: {
+            type: PropType<AnyObject>;
+        };
         consumer: {
             type: BooleanConstructor;
             default: boolean;
@@ -215,6 +221,7 @@ declare const _default: import("vue").DefineComponent<{
         onFormChange?: ((...args: any[]) => any) | undefined;
     }>>;
     emit: (event: "formChange", ...args: any[]) => void;
+    nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
     SchemaField: Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
     businessCollector: import("./hooks").BusinessCollector;
     formItemDepsCollector: import("./hooks").FormItemDepsCollector;
@@ -404,6 +411,11 @@ declare const _default: import("vue").DefineComponent<{
     scrollTo: (id: string) => Promise<void>;
     onScroll: () => Promise<void>;
     bindInfo: (info: AnyObject) => AnyObject;
+    queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: FieldItem[]) => Promise<{
+        widgetElement: HTMLInputElement | null | undefined;
+        widgetElementList: HTMLInputElement[];
+        decoratorElement: HTMLElement | null | undefined;
+    }>;
     FormConsumer: import("vue").DefineComponent<{}, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     FormProvider: import("vue").DefineComponent<Record<"form", any>, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<Record<"form", any>>>, {
         form: any;
@@ -1004,7 +1016,7 @@ declare const _default: import("vue").DefineComponent<{
                 errorCaptured?: ((err: unknown, instance: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>> | null, info: string) => boolean | void) | ((err: unknown, instance: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>> | null, info: string) => boolean | void)[] | undefined;
             };
             $forceUpdate: () => void;
-            $nextTick: typeof import("vue").nextTick;
+            $nextTick: typeof nextTick;
             $watch(source: string | Function, cb: Function, options?: import("vue").WatchOptions<boolean> | undefined): import("vue").WatchStopHandle;
         } & import("vue").ShallowUnwrapRef<{}> & import("vue").ComponentCustomProperties) | null>;
         scrollWrapperElRef: import("vue").Ref<HTMLElement | null>;
@@ -1299,6 +1311,302 @@ declare const _default: import("vue").DefineComponent<{
         readonly animated: boolean;
         readonly tabsPadding: number;
     }>;
+    NConfigProvider: import("vue").DefineComponent<{
+        readonly abstract: BooleanConstructor;
+        readonly bordered: {
+            readonly type: PropType<boolean | undefined>;
+            readonly default: undefined;
+        };
+        readonly clsPrefix: StringConstructor;
+        readonly locale: PropType<{
+            name: string;
+            global: {
+                undo: string;
+                redo: string;
+                confirm: string;
+            };
+            Popconfirm: {
+                positiveText: string;
+                negativeText: string;
+            };
+            Cascader: {
+                placeholder: string;
+                loading: string;
+                loadingRequiredMessage: (label: string) => string;
+            };
+            Time: {
+                dateFormat: string;
+                dateTimeFormat: string;
+            };
+            DatePicker: {
+                yearFormat: string;
+                monthFormat: string;
+                dayFormat: string;
+                yearTypeFormat: string;
+                monthTypeFormat: string;
+                dateFormat: string;
+                dateTimeFormat: string;
+                quarterFormat: string;
+                clear: string;
+                now: string;
+                confirm: string;
+                selectTime: string;
+                selectDate: string;
+                datePlaceholder: string;
+                datetimePlaceholder: string;
+                monthPlaceholder: string;
+                yearPlaceholder: string;
+                quarterPlaceholder: string;
+                startDatePlaceholder: string;
+                endDatePlaceholder: string;
+                startDatetimePlaceholder: string;
+                endDatetimePlaceholder: string;
+                startMonthPlaceholder: string;
+                endMonthPlaceholder: string;
+                monthBeforeYear: boolean;
+                firstDayOfWeek: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+                today: string;
+            };
+            DataTable: {
+                checkTableAll: string;
+                uncheckTableAll: string;
+                confirm: string;
+                clear: string;
+            };
+            Transfer: {
+                sourceTitle: string;
+                targetTitle: string;
+            };
+            Empty: {
+                description: string;
+            };
+            Select: {
+                placeholder: string;
+            };
+            TimePicker: {
+                placeholder: string;
+                positiveText: string;
+                negativeText: string;
+                now: string;
+            };
+            Pagination: {
+                goto: string;
+                selectionSuffix: string;
+            };
+            DynamicTags: {
+                add: string;
+            };
+            Log: {
+                loading: string;
+            };
+            Input: {
+                placeholder: string;
+            };
+            InputNumber: {
+                placeholder: string;
+            };
+            DynamicInput: {
+                create: string;
+            };
+            ThemeEditor: {
+                title: string;
+                clearAllVars: string;
+                clearSearch: string;
+                filterCompName: string;
+                filterVarName: string;
+                import: string;
+                export: string;
+                restore: string;
+            };
+            Image: {
+                tipPrevious: string;
+                tipNext: string;
+                tipCounterclockwise: string;
+                tipClockwise: string;
+                tipZoomOut: string;
+                tipZoomIn: string;
+                tipClose: string;
+                tipOriginalSize: string;
+            };
+        } | null>;
+        readonly dateLocale: PropType<import("naive-ui/es/locales/date/enUS").NDateLocale | null>;
+        readonly namespace: StringConstructor;
+        readonly rtl: PropType<import("naive-ui/es/config-provider/src/internal-interface").RtlProp>;
+        readonly tag: {
+            readonly type: StringConstructor;
+            readonly default: "div";
+        };
+        readonly hljs: PropType<import("naive-ui/es/_mixins").Hljs>;
+        readonly theme: PropType<import("naive-ui").GlobalTheme | null>;
+        readonly themeOverrides: PropType<import("naive-ui").GlobalThemeOverrides | null>;
+        readonly componentOptions: PropType<import("naive-ui").GlobalComponentConfig>;
+        readonly icons: PropType<import("naive-ui").GlobalIconConfig>;
+        readonly breakpoints: PropType<import("naive-ui/es/config-provider/src/internal-interface").Breakpoints>;
+        readonly preflightStyleDisabled: BooleanConstructor;
+        readonly inlineThemeDisabled: {
+            readonly type: BooleanConstructor;
+            readonly default: undefined;
+        };
+        readonly as: {
+            readonly type: PropType<string | undefined>;
+            readonly validator: () => boolean;
+            readonly default: undefined;
+        };
+    }, {
+        mergedClsPrefix: import("vue").ComputedRef<string | undefined>;
+        mergedBordered: import("vue").ComputedRef<boolean | undefined>;
+        mergedNamespace: import("vue").ComputedRef<string | undefined>;
+        mergedTheme: import("vue").ComputedRef<import("naive-ui").GlobalTheme | undefined>;
+        mergedThemeOverrides: import("vue").ComputedRef<import("naive-ui").GlobalThemeOverrides | undefined>;
+    }, 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 abstract: BooleanConstructor;
+        readonly bordered: {
+            readonly type: PropType<boolean | undefined>;
+            readonly default: undefined;
+        };
+        readonly clsPrefix: StringConstructor;
+        readonly locale: PropType<{
+            name: string;
+            global: {
+                undo: string;
+                redo: string;
+                confirm: string;
+            };
+            Popconfirm: {
+                positiveText: string;
+                negativeText: string;
+            };
+            Cascader: {
+                placeholder: string;
+                loading: string;
+                loadingRequiredMessage: (label: string) => string;
+            };
+            Time: {
+                dateFormat: string;
+                dateTimeFormat: string;
+            };
+            DatePicker: {
+                yearFormat: string;
+                monthFormat: string;
+                dayFormat: string;
+                yearTypeFormat: string;
+                monthTypeFormat: string;
+                dateFormat: string;
+                dateTimeFormat: string;
+                quarterFormat: string;
+                clear: string;
+                now: string;
+                confirm: string;
+                selectTime: string;
+                selectDate: string;
+                datePlaceholder: string;
+                datetimePlaceholder: string;
+                monthPlaceholder: string;
+                yearPlaceholder: string;
+                quarterPlaceholder: string;
+                startDatePlaceholder: string;
+                endDatePlaceholder: string;
+                startDatetimePlaceholder: string;
+                endDatetimePlaceholder: string;
+                startMonthPlaceholder: string;
+                endMonthPlaceholder: string;
+                monthBeforeYear: boolean;
+                firstDayOfWeek: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+                today: string;
+            };
+            DataTable: {
+                checkTableAll: string;
+                uncheckTableAll: string;
+                confirm: string;
+                clear: string;
+            };
+            Transfer: {
+                sourceTitle: string;
+                targetTitle: string;
+            };
+            Empty: {
+                description: string;
+            };
+            Select: {
+                placeholder: string;
+            };
+            TimePicker: {
+                placeholder: string;
+                positiveText: string;
+                negativeText: string;
+                now: string;
+            };
+            Pagination: {
+                goto: string;
+                selectionSuffix: string;
+            };
+            DynamicTags: {
+                add: string;
+            };
+            Log: {
+                loading: string;
+            };
+            Input: {
+                placeholder: string;
+            };
+            InputNumber: {
+                placeholder: string;
+            };
+            DynamicInput: {
+                create: string;
+            };
+            ThemeEditor: {
+                title: string;
+                clearAllVars: string;
+                clearSearch: string;
+                filterCompName: string;
+                filterVarName: string;
+                import: string;
+                export: string;
+                restore: string;
+            };
+            Image: {
+                tipPrevious: string;
+                tipNext: string;
+                tipCounterclockwise: string;
+                tipClockwise: string;
+                tipZoomOut: string;
+                tipZoomIn: string;
+                tipClose: string;
+                tipOriginalSize: string;
+            };
+        } | null>;
+        readonly dateLocale: PropType<import("naive-ui/es/locales/date/enUS").NDateLocale | null>;
+        readonly namespace: StringConstructor;
+        readonly rtl: PropType<import("naive-ui/es/config-provider/src/internal-interface").RtlProp>;
+        readonly tag: {
+            readonly type: StringConstructor;
+            readonly default: "div";
+        };
+        readonly hljs: PropType<import("naive-ui/es/_mixins").Hljs>;
+        readonly theme: PropType<import("naive-ui").GlobalTheme | null>;
+        readonly themeOverrides: PropType<import("naive-ui").GlobalThemeOverrides | null>;
+        readonly componentOptions: PropType<import("naive-ui").GlobalComponentConfig>;
+        readonly icons: PropType<import("naive-ui").GlobalIconConfig>;
+        readonly breakpoints: PropType<import("naive-ui/es/config-provider/src/internal-interface").Breakpoints>;
+        readonly preflightStyleDisabled: BooleanConstructor;
+        readonly inlineThemeDisabled: {
+            readonly type: BooleanConstructor;
+            readonly default: undefined;
+        };
+        readonly as: {
+            readonly type: PropType<string | undefined>;
+            readonly validator: () => boolean;
+            readonly default: undefined;
+        };
+    }>>, {
+        readonly abstract: boolean;
+        readonly tag: string;
+        readonly as: string | undefined;
+        readonly bordered: boolean | undefined;
+        readonly preflightStyleDisabled: boolean;
+        readonly inlineThemeDisabled: boolean;
+    }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fieldList: {
         type: PropType<FieldItem[]>;
@@ -1396,6 +1704,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<AnyObject>;
         default: () => {};
     };
+    annotation: {
+        type: PropType<AnyObject>;
+    };
     consumer: {
         type: BooleanConstructor;
         default: boolean;

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

@@ -1,8 +1,11 @@
-import { defineComponent, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString } from 'vue';
+import { defineComponent, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString, nextTick } from 'vue';
 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 { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
+import { FormItemLineBarDepKeyPrepend } from '../../../packages/form-render/src/constants';
+import { queryDecorator, queryInput, getParentLinebar } from '../../../packages/form-render/src/utils';
+import { useNuiThemeOverrides } from '../../../packages/form-table/src/hooks/useNuiThemeOverrides';
 import { useFormContext } from './hooks/useFormContext.js';
 import { useInitialData } from './hooks/useInitialData.js';
 import { useFieldListAdaptor } from './hooks/useFieldListAdaptor.js';
@@ -31,6 +34,7 @@ var script = /* @__PURE__ */ defineComponent({
     },
     businessFilter: { type: Function },
     scope: { type: Object, default: () => ({}) },
+    annotation: { type: Object },
     consumer: { type: Boolean, default: false },
     uuid: { type: String }
   },
@@ -39,6 +43,7 @@ var script = /* @__PURE__ */ defineComponent({
   ],
   setup(__props, { expose, emit }) {
     const props = __props;
+    const { nuiThemeOverrides } = useNuiThemeOverrides();
     const { SchemaField, businessCollector, formItemDepsCollector, changeContextCollector, formUUID } = useFormContext(props);
     const formModel = createForm({
       initialValues: useInitialData().assignInitialData(props.initialData, props.fieldList),
@@ -71,12 +76,27 @@ var script = /* @__PURE__ */ defineComponent({
     const { currentAnchor, scrollbarRef, generateAnchorList, anchorIdList, formHeight, scrollTo, onScroll } = useAnchor(props, formItemDepsCollector);
     watch(parsedSchema, generateAnchorList, { immediate: true });
     function bindInfo(info) {
-      var _a, _b;
       info.title = formModel.query(info.path).get("title");
-      info.decoratorElement = (_a = scrollbarRef.value) == null ? void 0 : _a.querySelector(`#${formUUID}-${info.path}`);
-      info.widgetElement = (_b = info.decoratorElement) == null ? void 0 : _b.querySelector(`input`);
+      info.decoratorElement = queryDecorator(info.path, scrollbarRef.value, formUUID);
+      Object.assign(info, queryInput(info.decoratorElement));
       return info;
     }
+    async function queryWidget(key, wrapperElement, fieldList) {
+      if (!scrollbarRef.value)
+        return createResult();
+      const decoratorElement = queryDecorator(key, wrapperElement, formUUID);
+      if (decoratorElement)
+        return createResult(decoratorElement);
+      const parentLinebarKey = getParentLinebar(key, fieldList);
+      if (!parentLinebarKey)
+        return createResult();
+      formItemDepsCollector.trigger(FormItemLineBarDepKeyPrepend + parentLinebarKey, true);
+      await nextTick();
+      return createResult(queryDecorator(key, wrapperElement, formUUID));
+      function createResult(decoratorElement2) {
+        return { decoratorElement: decoratorElement2, ...queryInput(decoratorElement2) };
+      }
+    }
     expose({
       validate(path = "*") {
         return formModel.validate(path).catch((err) => {
@@ -101,10 +121,16 @@ var script = /* @__PURE__ */ defineComponent({
             field.value = (_a = field.initialValue) != null ? _a : null;
           }
         });
+      },
+      async queryWidget(key) {
+        return scrollbarRef.value ? await queryWidget(key, scrollbarRef.value, props.fieldList || []) : null;
       }
     });
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(NForm), null, {
+      return openBlock(), createBlock(unref(NForm), {
+        class: "form-render",
+        "require-mark-placement": "left"
+      }, {
         default: withCtx(() => [
           __props.anchor ? (openBlock(), createElementBlock("section", _hoisted_1, [
             createVNode(unref(NTabs), {
@@ -124,28 +150,33 @@ var script = /* @__PURE__ */ defineComponent({
               _: 1
             }, 8, ["value"])
           ])) : createCommentVNode("v-if", true),
-          createElementVNode("section", {
-            class: "form-render__wrapper",
-            style: normalizeStyle({ "--column": __props.column, "--form-height": unref(formHeight) }),
-            ref_key: "scrollbarRef",
-            ref: scrollbarRef,
-            onScroll: _cache[1] || (_cache[1] = (...args) => unref(onScroll) && unref(onScroll)(...args))
-          }, [
-            createVNode(unref(FormProvider), { form: unref(formModel) }, {
-              default: withCtx(() => [
-                renderSlot(_ctx.$slots, "default", { schemaFiled: unref(SchemaField) }, () => [
-                  createVNode(unref(SchemaField), { schema: unref(parsedSchema) }, null, 8, ["schema"])
-                ]),
-                __props.consumer ? (openBlock(), createBlock(unref(FormConsumer), { key: 0 }, {
-                  default: withCtx(({ form }) => [
-                    createElementVNode("div", _hoisted_2, toDisplayString(JSON.stringify(form.values, null, 2)), 1)
+          createVNode(unref(NConfigProvider), { "theme-overrides": unref(nuiThemeOverrides) }, {
+            default: withCtx(() => [
+              createElementVNode("section", {
+                class: "form-render__wrapper",
+                style: normalizeStyle({ "--column": __props.column, "--form-height": unref(formHeight) }),
+                ref_key: "scrollbarRef",
+                ref: scrollbarRef,
+                onScroll: _cache[1] || (_cache[1] = (...args) => unref(onScroll) && unref(onScroll)(...args))
+              }, [
+                createVNode(unref(FormProvider), { form: unref(formModel) }, {
+                  default: withCtx(() => [
+                    renderSlot(_ctx.$slots, "default", { schemaFiled: unref(SchemaField) }, () => [
+                      createVNode(unref(SchemaField), { schema: unref(parsedSchema) }, null, 8, ["schema"])
+                    ]),
+                    __props.consumer ? (openBlock(), createBlock(unref(FormConsumer), { key: 0 }, {
+                      default: withCtx(({ form }) => [
+                        createElementVNode("div", _hoisted_2, toDisplayString(JSON.stringify(form.values, null, 2)), 1)
+                      ]),
+                      _: 1
+                    })) : createCommentVNode("v-if", true)
                   ]),
-                  _: 1
-                })) : createCommentVNode("v-if", true)
-              ]),
-              _: 3
-            }, 8, ["form"])
-          ], 36)
+                  _: 3
+                }, 8, ["form"])
+              ], 36)
+            ]),
+            _: 3
+          }, 8, ["theme-overrides"])
         ]),
         _: 3
       });

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

@@ -1,4 +1,4 @@
-import { AnyObject, ArrayAble } from '../../../../../../es/src/types';
+import { AnyObject, ArrayAble, Func } from '../../../../../../es/src/types';
 import { FormRequestType } from '../../types';
 import { PropType } from 'vue';
 declare type DependKeyObj = {
@@ -24,6 +24,9 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
     urlConfig: {
         type: PropType<UrlConfig>;
     };
+    onFocus: {
+        type: PropType<Func<any[], any>>;
+    };
     onChange: {};
     value: {};
 }, () => 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<{
@@ -38,6 +41,9 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
     urlConfig: {
         type: PropType<UrlConfig>;
     };
+    onFocus: {
+        type: PropType<Func<any[], any>>;
+    };
     onChange: {};
     value: {};
 }>> & {