ele-admin-plus 1.5.1-beta.4 → 1.6.0-beta.2

package/es/ele-popover/props.d.ts

@@ -16,68 +16,20 @@ export declare const popoverProps: {
     /** 自定义内容样式 */
     contentStyle: PropType<StyleValue>;
     title: StringConstructor;
-    tabindex: {
-        readonly type: PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
-    content: {
-        readonly type: PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "";
-    };
+    tabindex: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | (((new (...args: any[]) => string | number) | (() => string | number)) | null)[], unknown, unknown, 0, boolean>;
+    content: import('element-plus/es/utils/vue/props/types').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     width: (NumberConstructor | StringConstructor)[];
     zIndex: NumberConstructor;
-    offset: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 12;
-    };
+    offset: import('element-plus/es/utils/vue/props/types').EpPropFinalized<NumberConstructor, unknown, unknown, 12, boolean>;
     className: StringConstructor;
     popperClass: StringConstructor;
     popperStyle: PropType<StyleValue>;
-    showArrow: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: boolean;
-    };
-    arrowOffset: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 5;
-    };
+    showArrow: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, boolean, boolean>;
+    arrowOffset: import('element-plus/es/utils/vue/props/types').EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     disabled: BooleanConstructor;
-    trigger: {
-        readonly type: PropType<import('element-plus').TooltipTriggerType | import('element-plus').TooltipTriggerType[]>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "hover";
-    };
-    triggerKeys: {
-        readonly type: PropType<string[]>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: () => string[];
-    };
+    trigger: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => "click" | "focus" | "hover" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | (((new (...args: any[]) => "click" | "focus" | "hover" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>)) | null)[], unknown, unknown, "hover", boolean>;
+    triggerKeys: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | (((new (...args: any[]) => string[]) | (() => string[])) | null)[], unknown, unknown, () => string[], boolean>;
+    focusOnTarget: BooleanConstructor;
     virtualRef: {
         readonly type: PropType<import('element-plus').Measurable>;
         readonly required: false;
@@ -87,100 +39,23 @@ export declare const popoverProps: {
     virtualTriggering: BooleanConstructor;
     ariaLabel: StringConstructor;
     appendTo: {
-        readonly type: PropType<string | HTMLElement>;
+        readonly type: PropType<import('element-plus/es/utils/vue/props/types').EpPropMergeType<(new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement) | (((new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement)) | null)[], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     persistent: BooleanConstructor;
-    visible: {
-        readonly type: PropType<boolean | null>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: null;
-    };
-    teleported: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    effect: {
-        readonly type: PropType<import('element-plus').PopperEffect>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "dark";
-    };
-    enterable: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    fallbackPlacements: {
-        readonly type: PropType<import('element-plus').Placement[]>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: undefined;
-    };
-    gpuAcceleration: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    placement: {
-        readonly type: PropType<import('element-plus').Placement>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "bottom";
-    };
-    popperOptions: {
-        readonly type: PropType<Partial<import('element-plus').Options>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: () => {};
-    };
-    showAfter: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
-    hideAfter: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 200;
-    };
-    autoClose: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
+    visible: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | (((new (...args: any[]) => boolean) | (() => boolean | null)) | null)[], unknown, unknown, null, boolean>;
+    teleported: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    effect: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => string) | (() => import('element-plus').PopperEffect) | (((new (...args: any[]) => string) | (() => import('element-plus').PopperEffect)) | null)[], unknown, unknown, "dark", boolean>;
+    enterable: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    fallbackPlacements: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement[]) | (() => import('element-plus').Placement[]) | (((new (...args: any[]) => import('element-plus').Placement[]) | (() => import('element-plus').Placement[])) | null)[], unknown, unknown, undefined, boolean>;
+    gpuAcceleration: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    placement: import('element-plus/es/utils/vue/props/types').EpPropFinalized<StringConstructor, import('element-plus').Placement, unknown, "bottom", boolean>;
+    popperOptions: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>) | (((new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>)) | null)[], unknown, unknown, () => {}, boolean>;
+    showAfter: import('element-plus/es/utils/vue/props/types').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
+    hideAfter: import('element-plus/es/utils/vue/props/types').EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
+    autoClose: import('element-plus/es/utils/vue/props/types').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     bodyStyle: PropType<StyleValue>;
     bg: StringConstructor;
     arrowBg: StringConstructor;
