ele-admin-plus 1.4.1 → 1.5.0-beta.2

package/lib/ele-modal/props.cjs

@@ -11,8 +11,10 @@ const modalProps = {
     type: Boolean,
     default: true
   },
-  /** 弹窗主体高度 */
-  bodyHeight: [String, Number],
+  /** 弹窗高度 */
+  height: [String, Number],
+  /** 弹窗最大高度 */
+  maxHeight: [String, Number],
   /** 是否可以拖出边界 */
   moveOut: [Boolean, Array],
   /** 是否可以拉伸 */
@@ -56,11 +58,23 @@ const modalProps = {
   resizeIconStyle: Object,
   /** 主体类名 */
   modalBodyClass: String,
+  /** 是否是失活状态 */
+  isDeactivated: Boolean,
+  /** 异步内容组件时加载状态 */
+  compLoading: Boolean,
+  /** 加载状态 */
+  loading: Boolean,
+  /** 加载组件属性 */
+  loadingProps: Object,
   /** 是否开启响应式 */
   responsive: {
     type: Boolean,
     default: null
   },
+  /** 内部表格弹性布局 */
+  flexTable: [Boolean, String],
+  /** 是否是在内容区添加自定义底栏 */
+  customFooter: Boolean,
   /** 是否是表单弹窗 */
   form: Boolean
 };
@@ -69,7 +83,9 @@ const modalEmits = {
   /** 更新全屏状态 */
   "update:fullscreen": (_fullscreen) => true
 };
-const dialogPropKeys = Object.keys(elementPlus.dialogProps);
+const dialogPropKeys = Object.keys(elementPlus.dialogProps).filter(
+  (k) => !["top", "closeIcon"].includes(k)
+);
 exports.dialogPropKeys = dialogPropKeys;
 exports.modalEmits = modalEmits;
 exports.modalProps = modalProps;

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

@@ -1,6 +1,7 @@
-import { PropType, ExtractPropTypes } from 'vue';
+import { PropType, ExtractPropTypes, EmitsToProps } from 'vue';
 import { dialogProps } from 'element-plus';
 import { StyleValue } from '../ele-app/types';
+import { EleLoadingProps } from '../ele-app/plus';
 import { Resizable, MoveOut, Position } from './types';
 
 /**
@@ -15,8 +16,10 @@ export declare const modalProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    /** 弹窗主体高度 */
-    bodyHeight: (NumberConstructor | StringConstructor)[];
+    /** 弹窗高度 */
+    height: (NumberConstructor | StringConstructor)[];
+    /** 弹窗最大高度 */
+    maxHeight: (NumberConstructor | StringConstructor)[];
     /** 是否可以拖出边界 */
     moveOut: PropType<MoveOut>;
     /** 是否可以拉伸 */
