ele-admin-plus 1.1.9-beta.10 → 1.1.9-beta.12

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

@@ -36,6 +36,7 @@ const _sfc_main = vue.defineComponent({
       isHover: false
     };
     const contentRef = vue.ref(null);
+    const modalsRef = vue.ref(null);
     const levelData = vue.shallowRef([]);
     const tabData = vue.shallowRef([]);
     const tabActive = vue.ref(util.getHomePath(props2.homePath));
@@ -93,7 +94,7 @@ const _sfc_main = vue.defineComponent({
         // 图标置于顶栏
         { "ele-admin-logo-auto": logoAuto && !mobile.value },
         // 开启页签栏
-        { "ele-admin-open-tab": props2.tabBar },
+        { "ele-admin-open-tab": props2.tabBar && props2.tabBar !== "header" },
         // 卡片风格页签
         { "ele-admin-tab-card": props2.tabStyle === "button" },
         // 主体定宽
@@ -111,7 +112,7 @@ const _sfc_main = vue.defineComponent({
         return props2.backTopTarget;
       }
       if (props2.fixedBody) {
-        return ".ele-admin-layout.ele-admin-fixed-body>.ele-admin-main>.ele-admin-body>.ele-admin-content";
+        return ".ele-admin-layout.ele-admin-fixed-body>.ele-admin-main>.ele-admin-body>.ele-admin-wrapper>.ele-admin-content";
       }
       return "body";
     });
@@ -194,7 +195,6 @@ const _sfc_main = vue.defineComponent({
         current,
         tabData.value,
         homeMenuPath.value,
-        props2.fixedHome,
         title
       );
       isHome.value = t.home;
@@ -702,6 +702,24 @@ const _sfc_main = vue.defineComponent({
       },
       { immediate: true }
     );
+    vue.watch([() => props2.tabBar, () => props2.keepAlive], () => {
+      layoutProvide.keepAlive = props2.tabBar && props2.keepAlive;
+    });
+    vue.watch(
+      () => props2.responsive,
+      () => {
+        layoutProvide.responsive = props2.responsive;
+      }
+    );
+    vue.watch(modalsRef, () => {
+      layoutProvide.modalsEl = modalsRef.value;
+    });
+    const layoutProvide = vue.shallowReactive({
+      keepAlive: props2.tabBar && props2.keepAlive,
+      responsive: props2.responsive,
+      modalsEl: modalsRef.value
+    });
+    vue.provide(receiver.LAYOUT_KEY, layoutProvide);
     util.useWindowListener(
       {
         onEscKeydown: (e) => {
@@ -726,25 +744,9 @@ const _sfc_main = vue.defineComponent({
       },
       props2
     );
-    const layoutProvide = vue.computed(() => {
-      const state2 = {
-        mobile: mobile.value,
-        collapse: props2.collapse,
-        compact: props2.compact,
-        topLayout: topLayout.value,
-        mixSidebar: mixSidebar.value,
-        maximized: props2.maximized,
-        expanded: props2.expanded,
-        tabBar: props2.tabBar,
-        sidebar: sidebar.value,
-        keepAlive: props2.tabBar && props2.keepAlive,
-        responsive: props2.responsive
-      };
-      return state2;
-    });
-    vue.provide(receiver.LAYOUT_KEY, layoutProvide);
     return {
       contentRef,
+      modalsRef,
       levelData,
       tabData,
       tabActive,
@@ -795,18 +797,23 @@ const _export_sfc = (sfc, props2) => {
   return target;
 };
 const _hoisted_1 = { class: "ele-admin-body" };
-const _hoisted_2 = {
+const _hoisted_2 = { class: "ele-admin-wrapper" };
+const _hoisted_3 = {
   ref: "contentRef",
   class: "ele-admin-content"
 };
+const _hoisted_4 = {
+  ref: "modalsRef",
+  class: "ele-admin-modals"
+};
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ProHeader = vue.resolveComponent("ProHeader");
   const _component_ProSidebox = vue.resolveComponent("ProSidebox");
   const _component_ProSidebar = vue.resolveComponent("ProSidebar");
   const _component_ProTabs = vue.resolveComponent("ProTabs");
   const _component_ProIframe = vue.resolveComponent("ProIframe");
-  const _component_ReceiverView = vue.resolveComponent("ReceiverView");
   const _component_ElBacktop = vue.resolveComponent("ElBacktop");
+  const _component_ReceiverView = vue.resolveComponent("ReceiverView");
   return vue.openBlock(), vue.createElementBlock("div", {
     class: vue.normalizeClass(_ctx.layoutClass)
   }, [
@@ -828,14 +835,25 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       homePath: _ctx.homeMenuPath,
       isHome: _ctx.isHome,
       menuTextEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
-      menuTextEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
+      tabs: _ctx.tabData,
+      tabActive: _ctx.tabActive,
+      fixedHome: _ctx.fixedHome,
+      tabStyle: _ctx.tabStyle,
+      tabContextMenu: _ctx.tabContextMenu,
+      tabContextMenus: _ctx.tabContextMenus,
+      tabSortable: _ctx.tabSortable,
+      tabBar: _ctx.tabBar,
       onLogoClick: _ctx.onLogoClick,
       onOpen: _ctx.onHeadMenuOpen,
       onClsoe: _ctx.onHeadMenuClose,
       onItemClick: _ctx.onNavItemClick,
       onItemMouseenter: _ctx.onNavItemMouseenter,
       onMouseEnter: _ctx.onNavMouseEnter,
-      onMouseLeave: _ctx.onNavMouseLeave
+      onMouseLeave: _ctx.onNavMouseLeave,
+      onTabClick: _ctx.onTabClick,
+      onTabRemove: _ctx.onTabRemove,
+      onTabContextMenu: _ctx.onTabContextMenu,
+      onTabSortChange: _ctx.onTabSortChange
     }, vue.createSlots({ _: 2 }, [
       vue.renderList(Object.keys(_ctx.$slots).filter(
         (k) => ![
@@ -844,11 +862,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           "bottom",
           "boxTop",
           "boxBottom",
-          "footer",
-          "tabTitle",
-          "tabContext",
-          "tabExtra",
-          "tabHome"
+          "footer"
         ].includes(k)
       ), (name) => {
         return {
@@ -858,7 +872,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ])
         };
       })
-    ]), 1032, ["menus", "headerStyle", "active", "ellipsis", "ellipsisProps", "menuTrigger", "itemTrigger", "collapse", "sidebar", "titleSlot", "iconSlot", "levels", "breadcrumb", "breadcrumbSeparator", "homePath", "isHome", "menuTextEllipsisTooltip", "menuTextEllipsisTooltipProps", "onLogoClick", "onOpen", "onClsoe", "onItemClick", "onItemMouseenter", "onMouseEnter", "onMouseLeave"]),
+    ]), 1032, ["menus", "headerStyle", "active", "ellipsis", "ellipsisProps", "menuTrigger", "itemTrigger", "collapse", "sidebar", "titleSlot", "iconSlot", "levels", "breadcrumb", "breadcrumbSeparator", "homePath", "isHome", "menuTextEllipsisTooltip", "tabs", "tabActive", "fixedHome", "tabStyle", "tabContextMenu", "tabContextMenus", "tabSortable", "tabBar", "onLogoClick", "onOpen", "onClsoe", "onItemClick", "onItemMouseenter", "onMouseEnter", "onMouseLeave", "onTabClick", "onTabRemove", "onTabContextMenu", "onTabSortChange"]),
     vue.createVNode(_component_ReceiverView, {
       class: "ele-admin-main",
       wrapPosition: false
@@ -877,7 +891,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           titleSlot: _ctx.sideboxTitleSlot,
           iconSlot: _ctx.sideboxIconSlot,
           menuTextEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
-          menuTextEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
           onItemClick: _ctx.onBoxItemClick,
           onItemMouseenter: _ctx.onBoxItemMouseenter,
           onMouseEnter: _ctx.onBoxMouseEnter,
@@ -907,7 +920,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             };
           })
-        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "compact", "collapse", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "menuTextEllipsisTooltip", "menuTextEllipsisTooltipProps", "onItemClick", "onItemMouseenter", "onMouseEnter", "onMouseLeave"])) : vue.createCommentVNode("", true),
+        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "compact", "collapse", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "menuTextEllipsisTooltip", "onItemClick", "onItemMouseenter", "onMouseEnter", "onMouseLeave"])) : vue.createCommentVNode("", true),
         _ctx.sidebar ? (vue.openBlock(), vue.createBlock(_component_ProSidebar, {
           key: 1,
           menus: _ctx.sidebarData,
@@ -922,7 +935,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           titleSlot: _ctx.sidebarTitleSlot,
           iconSlot: _ctx.sidebarIconSlot,
           menuTextEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
-          menuTextEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
           onOpen: _ctx.onSideMenuOpen,
           onClsoe: _ctx.onSideMenuClose,
           onItemClick: _ctx.onMenuItemClick,
@@ -953,9 +965,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             };
           })