@@ -190,9 +65,9 @@ export type PopoverProps = ExtractPropTypes<typeof popoverProps>;
  * 事件
  */
 export declare const popoverEmits: {
-    "update:visible": (value: boolean) => boolean;
-    "before-enter": () => boolean;
-    "before-leave": () => boolean;
-    "after-enter": () => boolean;
-    "after-leave": () => boolean;
+    'update:visible': (value: boolean) => boolean;
+    'before-enter': () => boolean;
+    'before-leave': () => boolean;
+    'after-enter': () => boolean;
+    'after-leave': () => boolean;
 };

package/es/ele-printer/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, shallowRef, computed, watch, onMounted, createBlock, openBlock, Teleport, createElementVNode, mergeProps, createElementBlock, createCommentVNode, normalizeStyle, renderSlot, nextTick } from "vue";
+import { defineComponent, shallowRef, ref, computed, watch, onMounted, openBlock, createBlock, Teleport, createElementVNode, mergeProps, createElementBlock, normalizeStyle, renderSlot, createCommentVNode, nextTick } from "vue";
 import { usePrinter, getPrintContainer, mergeOptions } from "./util";
 import { printerEmits, printerProps } from "./props";
 const _hoisted_1 = { key: 0 };

package/es/ele-pro-form/components/builder-tool-wrapper.js

@@ -1,4 +1,4 @@
-import { defineComponent, createElementBlock, openBlock, createElementVNode, normalizeClass, createBlock, createCommentVNode, renderSlot, unref, withCtx, createVNode, toDisplayString } from "vue";
+import { defineComponent, openBlock, createElementBlock, createElementVNode, normalizeClass, createBlock, unref, withCtx, createVNode, createCommentVNode, renderSlot, toDisplayString } from "vue";
 import { ElIcon } from "element-plus";
 import { DragOutlined } from "../../icons/index";
 const _hoisted_1 = { class: "ele-pro-form-builder-item-tool-wrapper" };

package/es/ele-pro-form/components/builder-wrapper.js

@@ -1,4 +1,4 @@
-import { defineComponent, createElementBlock, openBlock, withModifiers, normalizeClass, renderSlot, createVNode, createSlots, renderList, withCtx, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, openBlock, createElementBlock, withModifiers, normalizeClass, renderSlot, createVNode, createSlots, renderList, withCtx, normalizeProps, guardReactiveProps } from "vue";
 import BuilderToolWrapper from "./builder-tool-wrapper";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "BuilderWrapper" },

package/es/ele-pro-form/components/draggable-row.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, provide, createBlock, openBlock, unref, normalizeStyle, normalizeClass, createSlots, withCtx, mergeProps, renderSlot, createVNode, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, computed, provide, openBlock, createBlock, unref, normalizeStyle, normalizeClass, createSlots, withCtx, mergeProps, renderSlot, createVNode, normalizeProps, guardReactiveProps } from "vue";
 import { useNamespace, rowContextKey, ElCol } from "element-plus";
 import VueDraggable from "vuedraggable";
 import { sortableGroupName, getScreenSizeColProps, translateJsCode, computeContentExtraCol, isShowItem } from "./render-core";

package/es/ele-pro-form/components/pro-form-footer.d.ts

@@ -39,9 +39,9 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     /** 收起按钮的文字 */
     searchShrinkText: StringConstructor;
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    reset: () => void;
-    submit: () => void;
     updateSearchExpand: (_expand: boolean) => void;
+    submit: () => void;
+    reset: () => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 底栏 ElFormItem 属性 */
     footerProps: PropType<ElFormItemProps>;