@@ -60,11 +63,23 @@ export declare const modalProps: {
     resizeIconStyle: PropType<StyleValue>;
     /** 主体类名 */
     modalBodyClass: StringConstructor;
+    /** 是否是失活状态 */
+    isDeactivated: BooleanConstructor;
+    /** 异步内容组件时加载状态 */
+    compLoading: BooleanConstructor;
+    /** 加载状态 */
+    loading: BooleanConstructor;
+    /** 加载组件属性 */
+    loadingProps: PropType<EleLoadingProps>;
     /** 是否开启响应式 */
     responsive: {
         type: BooleanConstructor;
         default: null;
     };
+    /** 内部表格弹性布局 */
+    flexTable: PropType<boolean | "auto">;
+    /** 是否是在内容区添加自定义底栏 */
+    customFooter: BooleanConstructor;
     /** 是否是表单弹窗 */
     form: BooleanConstructor;
     appendTo: {
@@ -114,6 +129,7 @@ export declare const modalProps: {
     } & {
         readonly default: true;
     };
+    modalPenetrable: BooleanConstructor;
     openDelay: {
         readonly type: PropType<number>;
         readonly required: false;
@@ -162,15 +178,37 @@ export declare const modalProps: {
     } & {
         readonly default: "2";
     };
+    transition: {
+        readonly type: PropType<import('element-plus').DialogTransition>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: undefined;
+    };
     center: BooleanConstructor;
-    alignCenter: BooleanConstructor;
+    alignCenter: {
+        readonly type: PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: undefined;
+    };
     closeIcon: {
         readonly type: PropType<string | import('vue').Component>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    overflow: BooleanConstructor;
+    overflow: {
+        readonly type: PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: undefined;
+    };
     fullscreen: BooleanConstructor;
     showClose: {
         readonly type: PropType<boolean>;
@@ -212,8 +250,10 @@ export declare const modalEmits: {
     openAutoFocus: () => boolean;
     closeAutoFocus: () => boolean;
 };
-export type DialogPropKeys = Array<keyof typeof dialogProps>;
+export type ModalEmitsProps = EmitsToProps<typeof modalEmits>;
+export type ModalPropsAndEmits = ModalProps & ModalEmitsProps;
 /**
  * 弹窗组件属性名
  */
+export type DialogPropKeys = (keyof typeof dialogProps)[];
 export declare const dialogPropKeys: DialogPropKeys;

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

@@ -1,4 +1,5 @@
 "use strict";
 require("element-plus/es/components/dialog/style/index");
 require("element-plus/es/components/icon/style/index");
+require("../../ele-loading/style/index");
 require("./index.scss");

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

@@ -1,5 +1,6 @@
 @use '../../style/themes/default.scss' as *;
 @use '../../style/util.scss' as *;
+@use '../../ele-pro-table/style/css-var.scss' as *;
 @use './css-var.scss' as *;
 
 @include set-modal-var($ele);
@@ -17,12 +18,18 @@
     align-items: center;
 
     & > .el-dialog {
-      padding: 0;
       flex-shrink: 0;
-      position: relative;
+      padding: 0;
+      margin: auto;
       background: eleVar('modal', 'bg');
       border-radius: eleVar('modal', 'radius');
-      margin-bottom: eleVar('modal', 'mobile-space');
+      position: relative;
+      top: auto;
+      left: auto;
+      right: auto;
+      bottom: auto;
+      display: flex;
+      flex-direction: column;
 
       & > .el-dialog__header,
       & > .el-dialog__footer {
@@ -33,6 +40,7 @@
       }
 
       & > .el-dialog__body {
+        flex: auto;
         padding: 0;
         color: inherit;
         font-size: inherit;
@@ -64,11 +72,18 @@
   box-sizing: border-box;
 }
 
-.is-show-header-border > .el-dialog__header > .ele-modal-header {
+/* 强制显示头部边框 */
+.ele-modal-show-header-border > .el-dialog__header > .ele-modal-header {
   padding: eleVar('modal', 'bordered-header-padding');
   border-bottom: eleVar('modal', 'bordered-header-border');
 }
 
+/* 强制显示底部边框 */
+.ele-modal-show-footer-border > .el-dialog__footer > .ele-modal-footer {
+  padding: eleVar('modal', 'bordered-footer-padding');
+  border-top: eleVar('modal', 'bordered-footer-border');
+}
+
 /* 图标按钮 */
 .ele-modal-tool {
   flex-shrink: 0;
@@ -100,15 +115,13 @@
   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');
   }
+
+  & + .ele-loading-spinner {
+    border-radius: eleVar('modal', 'radius');
+  }
 }
 
 /* footer */
@@ -123,10 +136,6 @@
   margin: 0;
 }
 
-.ele-modal-center > .el-overlay-dialog > .el-dialog {
-  margin: auto;
-}
-
 .ele-modal-bottom > .el-overlay-dialog > .el-dialog {
   margin: auto auto 0 auto;
 }
@@ -182,15 +191,10 @@
   }
 }
 
-.ele-modal-resizable > .el-overlay-dialog > .el-dialog,
-.ele-modal-fullscreen > .el-overlay-dialog > .el-dialog {
-  display: flex;
-  flex-direction: column;
-
-  & > .el-dialog__body {
-    flex: auto;
-    overflow: auto;
-  }
+.ele-modal-fluid > .el-overlay-dialog > .el-dialog > .el-dialog__body,
+.ele-modal-resizable > .el-overlay-dialog > .el-dialog > .el-dialog__body,
+.ele-modal-fullscreen > .el-overlay-dialog > .el-dialog > .el-dialog__body {
+  overflow: eleVar('modal', 'default-overflow');
 }
 
 /* 全屏 */
@@ -250,6 +254,11 @@
   display: none !important;
 }
 
+/* 最大高度适应屏幕 */
+.ele-modal-fluid > .el-overlay-dialog > .el-dialog {
+  max-height: calc(100% - #{eleVar('modal', 'mobile-space')} * 2);
+}
+
 /* 最大宽度适应屏幕 */
 .ele-modal-responsive > .el-overlay-dialog > .el-dialog {
   max-width: calc(100% - #{eleVar('modal', 'mobile-space')} * 2);
@@ -260,3 +269,92 @@
   pointer-events: auto;
   position: absolute !important;
 }
+
+/* 内容异步组件加载状态 */
+.ele-modal-comp-loading > .el-overlay-dialog > .el-dialog > .el-dialog__body {
+  min-height: 128px;
+
+  & > .ele-loading {
+    background: none;
+    pointer-events: none;
+  }
+}
+
+/* 内部表格弹性布局 */
+.ele-modal-flex-table > .el-overlay-dialog > .el-dialog {
+  & > .el-dialog__body {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+
+    & > .ele-modal-body {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      overflow: auto;
+
+      @include flex-pro-table();
+    }
+  }
+}
+
+.ele-modal-flex-auto-table > .el-overlay-dialog > .el-dialog {
+  & > .el-dialog__body {
+    flex: auto;
+    display: flex;
+    flex-direction: column;
+
+    & > .ele-modal-body {
+      flex: auto;
+      display: flex;
+      flex-direction: column;
+
+      @include flex-auto-pro-table();
+    }
+  }
+}
+
+/* 在内容区添加自定义底栏 */
+.ele-modal-custom-footer > .el-overlay-dialog > .el-dialog {
+  & > .el-dialog__body {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+
+    & > .ele-modal-body {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      overflow: hidden;
+      padding: 0;
+
+      & > .ele-modal-custom-footer,
+      & > .ele-buttons.is-modal-footer {
+        flex-shrink: 0;
+        padding: eleVar('modal', 'footer-padding');
+        border-top: eleVar('modal', 'footer-border');
+        box-sizing: border-box;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+      }
+
+      & > .ele-modal-custom-body,
+      & > .el-form {
+        flex: 1;
+        box-sizing: border-box;
+        padding: eleVar('modal', 'body-padding');
+        overflow: auto;
+      }
+
+      &.is-form {
+        & > .ele-modal-custom-body,
+        & > .el-form {
+          padding: eleVar('modal', 'form-body-padding');
+        }
+      }
+    }
+  }
+}

package/lib/ele-modal/util.cjs

@@ -1,26 +1,9 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const vue = require("vue");
 const common = require("../utils/common");
-const hook = require("../utils/hook");
 const containerClass = "ele-modal-container";
 const wrapperClass = "ele-modal";
 const closedClass = "ele-modal-closed";
-const fixTop = 0.65;
-const fixLeft = 0.65;
-function getModalEl(dialogRef) {
-  var _a, _b;
-  const el = (_b = vue.unref((_a = vue.unref(dialogRef)) == null ? void 0 : _a.dialogContentRef)) == null ? void 0 : _b.$el;
-  return el;
-}
-function initModalStyle(modalEl) {
-  modalEl.style.top = modalEl.offsetTop + "px";
-  modalEl.style.left = modalEl.offsetLeft + "px";
-  modalEl.style.right = "auto";
-  modalEl.style.bottom = "auto";
-  modalEl.style.position = "absolute";
-  modalEl.style.margin = "0";
-}
 function canMoveOut(moveOut, direction) {
   if (direction && moveOut != null && Array.isArray(moveOut)) {
     return moveOut.includes(direction);
@@ -44,258 +27,42 @@ function getModalContainer(inner, multiple, appendTo, modalsEl) {
   }
   return appendTo || "body";
 }
-function useModalMove(dialogRef, props, isFullscreen) {
-  let modalEl = null;
-  let wrapEl = null;
-  let downOL = null;
-  let downOT = null;
-  const { handleMousedown, handleTouchstart } = hook.useMoveEvent({
-    start: () => {
-      modalEl = getModalEl(dialogRef);
-      wrapEl = modalEl == null ? void 0 : modalEl.parentElement;
-      if (!modalEl || !wrapEl || !props.draggable || isFullscreen.value) {
-        return;
-      }
-      modalEl.style.userSelect = "none";
-      initModalStyle(modalEl);
-      downOL = modalEl.offsetLeft;
-      downOT = modalEl.offsetTop;
-    },
-    move: ({ distanceX, distanceY, e }) => {
-      if (!modalEl || !wrapEl || downOL == null || downOT == null || distanceX == null || distanceY == null) {
-        return;
-      }
-      e.preventDefault();
-      let positionLeft = distanceX + downOL;
-      let positionTop = distanceY + downOT;
-      const limitL = wrapEl.clientWidth - modalEl.clientWidth - fixLeft;
-      const limitT = wrapEl.clientHeight - modalEl.clientHeight - fixTop;
-      if (!props.moveOut) {
-        if (positionLeft < 0) {
-          positionLeft = 0;
-        } else if (positionLeft > limitL) {
-          positionLeft = limitL;
-        }
-        if (positionTop > limitT) {
-          positionTop = limitT;
-        }
-        if (positionTop < 0) {
-          positionTop = 0;
-        }
-      } else {
-        if (!canMoveOut(props.moveOut, "left") && positionLeft < 0) {
-          positionLeft = 0;
-        }
-        if (!canMoveOut(props.moveOut, "right") && positionLeft > limitL) {
-          positionLeft = limitL;
-        }
-        if (!canMoveOut(props.moveOut, "bottom") && positionTop > limitT) {
-          positionTop = limitT;
-        }
-        if (!canMoveOut(props.moveOut, "top") && positionTop < 0) {
-          positionTop = 0;
-        }
-        const minLimitL = wrapEl.clientWidth - 48;
-        if (positionLeft > minLimitL) {
-          positionLeft = minLimitL;
-        }
-        const minLimitT = wrapEl.clientHeight - 48;
-        if (props.multiple && positionTop > minLimitT) {
-          positionTop = minLimitT;
-        }
-      }
-      modalEl.style.left = `${Math.floor(positionLeft)}px`;
-      modalEl.style.top = `${Math.floor(positionTop)}px`;
-    },
-    end: () => {
-      if (modalEl) {
-        modalEl.style.userSelect = "";
-      }
-      downOL = null;
-      downOT = null;
-      modalEl = null;
-      wrapEl = null;
-    },
-    touchmoveOptions: { passive: false }
-  });
-  return {
-    handleHeaderMousedown: handleMousedown,
-    handleHeaderTouchstart: handleTouchstart
-  };
-}
-function useModalResize(dialogRef, props, isFullscreen) {
-  let modalEl = null;
-  let wrapEl = null;
-  let downW = null;
-  let downH = null;
-  const { handleMousedown, handleTouchstart } = hook.useMoveEvent({
-    start: () => {
-      modalEl = getModalEl(dialogRef);
-      wrapEl = modalEl == null ? void 0 : modalEl.parentElement;
-      if (!modalEl || !wrapEl || !props.resizable || isFullscreen.value) {
-        return;
-      }
-      modalEl.style.userSelect = "none";
-      initModalStyle(modalEl);
-      downW = modalEl.clientWidth;
-      downH = modalEl.clientHeight;
-    },
-    move: ({ distanceX, distanceY, e }) => {
-      if (!modalEl || !wrapEl || downW == null || downH == null || distanceX == null || distanceY == null) {
-        return;
-      }
-      e.preventDefault();
-      if (props.resizable !== "vertical") {
-        const w = distanceX + downW;
-        const maxW = wrapEl.clientWidth - modalEl.offsetLeft - fixLeft;
-        const nw = (w < props.minWidth ? props.minWidth : !canMoveOut(props.moveOut, "right") && w > maxW ? maxW : w) + "px";
-        modalEl.style.width = nw;
-        modalEl.style.maxWidth = nw;
-        modalEl.style.minWidth = nw;
-      }
-      if (props.resizable !== "horizontal") {
-        const h = distanceY + downH;
-        const maxH = wrapEl.clientHeight - modalEl.offsetTop - fixTop;
-        const nh = (h < props.minHeight ? props.minHeight : !canMoveOut(props.moveOut, "bottom") && h > maxH ? maxH : h) + "px";
-        modalEl.style.height = nh;
-        modalEl.style.maxHeight = nh;
-        modalEl.style.minHeight = nh;
-      }
-    },
-    end: () => {
-      if (modalEl) {
-        modalEl.style.userSelect = "";
-      }
-      downW = null;
-      downH = null;
-      modalEl = null;
-      wrapEl = null;
-    },
-    touchmoveOptions: { passive: false }
-  });
-  return {
-    handleResizeMousedown: handleMousedown,
-    handleResizeTouchstart: handleTouchstart
-  };
+function getPositionMargin(position) {
+  if (position == null || typeof position !== "object" || position.top == null && position.right == null && position.bottom == null && position.left == null) {
+    return;
+  }
+  return [position.top, position.right, position.bottom, position.left].map((p) => typeof p === "number" ? `${p}px` : p || "auto").join(" ");
 }
-function useModalEvent(dialogRef, props, isFullscreen) {
-  const { handleHeaderMousedown, handleHeaderTouchstart } = useModalMove(
-    dialogRef,
-    props,
-    isFullscreen
-  );
-  const { handleResizeMousedown, handleResizeTouchstart } = useModalResize(
-    dialogRef,
-    props,
-    isFullscreen
-  );
-  let isInitPosition = true;
-  const getZIndex = () => {
-    return props.zIndex ?? 2e3;
-  };
-  const topModal = (el) => {
-    var _a;
-    const modalEl = el ?? getModalEl(dialogRef);
-    const overlayEl = (_a = modalEl == null ? void 0 : modalEl.parentElement) == null ? void 0 : _a.parentElement;
-    if (!overlayEl) {
-      return;
-    }
-    const currentIndex = common.getCurrentStyle(overlayEl).zIndex;
-    const containerEl = overlayEl.parentElement;
-    const cls = `.${wrapperClass}:not(.${closedClass})`;
-    const modals = containerEl ? containerEl.querySelectorAll(cls) : void 0;
-    let maxIndex = 0;
-    (modals ? Array.from(modals) : []).forEach((modalEl2) => {
-      const zIndex = common.getCurrentStyle(modalEl2).zIndex;
-      if (zIndex != null) {
-        const index = Number(zIndex);
-        if (index >= maxIndex && (!overlayEl || modalEl2 !== overlayEl)) {
-          maxIndex = index + 1;
-        }
-      }
-    });
-    if (maxIndex > Number(currentIndex || getZIndex() || 0)) {
-      overlayEl.style.zIndex = String(maxIndex);
-    }
-  };
-  const mousedownListener = (event) => {
-    if (props.multiple) {
-      topModal(event.currentTarget);
-    }
-  };
-  const bindAutoTopEvent = () => {
-    const modalEl = getModalEl(dialogRef);
-    if (modalEl) {
-      modalEl.addEventListener("mousedown", mousedownListener);
-      modalEl.addEventListener("touchstart", mousedownListener);
-    }
-  };
-  const unbindAutoTopEvent = () => {
-    const modalEl = getModalEl(dialogRef);
-    if (modalEl) {
-      modalEl.removeEventListener("mousedown", mousedownListener);
-      modalEl.removeEventListener("touchstart", mousedownListener);
-    }
-  };
-  const getPositionMargin = (position) => {
-    if (position == null || typeof position !== "object" || position.top == null && position.right == null && position.bottom == null && position.left == null) {
-      return;
-    }
-    return [position.top, position.right, position.bottom, position.left].map((p) => typeof p === "number" ? `${p}px` : p || "auto").join(" ");
-  };
-  const getPosition = () => {
-    if (props.alignCenter) {
-      return "center";
-    }
-    if (props.top != null && props.top !== "") {
-      return { top: props.top };
-    }
-    return props.position;
-  };
-  const setInitPosition = () => {
-    if (isInitPosition) {
-      isInitPosition = false;
-      const modalEl = getModalEl(dialogRef);
-      const margin = getPositionMargin(getPosition());
-      if (modalEl && margin != null) {
-        modalEl.style.margin = margin;
+function getMaxZIndex(modalEl, defaultZIndex) {
+  if (!modalEl) {
+    return;
+  }
+  const overlayEl = modalEl.parentElement?.parentElement;
+  if (!overlayEl) {
+    return;
+  }
+  const currentIndex = common.getCurrentStyle(overlayEl).zIndex;
+  const containerEl = overlayEl.parentElement;
+  const cls = `.${wrapperClass}:not(.${closedClass})`;
+  const modals = containerEl ? containerEl.querySelectorAll(cls) : void 0;
+  let maxIndex = 0;
+  (modals ? Array.from(modals) : []).forEach((modalEl2) => {
+    const zIndex = common.getCurrentStyle(modalEl2).zIndex;
+    if (zIndex != null) {
+      const index = Number(zIndex);
+      if (index >= maxIndex && (!overlayEl || modalEl2 !== overlayEl)) {
+        maxIndex = index + 1;
       }
     }
-  };
-  const resetModalStyle = () => {
-    const modalEl = getModalEl(dialogRef);
-    if (modalEl) {
-      const w = props.width;
-      modalEl.style.margin = getPositionMargin(getPosition()) || "";
-      modalEl.style.position = "";
-      modalEl.style.top = "";
-      modalEl.style.left = "";
-      modalEl.style.right = "";
-      modalEl.style.bottom = "";
-      modalEl.style.height = "";
-      modalEl.style.maxHeight = "";
-      modalEl.style.minHeight = "";
-      modalEl.style.width = typeof w === "number" ? `${w}px` : w ?? "";
-      modalEl.style.maxWidth = "";
-      modalEl.style.minWidth = "";
-    }
-  };
-  return {
-    handleHeaderMousedown,
-    handleHeaderTouchstart,
-    handleResizeMousedown,
-    handleResizeTouchstart,
-    bindAutoTopEvent,
-    unbindAutoTopEvent,
-    topModal,
-    setInitPosition,
-    resetModalStyle
-  };
+  });
+  if (maxIndex > Number(currentIndex || (defaultZIndex ?? 2e3) || 0)) {
+    return maxIndex;
+  }
 }
+exports.canMoveOut = canMoveOut;
 exports.closedClass = closedClass;
 exports.containerClass = containerClass;
+exports.getMaxZIndex = getMaxZIndex;
 exports.getModalContainer = getModalContainer;
-exports.useModalEvent = useModalEvent;
-exports.useModalMove = useModalMove;
-exports.useModalResize = useModalResize;
+exports.getPositionMargin = getPositionMargin;
 exports.wrapperClass = wrapperClass;