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

package/lib/ele-pro-layout/components/pro-iframe.cjs

@@ -22,20 +22,22 @@ const _sfc_main = vue.defineComponent({
     const visible = vue.ref(false);
     const active = vue.ref(null);
     const data = vue.computed(() => {
-      const result = [];
+      const list = [];
       props.tabData.forEach((t) => {
         var _a, _b;
         const isAlive = ((_a = t.meta) == null ? void 0 : _a.keepAlive) !== false;
-        if (t.key && ((_b = t.meta) == null ? void 0 : _b.iframe) && !t.refresh && isAlive) {
-          result.push({ id: t.key, src: t.meta.iframe });
+        if (t.key && ((_b = t.meta) == null ? void 0 : _b.iframe) && isAlive) {
+          list.push({ id: t.key, src: t.meta.iframe, refresh: t.refresh });
         }
       });
-      return result;
+      return list.sort((a, b) => a.id === b.id ? 0 : a.id > b.id ? 1 : -1);
     });
     const onAfterLeave = (delay) => {
       if (props.tabActive && data.value.length && data.value.some((d) => d.id === props.tabActive)) {
         if (delay) {
+          clearTimer();
           state.timer = setTimeout(() => {
+            state.timer = null;
             visible.value = true;
             vue.nextTick(() => {
               active.value = props.tabActive;
@@ -43,9 +45,7 @@ const _sfc_main = vue.defineComponent({
           }, delay);
         } else {
           visible.value = true;
-          vue.nextTick(() => {
-            active.value = props.tabActive;
-          });
+          active.value = props.tabActive;
         }
       } else {
         visible.value = false;
@@ -53,7 +53,7 @@ const _sfc_main = vue.defineComponent({
       }
     };
     const clearTimer = () => {
-      if (state.timer) {
+      if (state.timer != null) {
         clearTimeout(state.timer);
         state.timer = null;
       }
@@ -63,10 +63,14 @@ const _sfc_main = vue.defineComponent({
       () => {
         clearTimer();
         if (visible.value) {
-          active.value = null;
-        } else {
-          onAfterLeave(props.transitionDelay);
+          if (!props.transitionName) {
+            onAfterLeave();
+          } else {
+            active.value = null;
+          }
+          return;
         }
+        onAfterLeave(props.transitionName ? props.transitionDelay : void 0);
       }
     );
     vue.onBeforeUnmount(() => {
@@ -88,28 +92,47 @@ const _export_sfc = (sfc, props) => {
   return target;
 };
 const _hoisted_1 = { class: "ele-admin-iframe-wrap" };
-const _hoisted_2 = ["id", "src"];
+const _hoisted_2 = ["data-id", "src"];
+const _hoisted_3 = ["data-id", "src"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return vue.withDirectives((vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
-    vue.createVNode(vue.TransitionGroup, {
+    !_ctx.transitionName ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(_ctx.data, (item) => {
+      return vue.openBlock(), vue.createElementBlock(vue.Fragment, {
+        key: item.id
+      }, [
+        !item.refresh ? vue.withDirectives((vue.openBlock(), vue.createElementBlock("iframe", {
+          key: 0,
+          "data-id": item.id,
+          src: item.src,
+          class: "ele-admin-iframe"
+        }, null, 8, _hoisted_2)), [
+          [vue.vShow, _ctx.active === item.id]
+        ]) : vue.createCommentVNode("", true)
+      ], 64);
+    }), 128)) : (vue.openBlock(), vue.createBlock(vue.TransitionGroup, {
+      key: 1,
       appear: true,
       name: _ctx.transitionName,
       onAfterLeave: _cache[0] || (_cache[0] = ($event) => _ctx.onAfterLeave())
     }, {
       default: vue.withCtx(() => [
         (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.data, (item) => {
-          return vue.withDirectives((vue.openBlock(), vue.createElementBlock("iframe", {
-            key: item.id,
-            id: item.id,
-            src: item.src,
-            class: "ele-admin-iframe"
-          }, null, 8, _hoisted_2)), [
-            [vue.vShow, _ctx.active === item.id]
-          ]);
+          return vue.openBlock(), vue.createElementBlock(vue.Fragment, {
+            key: item.id
+          }, [
+            !item.refresh ? vue.withDirectives((vue.openBlock(), vue.createElementBlock("iframe", {
+              key: 0,
+              "data-id": item.id,
+              src: item.src,
+              class: "ele-admin-iframe"
+            }, null, 8, _hoisted_3)), [
+              [vue.vShow, _ctx.active === item.id]
+            ]) : vue.createCommentVNode("", true)
+          ], 64);
         }), 128))
       ]),
       _: 1
-    }, 8, ["name"])
+    }, 8, ["name"]))
   ], 512)), [
     [vue.vShow, _ctx.visible]
   ]);

package/lib/ele-pro-layout/components/pro-sidebar.cjs

@@ -20,23 +20,25 @@ const _sfc_main = vue.defineComponent({
     active: String,
     /** 是否折叠 */
     collapse: Boolean,
-    /** 是否只保持一个子菜单展开 */
+    /** 是否只保持一个父级菜单展开 */
     uniqueOpened: Boolean,
-    /** 默认展开的子菜单 */
+    /** 默认展开的父级菜单 */
     defaultOpeneds: Array,
-    /** tooltip 主题 */
+    /** 菜单折叠提示气泡主题 */
     popperEffect: String,
-    /** 菜单项触发模式 */
+    /** 子菜单项触发模式 */
     itemTrigger: String,
-    /** 标题插槽名称 */
+    /** 菜单标题插槽名称 */
     titleSlot: String,
-    /** 图标插槽名称 */
+    /** 菜单图标插槽名称 */
     iconSlot: String
   },
   emits: {
     open: (_index, _indexPath) => true,
     close: (_index, _indexPath) => true,
-    itemClick: (_item) => true
+    itemClick: (_item, _e) => true,
+    mouseEnter: (_e) => true,
+    mouseLeave: (_e) => true
   },
   setup(props, { emit }) {
     const { scrollIntoView } = util.useMenuScroll(() => {
@@ -45,7 +47,10 @@ const _sfc_main = vue.defineComponent({
     });
     const menusRef = vue.ref(null);
     const menuItems = vue.computed(() => {
-      return util.getMenuItems(props.menus, props.itemTrigger != "click");
+      return util.getMenuItems(
+        props.menus,
+        props.itemTrigger !== "click" && props.itemTrigger !== "hover"
+      );
     });
     const onOpen = (index, indexPath) => {
       emit("open", index, indexPath);
@@ -53,15 +58,29 @@ const _sfc_main = vue.defineComponent({
     const onClose = (index, indexPath) => {
       emit("close", index, indexPath);
     };
-    const onItemClick = (item) => {
-      emit("itemClick", item);
+    const onItemClick = (item, e) => {
+      emit("itemClick", item, e);
+    };
+    const onMouseenter = (e) => {
+      emit("mouseEnter", e);
+    };
+    const onMouseleave = (e) => {
+      emit("mouseLeave", e);
     };
     vue.watch([() => props.active, () => props.collapse], () => {
       vue.nextTick(() => {
         scrollIntoView();
       });
     });
-    return { menusRef, menuItems, onOpen, onClose, onItemClick };
+    return {
+      menusRef,
+      menuItems,
+      onOpen,
+      onClose,
+      onItemClick,
+      onMouseenter,
+      onMouseleave
+    };
   }
 });
 const _export_sfc = (sfc, props) => {
@@ -71,11 +90,14 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const _hoisted_1 = { class: "ele-admin-sidebar" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleMenus = vue.resolveComponent("EleMenus");
   const _component_ElScrollbar = vue.resolveComponent("ElScrollbar");
-  return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
+  return vue.openBlock(), vue.createElementBlock("div", {
+    class: "ele-admin-sidebar",
+    onMouseenter: _cache[0] || (_cache[0] = (...args) => _ctx.onMouseenter && _ctx.onMouseenter(...args)),
+    onMouseleave: _cache[1] || (_cache[1] = (...args) => _ctx.onMouseleave && _ctx.onMouseleave(...args))
+  }, [
     vue.renderSlot(_ctx.$slots, "top"),
     vue.createVNode(_component_ElScrollbar, {
       ref: "menusRef",
@@ -116,7 +138,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       _: 3
     }, 512),
     vue.renderSlot(_ctx.$slots, "bottom")
-  ]);
+  ], 32);
 }
 const proSidebar = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 module.exports = proSidebar;

package/lib/ele-pro-layout/components/pro-sidebar.d.ts

@@ -15,28 +15,32 @@ declare const _default: import("vue").DefineComponent<{
     active: StringConstructor;
     /** 是否折叠 */
     collapse: BooleanConstructor;
-    /** 是否只保持一个子菜单展开 */
+    /** 是否只保持一个父级菜单展开 */
     uniqueOpened: BooleanConstructor;
-    /** 默认展开的子菜单 */
+    /** 默认展开的父级菜单 */
     defaultOpeneds: PropType<string[]>;
-    /** tooltip 主题 */
+    /** 菜单折叠提示气泡主题 */
     popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
-    /** 菜单项触发模式 */
+    /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
-    /** 标题插槽名称 */
+    /** 菜单标题插槽名称 */
     titleSlot: StringConstructor;
-    /** 图标插槽名称 */
+    /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
 }, {
     menusRef: import("vue").Ref<ElScrollbarInstance>;
     menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
     onOpen: (index: string, indexPath: string[]) => void;
     onClose: (index: string, indexPath: string[]) => void;
-    onItemClick: (item: MenuItemProps) => void;
+    onItemClick: (item: MenuItemProps, e: MouseEvent) => void;
+    onMouseenter: (e: MouseEvent) => void;
+    onMouseleave: (e: MouseEvent) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     open: (_index: string, _indexPath: string[]) => true;
     close: (_index: string, _indexPath: string[]) => true;
-    itemClick: (_item: MenuItemProps) => true;
+    itemClick: (_item: MenuItemProps, _e: MouseEvent) => true;
+    mouseEnter: (_e: MouseEvent) => true;
+    mouseLeave: (_e: MouseEvent) => true;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 菜单数据 */
     menus: {
@@ -51,22 +55,24 @@ declare const _default: import("vue").DefineComponent<{
     active: StringConstructor;
     /** 是否折叠 */
     collapse: BooleanConstructor;
-    /** 是否只保持一个子菜单展开 */
+    /** 是否只保持一个父级菜单展开 */
     uniqueOpened: BooleanConstructor;
-    /** 默认展开的子菜单 */
+    /** 默认展开的父级菜单 */
     defaultOpeneds: PropType<string[]>;
-    /** tooltip 主题 */
+    /** 菜单折叠提示气泡主题 */
     popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
-    /** 菜单项触发模式 */
+    /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
-    /** 标题插槽名称 */
+    /** 菜单标题插槽名称 */
     titleSlot: StringConstructor;
-    /** 图标插槽名称 */
+    /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
 }>> & {
     onOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
-    onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>) => any) | undefined;
+    onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
+    onMouseEnter?: ((_e: MouseEvent) => any) | undefined;
+    onMouseLeave?: ((_e: MouseEvent) => any) | undefined;
 }, {
     uniqueOpened: boolean;
     collapse: boolean;

package/lib/ele-pro-layout/components/pro-sidebox.cjs

@@ -22,17 +22,21 @@ const _sfc_main = vue.defineComponent({
     compact: Boolean,
     /** 二级侧栏是否折叠 */
     collapse: Boolean,
-    /** tooltip 主题 */
+    /** 菜单折叠提示气泡主题 */
     popperEffect: String,
-    /** 菜单项触发模式 */
+    /** 子菜单项触发模式 */
     itemTrigger: String,
-    /** 标题插槽名称 */
+    /** 菜单标题插槽名称 */
     titleSlot: String,
-    /** 图标插槽名称 */
+    /** 菜单图标插槽名称 */
     iconSlot: String
   },
   emits: {
-    itemClick: (_item) => true
+    itemClick: (_item, _e) => true,
+    itemMouseenter: (_item, _e) => true,
+    itemMouseleave: (_item, _e) => true,
+    mouseEnter: (_e) => true,
+    mouseLeave: (_e) => true
   },
   setup(props, { emit }) {
     const { scrollIntoView } = util.useMenuScroll(() => {
@@ -41,17 +45,40 @@ const _sfc_main = vue.defineComponent({
     });
     const menusRef = vue.ref(null);
     const menuItems = vue.computed(() => {
-      return util.getMenuItems(props.menus, props.itemTrigger != "click");
+      return util.getMenuItems(
+        props.menus,
+        props.itemTrigger !== "click" && props.itemTrigger !== "hover"
+      );
     });
-    const onItemClick = (item) => {
-      emit("itemClick", item);
+    const onItemClick = (item, e) => {
+      emit("itemClick", item, e);
+    };
+    const onItemMouseenter = (item, e) => {
+      emit("itemMouseenter", item, e);
+    };
+    const onItemMouseleave = (item, e) => {
+      emit("itemMouseleave", item, e);
+    };
+    const onMouseenter = (e) => {
+      emit("mouseEnter", e);
+    };
+    const onMouseleave = (e) => {
+      emit("mouseLeave", e);
     };
     vue.watch([() => props.active, () => props.compact], () => {
       vue.nextTick(() => {
         scrollIntoView();
       });
     });
-    return { menusRef, menuItems, onItemClick };
+    return {
+      menusRef,
+      menuItems,
+      onItemClick,
+      onItemMouseenter,
+      onItemMouseleave,
+      onMouseenter,
+      onMouseleave
+    };
   }
 });
 const _export_sfc = (sfc, props) => {
@@ -61,11 +88,14 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const _hoisted_1 = { class: "ele-admin-sidebox" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleMenus = vue.resolveComponent("EleMenus");
   const _component_ElScrollbar = vue.resolveComponent("ElScrollbar");
-  return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
+  return vue.openBlock(), vue.createElementBlock("div", {
+    class: "ele-admin-sidebox",
+    onMouseenter: _cache[0] || (_cache[0] = (...args) => _ctx.onMouseenter && _ctx.onMouseenter(...args)),
+    onMouseleave: _cache[1] || (_cache[1] = (...args) => _ctx.onMouseleave && _ctx.onMouseleave(...args))
+  }, [
     vue.renderSlot(_ctx.$slots, "boxTop"),
     vue.createVNode(_component_ElScrollbar, {
       ref: "menusRef",
@@ -84,7 +114,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           collapseTransition: false,
           firstPopperClass: "ele-admin-sidebox-popup",
           tooltipDisabled: !_ctx.compact,
-          onItemClick: _ctx.onItemClick
+          onItemClick: _ctx.onItemClick,
+          onItemMouseenter: _ctx.onItemMouseenter,
+          onItemMouseleave: _ctx.onItemMouseleave
         }, vue.createSlots({ _: 2 }, [
           _ctx.iconSlot && !["boxTop", "boxBottom"].includes(_ctx.iconSlot) && _ctx.$slots[_ctx.iconSlot] ? {
             name: "icon",
@@ -100,12 +132,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ]),
             key: "1"
           } : void 0
-        ]), 1032, ["items", "theme", "popupColorful", "collapse", "defaultActive", "popperEffect", "tooltipDisabled", "onItemClick"])) : vue.createCommentVNode("", true)
+        ]), 1032, ["items", "theme", "popupColorful", "collapse", "defaultActive", "popperEffect", "tooltipDisabled", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : vue.createCommentVNode("", true)
       ]),
       _: 3
     }, 512),
     vue.renderSlot(_ctx.$slots, "boxBottom")
-  ]);
+  ], 32);
 }
 const proSidebox = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 module.exports = proSidebox;

package/lib/ele-pro-layout/components/pro-sidebox.d.ts

@@ -17,20 +17,28 @@ declare const _default: import("vue").DefineComponent<{
     compact: BooleanConstructor;
     /** 二级侧栏是否折叠 */
     collapse: BooleanConstructor;
-    /** tooltip 主题 */
+    /** 菜单折叠提示气泡主题 */
     popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
-    /** 菜单项触发模式 */
+    /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
-    /** 标题插槽名称 */
+    /** 菜单标题插槽名称 */
     titleSlot: StringConstructor;
-    /** 图标插槽名称 */
+    /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
 }, {
     menusRef: import("vue").Ref<ElScrollbarInstance>;
     menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
-    onItemClick: (item: MenuItemProps) => void;
+    onItemClick: (item: MenuItemProps, e: MouseEvent) => void;
+    onItemMouseenter: (item: MenuItemProps, e: MouseEvent) => void;
+    onItemMouseleave: (item: MenuItemProps, e: MouseEvent) => void;
+    onMouseenter: (e: MouseEvent) => void;
+    onMouseleave: (e: MouseEvent) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    itemClick: (_item: MenuItemProps) => true;
+    itemClick: (_item: MenuItemProps, _e: MouseEvent) => true;
+    itemMouseenter: (_item: MenuItemProps, _e: MouseEvent) => true;
+    itemMouseleave: (_item: MenuItemProps, _e: MouseEvent) => true;
+    mouseEnter: (_e: MouseEvent) => true;
+    mouseLeave: (_e: MouseEvent) => true;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 菜单数据 */
     menus: {
@@ -47,16 +55,20 @@ declare const _default: import("vue").DefineComponent<{
     compact: BooleanConstructor;
     /** 二级侧栏是否折叠 */
     collapse: BooleanConstructor;
-    /** tooltip 主题 */
+    /** 菜单折叠提示气泡主题 */
     popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
-    /** 菜单项触发模式 */
+    /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
-    /** 标题插槽名称 */
+    /** 菜单标题插槽名称 */
     titleSlot: StringConstructor;
-    /** 图标插槽名称 */
+    /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
 }>> & {
-    onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>) => any) | undefined;
+    onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
+    onItemMouseenter?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
+    onItemMouseleave?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
+    onMouseEnter?: ((_e: MouseEvent) => any) | undefined;
+    onMouseLeave?: ((_e: MouseEvent) => any) | undefined;
 }, {
     collapse: boolean;
     compact: boolean;

package/lib/ele-pro-layout/components/tab-dropdown.cjs

@@ -25,13 +25,17 @@ const _sfc_main = vue.defineComponent({
     const state = { timer: null };
     const dropdownRef = vue.ref(null);
     const clearTimer = () => {
-      state.timer && clearTimeout(state.timer);
+      if (state.timer) {
+        clearTimeout(state.timer);
+        state.timer = null;
+      }
     };
     const onCommand = (command) => {
       emit("menuClick", command);
       clearTimer();
       if (props.autoClose) {
         state.timer = setTimeout(() => {
+          state.timer = null;
           if (dropdownRef.value) {
             dropdownRef.value.handleClose();
           }