@@ -70,9 +70,9 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     /** 收起按钮的文字 */
     searchShrinkText: StringConstructor;
 }>> & Readonly<{
-    onReset?: (() => any) | undefined;
-    onSubmit?: (() => any) | undefined;
     onUpdateSearchExpand?: ((_expand: boolean) => any) | undefined;
+    onSubmit?: (() => any) | undefined;
+    onReset?: (() => any) | undefined;
 }>, {
     autoFooterCol: boolean;
     showSearchExpand: boolean;

package/es/ele-pro-form/components/pro-form-footer.js

@@ -1,4 +1,4 @@
-import { defineComponent, createBlock, openBlock, unref, mergeProps, createSlots, withCtx, createElementVNode, normalizeStyle, renderSlot, createCommentVNode, createVNode, createTextVNode, toDisplayString, createElementBlock, Fragment, renderList, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, openBlock, createBlock, unref, mergeProps, createSlots, withCtx, createElementVNode, normalizeStyle, renderSlot, createVNode, createTextVNode, toDisplayString, createElementBlock, Fragment, createCommentVNode, renderList, normalizeProps, guardReactiveProps } from "vue";
 import { ElFormItem, ElButton, ElLink, ElIcon } from "element-plus";
 import { ArrowUp, ArrowDown } from "../../icons/index";
 import { getSlotsMap } from "../../utils/common";

package/es/ele-pro-form/components/render-util.d.ts

@@ -69,7 +69,7 @@ export declare const ChildrenRender: import('vue').DefineComponent<import('vue')
     grid: import('vue').PropType<boolean | import('../../ele-app/el').ElColProps>;
     model: ObjectConstructor;
     rules: {
-        readonly type: import('vue').PropType<Partial<Record<string, FormItemRule | FormItemRule[]>>>;
+        readonly type: import('vue').PropType<Partial<Record<string, Record<string, any> | import('element-plus/es/utils/typescript').Arrayable<FormItemRule>>>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -111,7 +111,7 @@ export declare const ChildrenRender: import('vue').DefineComponent<import('vue')
     grid: import('vue').PropType<boolean | import('../../ele-app/el').ElColProps>;
     model: ObjectConstructor;
     rules: {
-        readonly type: import('vue').PropType<Partial<Record<string, FormItemRule | FormItemRule[]>>>;
+        readonly type: import('vue').PropType<Partial<Record<string, Record<string, any> | import('element-plus/es/utils/typescript').Arrayable<FormItemRule>>>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;

package/es/ele-pro-form/components/render-util.js

@@ -1,4 +1,4 @@
-import { defineComponent, h, mergeProps, createVNode, isVNode } from "vue";
+import { h, mergeProps, createVNode, defineComponent, isVNode } from "vue";
 import { get } from "lodash-es";
 import { cloneDeep, get as get2, merge, set } from "lodash-es";
 import VueDraggable from "vuedraggable";
@@ -10,7 +10,7 @@ import BuilderWrapper from "./builder-wrapper";
 import BuilderToolWrapper from "./builder-tool-wrapper";
 import DraggableRow from "./draggable-row";
 import { defaultItemTypeData } from "./item-type-data";
-import { isShowItem, translateJsCode, getScreenSizeColProps, sortableGroupName, computeContentExtraCol } from "./render-core";
+import { translateJsCode, getScreenSizeColProps, isShowItem, sortableGroupName, computeContentExtraCol } from "./render-core";
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }

package/es/ele-pro-form/index.d.ts

@@ -8,7 +8,7 @@ declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Pa
 };
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     labelWidth: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: string;
     };
     items: import('vue').PropType<ProFormItemProps[]>;
