ele-admin-plus 1.4.0 → 1.4.1

package/lib/ele-modal/props.cjs

@@ -11,6 +11,8 @@ const modalProps = {
     type: Boolean,
     default: true
   },
+  /** 弹窗主体高度 */
+  bodyHeight: [String, Number],
   /** 是否可以拖出边界 */
   moveOut: [Boolean, Array],
   /** 是否可以拉伸 */

package/lib/ele-modal/props.d.ts

@@ -15,6 +15,8 @@ export declare const modalProps: {
         type: BooleanConstructor;
         default: boolean;
     };
+    /** 弹窗主体高度 */
+    bodyHeight: (NumberConstructor | StringConstructor)[];
     /** 是否可以拖出边界 */
     moveOut: PropType<MoveOut>;
     /** 是否可以拉伸 */

package/lib/ele-modal/style/index.scss

@@ -39,6 +39,11 @@
       }
     }
   }
+
+  &.dialog-fade-enter-active .el-overlay-dialog *,
+  &.dialog-fade-leave-active .el-overlay-dialog * {
+    pointer-events: none !important;
+  }
 }
 
 /* header */
@@ -59,6 +64,11 @@
   box-sizing: border-box;
 }
 
+.is-show-header-border > .el-dialog__header > .ele-modal-header {
+  padding: eleVar('modal', 'bordered-header-padding');
+  border-bottom: eleVar('modal', 'bordered-header-border');
+}
+
 /* 图标按钮 */
 .ele-modal-tool {
   flex-shrink: 0;
@@ -90,6 +100,12 @@
   padding: eleVar('modal', 'body-padding');
   box-sizing: border-box;
 
+  &.is-fluid-body {
+    max-height: 100%;
+    min-height: 100%;
+    overflow: auto;
+  }
+
   &.is-form {
     padding: eleVar('modal', 'form-body-padding');
   }

package/lib/ele-popconfirm/index.cjs

@@ -32,24 +32,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       options.popperClass = classes.join(" ");
       return options;
     });
-    const iconOptions = vue.computed(() => {
-      const options = props2.iconProps || {};
-      if (props2.iconColor) {
-        options.style = Object.assign({ color: props2.iconColor }, options.style);
-      }
-      const classes = ["ele-popconfirm-icon"];
-      if (options.class) {
-        if (Array.isArray(options.class)) {
-          options.class.forEach((c) => {
-            classes.push(c);
-          });
-        } else {
-          classes.push(options.class);
-        }
-      }
-      options.class = classes;
-      return options;
-    });
     const confirmText = vue.computed(() => {
       return props2.confirmButtonText || t("el.popconfirm.confirmButtonText");
     });
