ele-admin-plus 1.3.0 → 1.4.0-beta.1

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

@@ -34,24 +34,102 @@ export declare const menusProps: {
     ellipsisProps: PropType<EllipsisProps>;
     /** 是否开启菜单文本溢出提示 */
     textEllipsisTooltip: PropType<TextEllipsisTooltip>;
-    defaultActive: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    defaultOpeneds: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => [], boolean>;
+    defaultActive: {
+        readonly type: PropType<string>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "";
+    };
+    defaultOpeneds: {
+        readonly type: PropType<string[]>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: () => [];
+    };
     uniqueOpened: BooleanConstructor;
     router: BooleanConstructor;
-    menuTrigger: import('element-plus/es/utils/index' /** 是否开启菜单文本溢出提示 */).EpPropFinalized<StringConstructor, "click" | "hover", unknown, "hover", boolean>;
+    menuTrigger: {
+        readonly type: PropType<"hover" | "click">;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "hover";
+    };
     collapse: BooleanConstructor;
     backgroundColor: StringConstructor;
     textColor: StringConstructor;
     activeTextColor: StringConstructor;
     closeOnClickOutside: BooleanConstructor;
-    collapseTransition: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    ellipsis: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    popperOffset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 6, boolean>;
-    ellipsisIcon: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | import('vue').Component) & {}) | (() => string | import('vue').Component) | ((new (...args: any[]) => (string | import('vue').Component) & {}) | (() => string | import('vue').Component))[], unknown, unknown, () => any, boolean>;
-    popperEffect: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string) | (() => import('element-plus').PopperEffect) | ((new (...args: any[]) => string) | (() => import('element-plus').PopperEffect))[], unknown, unknown, "dark", boolean>;
+    collapseTransition: {
+        readonly type: PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    ellipsis: {
+        readonly type: PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    popperOffset: {
+        readonly type: PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 6;
+    };
+    ellipsisIcon: {
+        readonly type: PropType<string | import('vue').Component>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: () => any;
+    };
+    popperEffect: {
+        readonly type: PropType<import('element-plus').PopperEffect>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "dark";
+    };
     popperClass: StringConstructor;
-    showTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
-    hideTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
+    showTimeout: {
+        readonly type: PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 300;
+    };
+    hideTimeout: {
+        readonly type: PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 300;
+    };
+    persistent: {
+        readonly type: PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
 };
 export type MenusProps = ExtractPropTypes<typeof menusProps>;
 export type MenuPropKeys = Array<keyof typeof menuProps>;

package/es/ele-menus/util.js

@@ -1,5 +1,5 @@
 import { onBeforeUnmount, onActivated, onDeactivated } from "vue";
-import { getCurrentStyle, debounce } from "../utils/core";
+import { getCurrentStyle, debounce } from "../utils/common";
 function getPopperClass(customerClass, theme, popTheme, colorful, popupColorful, firstPopClass, first, webkit) {
   const popperClass = ["ele-menu"];
   if (webkit) {

package/es/ele-modal/index.d.ts

@@ -48,12 +48,20 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     closeBtnStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     fullscreenBtnStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     resizeIconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    modalBodyClass: StringConstructor;
     responsive: {
         type: BooleanConstructor;
         default: null;
     };
     form: BooleanConstructor;
-    appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement) | ((new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement))[], unknown, unknown, "body", boolean>;
+    appendTo: {
+        readonly type: import('vue').PropType<string | HTMLElement>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "body";
+    };
     beforeClose: {
         readonly type: import('vue').PropType<import('element-plus').DialogBeforeCloseFn>;
         readonly required: false;
@@ -61,12 +69,54 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         __epPropKey: true;
     };
     destroyOnClose: BooleanConstructor;
-    closeOnClickModal: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    closeOnPressEscape: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    lockScroll: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    modal: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    openDelay: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    closeDelay: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
+    closeOnClickModal: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    closeOnPressEscape: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    lockScroll: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    modal: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    openDelay: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 0;
+    };
+    closeDelay: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 0;
+    };
     top: {
         readonly type: import('vue').PropType<string>;
         readonly required: false;
@@ -75,8 +125,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     modelValue: BooleanConstructor;
     modalClass: StringConstructor;
+    headerClass: StringConstructor;
+    bodyClass: StringConstructor;
+    footerClass: StringConstructor;
     width: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>>;
+        readonly type: import('vue').PropType<string | number>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -88,22 +141,52 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         __epPropKey: true;
     };
     trapFocus: BooleanConstructor;
-    headerAriaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
+    headerAriaLevel: {
+        readonly type: import('vue').PropType<string>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "2";
+    };
     center: BooleanConstructor;
     alignCenter: BooleanConstructor;
     closeIcon: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component) & {}) | (() => string | import('vue').Component) | ((new (...args: any[]) => (string | import('vue').Component) & {}) | (() => string | import('vue').Component))[], unknown, unknown>>;
+        readonly type: import('vue').PropType<string | import('vue').Component>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     overflow: BooleanConstructor;
     fullscreen: BooleanConstructor;
-    showClose: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    title: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    ariaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
+    showClose: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    title: {
+        readonly type: import('vue').PropType<string>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "";
+    };
+    ariaLevel: {
+        readonly type: import('vue').PropType<string>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "2";
+    };
 }>, {
     dialogRef: import('vue').Ref<ElDialogInstance, ElDialogInstance>;
+    resetPosition: () => void;
+    handleClose: () => void;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     close: () => void;
     open: () => void;
@@ -147,12 +230,20 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     closeBtnStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     fullscreenBtnStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     resizeIconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    modalBodyClass: StringConstructor;
     responsive: {
         type: BooleanConstructor;
         default: null;
     };
     form: BooleanConstructor;
-    appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement) | ((new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement))[], unknown, unknown, "body", boolean>;
+    appendTo: {
+        readonly type: import('vue').PropType<string | HTMLElement>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "body";
+    };
     beforeClose: {
         readonly type: import('vue').PropType<import('element-plus').DialogBeforeCloseFn>;
         readonly required: false;
@@ -160,12 +251,54 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         __epPropKey: true;
     };
     destroyOnClose: BooleanConstructor;