@@ -41,66 +41,24 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     locale: import('vue').PropType<Partial<import('./types').ProFormLocale>>;
     model: ObjectConstructor;
     rules: {
-        readonly type: import('vue').PropType<Partial<Record<string, import('element-plus').FormItemRule | import('element-plus').FormItemRule[]>>>;
+        readonly type: import('vue').PropType<Partial<Record<string, Record<string, any> | import('element-plus/es/utils/typescript').Arrayable<import('element-plus').FormItemRule>>>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    labelPosition: {
-        readonly type: import('vue').PropType<"top" | "left" | "right">;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "right";
-    };
-    requireAsteriskPosition: {
-        readonly type: import('vue').PropType<"left" | "right">;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "left";
-    };
-    labelSuffix: {
-        readonly type: import('vue').PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "";
-    };
+    labelPosition: import('element-plus/es/utils/vue/props/types').EpPropFinalized<StringConstructor, "top" | "left" | "right", unknown, "right", boolean>;
+    requireAsteriskPosition: import('element-plus/es/utils/vue/props/types').EpPropFinalized<StringConstructor, "left" | "right", unknown, "left", boolean>;
+    labelSuffix: import('element-plus/es/utils/vue/props/types').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     inline: BooleanConstructor;
     inlineMessage: BooleanConstructor;
     statusIcon: BooleanConstructor;
-    showMessage: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    validateOnRuleChange: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
+    showMessage: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    validateOnRuleChange: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     hideRequiredAsterisk: BooleanConstructor;
     scrollToError: BooleanConstructor;
-    scrollIntoViewOptions: {
-        readonly type: import('vue').PropType<boolean | Record<string, any>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
+    scrollIntoViewOptions: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => boolean | ScrollIntoViewOptions) | (() => boolean | ScrollIntoViewOptions) | (((new (...args: any[]) => boolean | ScrollIntoViewOptions) | (() => boolean | ScrollIntoViewOptions)) | null)[], unknown, unknown, true, boolean>;
     size: {
-        readonly type: import('vue').PropType<"" | "small" | "default" | "large">;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/vue/props/types').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -112,21 +70,21 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     getProFormRefs: () => Record<string, any>;
     clearCodeCache: () => void;
     validate: (callback?: import('element-plus').FormValidateCallback) => import('element-plus').FormValidationResult;
-    validateField: (props?: import('element-plus').FormItemProp | import('element-plus').FormItemProp[], callback?: import('element-plus').FormValidateCallback) => import('element-plus').FormValidationResult;
-    resetFields: (props?: import('element-plus').FormItemProp | import('element-plus').FormItemProp[]) => void;
-    clearValidate: (props?: import('element-plus').FormItemProp | import('element-plus').FormItemProp[]) => void;
+    validateField: (props?: import('element-plus/es/utils/typescript').Arrayable<import('element-plus').FormItemProp>, callback?: import('element-plus').FormValidateCallback) => import('element-plus').FormValidationResult;
+    resetFields: (props?: import('element-plus/es/utils/typescript').Arrayable<import('element-plus').FormItemProp>) => void;
+    clearValidate: (props?: import('element-plus/es/utils/typescript').Arrayable<import('element-plus').FormItemProp>) => void;
     scrollToField: (prop: import('element-plus').FormItemProp) => void;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    validate: (prop: import('element-plus').FormItemProp, isValid: boolean, message: string) => void;
     reset: () => void;
     submit: (_model: Record<string, any>) => void;
-    validate: (prop: import('element-plus').FormItemProp, isValid: boolean, message: string) => void;
     "update:activeItemKey": (_activeKey: string | number | symbol) => void;
     updateValue: (_prop: string, _value: unknown) => void;
     "update:searchExpand": (_expand: boolean) => void;
     "update:items": (_items: ProFormItemProps[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     labelWidth: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: string;
     };
     items: import('vue').PropType<ProFormItemProps[]>;
@@ -159,75 +117,33 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     locale: import('vue').PropType<Partial<import('./types').ProFormLocale>>;
     model: ObjectConstructor;
     rules: {
-        readonly type: import('vue').PropType<Partial<Record<string, import('element-plus').FormItemRule | import('element-plus').FormItemRule[]>>>;
+        readonly type: import('vue').PropType<Partial<Record<string, Record<string, any> | import('element-plus/es/utils/typescript').Arrayable<import('element-plus').FormItemRule>>>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    labelPosition: {
-        readonly type: import('vue').PropType<"top" | "left" | "right">;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "right";
-    };
-    requireAsteriskPosition: {
-        readonly type: import('vue').PropType<"left" | "right">;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "left";
-    };
-    labelSuffix: {
-        readonly type: import('vue').PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "";
-    };
+    labelPosition: import('element-plus/es/utils/vue/props/types').EpPropFinalized<StringConstructor, "top" | "left" | "right", unknown, "right", boolean>;
+    requireAsteriskPosition: import('element-plus/es/utils/vue/props/types').EpPropFinalized<StringConstructor, "left" | "right", unknown, "left", boolean>;
+    labelSuffix: import('element-plus/es/utils/vue/props/types').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     inline: BooleanConstructor;
     inlineMessage: BooleanConstructor;
     statusIcon: BooleanConstructor;
-    showMessage: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    validateOnRuleChange: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
+    showMessage: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    validateOnRuleChange: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     hideRequiredAsterisk: BooleanConstructor;
     scrollToError: BooleanConstructor;
-    scrollIntoViewOptions: {
-        readonly type: import('vue').PropType<boolean | Record<string, any>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
+    scrollIntoViewOptions: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => boolean | ScrollIntoViewOptions) | (() => boolean | ScrollIntoViewOptions) | (((new (...args: any[]) => boolean | ScrollIntoViewOptions) | (() => boolean | ScrollIntoViewOptions)) | null)[], unknown, unknown, true, boolean>;
     size: {
-        readonly type: import('vue').PropType<"" | "small" | "default" | "large">;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/vue/props/types').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     disabled: BooleanConstructor;
 }>> & Readonly<{
+    onValidate?: ((prop: import('element-plus').FormItemProp, isValid: boolean, message: string) => any) | undefined;
     onReset?: (() => any) | undefined;
     onSubmit?: ((_model: Record<string, any>) => any) | undefined;
-    onValidate?: ((prop: import('element-plus').FormItemProp, isValid: boolean, message: string) => any) | undefined;
     "onUpdate:activeItemKey"?: ((_activeKey: string | number | symbol) => any) | undefined;
     onUpdateValue?: ((_prop: string, _value: unknown) => any) | undefined;
     "onUpdate:searchExpand"?: ((_expand: boolean) => any) | undefined;
@@ -235,18 +151,18 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }>, {
     disabled: boolean;
     footer: boolean;
-    labelPosition: "top" | "left" | "right";
-    requireAsteriskPosition: "left" | "right";
+    labelPosition: import('element-plus/es/utils/vue/props/types').EpPropMergeType<StringConstructor, "top" | "left" | "right", unknown>;
+    requireAsteriskPosition: import('element-plus/es/utils/vue/props/types').EpPropMergeType<StringConstructor, "left" | "right", unknown>;
     labelWidth: string | number;
     labelSuffix: string;
     inline: boolean;
     inlineMessage: boolean;
     statusIcon: boolean;
-    showMessage: boolean;
-    validateOnRuleChange: boolean;
+    showMessage: import('element-plus/es/utils/vue/props/types').EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    validateOnRuleChange: import('element-plus/es/utils/vue/props/types').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     hideRequiredAsterisk: boolean;
     scrollToError: boolean;
-    scrollIntoViewOptions: boolean | Record<string, any>;
+    scrollIntoViewOptions: import('element-plus/es/utils/vue/props/types').EpPropMergeType<(new (...args: any[]) => boolean | ScrollIntoViewOptions) | (() => boolean | ScrollIntoViewOptions) | ((new (...args: any[]) => boolean | ScrollIntoViewOptions) | (() => boolean | ScrollIntoViewOptions) | null)[], unknown, unknown>;
     editable: boolean;
     searchExpand: boolean;
     autoFooterCol: boolean;

package/es/ele-pro-form/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, useModel, ref, computed, watch, onBeforeUnmount, createBlock, openBlock, unref, normalizeClass, withCtx, renderSlot, createVNode, createSlots, renderList, normalizeProps, guardReactiveProps, nextTick } from "vue";
+import { defineComponent, useModel, ref, computed, watch, onBeforeUnmount, openBlock, createBlock, unref, normalizeClass, withCtx, renderSlot, createVNode, createSlots, renderList, normalizeProps, guardReactiveProps, nextTick } from "vue";
 import { ElForm } from "element-plus";
 import { useLocale } from "../ele-config-provider/receiver";
 import { eachTree } from "../utils/common";

package/es/ele-pro-form/props.d.ts

@@ -8,7 +8,7 @@ import { ProFormItemKey, ProFormItemProps, ProFormItemTypeData, ProFormItemRende
 export declare const proFormProps: {
     /** 标签宽度 */
     labelWidth: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: string;
     };
     /** 表单项 */
@@ -66,66 +66,24 @@ export declare const proFormProps: {
     locale: PropType<Partial<ProFormLocale>>;
     model: ObjectConstructor;
     rules: {
-        readonly type: PropType<Partial<Record<string, import('element-plus').FormItemRule | import('element-plus').FormItemRule[]>>>;
+        readonly type: PropType<Partial<Record<string, Record<string, any> | import('element-plus/es/utils/typescript').Arrayable<import('element-plus').FormItemRule>>>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    labelPosition: {
-        readonly type: PropType<"top" | "left" | "right">;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "right";
-    };
-    requireAsteriskPosition: {
-        readonly type: PropType<"left" | "right">;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "left";
-    };
-    labelSuffix: {
-        readonly type: PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "";
-    };
+    labelPosition: import('element-plus/es/utils/vue/props/types').EpPropFinalized<StringConstructor, "top" | "left" | "right", unknown, "right", boolean>;
+    requireAsteriskPosition: import('element-plus/es/utils/vue/props/types').EpPropFinalized<StringConstructor, "left" | "right", unknown, "left", boolean>;
+    labelSuffix: import('element-plus/es/utils/vue/props/types').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     inline: BooleanConstructor;
     inlineMessage: BooleanConstructor;
     statusIcon: BooleanConstructor;
-    showMessage: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    validateOnRuleChange: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
+    showMessage: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    validateOnRuleChange: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     hideRequiredAsterisk: BooleanConstructor;
     scrollToError: BooleanConstructor;
-    scrollIntoViewOptions: {
-        readonly type: PropType<boolean | Record<string, any>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
+    scrollIntoViewOptions: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => boolean | ScrollIntoViewOptions) | (() => boolean | ScrollIntoViewOptions) | (((new (...args: any[]) => boolean | ScrollIntoViewOptions) | (() => boolean | ScrollIntoViewOptions)) | null)[], unknown, unknown, true, boolean>;
     size: {
-        readonly type: PropType<"" | "small" | "default" | "large">;
+        readonly type: PropType<import('element-plus/es/utils/vue/props/types').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -185,7 +143,7 @@ export declare const childrenRenderProps: {
     grid: PropType<boolean | ElColProps>;
     model: ObjectConstructor;
     rules: {
-        readonly type: PropType<Partial<Record<string, import('element-plus').FormItemRule | import('element-plus').FormItemRule[]>>>;
+        readonly type: PropType<Partial<Record<string, Record<string, any> | import('element-plus/es/utils/typescript').Arrayable<import('element-plus').FormItemRule>>>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;

package/es/ele-pro-form/style/index.scss

@@ -54,7 +54,7 @@ $exclude-disabled-selectors: list.join(
   }
 }
 
-.ele-pro-form-builder-item-handle-icon {
+.ele-pro-form-builder-item-handle-icon.el-icon {
   margin-right: eleVar('pro-form', 'handle-space');
 }