ele-admin-plus 1.1.9-beta.1 → 1.1.9-beta.11

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

@@ -1,6 +1,7 @@
-import type { PropType, ExtractPropTypes } from 'vue';
+import { Resizable, MoveOut, Position } from './types';
 import { dialogProps } from 'element-plus';
-import type { Resizable, MoveOut, Position } from './types';
+import { PropType, ExtractPropTypes } from 'vue';
+
 /**
  * 属性
  */
@@ -41,17 +42,19 @@ export declare const modalProps: {
         default: number;
     };
     /** 标题栏样式 */
-    headerStyle: PropType<Partial<import("vue").CSSProperties>>;
+    headerStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 标题样式 */
-    titleStyle: PropType<Partial<import("vue").CSSProperties>>;
+    titleStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 主体样式 */
-    bodyStyle: PropType<Partial<import("vue").CSSProperties>>;
+    bodyStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 底栏样式 */
-    footerStyle: PropType<Partial<import("vue").CSSProperties>>;
+    footerStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 自定义关闭按钮样式 */
-    closeBtnStyle: PropType<Partial<import("vue").CSSProperties>>;
+    closeBtnStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 自定义全屏按钮样式 */
-    fullscreenBtnStyle: PropType<Partial<import("vue").CSSProperties>>;
+    fullscreenBtnStyle: PropType<Partial<import('vue').CSSProperties>>;
+    /** 拉伸图标样式 */
+    resizeIconStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 是否开启响应式 */
     responsive: {
         type: BooleanConstructor;
@@ -59,20 +62,20 @@ export declare const modalProps: {
     };
     /** 是否是表单弹窗 */
     form: BooleanConstructor;
-    appendTo: import("element-plus/es/utils/index").EpPropFinalized<(new (...args: any[]) => string & {}) | (() => string) | ((new (...args: any[]) => string & {}) | (() => string))[], unknown, unknown, "body", boolean>;
+    appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string & {}) | (() => string) | ((new (...args: any[]) => string & {}) | (() => string))[], unknown, unknown, "body", boolean>;
     beforeClose: {
-        readonly type: PropType<import("element-plus").DialogBeforeCloseFn>;
+        readonly type: PropType<import('element-plus').DialogBeforeCloseFn>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __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: 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>;
     top: {
         readonly type: PropType<string>;
         readonly required: false;
@@ -82,7 +85,7 @@ export declare const modalProps: {
     modelValue: BooleanConstructor;
     modalClass: StringConstructor;
     width: {
-        readonly type: PropType<import("element-plus/es/utils/index").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>>;
+        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -93,21 +96,21 @@ export declare const modalProps: {
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    trapFocus: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
-    headerAriaLevel: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
+    trapFocus: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
+    headerAriaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
     center: BooleanConstructor;
     alignCenter: BooleanConstructor;
     closeIcon: {
-        readonly type: PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>))[], unknown, unknown>>;
+        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>))[], unknown, unknown>>;
         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: 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>;
 };
 export type ModalProps = ExtractPropTypes<typeof modalProps>;
 /**

package/es/ele-modal/props.js

@@ -48,6 +48,8 @@ const modalProps = {
   closeBtnStyle: Object,
   /** 自定义全屏按钮样式 */
   fullscreenBtnStyle: Object,
+  /** 拉伸图标样式 */
+  resizeIconStyle: Object,
   /** 是否开启响应式 */
   responsive: {
     type: Boolean,

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

@@ -11,15 +11,25 @@
 
   & > .el-overlay-dialog {
     position: absolute;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: center;
 
     & > .el-dialog {
+      padding: 0;
+      flex-shrink: 0;
+      position: relative;
       background: eleVar('modal', 'bg');
       border-radius: eleVar('modal', 'radius');
-      padding: 0;
+      margin-bottom: eleVar('modal', 'mobile-space');
 
+      & > .el-dialog__header,
       & > .el-dialog__footer {
+        flex-shrink: 0;
         border: none;
         padding: 0;
+        margin: 0;
       }
 
       & > .el-dialog__body {
@@ -27,78 +37,106 @@
         color: inherit;
         font-size: inherit;
       }
-
-      & > .el-dialog__header {
-        margin: 0;
-        padding: 0;
-        border: none;
-      }
     }
   }
+}
 
-  /* header */
-  .ele-modal-header {
-    display: flex;
-    align-items: center;
-    box-sizing: border-box;
-    padding: eleVar('modal', 'header-padding');
-    border-bottom: eleVar('modal', 'header-border');
-  }
+/* header */
+.ele-modal-header {
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  padding: eleVar('modal', 'header-padding');
+  border-bottom: eleVar('modal', 'header-border');
+}
 
-  .ele-modal-title {
-    flex: 1;
-    color: eleVar('modal', 'header-color');
-    font-size: eleVar('modal', 'header-font-size');
-    line-height: eleVar('modal', 'header-line-height');
-    font-weight: eleVar('modal', 'header-font-weight');
-    box-sizing: border-box;
+.ele-modal-title {
+  flex: 1;
+  color: eleVar('modal', 'header-color');
+  font-size: eleVar('modal', 'header-font-size');
+  line-height: eleVar('modal', 'header-line-height');
+  font-weight: eleVar('modal', 'header-font-weight');
+  box-sizing: border-box;
+}
+
+/* 图标按钮 */
+.ele-modal-tool {
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: eleVar('modal', 'icon-size');
+  height: eleVar('modal', 'icon-size');
+  line-height: eleVar('modal', 'icon-size');
+  color: eleVar('modal', 'icon-color');
+  font-size: eleVar('modal', 'icon-font-size');
+  border-radius: eleVar('modal', 'icon-radius');
+  transition: (color $ele-transition, background-color $ele-transition);
+  box-sizing: border-box;
+  cursor: pointer;
+
+  &:hover {
+    color: eleVar('modal', 'icon-hover-color');
+    background: eleVar('modal', 'icon-hover-bg');
+  }
+
+  & + .ele-modal-tool {
+    margin-left: eleVar('modal', 'icon-space');
   }
+}
 
-  /* 图标按钮 */
-  .ele-modal-tool {
-    flex-shrink: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: eleVar('modal', 'icon-size');
-    height: eleVar('modal', 'icon-size');
-    line-height: eleVar('modal', 'icon-size');
-    color: eleVar('modal', 'icon-color');
-    font-size: eleVar('modal', 'icon-font-size');
-    border-radius: eleVar('modal', 'icon-radius');
-    transition: (color $ele-transition, background-color $ele-transition);
-    box-sizing: border-box;
-    cursor: pointer;
-
-    &:hover {
-      color: eleVar('modal', 'icon-hover-color');
-      background: eleVar('modal', 'icon-hover-bg');
-    }
+/* body */
+.ele-modal-body {
+  padding: eleVar('modal', 'body-padding');
+  box-sizing: border-box;
 
-    & + .ele-modal-tool {
-      margin-left: eleVar('modal', 'icon-space');
-    }
+  &.is-form {
+    padding: eleVar('modal', 'form-body-padding');
   }
+}
 
-  /* body */
-  .ele-modal-body {
-    padding: eleVar('modal', 'body-padding');
-    box-sizing: border-box;
-  }
+/* footer */
+.ele-modal-footer {
+  padding: eleVar('modal', 'footer-padding');
+  border-top: eleVar('modal', 'footer-border');
+  box-sizing: border-box;
+}
 
-  /* footer */
-  .ele-modal-footer {
-    padding: eleVar('modal', 'footer-padding');
-    border-top: eleVar('modal', 'footer-border');
-    box-sizing: border-box;
-  }
+/* 默认位置 */
+.ele-modal-top > .el-overlay-dialog > .el-dialog {
+  margin: 0;
+}
 
-  /* 表单弹窗 */
-  &.ele-modal-form > .el-overlay-dialog > .el-dialog > .el-dialog__body {
-    & > .ele-modal-body {
-      padding: eleVar('modal', 'form-body-padding');
-    }
-  }
+.ele-modal-center > .el-overlay-dialog > .el-dialog {
+  margin: auto;
+}
+
+.ele-modal-bottom > .el-overlay-dialog > .el-dialog {
+  margin: auto auto 0 auto;
+}
+
+.ele-modal-left > .el-overlay-dialog > .el-dialog {
+  margin: auto auto auto 0;
+}
+
+.ele-modal-right > .el-overlay-dialog > .el-dialog {
+  margin: auto 0 auto auto;
+}
+
+.ele-modal-left-top > .el-overlay-dialog > .el-dialog {
+  margin: 0 auto 0 0;
+}
+
+.ele-modal-left-bottom > .el-overlay-dialog > .el-dialog {
+  margin: auto auto 0 0;
+}
+
+.ele-modal-right-top > .el-overlay-dialog > .el-dialog {
+  margin: 0 0 0 auto;
+}
+
+.ele-modal-right-bottom > .el-overlay-dialog > .el-dialog {
+  margin: auto 0 0 auto;
 }
 
 /* 支持拖拽 */
@@ -108,26 +146,24 @@
 }
 
 /* 支持拉伸 */
-.ele-modal-resizable > .el-overlay-dialog > .el-dialog::after {
-  content: '';
+.ele-modal-resize-icon {
   position: absolute;
-  right: 0;
-  bottom: 0;
-  width: 12px;
-  height: 12px;
+  right: 2px;
+  bottom: 2px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: eleVar('modal', 'icon-color');
+  font-size: 12px;
   cursor: se-resize;
-  background-image: eleVar('modal', 'resize-bg');
-  background-position: 0 0;
-  background-size: 10px 10px;
-  background-repeat: no-repeat;
-}
 
-.ele-modal-resizable-horizontal > .el-overlay-dialog > .el-dialog::after {
-  cursor: e-resize;
-}
+  &.is-horizontal {
+    cursor: e-resize;
+  }
 
-.ele-modal-resizable-vertical > .el-overlay-dialog > .el-dialog::after {
-  cursor: s-resize;
+  &.is-vertical {
+    cursor: s-resize;
+  }
 }
 
 .ele-modal-resizable > .el-overlay-dialog > .el-dialog,
@@ -135,10 +171,6 @@
   display: flex;
   flex-direction: column;
 
-  & > .el-dialog__header {
-    flex-shrink: 0;
-  }
-
   & > .el-dialog__body {
     flex: auto;
     overflow: auto;
@@ -153,40 +185,40 @@
   width: 100% !important;
   height: 100% !important;
   display: flex !important;
-  max-width: inherit !important;
-  min-width: inherit !important;
-  max-height: inherit !important;
-  min-height: inherit !important;
-  border: eleVar('modal', 'fullscreen-border');
-  border-radius: 0;
+  max-width: none !important;
+  min-width: auto !important;
+  max-height: none !important;
+  min-height: auto !important;
+  border-radius: 0 !important;
 
   & > .el-dialog__header {
-    cursor: default !important;
-  }
+    cursor: default;
 
-  &::after {
-    display: none;
+    & > .ele-modal-resize-icon {
+      display: none;
+    }
   }
 }
 
-/* 支持打开多个 */
-#ele-modal-container {
+/* 同时打开多个 */
+.ele-modal-container {
   position: absolute;
   top: 0;
   left: 0;
   right: 0;
   bottom: 0;
+  width: 100%;
+  height: 100%;
   pointer-events: none;
   z-index: elVar('index', 'popper');
 }
 
 .ele-modal-multiple {
-  pointer-events: none;
+  pointer-events: none !important;
   position: absolute !important;
 
   & > .el-overlay-dialog {
     pointer-events: none;
-    position: absolute;
     overflow: hidden;
 
     & > .el-dialog {
@@ -200,70 +232,13 @@
   display: none !important;
 }
 
-/* 移动端 */
+/* 最大宽度适应屏幕 */
 .ele-modal-responsive > .el-overlay-dialog > .el-dialog {
-  max-width: calc(100vw - #{eleVar('modal', 'mobile-space')} * 2);
+  max-width: calc(100% - #{eleVar('modal', 'mobile-space')} * 2);
 }
 
-/* 限制在内部并适配布局状态 */
-.ele-modal-inner {
-  &.ele-modal {
-    top: eleVar('header', 'height', 0);
-    left: eleVar('sidebar', 'width', 0);
-  }
-
-  &:not(.dialog-fade-leave-active, .dialog-fade-enter-active) {
-    transition: (width $ele-transition, left $ele-transition);
-  }
-
-  &.ele-state-has-tab {
-    top: calc(#{eleVar('header', 'height')} + #{eleVar('tab', 'height')});
-  }
-
-  &.ele-state-collapse {
-    left: eleVar('sidebar', 'collapse-width');
-  }
-
-  &.ele-state-mix-sidebar {
-    $box-width: eleVar('sidebox', 'width');
-    left: calc(#{$box-width} + #{eleVar('sidebar', 'mix-width')});
-
-    &.ele-state-collapse {
-      left: $box-width;
-    }
-
-    &.ele-state-single-sidebar {
-      left: $box-width;
-    }
-  }
-
-  &.ele-state-compact {
-    $collapse-width: eleVar('sidebar', 'collapse-width');
-    left: calc(#{$collapse-width} + #{eleVar('sidebar', 'mix-width')});
-
-    &.ele-state-single-sidebar {
-      left: $collapse-width;
-    }
-
-    &.ele-state-collapse {
-      left: $collapse-width;
-    }
-  }
-
-  &.ele-state-top-layout {
-    left: 0;
-  }
-
-  &.ele-state-maximized {
-    top: eleVar('tab', 'height');
-    left: 0 !important;
-  }
-
-  &.ele-state-expanded {
-    top: 0 !important;
-  }
-
-  &.ele-state-mobile {
-    left: 0 !important;
-  }
+/* 限制在主体区域 */
+.ele-admin-modals > .ele-modal {
+  pointer-events: auto;
+  position: absolute !important;
 }

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

@@ -19,6 +19,8 @@ export type MoveOut = boolean | MoveOutValue[];
 export interface PositionObject {
   top?: string | number;
   left?: string | number;
+  bottom?: string | number;
+  right?: string | number;
 }
 
 /**
@@ -39,13 +41,3 @@ export type PositionValue =
  * 初始位置类型
  */
 export type Position = PositionValue | PositionObject;
-
-/**
- * 弹窗坐标
- */
-export interface Location {
-  top?: number;
-  left?: number;
-  topValue?: string;
-  leftValue?: string;
-}

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

@@ -1,70 +1,45 @@
-import type { Resizable, Position, MoveOut } from './types';
-import type { ModalProps } from './props';
+import { ModalProps } from './props';
+import { Position } from './types';
+
+export declare const containerClass = "ele-modal-container";
 export declare const wrapperClass = "ele-modal";
-export declare const containerId = "ele-modal-container";
-export declare const movableClass = "ele-modal-movable";
-export declare const resizableClass = "ele-modal-resizable";
-export declare const multipleClass = "ele-modal-multiple";
-export declare const fullscreenClass = "ele-modal-fullscreen";
-export declare const innerClass = "ele-modal-inner";
-export declare const responsiveClass = "ele-modal-responsive";
 export declare const closedClass = "ele-modal-closed";
-export declare const hideClass = "ele-modal-hide";
-export declare const collapseClass = "ele-state-collapse";
-export declare const compactClass = "ele-state-compact";
-export declare const maximizedClass = "ele-state-maximized";
-export declare const hasTabClass = "ele-state-has-tab";
-export declare const mixSidebarClass = "ele-state-mix-sidebar";
-export declare const singleSidebarClass = "ele-state-single-sidebar";
-export declare const topLayoutClass = "ele-state-top-layout";
-export declare const expandedClass = "ele-state-expanded";
-export declare const mobileClass = "ele-state-mobile";
 /**
- * 创建并获取弹窗容器
+ * 获取弹窗容器
+ * @param inner 是否限制在主体内部
  * @param multiple 是否支持同时打开多个
- * @param appendTo 自定义插入的位置
+ * @param appendTo 自定义插入的容器
+ * @param modalsEl 限制在主体内部时的容器
  */
-export declare function getModalContainer(multiple?: boolean, appendTo?: string): Element | string;
+export declare function getModalContainer(inner?: boolean, multiple?: boolean, appendTo?: string, modalsEl?: HTMLElement | null): Element | string;
 /**
  * 弹窗移动事件处理
+ * @param modalEl 弹窗节点
  * @param event 事件
  * @param props 属性
  */
-export declare function handleMovable(event: MouseEvent, props: ModalProps): void;
+export declare function handleMove(modalEl: HTMLElement, event: MouseEvent, props: ModalProps): void;
 /**
  * 弹窗拉伸事件处理
  * @param event 事件
  * @param props 属性
  */
-export declare function handleResizable(event: MouseEvent, props: ModalProps): void;
+export declare function handleResize(modalEl: HTMLElement, event: MouseEvent, props: ModalProps): void;
 /**
  * 置顶弹窗
- * @param modalEl 弹窗节点
+ * @param modalEl 弹窗
  * @param zIndex 弹窗初始层级
- * @returns
  */
-export declare function setModalTop(modalEl?: HTMLElement, zIndex?: number): void;
+export declare function topModal(modalEl?: HTMLElement, zIndex?: number): void;
 /**
- * 重置弹窗位置及大小
- * @param modalEl 弹窗节点
- * @param width 初始宽度
- * @param top 初始顶部距离
- */
-export declare function resetModalStyle(modalEl?: HTMLElement, width?: string | number, top?: string | number): void;
-/**
- * 设置弹窗位置
- * @param modalEl 弹窗节点
+ * 获取位置对应的外间距值
  * @param position 位置
- * @param resizable 是否可以拉伸
- * @param moveOut 是否可以拉出容器
  */
-export declare function setModalPosition(modalEl?: HTMLElement, resizable?: Resizable, position?: Position, moveOut?: MoveOut): void;
+export declare function getPositionMargin(position?: Position): string | undefined;
 /**
- * 设置弹窗初始位置
+ * 重置弹窗位置及大小
  * @param modalEl 弹窗节点
- * @param position 位置
- * @param resizable 是否可以拉伸
- * @param moveOut 是否可以拉出容器
- * @param force 是否强制更新
+ * @param width 初始宽度
+ * @param top 初始顶部距离
  */
-export declare function setInitPosition(modalEl?: HTMLElement, resizable?: Resizable, position?: Position, moveOut?: MoveOut, force?: boolean): void;
+export declare function resetModalStyle(modalEl?: HTMLElement, width?: string | number, position?: Position): void;