@@ -103,7 +85,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             style: vue.normalizeStyle(_ctx.bodyStyle)
           }, [
             vue.createElementVNode("div", _hoisted_1, [
-              !_ctx.hideIcon ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElIcon), vue.normalizeProps(vue.mergeProps({ key: 0 }, iconOptions.value)), {
+              !_ctx.hideIcon ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElIcon), vue.mergeProps({ key: 0 }, _ctx.iconProps || {}, {
+                style: _ctx.iconColor ? { color: _ctx.iconColor } : void 0,
+                class: "ele-popconfirm-icon"
+              }), {
                 default: vue.withCtx(() => [
                   _ctx.icon ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(_ctx.icon), {
                     key: 0,
@@ -114,7 +99,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   }, null, 8, ["style"]))
                 ]),
                 _: 1
-              }, 16)) : vue.createCommentVNode("", true),
+              }, 16, ["style"])) : vue.createCommentVNode("", true),
               vue.createElementVNode("div", _hoisted_2, [
                 (_ctx.content || _ctx.$slots.content) && (_ctx.title || _ctx.$slots.title) ? (vue.openBlock(), vue.createElementBlock("div", {
                   key: 0,

package/lib/ele-popconfirm/index.d.ts

@@ -1,4 +1,3 @@
-import { ElIconProps } from '../ele-app/el';
 import { EleTooltipInstance } from '../ele-app/plus';
 
 declare function __VLS_template(): {
@@ -42,7 +41,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     hideConfirmButton: BooleanConstructor;
     hideCancelButton: BooleanConstructor;
     iconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    iconProps: import('vue').PropType<ElIconProps>;
+    iconProps: import('vue').PropType<import('../ele-app/el').ElIconProps>;
     confirmButtonProps: import('vue').PropType<import('../ele-app/el').ElButtonProps>;
     cancelButtonProps: import('vue').PropType<import('../ele-app/el').ElButtonProps>;
     footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
@@ -55,6 +54,38 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     titleStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     contentStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     title: StringConstructor;
+    width: {
+        readonly type: import('vue').PropType<string | number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 150;
+    };
+    showAfter: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 0;
+    };
+    hideAfter: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 200;
+    };
+    autoClose: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 0;
+    };
     effect: {
         readonly default: "light";
         readonly type: import('vue').PropType<import('element-plus').PopperEffect>;
@@ -85,6 +116,14 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         __epPropKey: true;
     };
     disabled: BooleanConstructor;
+    tabindex: {
+        readonly type: import('vue').PropType<string | number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 0;
+    };
     offset: {
         readonly type: import('vue').PropType<number>;
         readonly required: false;
@@ -101,14 +140,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     } & {
         readonly default: true;
     };
-    width: {
-        readonly type: import('vue').PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 150;
-    };
     visible: {
         readonly type: import('vue').PropType<boolean | null>;
         readonly required: false;
@@ -133,14 +164,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     } & {
         readonly default: () => {};
     };
-    tabindex: {
-        readonly type: import('vue').PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
     showArrow: {
         readonly type: import('vue').PropType<boolean>;
         readonly required: false;
@@ -164,30 +187,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         readonly validator: ((val: unknown) => boolean) | undefined;
         readonly __epPropKey: true;
     };
-    showAfter: {
-        readonly type: import('vue').PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
-    hideAfter: {
-        readonly type: import('vue').PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 200;
-    };
-    autoClose: {
-        readonly type: import('vue').PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
     popperStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     popperClass: StringConstructor;
     ariaLabel: StringConstructor;
@@ -224,11 +223,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     cancel: (_e: MouseEvent) => void;
     "update:visible": (value: boolean) => void;
-    "before-enter": () => void;
+    confirm: (_e: MouseEvent) => void;
     "before-leave": () => void;
-    "after-enter": () => void;
     "after-leave": () => void;
-    confirm: (_e: MouseEvent) => void;
+    "before-enter": () => void;
+    "after-enter": () => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     trigger: {
         type: import('vue').PropType<import('../ele-app/plus').ElePopoverProps["trigger"]>;
@@ -253,7 +252,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     hideConfirmButton: BooleanConstructor;
     hideCancelButton: BooleanConstructor;
     iconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    iconProps: import('vue').PropType<ElIconProps>;
+    iconProps: import('vue').PropType<import('../ele-app/el').ElIconProps>;
     confirmButtonProps: import('vue').PropType<import('../ele-app/el').ElButtonProps>;
     cancelButtonProps: import('vue').PropType<import('../ele-app/el').ElButtonProps>;
     footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
@@ -266,6 +265,38 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     titleStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     contentStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     title: StringConstructor;
+    width: {
+        readonly type: import('vue').PropType<string | number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 150;
+    };
+    showAfter: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 0;
+    };
+    hideAfter: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 200;
+    };
+    autoClose: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 0;
+    };
     effect: {
         readonly default: "light";
         readonly type: import('vue').PropType<import('element-plus').PopperEffect>;
@@ -296,6 +327,14 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         __epPropKey: true;
     };
     disabled: BooleanConstructor;
+    tabindex: {
+        readonly type: import('vue').PropType<string | number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 0;
+    };
     offset: {
         readonly type: import('vue').PropType<number>;
         readonly required: false;
@@ -312,14 +351,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     } & {
         readonly default: true;
     };
-    width: {
-        readonly type: import('vue').PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 150;
-    };
     visible: {
         readonly type: import('vue').PropType<boolean | null>;
         readonly required: false;
@@ -344,14 +375,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     } & {
         readonly default: () => {};
     };
-    tabindex: {
-        readonly type: import('vue').PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
     showArrow: {
         readonly type: import('vue').PropType<boolean>;
         readonly required: false;
@@ -375,30 +398,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         readonly validator: ((val: unknown) => boolean) | undefined;
         readonly __epPropKey: true;
     };
-    showAfter: {
-        readonly type: import('vue').PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
-    hideAfter: {
-        readonly type: import('vue').PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 200;
-    };
-    autoClose: {
-        readonly type: import('vue').PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
     popperStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     popperClass: StringConstructor;
     ariaLabel: StringConstructor;
@@ -432,36 +431,36 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }>> & Readonly<{
     onCancel?: ((_e: MouseEvent) => any) | undefined;
     "onUpdate:visible"?: ((value: boolean) => any) | undefined;
-    "onBefore-enter"?: (() => any) | undefined;
+    onConfirm?: ((_e: MouseEvent) => any) | undefined;
     "onBefore-leave"?: (() => any) | undefined;
-    "onAfter-enter"?: (() => any) | undefined;
     "onAfter-leave"?: (() => any) | undefined;
-    onConfirm?: ((_e: MouseEvent) => any) | undefined;
+    "onBefore-enter"?: (() => any) | undefined;
+    "onAfter-enter"?: (() => any) | undefined;
 }>, {
+    width: string | number;
+    showAfter: number;
+    hideAfter: number;
+    autoClose: number;
     effect: import('element-plus').PopperEffect;
     placement: import('element-plus').Placement;
     teleported: boolean;
     disabled: boolean;
+    tabindex: string | number;
     offset: number;
     persistent: boolean;
-    width: string | number;
     visible: boolean | null;
     trigger: (import('element-plus').TooltipTriggerType | import('element-plus').TooltipTriggerType[]) | undefined;
     triggerKeys: string[];
     popperOptions: Partial<import('element-plus').Options>;
-    tabindex: string | number;
     showArrow: boolean;
     transition: string;
     content: string;
     enterable: boolean;
-    showAfter: number;
-    hideAfter: number;
-    autoClose: number;
     arrowOffset: number;
     virtualTriggering: boolean;
     gpuAcceleration: boolean;
-    confirmButtonType: ("" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text") | undefined;
-    cancelButtonType: ("" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text") | undefined;
+    confirmButtonType: ("" | "primary" | "success" | "warning" | "info" | "text" | "default" | "danger") | undefined;
+    cancelButtonType: ("" | "primary" | "success" | "warning" | "info" | "text" | "default" | "danger") | undefined;
     iconColor: string;
     hideIcon: boolean;
     hideConfirmButton: boolean;

package/lib/ele-popconfirm/props.d.ts

@@ -56,6 +56,30 @@ export declare const popconfirmProps: {
     bodyStyle: PropType<StyleValue>;
     titleStyle: PropType<StyleValue>;
     contentStyle: PropType<StyleValue>;
+    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;
+    };
     title: StringConstructor;
     effect: {
         readonly default: "light";
@@ -87,6 +111,14 @@ export declare const popconfirmProps: {
         __epPropKey: true;
     };
     disabled: BooleanConstructor;
+    tabindex: {
+        readonly type: PropType<string | number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 0;
+    };
     offset: {
         readonly type: PropType<number>;
         readonly required: false;
@@ -135,14 +167,6 @@ export declare const popconfirmProps: {
     } & {
         readonly default: () => {};
     };
-    tabindex: {
-        readonly type: PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
     showArrow: {
         readonly type: PropType<boolean>;
         readonly required: false;
@@ -166,30 +190,6 @@ export declare const popconfirmProps: {
         readonly validator: ((val: unknown) => boolean) | undefined;
         readonly __epPropKey: true;
     };
-    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;
-    };
     popperStyle: PropType<StyleValue>;
     popperClass: StringConstructor;
     ariaLabel: StringConstructor;