-    closeOnClickModal: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    closeOnPressEscape: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    lockScroll: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    modal: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    openDelay: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    closeDelay: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
+    closeOnClickModal: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    closeOnPressEscape: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    lockScroll: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    modal: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    openDelay: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 0;
+    };
+    closeDelay: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 0;
+    };
     top: {
         readonly type: import('vue').PropType<string>;
         readonly required: false;
@@ -174,8 +307,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     modelValue: BooleanConstructor;
     modalClass: StringConstructor;
+    headerClass: StringConstructor;
+    bodyClass: StringConstructor;
+    footerClass: StringConstructor;
     width: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>>;
+        readonly type: import('vue').PropType<string | number>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -187,20 +323,48 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         __epPropKey: true;
     };
     trapFocus: BooleanConstructor;
-    headerAriaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
+    headerAriaLevel: {
+        readonly type: import('vue').PropType<string>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "2";
+    };
     center: BooleanConstructor;
     alignCenter: BooleanConstructor;
     closeIcon: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component) & {}) | (() => string | import('vue').Component) | ((new (...args: any[]) => (string | import('vue').Component) & {}) | (() => string | import('vue').Component))[], unknown, unknown>>;
+        readonly type: import('vue').PropType<string | import('vue').Component>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     overflow: BooleanConstructor;
     fullscreen: BooleanConstructor;
-    showClose: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    title: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    ariaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
+    showClose: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    title: {
+        readonly type: import('vue').PropType<string>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "";
+    };
+    ariaLevel: {
+        readonly type: import('vue').PropType<string>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "2";
+    };
 }>> & Readonly<{
     onClose?: (() => any) | undefined;
     onOpen?: (() => any) | undefined;
@@ -215,13 +379,13 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     title: string;
     center: boolean;
     modelValue: boolean;
+    appendTo: string | HTMLElement;
     appendToBody: boolean;
-    appendTo: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement) | ((new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement))[], unknown, unknown>;
     destroyOnClose: boolean;
-    closeOnClickModal: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    closeOnPressEscape: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    lockScroll: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    modal: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    closeOnClickModal: boolean;
+    closeOnPressEscape: boolean;
+    lockScroll: boolean;
+    modal: boolean;
     openDelay: number;
     closeDelay: number;
     trapFocus: boolean;
@@ -230,15 +394,15 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     draggable: boolean;
     overflow: boolean;
     fullscreen: boolean;
-    showClose: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    showClose: boolean;
     ariaLevel: string;
     multiple: boolean;
     minWidth: number;
     minHeight: number;
     responsive: boolean;
+    inner: boolean;
     resetOnClose: boolean;
     maxable: boolean;
-    inner: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/es/ele-modal/index.js

@@ -1,10 +1,10 @@
-import { defineComponent, ref, computed, watch, onMounted, onActivated, onDeactivated, openBlock, createBlock, Teleport, createVNode, unref, mergeProps, createSlots, withCtx, createElementVNode, normalizeStyle, renderSlot, createTextVNode, toDisplayString, createElementBlock, withModifiers, createCommentVNode, resolveDynamicComponent, normalizeClass, nextTick } from "vue";
+import { defineComponent, ref, computed, watch, onMounted, onActivated, onDeactivated, createBlock, openBlock, Teleport, createVNode, unref, mergeProps, createSlots, withCtx, normalizeStyle, normalizeClass, renderSlot, createElementVNode, createElementBlock, createCommentVNode, createTextVNode, toDisplayString, withModifiers, resolveDynamicComponent, nextTick } from "vue";
 import { ElDialog, ElIcon } from "element-plus";
-import { CompressOutlined, ExpandOutlined, CloseOutlined, ResizeOutlined } from "../icons";
+import { CompressOutlined, ExpandOutlined, CloseOutlined, ResizeOutlined } from "../icons/index";
 import ReceiverView from "../ele-config-provider/components/receiver-view";
 import { useLayoutState, useResponsive } from "../ele-pro-layout/util";
-import { getModalContainer, useModalEvent, wrapperClass, closedClass } from "./util";
-import { modalProps, modalEmits } from "./props";
+import { wrapperClass, getModalContainer, useModalEvent, closedClass } from "./util";
+import { modalEmits, modalProps } from "./props";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "EleModal", inheritAttrs: false },
   __name: "index",
@@ -133,6 +133,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleCloseAutoFocus = () => {
       emit("closeAutoFocus");
     };
+    const resetPosition = () => {
+      resetModalStyle();
+    };
+    const closeModal = () => {
+      dialogRef.value && dialogRef.value.handleClose();
+    };
     watch(
       () => props.fullscreen,
       (fullscreen) => {
@@ -151,7 +157,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       isActivated.value = false;
     });
     __expose({
-      dialogRef
+      dialogRef,
+      resetPosition,
+      handleClose: closeModal
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(Teleport, {
@@ -276,7 +284,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           default: withCtx(() => [
             createVNode(ReceiverView, {
               wrapPosition: false,
-              class: normalizeClass(["ele-modal-body", { "is-form": _ctx.form }]),
+              class: normalizeClass(["ele-modal-body", { "is-form": _ctx.form }, _ctx.modalBodyClass]),
               style: normalizeStyle(_ctx.bodyStyle)
             }, {
               default: withCtx(() => [