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

package/es/ele-app/el.d.ts

@@ -1,5 +1,6 @@
 import type { ExtractPropTypes } from 'vue';
 import type {
+  CascaderProps,
   IconProps,
   RowProps,
   ColProps,
@@ -29,6 +30,7 @@ import type {
   TabPaneProps,
   TableProps,
   TableV2Props,
+  ElCascader,
   ElPopper,
   ElPopover,
   ElTooltip,
@@ -56,6 +58,8 @@ import type { ComponentProps } from './types';
 /**
  * 组件属性
  */
+export type ElCascaderProps = ComponentProps<CascaderProps>;
+
 export type ElIconProps = ComponentProps<IconProps>;
 
 export type ElRowProps = ComponentProps<RowProps>;
@@ -129,6 +133,8 @@ export type ElTreeV2Props = ComponentProps<TreeProps>;
 /**
  * 组件实例
  */
+export type ElCascaderInstance = InstanceType<typeof ElCascader> | null;
+
 export type ElPopperInstance = InstanceType<typeof ElPopper> | null;
 
 export type ElPopoverInstance = InstanceType<typeof ElPopover> | null;

package/es/ele-app/style/overwrite/message-box/index.scss

@@ -60,6 +60,7 @@
   }
 
   .el-message-box__status {
+    flex-shrink: 0;
     font-size: eleVar('message-box', 'status-size');
   }
 
@@ -83,6 +84,10 @@
   }
 }
 