-        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "collapse", "uniqueOpened", "defaultOpeneds", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "menuTextEllipsisTooltip", "menuTextEllipsisTooltipProps", "onOpen", "onClsoe", "onItemClick", "onMouseEnter", "onMouseLeave"])) : vue.createCommentVNode("", true),
+        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "collapse", "uniqueOpened", "defaultOpeneds", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "menuTextEllipsisTooltip", "onOpen", "onClsoe", "onItemClick", "onMouseEnter", "onMouseLeave"])) : vue.createCommentVNode("", true),
         vue.createElementVNode("div", _hoisted_1, [
-          _ctx.tabBar ? (vue.openBlock(), vue.createBlock(_component_ProTabs, {
+          _ctx.tabBar && _ctx.tabBar !== "header" ? (vue.openBlock(), vue.createBlock(_component_ProTabs, {
             key: 0,
             tabs: _ctx.tabData,
             active: _ctx.tabActive,
@@ -983,6 +995,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             })
           ]), 1032, ["tabs", "active", "tabStyle", "fixedHome", "homePath", "isHome", "tabContextMenu", "tabContextMenus", "tabSortable", "onTabClick", "onTabRemove", "onTabContextMenu", "onTabSortChange"])) : vue.createCommentVNode("", true),
           vue.createElementVNode("div", _hoisted_2, [
+            vue.createElementVNode("div", _hoisted_3, [
+              vue.renderSlot(_ctx.$slots, "default"),
+              !_ctx.hideFooter ? vue.renderSlot(_ctx.$slots, "footer", { key: 0 }) : vue.createCommentVNode("", true)
+            ], 512),
             _ctx.tabBar && _ctx.keepAlive ? (vue.openBlock(), vue.createBlock(_component_ProIframe, {
               key: 0,
               keepAlive: _ctx.keepAlive,
@@ -991,9 +1007,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               tabData: _ctx.tabData,
               tabActive: _ctx.tabActive
             }, null, 8, ["keepAlive", "transitionName", "transitionDelay", "tabData", "tabActive"])) : vue.createCommentVNode("", true),
-            vue.renderSlot(_ctx.$slots, "default"),
-            !_ctx.hideFooter ? vue.renderSlot(_ctx.$slots, "footer", { key: 1 }) : vue.createCommentVNode("", true)
-          ], 512)
+            _ctx.backTop ? (vue.openBlock(), vue.createBlock(_component_ElBacktop, {
+              key: _ctx.backTopSelector,
+              target: _ctx.backTopSelector,
+              visibilityHeight: _ctx.backTopVisibilityHeight,
+              bottom: _ctx.backTopBottom,
+              right: _ctx.backTopRight
+            }, null, 8, ["target", "visibilityHeight", "bottom", "right"])) : vue.createCommentVNode("", true),
+            vue.createElementVNode("div", _hoisted_4, null, 512)
+          ])
         ])
       ]),
       _: 3
@@ -1001,14 +1023,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     vue.createElementVNode("div", {
       class: "ele-admin-mask",
       onClick: _cache[0] || (_cache[0] = (...args) => _ctx.updateCollapse && _ctx.updateCollapse(...args))
-    }),
-    _ctx.backTop ? (vue.openBlock(), vue.createBlock(_component_ElBacktop, {
-      key: 0,
-      right: _ctx.backTopRight,
-      bottom: _ctx.backTopBottom,
-      visibilityHeight: _ctx.backTopVisibilityHeight,
-      target: _ctx.backTopSelector
-    }, null, 8, ["right", "bottom", "visibilityHeight", "target"])) : vue.createCommentVNode("", true)
+    })
   ], 2);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);