ele-admin-plus 1.1.9-beta.2 → 1.1.9-beta.4

package/es/ele-menus/util.js

@@ -5,26 +5,22 @@ import { isExternalLink, getCurrentStyle, debounce } from "../utils/core";
 import { ArrowDown, ArrowRight } from "../icons";
 const linkClass = "ele-menu-link";
 const titleClass = "ele-menu-title";
+const triggerClass = "ele-menu-trigger";
 const overflowClass = "ele-menu-overflow";
 const ellipsisClass = "ele-sub-menu-ellipsis";
-function getLinkNode(item, onItemClick) {
-  if (!(item == null ? void 0 : item.path)) {
-    return;
-  }
-  if (isExternalLink(item.path)) {
+function getLinkNode(path) {
+  if (isExternalLink(path)) {
     return h("a", {
-      href: item.path,
+      href: path,
       target: "_blank",
-      class: linkClass,
-      onClick: (e) => {
-        e.stopPropagation();
-        onItemClick && onItemClick(item);
-      }
+      class: linkClass
     });
   }
-  return h(RouterLink, { to: item.path, class: linkClass });
+  if (path) {
+    return h(RouterLink, { to: path, class: linkClass });
+  }
 }
-function getNodes(icons, titles, badge, link) {
+function getNodes(icons, titles, badge, trigger) {
   const nodes = [];
   if (icons) {
     icons.forEach((t) => {
@@ -39,18 +35,19 @@ function getNodes(icons, titles, badge, link) {
   if (badge) {
     nodes.push(badge);
   }
-  if (link) {
-    nodes.push(link);
+  if (trigger) {
+    nodes.push(trigger);
   }
   return nodes;
 }
-function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorful, popupColorful, firstPopClass, first, onItemClick) {
+function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorful, popupColorful, firstPopClass, first, onItemClick, onItemMouseenter, onItemMouseleave, webkit) {
   const nodes = [];
   if (!items) {
     return nodes;
   }
   items.forEach((item) => {
     var _a;
+    const key = item.key || item.index || item.path;
     const iNodes = sIcon ? sIcon({ item, icon: item.icon }) ?? [] : [];
     if (!iNodes.length && item.icon) {
       iNodes.push(
@@ -65,27 +62,40 @@ function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorfu
     }
     const bNode = item.badge != null ? h(ElBadge, item.badge) : null;
     if (!((_a = item.children) == null ? void 0 : _a.length)) {
-      const linkNode = getLinkNode(item, onItemClick);
-      const key = item.key || item.index || item.path;
+      const triggerNode = h(
+        "div",
+        {
+          class: triggerClass,
+          onClick: (e) => {
+            onItemClick && onItemClick(item, e);
+          },
+          onMouseenter: (e) => {
+            onItemMouseenter && onItemMouseenter(item, e);
+          },
+          onMouseleave: (e) => {
+            onItemMouseleave && onItemMouseleave(item, e);
+          }
+        },
+        getLinkNode(item.path)
+      );
       nodes.push(
         h(
           ElMenuItem,
           {
             key: key + "-" + tipDisabled,
-            index: item.index,
+            index: item.index || item.path,
             route: item.route,
             disabled: item.disabled,
             class: item.overflow ? overflowClass : void 0,
             onClick: () => {
-              onItemClick && onItemClick(item);
             }
           },
           {
             default: () => {
-              if (!first || tipDisabled) {
-                return getNodes(iNodes, tNodes, bNode, linkNode);
+              if (first && !tipDisabled) {
+                return getNodes(iNodes, void 0, bNode, triggerNode);
               }
-              return getNodes(iNodes, void 0, bNode, linkNode);
+              return getNodes(iNodes, tNodes, bNode, triggerNode);
             },
             title: first && !tipDisabled ? () => tNodes : void 0
           }
@@ -95,47 +105,45 @@ function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorfu
     }
     if (item.group === true) {
       nodes.push(
-        h(
-          ElMenuItemGroup,
-          { key: item.key || item.index },
-          {
-            default: () => {
-              return renderItems(
-                item.children,
-                sIcon,
-                sTitle,
-                tipDisabled,
-                theme,
-                popTheme,
-                colorful,
-                popupColorful,
-                firstPopClass,
-                first,
-                onItemClick
-              );
-            },
-            title: () => getNodes(iNodes, tNodes, bNode)
-          }
-        )
+        h(ElMenuItemGroup, { key }, {
+          default: () => {
+            return renderItems(
+              item.children,
+              sIcon,
+              sTitle,
+              tipDisabled,
+              theme,
+              popTheme,
+              colorful,
+              popupColorful,
+              firstPopClass,
+              first,
+              onItemClick,
+              onItemMouseenter,
+              onItemMouseleave
+            );
+          },
+          title: () => getNodes(iNodes, tNodes, bNode)
+        })
       );
       return;
     }
-    const popperClass = getPopperClass(
-      item.popperClass,
-      theme,
-      popTheme,
-      colorful,
-      popupColorful,
-      firstPopClass,
-      first
-    );
     nodes.push(
       h(
         ElSubMenu,
         {
-          key: item.key || item.index,
-          index: item.index,
-          popperClass,
+          key,
+          index: item.index || item.path,
+          popperClass: getPopperClass(
+            item.popperClass,
+            theme,
+            popTheme,
+            colorful,
+            popupColorful,
+            firstPopClass,
+            first,
+            webkit
+          ),
           showTimeout: item.showTimeout,
           hideTimeout: item.hideTimeout,
           disabled: item.disabled,
@@ -164,7 +172,9 @@ function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorfu
               popupColorful,
               firstPopClass,
               false,
-              onItemClick
+              onItemClick,
+              onItemMouseenter,
+              onItemMouseleave
             );
           },
           title: () => getNodes(iNodes, tNodes, bNode)
@@ -174,6 +184,25 @@ function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorfu
   });
   return nodes;
 }
+function getPopperClass(customerClass, theme, popTheme, colorful, popupColorful, firstPopClass, first, webkit) {
+  const popperClass = ["ele-menu"];
+  if (webkit) {
+    popperClass.push("is-webkit");
+  }
+  if (popTheme === "dark" || popTheme === "auto" && theme === "dark") {
+    popperClass.push("is-night ele-menu-dark");
+  }
+  if (popupColorful === true || popupColorful === "auto" && colorful) {
+    popperClass.push("is-colorful ele-menu-colorful");
+  }
+  if (first && firstPopClass) {
+    popperClass.push(firstPopClass);
+  }
+  if (customerClass) {
+    popperClass.push(customerClass);
+  }
+  return popperClass.join(" ");
+}
 function getMenuItems(menus, index, horizontal) {
   if (!horizontal || !menus || !menus.length) {
     return { items: menus };
@@ -188,36 +217,16 @@ function getMenuItems(menus, index, horizontal) {
   const moreItems = index === 0 ? data : data.slice(index);
   moreItems.forEach((d) => {
     var _a;
-    const children = ((_a = d.children) == null ? void 0 : _a.length) ? [null] : void 0;
     items.push({
       ...d,
+      key: `overflow-${d.key || d.index || d.path}`,
+      index: `overflow-${d.index || d.path}`,
       overflow: true,
-      key: `overflow-${d.key || d.index}`,
-      index: `overflow-${d.index}`,
-      children
+      children: ((_a = d.children) == null ? void 0 : _a.length) ? [null] : void 0
     });
   });
   return { items, moreItems };
 }
-function getPopperClass(customerClass, theme, popTheme, colorful, popupColorful, firstPopClass, first) {
-  const popperClass = ["ele-menu"];
-  if (navigator.userAgent.includes("WebKit")) {
-    popperClass.push("is-webkit");
-  }
-  if (popTheme === "dark" || popTheme === "auto" && theme === "dark") {
-    popperClass.push("is-night ele-menu-dark");
-  }
-  if (popupColorful === true || popupColorful === "auto" && colorful) {
-    popperClass.push("is-colorful ele-menu-colorful");
-  }
-  if (first && firstPopClass) {
-    popperClass.push(firstPopClass);
-  }
-  if (customerClass) {
-    popperClass.push(customerClass);
-  }
-  return popperClass.join(" ");
-}
 function getMenuWidth(el) {
   if (!el) {
     return;
@@ -237,8 +246,7 @@ function getItemWidth(el) {
   return el.offsetWidth + ml + mr;
 }
 function getMenuChilds(el) {
-  const childs = Array.from(el.childNodes ?? []);
-  return childs.filter((t) => {
+  return Array.from(el.childNodes ?? []).filter((t) => {
     return t.nodeName === "LI" && !t.classList.contains(ellipsisClass);
   });
 }
@@ -310,5 +318,6 @@ export {
   overflowClass,
   renderItems,
   titleClass,
+  triggerClass,
   useMenuEllipsis
 };

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) => {