+.el-message-box__message {
+  word-break: break-all;
+}
+
 body .el-overlay.is-message-box > .el-overlay-message-box {
   overflow-x: hidden;
   scrollbar-width: none;

package/es/ele-data-table/index.d.ts

@@ -289,6 +289,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     flexible: BooleanConstructor;
 }>> & {
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
@@ -306,7 +307,6 @@ declare const _default: import("vue").DefineComponent<{
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: DataKey[] | undefined) => any) | undefined;
 }, {

package/es/ele-data-table/index.js

@@ -165,7 +165,7 @@ const index = defineComponent({
       const isChanged = arrayIsChanged(tableState.checked, checked);
       tableState.checked = checked;
       tableState.checkedKeys = checkedKeys;
-      if (isChanged) {
+      if (isChanged || force && arrayIsChanged(methods.getSelectionRows(), checked)) {
         methods.clearSelection();
         checked.forEach((row) => {
           toggleRowSelectionPro(tableRef.value, row, true);

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

@@ -99,10 +99,10 @@ declare const _default: import("vue").DefineComponent<{
     teleported: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
 }>> & {
     onClick?: (() => any) | undefined;
-    "onUpdate:modelValue"?: ((_value: import("element-plus/es/utils/index").EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => any) | undefined;
     onChange?: ((_active: import("element-plus/es/utils/index").EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => any) | undefined;
-    onCommand?: ((_command: import("element-plus/es/utils/index").EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => any) | undefined;
+    "onUpdate:modelValue"?: ((_value: import("element-plus/es/utils/index").EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => any) | undefined;
     onVisibleChange?: ((_visible: boolean) => any) | undefined;
+    onCommand?: ((_command: import("element-plus/es/utils/index").EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => any) | undefined;
 }, {
     size: string;
     trigger: import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>) | ((new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>))[], unknown, unknown>;

package/es/ele-dropdown/index.js

@@ -16,6 +16,7 @@ const _sfc_main = defineComponent({
         "items",
         "modelValue",
         "menuStyle",
+        "iconProps",
         "onCommand",
         "onClick",
         "onVisibleChange"

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

@@ -198,11 +198,11 @@ declare const _default: import("vue").DefineComponent<{
     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>;
 }>> & {
+    "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
     onOpen?: (() => any) | undefined;
     onClose?: (() => any) | undefined;
     onOpenAutoFocus?: (() => any) | undefined;
     onCloseAutoFocus?: (() => any) | undefined;
-    "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
     onOpened?: (() => any) | undefined;
     onClosed?: (() => any) | undefined;
     "onUpdate:fullscreen"?: ((_fullscreen: boolean) => any) | undefined;
@@ -229,8 +229,8 @@ declare const _default: import("vue").DefineComponent<{
     showClose: import("element-plus/es/utils/index").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     ariaLevel: string;
     minWidth: number;
-    minHeight: number;
     multiple: boolean;
+    minHeight: number;
     responsive: boolean;
     resetOnClose: boolean;
     maxable: boolean;

package/es/ele-modal/index.js

@@ -38,6 +38,29 @@ const _sfc_main = defineComponent({
       if (props.form) {
         classes.push("ele-modal-form");
       }
+      if (props.position) {
+        if (props.position === "top") {
+          classes.push("ele-modal-top");
+        } else if (props.position === "bottom") {
+          classes.push("ele-modal-bottom");
+        } else if (props.position === "left") {
+          classes.push("ele-modal-left");
+        } else if (props.position === "right") {
+          classes.push("ele-modal-right");
+        } else if (props.position === "leftTop") {
+          classes.push("ele-modal-left-top");
+        } else if (props.position === "leftBottom") {
+          classes.push("ele-modal-left-bottom");
+        } else if (props.position === "rightTop") {
+          classes.push("ele-modal-right-top");
+        } else if (props.position === "rightBottom") {
+          classes.push("ele-modal-right-bottom");
+        } else if (props.position === "center") {
+          classes.push("ele-modal-center");
+        }
+      } else if (props.alignCenter) {
+        classes.push("ele-modal-center");
+      }
       if (props.draggable) {
         classes.push(movableClass);
       }
@@ -97,7 +120,7 @@ const _sfc_main = defineComponent({
       return classes.join(" ");
     });
     const dialogProps = computed(() => {
-      const opt = {
+      const option = {
         fullscreen: false,
         modal: props.multiple ? false : props.modal,
         appendToBody: false,
@@ -107,7 +130,7 @@ const _sfc_main = defineComponent({
         destroyOnClose: false,
         modalClass: dialogClass.value
       };
-      return Object.assign({}, attrs, pick(props, dialogPropKeys), opt);
+      return Object.assign({}, attrs, pick(props, dialogPropKeys), option);
     });
     const teleportDisabled = computed(() => {
       const appendTo = props.appendTo || "body";
@@ -148,7 +171,7 @@ const _sfc_main = defineComponent({
         if (props.resetOnClose) {
           resetModalStyle(modalEl, props.width, props.top);
         }
-        if (props.position) {
+        if (props.position && typeof props.position === "object") {
           setInitPosition(
             modalEl,
             props.resizable,
@@ -210,7 +233,7 @@ const _sfc_main = defineComponent({
     watch(
       () => props.position,
       (position) => {
-        if (position && props.modelValue) {
+        if (props.modelValue && position && typeof position === "object") {
           setInitPosition(
             getModalEl(),
             props.resizable,

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

@@ -11,15 +11,23 @@
 
   & > .el-overlay-dialog {
     position: absolute;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: center;
 
     & > .el-dialog {
+      padding: 0;
+      position: relative;
       background: eleVar('modal', 'bg');
       border-radius: eleVar('modal', 'radius');
-      padding: 0;
 
+      & > .el-dialog__header,
       & > .el-dialog__footer {
+        flex-shrink: 0;
         border: none;
         padding: 0;
+        margin: 0;
       }
 
       & > .el-dialog__body {
@@ -27,12 +35,6 @@
         color: inherit;
         font-size: inherit;
       }
-
-      & > .el-dialog__header {
-        margin: 0;
-        padding: 0;
-        border: none;
-      }
     }
   }
 
@@ -101,6 +103,55 @@
   }
 }
 
+/* 默认位置 */
+.ele-modal-center > .el-overlay-dialog > .el-dialog,
+.ele-modal-top > .el-overlay-dialog > .el-dialog,
+.ele-modal-bottom > .el-overlay-dialog > .el-dialog,
+.ele-modal-left > .el-overlay-dialog > .el-dialog,
+.ele-modal-right > .el-overlay-dialog > .el-dialog,
+.ele-modal-left-top > .el-overlay-dialog > .el-dialog,
+.ele-modal-left-bottom > .el-overlay-dialog > .el-dialog,
+.ele-modal-right-top > .el-overlay-dialog > .el-dialog,
+.ele-modal-right-bottom > .el-overlay-dialog > .el-dialog {
+  margin: 0;
+}
+
+.ele-modal-center > .el-overlay-dialog {
+  justify-content: center;
+}
+
+.ele-modal-bottom > .el-overlay-dialog {
+  justify-content: flex-end;
+}
+
+.ele-modal-left > .el-overlay-dialog {
+  justify-content: center;
+  align-items: flex-start;
+}
+
+.ele-modal-right > .el-overlay-dialog {
+  justify-content: center;
+  align-items: flex-end;
+}
+
+.ele-modal-left-top > .el-overlay-dialog {
+  align-items: flex-start;
+}
+
+.ele-modal-left-bottom > .el-overlay-dialog {
+  justify-content: flex-end;
+  align-items: flex-start;
+}
+
+.ele-modal-right-top > .el-overlay-dialog {
+  align-items: flex-end;
+}
+
+.ele-modal-right-bottom > .el-overlay-dialog {
+  justify-content: flex-end;
+  align-items: flex-end;
+}
+
 /* 支持拖拽 */
 .ele-modal-movable > .el-overlay-dialog > .el-dialog > .el-dialog__header {
   cursor: move;
@@ -135,10 +186,6 @@
   display: flex;
   flex-direction: column;
 
-  & > .el-dialog__header {
-    flex-shrink: 0;
-  }
-
   & > .el-dialog__body {
     flex: auto;
     overflow: auto;
@@ -186,7 +233,6 @@
 
   & > .el-overlay-dialog {
     pointer-events: none;
-    position: absolute;
     overflow: hidden;
 
     & > .el-dialog {

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,4 +1,4 @@
-import type { Resizable, Position, MoveOut } from './types';
+import type { Resizable, PositionObject, MoveOut } from './types';
 import type { ModalProps } from './props';
 export declare const wrapperClass = "ele-modal";
 export declare const containerId = "ele-modal-container";
@@ -58,7 +58,7 @@ export declare function resetModalStyle(modalEl?: HTMLElement, width?: string |
  * @param resizable 是否可以拉伸
  * @param moveOut 是否可以拉出容器
  */
-export declare function setModalPosition(modalEl?: HTMLElement, resizable?: Resizable, position?: Position, moveOut?: MoveOut): void;
+export declare function setModalPosition(modalEl?: HTMLElement, resizable?: Resizable, position?: PositionObject, moveOut?: MoveOut): void;
 /**
  * 设置弹窗初始位置
  * @param modalEl 弹窗节点
@@ -67,4 +67,4 @@ export declare function setModalPosition(modalEl?: HTMLElement, resizable?: Resi
  * @param moveOut 是否可以拉出容器
  * @param force 是否强制更新
  */
-export declare function setInitPosition(modalEl?: HTMLElement, resizable?: Resizable, position?: Position, moveOut?: MoveOut, force?: boolean): void;
+export declare function setInitPosition(modalEl?: HTMLElement, resizable?: Resizable, position?: PositionObject, moveOut?: MoveOut, force?: boolean): void;

package/es/ele-modal/util.js

@@ -28,7 +28,7 @@ function initModalStyle(modalEl, resizable) {
   modalEl.style.bottom = "auto";
   modalEl.style.right = "auto";
   modalEl.style.margin = "0";
-  modalEl.style.position = "relative";
+  modalEl.style.position = "absolute";
   modalEl.style.display = resizable ? "inline-flex" : "inline-block";
   modalEl.style.verticalAlign = "top";
 }
@@ -245,78 +245,43 @@ function resetModalStyle(modalEl, width, top) {
   modalEl.style.minWidth = "";
 }
 function setModalPosition(modalEl, resizable, position, moveOut) {
-  if (!modalEl) {
+  if (!position || typeof position !== "object" || !modalEl) {
     return;
   }
   const wrapEl = modalEl.parentElement;
   if (!wrapEl) {
     return;
   }
-  const location = {};
   initModalStyle(modalEl, resizable);
+  const location = {};
   const canOutB = canMoveOut(moveOut, "bottom");
   const canOutR = canMoveOut(moveOut, "right");
   const t = wrapEl.clientHeight - modalEl.clientHeight - (canOutB ? 0 : fixTop);
   const maxTop = t < 0 ? 0 : t;
   const l = wrapEl.clientWidth - modalEl.clientWidth - (canOutR ? 0 : fixLeft);
   const maxLeft = l < 0 ? 0 : l;
-  if (position === "top") {
-    location.top = 0;
-    location.left = maxLeft / 2;
-  } else if (position === "bottom") {
-    location.top = maxTop;
-    location.left = maxLeft / 2;
-  } else if (position === "left") {
-    location.top = maxTop / 2;
-    location.left = 0;
-  } else if (position === "right") {
+  if (position.top != null) {
+    location.top = position.top;
+  } else if (position.bottom != null) {
+    location.bottom = position.bottom;
+  } else if (position.left != null || position.right != null) {
     location.top = maxTop / 2;
-    location.left = maxLeft;
-  } else if (position === "leftTop") {
-    location.top = 0;
-    location.left = 0;
-  } else if (position === "leftBottom") {
-    location.top = maxTop;
-    location.left = 0;
-  } else if (position === "rightTop") {
-    location.top = 0;
-    location.left = maxLeft;
-  } else if (position === "rightBottom") {
-    location.top = maxTop;
-    location.left = maxLeft;
-  } else if (position === "center") {
-    location.top = maxTop / 2;
-    location.left = maxLeft / 2;
-  } else if (typeof position === "object") {
-    if (position.top != null) {
-      if (typeof position.top === "number") {
-        location.top = position.top;
-      } else {
-        location.topValue = position.top;
-      }
-    } else if (position.left != null) {
-      location.top = maxTop / 2;
-    }
-    if (position.left != null) {
-      if (typeof position.left === "number") {
-        location.left = position.left;
-      } else {
-        location.leftValue = position.left;
-      }
-    } else if (position.top != null) {
-      location.left = maxLeft / 2;
-    }
   }
-  if (location.top != null) {
-    modalEl.style.top = `${Math.floor(location.top)}px`;
-  } else if (location.topValue != null) {
-    modalEl.style.top = location.topValue;
-  }
-  if (location.left != null) {
-    modalEl.style.left = `${Math.floor(location.left)}px`;
-  } else if (location.leftValue != null) {
-    modalEl.style.left = location.leftValue;
+  if (position.left != null) {
+    location.left = position.left;
+  } else if (position.right != null) {
+    location.right = position.right;
+  } else if (position.top != null || position.bottom != null) {
+    location.left = maxLeft / 2;
   }
+  Object.keys(location).forEach((key) => {
+    const value = location[key];
+    if (typeof value === "number") {
+      modalEl.style[key] = `${Math.floor(value)}px`;
+    } else if (value != null) {
+      modalEl.style[key] = value;
+    }
+  });
 }
 function setInitPosition(modalEl, resizable, position, moveOut, force) {
   const attr = "ele-position";

package/es/ele-printer/util.js

@@ -134,10 +134,12 @@ function usePrinter(done) {
 function printPdf(option) {
   const pFrame = getPrintFrame();
   pFrame.onload = () => {
-    if (!!pFrame.getAttribute("src")) {
+    const url = pFrame.getAttribute("src");
+    if (!!url) {
       pFrame.focus();
       pFrame.contentWindow && pFrame.contentWindow.print(option.options);
       option.done && option.done();
+      URL.revokeObjectURL(url);
     }
   };
   const doPrint2 = (buffer) => {

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

@@ -202,13 +202,13 @@ declare const _default: import("vue").DefineComponent<{
     setScrollTop: (top?: number | undefined) => void;
     setScrollLeft: (left?: number | undefined) => void;
     setCurrentRowKey: (key?: import("../ele-data-table/types").DataKey | null | undefined) => void;
-    getCurrentRow: () => DataItem | undefined;
+    getCurrentRow: () => DataItem | undefined; /** 当前页码 */
     setSelectedRows: (rows?: DataItem[] | undefined) => void;
     setSelectedRowKeys: (keys?: import("../ele-data-table/types").DataKey[] | undefined, rows?: DataItem[] | undefined) => void;
     toggleRowExpansionAll: (expanded?: boolean | undefined) => void;
     updateSelectedAndChecked: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean;
+    done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean; /** 当前页码 */
     'update:selections': (_selections: DataItem[]) => boolean;
     'update:current': (_current?: DataItem | null | undefined) => boolean;
     columnsChange: (_columns: Columns) => boolean;
@@ -227,12 +227,11 @@ declare const _default: import("vue").DefineComponent<{
     rowContextmenu: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
     headerClick: (_column: import("./types").Column, _e: MouseEvent) => boolean;
-    headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean;
+    headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean; /** 当前页码 */
     sortChange: (_sorter: Sorter) => boolean;
-    filterChange: (_filter: Filter) => boolean; /** 每页显示数量 */
+    filterChange: (_filter: Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
     headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    /** 数据请求状态 */
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
     'update:currentRowKey': (_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => boolean;
     'update:selectedRowKeys': (_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => boolean;
@@ -401,6 +400,7 @@ declare const _default: import("vue").DefineComponent<{
     reserveCurrent: BooleanConstructor;
     selectedRowKeys: import("vue").PropType<import("../ele-data-table/types").DataKey[]>;
 }>> & {
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
@@ -418,7 +418,6 @@ declare const _default: import("vue").DefineComponent<{
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => any) | undefined;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => any) | undefined;
     onDone?: ((_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => any) | undefined;

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, watch, onMounted, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps as mergeProps$1, renderSlot, createSlots, renderList, createCommentVNode, createElementBlock, normalizeStyle } from "vue";
+import { defineComponent, ref, computed, watch, onMounted, nextTick, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps as mergeProps$1, renderSlot, createSlots, renderList, createCommentVNode, createElementBlock, normalizeStyle } from "vue";
 import { pick } from "../utils/core";
 import { useGlobalProps, useLicense, UNAUTHORIZED_TIP } from "../ele-config-provider/receiver";
 import EleLoading from "../ele-loading/index";
@@ -249,6 +249,18 @@ const _sfc_main = defineComponent({
       reload(void 0, row, resolve);
     };
     const onDone = (result, parent) => {
+      nextTick(() => {
+        if (props.current != null) {
+          methods.setCurrentRowKey(
+            getValue(props.current, getRowKey(props.rowKey))
+          );
+        }
+        if (props.selections != null && props.selections.length) {
+          methods.setSelectedRowKeys(
+            getRowKeys(props.selections, getRowKey(props.rowKey))
+          );
+        }
+      });
       emit("done", result, parent);
     };
     const onRefresh = () => {

package/lib/ele-app/el.d.ts

@@ -1,5 +1,6 @@
 import type { ExtractPropTypes } from 'vue';
 import type {
+  CascaderProps,
   IconProps,
   RowProps,
   ColProps,
@@ -29,6 +30,7 @@ import type {
   TabPaneProps,
   TableProps,
   TableV2Props,
+  ElCascader,
   ElPopper,
   ElPopover,
   ElTooltip,
@@ -56,6 +58,8 @@ import type { ComponentProps } from './types';
 /**
  * 组件属性
  */
+export type ElCascaderProps = ComponentProps<CascaderProps>;
+
 export type ElIconProps = ComponentProps<IconProps>;
 
 export type ElRowProps = ComponentProps<RowProps>;
@@ -129,6 +133,8 @@ export type ElTreeV2Props = ComponentProps<TreeProps>;
 /**
  * 组件实例
  */
+export type ElCascaderInstance = InstanceType<typeof ElCascader> | null;
+
 export type ElPopperInstance = InstanceType<typeof ElPopper> | null;
 
 export type ElPopoverInstance = InstanceType<typeof ElPopover> | null;

package/lib/ele-app/style/overwrite/message-box/index.scss

@@ -60,6 +60,7 @@
   }
 
   .el-message-box__status {
+    flex-shrink: 0;
     font-size: eleVar('message-box', 'status-size');
   }
 
@@ -83,6 +84,10 @@
   }
 }
 
+.el-message-box__message {
+  word-break: break-all;
+}
+
 body .el-overlay.is-message-box > .el-overlay-message-box {
   overflow-x: hidden;
   scrollbar-width: none;

package/lib/ele-data-table/index.cjs

@@ -166,7 +166,7 @@ const index = vue.defineComponent({
       const isChanged = util.arrayIsChanged(tableState.checked, checked);
       tableState.checked = checked;
       tableState.checkedKeys = checkedKeys;
-      if (isChanged) {
+      if (isChanged || force && util.arrayIsChanged(methods.getSelectionRows(), checked)) {
         methods.clearSelection();
         checked.forEach((row) => {
           util.toggleRowSelectionPro(tableRef.value, row, true);

package/lib/ele-data-table/index.d.ts

@@ -289,6 +289,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     flexible: BooleanConstructor;
 }>> & {
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
@@ -306,7 +307,6 @@ declare const _default: import("vue").DefineComponent<{
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: DataKey[] | undefined) => any) | undefined;
 }, {

package/lib/ele-dropdown/index.cjs

@@ -17,6 +17,7 @@ const _sfc_main = vue.defineComponent({
         "items",
         "modelValue",
         "menuStyle",
+        "iconProps",
         "onCommand",
         "onClick",
         "onVisibleChange"

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

@@ -99,10 +99,10 @@ declare const _default: import("vue").DefineComponent<{
     teleported: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
 }>> & {
     onClick?: (() => any) | undefined;
-    "onUpdate:modelValue"?: ((_value: import("element-plus/es/utils/index").EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => any) | undefined;
     onChange?: ((_active: import("element-plus/es/utils/index").EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => any) | undefined;
-    onCommand?: ((_command: import("element-plus/es/utils/index").EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => any) | undefined;
+    "onUpdate:modelValue"?: ((_value: import("element-plus/es/utils/index").EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => any) | undefined;
     onVisibleChange?: ((_visible: boolean) => any) | undefined;
+    onCommand?: ((_command: import("element-plus/es/utils/index").EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => any) | undefined;
 }, {
     size: string;
     trigger: import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>) | ((new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>))[], unknown, unknown>;

package/lib/ele-modal/index.cjs

@@ -39,6 +39,29 @@ const _sfc_main = vue.defineComponent({
       if (props$1.form) {
         classes.push("ele-modal-form");
       }
+      if (props$1.position) {
+        if (props$1.position === "top") {
+          classes.push("ele-modal-top");
+        } else if (props$1.position === "bottom") {
+          classes.push("ele-modal-bottom");
+        } else if (props$1.position === "left") {
+          classes.push("ele-modal-left");
+        } else if (props$1.position === "right") {
+          classes.push("ele-modal-right");
+        } else if (props$1.position === "leftTop") {
+          classes.push("ele-modal-left-top");
+        } else if (props$1.position === "leftBottom") {
+          classes.push("ele-modal-left-bottom");
+        } else if (props$1.position === "rightTop") {
+          classes.push("ele-modal-right-top");
+        } else if (props$1.position === "rightBottom") {
+          classes.push("ele-modal-right-bottom");
+        } else if (props$1.position === "center") {
+          classes.push("ele-modal-center");
+        }
+      } else if (props$1.alignCenter) {
+        classes.push("ele-modal-center");
+      }
       if (props$1.draggable) {
         classes.push(util.movableClass);
       }
@@ -98,7 +121,7 @@ const _sfc_main = vue.defineComponent({
       return classes.join(" ");
     });
     const dialogProps = vue.computed(() => {
-      const opt = {
+      const option = {
         fullscreen: false,
         modal: props$1.multiple ? false : props$1.modal,
         appendToBody: false,
@@ -108,7 +131,7 @@ const _sfc_main = vue.defineComponent({
         destroyOnClose: false,
         modalClass: dialogClass.value
       };
-      return Object.assign({}, attrs, core.pick(props$1, props.dialogPropKeys), opt);
+      return Object.assign({}, attrs, core.pick(props$1, props.dialogPropKeys), option);
     });
     const teleportDisabled = vue.computed(() => {
       const appendTo = props$1.appendTo || "body";
@@ -149,7 +172,7 @@ const _sfc_main = vue.defineComponent({
         if (props$1.resetOnClose) {
           util.resetModalStyle(modalEl, props$1.width, props$1.top);
         }
-        if (props$1.position) {
+        if (props$1.position && typeof props$1.position === "object") {
           util.setInitPosition(
             modalEl,
             props$1.resizable,
@@ -211,7 +234,7 @@ const _sfc_main = vue.defineComponent({
     vue.watch(
       () => props$1.position,
       (position) => {
-        if (position && props$1.modelValue) {
+        if (props$1.modelValue && position && typeof position === "object") {
           util.setInitPosition(
             getModalEl(),
             props$1.resizable,

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

@@ -198,11 +198,11 @@ declare const _default: import("vue").DefineComponent<{
     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>;
 }>> & {
+    "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
     onOpen?: (() => any) | undefined;
     onClose?: (() => any) | undefined;
     onOpenAutoFocus?: (() => any) | undefined;
     onCloseAutoFocus?: (() => any) | undefined;
-    "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
     onOpened?: (() => any) | undefined;
     onClosed?: (() => any) | undefined;
     "onUpdate:fullscreen"?: ((_fullscreen: boolean) => any) | undefined;
@@ -229,8 +229,8 @@ declare const _default: import("vue").DefineComponent<{
     showClose: import("element-plus/es/utils/index").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     ariaLevel: string;
     minWidth: number;
-    minHeight: number;
     multiple: boolean;
+    minHeight: number;
     responsive: boolean;
     resetOnClose: boolean;
     maxable: boolean;

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

@@ -11,15 +11,23 @@
 
   & > .el-overlay-dialog {
     position: absolute;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: center;
 
     & > .el-dialog {
+      padding: 0;
+      position: relative;
       background: eleVar('modal', 'bg');
       border-radius: eleVar('modal', 'radius');
-      padding: 0;
 
+      & > .el-dialog__header,
       & > .el-dialog__footer {
+        flex-shrink: 0;
         border: none;
         padding: 0;
+        margin: 0;
       }
 
       & > .el-dialog__body {
@@ -27,12 +35,6 @@
         color: inherit;
         font-size: inherit;
       }
-
-      & > .el-dialog__header {
-        margin: 0;
-        padding: 0;
-        border: none;
-      }
     }
   }
 
@@ -101,6 +103,55 @@
   }
 }
 
+/* 默认位置 */
+.ele-modal-center > .el-overlay-dialog > .el-dialog,
+.ele-modal-top > .el-overlay-dialog > .el-dialog,
+.ele-modal-bottom > .el-overlay-dialog > .el-dialog,
+.ele-modal-left > .el-overlay-dialog > .el-dialog,
+.ele-modal-right > .el-overlay-dialog > .el-dialog,
+.ele-modal-left-top > .el-overlay-dialog > .el-dialog,
+.ele-modal-left-bottom > .el-overlay-dialog > .el-dialog,
+.ele-modal-right-top > .el-overlay-dialog > .el-dialog,
+.ele-modal-right-bottom > .el-overlay-dialog > .el-dialog {
+  margin: 0;
+}
+
+.ele-modal-center > .el-overlay-dialog {
+  justify-content: center;
+}
+
+.ele-modal-bottom > .el-overlay-dialog {
+  justify-content: flex-end;
+}
+
+.ele-modal-left > .el-overlay-dialog {
+  justify-content: center;
+  align-items: flex-start;
+}
+
+.ele-modal-right > .el-overlay-dialog {
+  justify-content: center;
+  align-items: flex-end;
+}
+
+.ele-modal-left-top > .el-overlay-dialog {
+  align-items: flex-start;
+}
+
+.ele-modal-left-bottom > .el-overlay-dialog {
+  justify-content: flex-end;
+  align-items: flex-start;
+}
+
+.ele-modal-right-top > .el-overlay-dialog {
+  align-items: flex-end;
+}
+
+.ele-modal-right-bottom > .el-overlay-dialog {
+  justify-content: flex-end;
+  align-items: flex-end;
+}
+
 /* 支持拖拽 */
 .ele-modal-movable > .el-overlay-dialog > .el-dialog > .el-dialog__header {
   cursor: move;
@@ -135,10 +186,6 @@
   display: flex;
   flex-direction: column;
 
-  & > .el-dialog__header {
-    flex-shrink: 0;
-  }
-
   & > .el-dialog__body {
     flex: auto;
     overflow: auto;
@@ -186,7 +233,6 @@
 
   & > .el-overlay-dialog {
     pointer-events: none;
-    position: absolute;
     overflow: hidden;
 
     & > .el-dialog {

package/lib/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/lib/ele-modal/util.cjs

@@ -30,7 +30,7 @@ function initModalStyle(modalEl, resizable) {
   modalEl.style.bottom = "auto";
   modalEl.style.right = "auto";
   modalEl.style.margin = "0";
-  modalEl.style.position = "relative";
+  modalEl.style.position = "absolute";
   modalEl.style.display = resizable ? "inline-flex" : "inline-block";
   modalEl.style.verticalAlign = "top";
 }
@@ -247,78 +247,43 @@ function resetModalStyle(modalEl, width, top) {
   modalEl.style.minWidth = "";
 }
 function setModalPosition(modalEl, resizable, position, moveOut) {
-  if (!modalEl) {
+  if (!position || typeof position !== "object" || !modalEl) {
     return;
   }
   const wrapEl = modalEl.parentElement;
   if (!wrapEl) {
     return;
   }
-  const location = {};
   initModalStyle(modalEl, resizable);
+  const location = {};
   const canOutB = canMoveOut(moveOut, "bottom");
   const canOutR = canMoveOut(moveOut, "right");
   const t = wrapEl.clientHeight - modalEl.clientHeight - (canOutB ? 0 : fixTop);
   const maxTop = t < 0 ? 0 : t;
   const l = wrapEl.clientWidth - modalEl.clientWidth - (canOutR ? 0 : fixLeft);
   const maxLeft = l < 0 ? 0 : l;
-  if (position === "top") {
-    location.top = 0;
-    location.left = maxLeft / 2;
-  } else if (position === "bottom") {
-    location.top = maxTop;
-    location.left = maxLeft / 2;
-  } else if (position === "left") {
-    location.top = maxTop / 2;
-    location.left = 0;
-  } else if (position === "right") {
+  if (position.top != null) {
+    location.top = position.top;
+  } else if (position.bottom != null) {
+    location.bottom = position.bottom;
+  } else if (position.left != null || position.right != null) {
     location.top = maxTop / 2;
-    location.left = maxLeft;
-  } else if (position === "leftTop") {
-    location.top = 0;
-    location.left = 0;
-  } else if (position === "leftBottom") {
-    location.top = maxTop;
-    location.left = 0;
-  } else if (position === "rightTop") {
-    location.top = 0;
-    location.left = maxLeft;
-  } else if (position === "rightBottom") {
-    location.top = maxTop;
-    location.left = maxLeft;
-  } else if (position === "center") {
-    location.top = maxTop / 2;
-    location.left = maxLeft / 2;
-  } else if (typeof position === "object") {
-    if (position.top != null) {
-      if (typeof position.top === "number") {
-        location.top = position.top;
-      } else {
-        location.topValue = position.top;
-      }
-    } else if (position.left != null) {
-      location.top = maxTop / 2;
-    }
-    if (position.left != null) {
-      if (typeof position.left === "number") {
-        location.left = position.left;
-      } else {
-        location.leftValue = position.left;
-      }
-    } else if (position.top != null) {
-      location.left = maxLeft / 2;
-    }
   }
-  if (location.top != null) {
-    modalEl.style.top = `${Math.floor(location.top)}px`;
-  } else if (location.topValue != null) {
-    modalEl.style.top = location.topValue;
-  }
-  if (location.left != null) {
-    modalEl.style.left = `${Math.floor(location.left)}px`;
-  } else if (location.leftValue != null) {
-    modalEl.style.left = location.leftValue;
+  if (position.left != null) {
+    location.left = position.left;
+  } else if (position.right != null) {
+    location.right = position.right;
+  } else if (position.top != null || position.bottom != null) {
+    location.left = maxLeft / 2;
   }
+  Object.keys(location).forEach((key) => {
+    const value = location[key];
+    if (typeof value === "number") {
+      modalEl.style[key] = `${Math.floor(value)}px`;
+    } else if (value != null) {
+      modalEl.style[key] = value;
+    }
+  });
 }
 function setInitPosition(modalEl, resizable, position, moveOut, force) {
   const attr = "ele-position";

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

@@ -1,4 +1,4 @@
-import type { Resizable, Position, MoveOut } from './types';
+import type { Resizable, PositionObject, MoveOut } from './types';
 import type { ModalProps } from './props';
 export declare const wrapperClass = "ele-modal";
 export declare const containerId = "ele-modal-container";
@@ -58,7 +58,7 @@ export declare function resetModalStyle(modalEl?: HTMLElement, width?: string |
  * @param resizable 是否可以拉伸
  * @param moveOut 是否可以拉出容器
  */
-export declare function setModalPosition(modalEl?: HTMLElement, resizable?: Resizable, position?: Position, moveOut?: MoveOut): void;
+export declare function setModalPosition(modalEl?: HTMLElement, resizable?: Resizable, position?: PositionObject, moveOut?: MoveOut): void;
 /**
  * 设置弹窗初始位置
  * @param modalEl 弹窗节点
@@ -67,4 +67,4 @@ export declare function setModalPosition(modalEl?: HTMLElement, resizable?: Resi
  * @param moveOut 是否可以拉出容器
  * @param force 是否强制更新
  */
-export declare function setInitPosition(modalEl?: HTMLElement, resizable?: Resizable, position?: Position, moveOut?: MoveOut, force?: boolean): void;
+export declare function setInitPosition(modalEl?: HTMLElement, resizable?: Resizable, position?: PositionObject, moveOut?: MoveOut, force?: boolean): void;

package/lib/ele-printer/util.cjs

@@ -136,10 +136,12 @@ function usePrinter(done) {
 function printPdf(option) {
   const pFrame = getPrintFrame();
   pFrame.onload = () => {
-    if (!!pFrame.getAttribute("src")) {
+    const url = pFrame.getAttribute("src");
+    if (!!url) {
       pFrame.focus();
       pFrame.contentWindow && pFrame.contentWindow.print(option.options);
       option.done && option.done();
+      URL.revokeObjectURL(url);
     }
   };
   const doPrint2 = (buffer) => {

package/lib/ele-pro-table/index.cjs

@@ -250,6 +250,18 @@ const _sfc_main = vue.defineComponent({
       reload(void 0, row, resolve);
     };
     const onDone = (result, parent) => {
+      vue.nextTick(() => {
+        if (props2.current != null) {
+          methods.setCurrentRowKey(
+            util.getValue(props2.current, util$1.getRowKey(props2.rowKey))
+          );
+        }
+        if (props2.selections != null && props2.selections.length) {
+          methods.setSelectedRowKeys(
+            util.getRowKeys(props2.selections, util$1.getRowKey(props2.rowKey))
+          );
+        }
+      });
       emit("done", result, parent);
     };
     const onRefresh = () => {

package/lib/ele-pro-table/index.d.ts

@@ -202,13 +202,13 @@ declare const _default: import("vue").DefineComponent<{
     setScrollTop: (top?: number | undefined) => void;
     setScrollLeft: (left?: number | undefined) => void;
     setCurrentRowKey: (key?: import("../ele-data-table/types").DataKey | null | undefined) => void;
-    getCurrentRow: () => DataItem | undefined;
+    getCurrentRow: () => DataItem | undefined; /** 当前页码 */
     setSelectedRows: (rows?: DataItem[] | undefined) => void;
     setSelectedRowKeys: (keys?: import("../ele-data-table/types").DataKey[] | undefined, rows?: DataItem[] | undefined) => void;
     toggleRowExpansionAll: (expanded?: boolean | undefined) => void;
     updateSelectedAndChecked: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean;
+    done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean; /** 当前页码 */
     'update:selections': (_selections: DataItem[]) => boolean;
     'update:current': (_current?: DataItem | null | undefined) => boolean;
     columnsChange: (_columns: Columns) => boolean;
@@ -227,12 +227,11 @@ declare const _default: import("vue").DefineComponent<{
     rowContextmenu: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
     headerClick: (_column: import("./types").Column, _e: MouseEvent) => boolean;
-    headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean;
+    headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean; /** 当前页码 */
     sortChange: (_sorter: Sorter) => boolean;
-    filterChange: (_filter: Filter) => boolean; /** 每页显示数量 */
+    filterChange: (_filter: Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
     headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    /** 数据请求状态 */
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
     'update:currentRowKey': (_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => boolean;
     'update:selectedRowKeys': (_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => boolean;
@@ -401,6 +400,7 @@ declare const _default: import("vue").DefineComponent<{
     reserveCurrent: BooleanConstructor;
     selectedRowKeys: import("vue").PropType<import("../ele-data-table/types").DataKey[]>;
 }>> & {
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
@@ -418,7 +418,6 @@ declare const _default: import("vue").DefineComponent<{
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => any) | undefined;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => any) | undefined;
     onDone?: ((_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => any) | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.1.9-beta.1",
+  "version": "1.1.9-beta.3",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",