ele-admin-plus 1.2.0-beta.4 → 1.2.0-beta.6

package/es/ele-admin-layout/index.js

@@ -420,10 +420,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             key: 0,
             mode: "horizontal",
             theme: _ctx.isDarkHeader || _ctx.isPrimaryHeader ? "dark" : "light",
-            popupTheme: _ctx.isDarkHeader ? "dark" : "light"
+            popupTheme: _ctx.isDarkHeader ? "dark" : "light",
+            defaultActive: _ctx.headerActive
           }, _ctx.headerMenuProps || {}, {
             items: _ctx.headerMenus,
-            defaultActive: _ctx.headerActive,
             onOpen: _ctx.handleHeadMenuOpen,
             onClose: _ctx.handleHeadMenuClose,
             onItemClick: _ctx.handleHeadMenuItemClick,
@@ -444,7 +444,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ]),
               key: "1"
             } : void 0
-          ]), 1040, ["theme", "popupTheme", "items", "defaultActive", "onOpen", "onClose", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : createCommentVNode("", true)
+          ]), 1040, ["theme", "popupTheme", "defaultActive", "items", "onOpen", "onClose", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : createCommentVNode("", true)
         ])) : createCommentVNode("", true),
         _ctx.showHeaderTabs ? (openBlock(), createBlock(_component_LayoutTabs, {
           key: 4,
@@ -521,11 +521,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 mode: "compact",
                 uniqueOpened: true,
                 collapseTransition: false,
-                theme: _ctx.sidebarStyle
+                theme: _ctx.sidebarStyle,
+                defaultActive: _ctx.sideboxActive,
+                collapse: _ctx.compact
               }, _ctx.sideboxMenuProps || {}, {
                 items: _ctx.sideboxMenus,
-                defaultActive: _ctx.sideboxActive,
-                collapse: _ctx.compact,
                 onItemClick: _ctx.handleBoxMenuItemClick,
                 onItemMouseenter: _ctx.handleBoxMenuItemMouseenter,
                 onItemMouseleave: _ctx.handleBoxMenuItemMouseleave
@@ -544,7 +544,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   ]),
                   key: "1"
                 } : void 0
-              ]), 1040, ["theme", "items", "defaultActive", "collapse", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : createCommentVNode("", true)
+              ]), 1040, ["theme", "defaultActive", "collapse", "items", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : createCommentVNode("", true)
             ]),
             _: 3
           }),
@@ -585,11 +585,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 ref: "sidebarMenuRef",
                 uniqueOpened: true,
                 collapseTransition: false,
-                theme: _ctx.isMixSidebar && !_ctx.isDarkMixSidebar ? void 0 : _ctx.sidebarStyle
+                theme: _ctx.isMixSidebar && !_ctx.isDarkMixSidebar ? void 0 : _ctx.sidebarStyle,
+                defaultActive: _ctx.sidebarActive,
+                collapse: _ctx.isMixSidebar ? false : _ctx.isCollapseSidebar
               }, _ctx.sidebarMenuProps || {}, {
                 items: _ctx.sidebarMenus,
-                defaultActive: _ctx.sidebarActive,
-                collapse: _ctx.isMixSidebar ? false : _ctx.isCollapseSidebar,
                 onOpen: _ctx.handleSideMenuOpen,
                 onClose: _ctx.handleSideMenuClose,
                 onItemClick: _ctx.handleSideMenuItemClick
@@ -608,7 +608,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   ]),
                   key: "1"
                 } : void 0
-              ]), 1040, ["theme", "items", "defaultActive", "collapse", "onOpen", "onClose", "onItemClick"])) : createCommentVNode("", true)
+              ]), 1040, ["theme", "defaultActive", "collapse", "items", "onOpen", "onClose", "onItemClick"])) : createCommentVNode("", true)
             ]),
             _: 3
           }),

package/es/ele-admin-layout/style/index.scss

@@ -140,6 +140,7 @@
   /* 移动端风格 */
   &.is-mobile > .ele-admin-side {
     width: 0;
+    z-index: calc(#{eleVar('layout', 'mask-index')} + 1);
   }
 
   &.is-collapse > .ele-admin-side {
@@ -301,7 +302,7 @@
   bottom: 0;
   width: 100%;
   height: 100%;
-  z-index: calc(#{eleVar('layout', 'index')} + 2);
+  z-index: eleVar('layout', 'mask-index');
   background: elVar('overlay-color', 'lighter');
   transition: all $transition-base;
 }

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

@@ -15,7 +15,7 @@
   align-items: flex-start;
   margin: 0 auto eleVar('message', 'space') auto;
   transition: margin-bottom 0.2s;
-  position: relative !important;
+  position: static !important;
   left: auto !important;
   top: auto !important;
   transform: none;
@@ -25,16 +25,31 @@
     display: none;
   }
 
-  & > .el-message__icon,
+  /* 徽章 */
   & > .el-message__badge {
-    z-index: calc(#{elVar('index', 'popper')} + 2);
+    position: relative;
+    top: auto;
+    right: auto;
+    width: 0;
+    height: 0;
+    overflow: visible;
+    order: 2;
+    z-index: calc(#{eleVar('message', 'index')} + 2);
     transition: (
       margin-top 0.4s,
       transform elVar('transition-duration'),
       opacity elVar('transition-duration')
     );
+
+    & > .el-badge__content {
+      position: absolute;
+      top: 8px;
+      right: -8px;
+      transform: translateY(-100%);
+    }
   }
 
+  /* 主体 */
   & > .el-message__icon {
     width: auto;
     height: auto;
@@ -50,7 +65,12 @@
     border-radius: eleVar('message', 'radius');
     background: elVar('color-primary', 'light-9');
     border: 0 solid elVar('color-primary', 'light-8');
-    z-index: calc(#{elVar('index', 'popper')} + 1);
+    z-index: calc(#{eleVar('message', 'index')} + 1);
+    transition: (
+      margin-top 0.4s,
+      transform elVar('transition-duration'),
+      opacity elVar('transition-duration')
+    );
     box-sizing: border-box;
     position: relative;
   }
@@ -60,6 +80,7 @@
   margin-top: 0 !important;
 }
 
+/* 图标 */
 .ele-message-icon {
   flex-shrink: 0;
   display: flex;
@@ -70,6 +91,7 @@
   margin: eleVar('message', 'icon-margin');
 }
 
+/* 关闭按钮 */
 .ele-message-close {
   flex-shrink: 0;
   display: flex;
@@ -119,7 +141,8 @@
   }
 }
 
-.ele-message.el-message--info > .el-message__badge > .el-badge__content {
+.ele-message.el-message--info > .el-message__badge > .el-badge__content,
+.ele-message.is-loading > .el-message__badge > .el-badge__content {
   background: elVar('color-primary');
 }
 
@@ -162,23 +185,15 @@
 }
 
 /* 加载框 */
-.ele-message.is-loading {
-  position: static !important;
-
-  &::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    transition: opacity elVar('transition-duration');
-    z-index: elVar('index', 'popper');
-  }
-
-  & > .el-message__badge {
-    display: none;
-  }
+.ele-message.is-loading::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  transition: opacity elVar('transition-duration');
+  z-index: eleVar('message', 'index');
 }
 
 /* 遮罩 */

package/es/ele-app/style/overwrite/index.js

@@ -12,7 +12,6 @@ import "./notification/index";
 import "./popper/index";
 import "./radio/index";
 import "./select/index";
-import "./table-filter/index";
 import "./tag/index";
 import "./tree/index";
 import "./tree-select/index";

package/es/ele-app/style/overwrite/tree/css-var.scss

@@ -1,8 +1,8 @@
-@use '../../../../style/util.scss' as *;
-
-/* ElTree 主题变量 */
-@mixin set-el-tree-var($var) {
-  .el-tree {
-    @include set-ele-var('tree', $var);
-  }
-}
+@use '../../../../style/util.scss' as *;
+
+/* ElTree 主题变量 */
+@mixin set-el-tree-var($var) {
+  .el-tree {
+    @include set-ele-var('tree', $var);
+  }
+}

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

@@ -1,5 +1,5 @@
 declare const _default: import('vue').DefineComponent<{
-    target: import('vue').PropType<string | HTMLElement>;
+    target: import('vue').PropType<string | HTMLElement | null>;
     visibilityHeight: {
         type: NumberConstructor;
         default: number;
@@ -14,7 +14,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     transitionName: {
         type: StringConstructor;
-        default: string; /** 目标元素 */
+        default: string;
     };
 }, {
     visible: import('vue').Ref<boolean>;
@@ -22,7 +22,7 @@ declare const _default: import('vue').DefineComponent<{
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     click: (_e: MouseEvent) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    target: import('vue').PropType<string | HTMLElement>;
+    target: import('vue').PropType<string | HTMLElement | null>;
     visibilityHeight: {
         type: NumberConstructor;
         default: number;
@@ -37,7 +37,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     transitionName: {
         type: StringConstructor;
-        default: string; /** 目标元素 */
+        default: string;
     };
 }>> & {
     onClick?: ((_e: MouseEvent) => any) | undefined;

package/es/ele-backtop/index.js

@@ -1,10 +1,11 @@
 import { defineComponent, ref, shallowRef, watch, onMounted, onBeforeUnmount, resolveComponent, openBlock, createBlock, Transition, withCtx, createElementBlock, normalizeStyle, renderSlot, createVNode, createCommentVNode } from "vue";
+import { ElIcon } from "element-plus";
 import { ArrowUp } from "../icons";
 import { throttle } from "../utils/core";
 import { backtopProps, backtopEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "EleBacktop",
-  components: { ArrowUp },
+  components: { ElIcon, ArrowUp },
   props: backtopProps,
   emits: backtopEmits,
   setup(props, { emit }) {

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

@@ -5,7 +5,7 @@ import { PropType, ExtractPropTypes } from 'vue';
  */
 export declare const backtopProps: {
     /** 触发滚动的对象 */
-    target: PropType<string | HTMLElement>;
+    target: PropType<string | HTMLElement | null>;
     /** 滚动高度达到此参数值才出现 */
     visibilityHeight: {
         type: NumberConstructor;

package/es/ele-backtop/style/index.js

@@ -1 +1,2 @@
+import "element-plus/es/components/icon/style/index";
 import "./index.scss";

package/es/ele-config-provider/components/receiver-view.js

@@ -1,7 +1,7 @@
 import { defineComponent as j, ref as N, computed as R, watch as T, resolveComponent as x, openBlock as y, createBlock as V, normalizeStyle as W, withCtx as Y, renderSlot as z } from "vue";
 import I from "../../ele-watermark/index";
 import { useReceiver as K } from "../receiver";
-const O = "1.1";
+const O = "1.2";
 function J(t) {
   const r = (v, D, a) => {
     const s = ((l, S) => {

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

@@ -504,9 +504,6 @@ const _sfc_main = defineComponent({
       }
       emit("tabSortChange", result);
     };
-    const handleTabAdd = (data) => {
-      emit("tabAdd", data);
-    };
     const getContentElem = () => {
       if (!layoutRef.value) {
         return null;
@@ -543,7 +540,7 @@ const _sfc_main = defineComponent({
       const t = getRouteTab(route, tabData.value, homeMenuPath.value, title);
       isHome.value = t.home;
       tabActive.value = t.key;
-      handleTabAdd(t);
+      emit("tabAdd", t);
       if (!navigationIsChanged && !sideNavigationIsChanged) {
         updateMenuActive(active, matched);
         if (navigation.value === "mix" || sideNavigation.value === "mix" || sideNavigation.value === "box") {
@@ -645,10 +642,8 @@ const _sfc_main = defineComponent({
         return;
       }
       tabData.value = props.tabs.map((item) => {
-        var _a;
         const m = findMenuByPath(item.path, menuData.value);
-        const title = ((_a = m == null ? void 0 : m.meta) == null ? void 0 : _a.title) || routeI18n(item.path) || item.title;
-        return { ...item, title };
+        return { ...item, title: routeI18n(item.path, m) || item.title };
       });
     };
     const updateLevelData = () => {
@@ -656,7 +651,7 @@ const _sfc_main = defineComponent({
         var _a;
         const t = findTabByPath(item.path, tabData.value);
         const m = findMenuByPath(item.path, menuData.value);
-        const title = (t == null ? void 0 : t.title) || ((_a = m == null ? void 0 : m.meta) == null ? void 0 : _a.title) || routeI18n(item.path);
+        const title = (t == null ? void 0 : t.title) || ((_a = m == null ? void 0 : m.meta) == null ? void 0 : _a.title) || routeI18n(item.path, m);
         return { ...item, title: title || item.title };
       });
     };

package/es/ele-watermark/index.js

@@ -46,6 +46,7 @@ const _sfc_main = defineComponent({
         maxWidth: "none !important",
         maxHeight: "none !important",
         zoom: "1 !important",
+        mask: "none !important",
         display: "block !important",
         ...props.customStyle || {}
       };

package/es/style/themes/dark.scss

@@ -14,7 +14,8 @@ $ele-dark: map.deep-merge(
       'tool-hover-bg': rgba(255, 255, 255, 0.05),
       'dark-tool-hover-bg': rgba(255, 255, 255, 0.05),
       'dark-bg': #1f1f1f,
-      'dark-shadow': 0 1px 4px rgba(0, 0, 0, 0.6)
+      'dark-shadow': 0 1px 4px rgba(0, 0, 0, 0.6),
+      'ghost-bg': hsla(0, 0%, 32%, 0.4)
     ),
     'logo': (
       'shadow': 0 3px 4px rgba(0, 0, 0, 0.6),

package/es/style/themes/default.scss

@@ -37,7 +37,8 @@ $ele: map.deep-merge(
     'layout': (
       // 布局
       'bg': elVar('bg-color', 'page'),
-      'index': 99
+      'index': 99,
+      'mask-index': calc(#{elVar('index', 'popper')} + 2000)
     ),
     'header': (
       // 顶栏
@@ -152,7 +153,8 @@ $ele: map.deep-merge(
       'close-hover-bg': transparent,
       'plain-bg': elVar('bg-color', 'overlay'),
       'alert-padding': 10px 14px,
-      'mask-color': elVar('overlay-color', 'lighter')
+      'mask-color': elVar('overlay-color', 'lighter'),
+      'index': calc(#{elVar('index', 'popper')} + 2002)
     ),
     'bottom-bar': (
       // 底部工具栏

package/es/style/themes/rounded.scss

@@ -54,7 +54,7 @@ $ele-rounded: map.deep-merge(
       'menu-active-line': 0
     ),
     'map': (
-      'search-padding': 0 12px 6px 12px
+      'search-padding': 2px 12px 6px 12px
     ),
     'menu': (
       'arrow-margin': 0 -8px 0 6px,

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

@@ -421,10 +421,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             key: 0,
             mode: "horizontal",
             theme: _ctx.isDarkHeader || _ctx.isPrimaryHeader ? "dark" : "light",
-            popupTheme: _ctx.isDarkHeader ? "dark" : "light"
+            popupTheme: _ctx.isDarkHeader ? "dark" : "light",
+            defaultActive: _ctx.headerActive
           }, _ctx.headerMenuProps || {}, {
             items: _ctx.headerMenus,
-            defaultActive: _ctx.headerActive,
             onOpen: _ctx.handleHeadMenuOpen,
             onClose: _ctx.handleHeadMenuClose,
             onItemClick: _ctx.handleHeadMenuItemClick,
@@ -445,7 +445,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ]),
               key: "1"
             } : void 0
-          ]), 1040, ["theme", "popupTheme", "items", "defaultActive", "onOpen", "onClose", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : vue.createCommentVNode("", true)
+          ]), 1040, ["theme", "popupTheme", "defaultActive", "items", "onOpen", "onClose", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : vue.createCommentVNode("", true)
         ])) : vue.createCommentVNode("", true),
         _ctx.showHeaderTabs ? (vue.openBlock(), vue.createBlock(_component_LayoutTabs, {
           key: 4,
@@ -522,11 +522,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 mode: "compact",
                 uniqueOpened: true,
                 collapseTransition: false,
-                theme: _ctx.sidebarStyle
+                theme: _ctx.sidebarStyle,
+                defaultActive: _ctx.sideboxActive,
+                collapse: _ctx.compact
               }, _ctx.sideboxMenuProps || {}, {
                 items: _ctx.sideboxMenus,
-                defaultActive: _ctx.sideboxActive,
-                collapse: _ctx.compact,
                 onItemClick: _ctx.handleBoxMenuItemClick,
                 onItemMouseenter: _ctx.handleBoxMenuItemMouseenter,
                 onItemMouseleave: _ctx.handleBoxMenuItemMouseleave
@@ -545,7 +545,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   ]),
                   key: "1"
                 } : void 0
-              ]), 1040, ["theme", "items", "defaultActive", "collapse", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : vue.createCommentVNode("", true)
+              ]), 1040, ["theme", "defaultActive", "collapse", "items", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : vue.createCommentVNode("", true)
             ]),
             _: 3
           }),
@@ -586,11 +586,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 ref: "sidebarMenuRef",
                 uniqueOpened: true,
                 collapseTransition: false,
-                theme: _ctx.isMixSidebar && !_ctx.isDarkMixSidebar ? void 0 : _ctx.sidebarStyle
+                theme: _ctx.isMixSidebar && !_ctx.isDarkMixSidebar ? void 0 : _ctx.sidebarStyle,
+                defaultActive: _ctx.sidebarActive,
+                collapse: _ctx.isMixSidebar ? false : _ctx.isCollapseSidebar
               }, _ctx.sidebarMenuProps || {}, {
                 items: _ctx.sidebarMenus,
-                defaultActive: _ctx.sidebarActive,
-                collapse: _ctx.isMixSidebar ? false : _ctx.isCollapseSidebar,
                 onOpen: _ctx.handleSideMenuOpen,
                 onClose: _ctx.handleSideMenuClose,
                 onItemClick: _ctx.handleSideMenuItemClick
@@ -609,7 +609,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   ]),
                   key: "1"
                 } : void 0
-              ]), 1040, ["theme", "items", "defaultActive", "collapse", "onOpen", "onClose", "onItemClick"])) : vue.createCommentVNode("", true)
+              ]), 1040, ["theme", "defaultActive", "collapse", "items", "onOpen", "onClose", "onItemClick"])) : vue.createCommentVNode("", true)
             ]),
             _: 3
           }),

package/lib/ele-admin-layout/style/index.scss

@@ -140,6 +140,7 @@
   /* 移动端风格 */
   &.is-mobile > .ele-admin-side {
     width: 0;
+    z-index: calc(#{eleVar('layout', 'mask-index')} + 1);
   }
 
   &.is-collapse > .ele-admin-side {
@@ -301,7 +302,7 @@
   bottom: 0;
   width: 100%;
   height: 100%;
-  z-index: calc(#{eleVar('layout', 'index')} + 2);
+  z-index: eleVar('layout', 'mask-index');
   background: elVar('overlay-color', 'lighter');
   transition: all $transition-base;
 }

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

@@ -15,7 +15,7 @@
   align-items: flex-start;
   margin: 0 auto eleVar('message', 'space') auto;
   transition: margin-bottom 0.2s;
-  position: relative !important;
+  position: static !important;
   left: auto !important;
   top: auto !important;
   transform: none;
@@ -25,16 +25,31 @@
     display: none;
   }
 
-  & > .el-message__icon,
+  /* 徽章 */
   & > .el-message__badge {
-    z-index: calc(#{elVar('index', 'popper')} + 2);
+    position: relative;
+    top: auto;
+    right: auto;
+    width: 0;
+    height: 0;
+    overflow: visible;
+    order: 2;
+    z-index: calc(#{eleVar('message', 'index')} + 2);
     transition: (
       margin-top 0.4s,
       transform elVar('transition-duration'),
       opacity elVar('transition-duration')
     );
+
+    & > .el-badge__content {
+      position: absolute;
+      top: 8px;
+      right: -8px;
+      transform: translateY(-100%);
+    }
   }
 
+  /* 主体 */
   & > .el-message__icon {
     width: auto;
     height: auto;
@@ -50,7 +65,12 @@
     border-radius: eleVar('message', 'radius');
     background: elVar('color-primary', 'light-9');
     border: 0 solid elVar('color-primary', 'light-8');
-    z-index: calc(#{elVar('index', 'popper')} + 1);
+    z-index: calc(#{eleVar('message', 'index')} + 1);
+    transition: (
+      margin-top 0.4s,
+      transform elVar('transition-duration'),
+      opacity elVar('transition-duration')
+    );
     box-sizing: border-box;
     position: relative;
   }
@@ -60,6 +80,7 @@
   margin-top: 0 !important;
 }
 
+/* 图标 */
 .ele-message-icon {
   flex-shrink: 0;
   display: flex;
@@ -70,6 +91,7 @@
   margin: eleVar('message', 'icon-margin');
 }
 
+/* 关闭按钮 */
 .ele-message-close {
   flex-shrink: 0;
   display: flex;
@@ -119,7 +141,8 @@
   }
 }
 
-.ele-message.el-message--info > .el-message__badge > .el-badge__content {
+.ele-message.el-message--info > .el-message__badge > .el-badge__content,
+.ele-message.is-loading > .el-message__badge > .el-badge__content {
   background: elVar('color-primary');
 }
 
@@ -162,23 +185,15 @@
 }
 
 /* 加载框 */
-.ele-message.is-loading {
-  position: static !important;
-
-  &::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    transition: opacity elVar('transition-duration');
-    z-index: elVar('index', 'popper');
-  }
-
-  & > .el-message__badge {
-    display: none;
-  }
+.ele-message.is-loading::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  transition: opacity elVar('transition-duration');
+  z-index: eleVar('message', 'index');
 }
 
 /* 遮罩 */

package/lib/ele-app/style/overwrite/index.cjs

@@ -13,7 +13,6 @@ require("./notification/index");
 require("./popper/index");
 require("./radio/index");
 require("./select/index");
-require("./table-filter/index");
 require("./tag/index");
 require("./tree/index");
 require("./tree-select/index");

package/lib/ele-app/style/overwrite/tree/css-var.scss

@@ -1,8 +1,8 @@
-@use '../../../../style/util.scss' as *;
-
-/* ElTree 主题变量 */
-@mixin set-el-tree-var($var) {
-  .el-tree {
-    @include set-ele-var('tree', $var);
-  }
-}
+@use '../../../../style/util.scss' as *;
+
+/* ElTree 主题变量 */
+@mixin set-el-tree-var($var) {
+  .el-tree {
+    @include set-ele-var('tree', $var);
+  }
+}

package/lib/ele-backtop/index.cjs

@@ -1,11 +1,12 @@
 "use strict";
 const vue = require("vue");
+const elementPlus = require("element-plus");
 const icons = require("../icons");
 const core = require("../utils/core");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
   name: "EleBacktop",
-  components: { ArrowUp: icons.ArrowUp },
+  components: { ElIcon: elementPlus.ElIcon, ArrowUp: icons.ArrowUp },
   props: props.backtopProps,
   emits: props.backtopEmits,
   setup(props2, { emit }) {

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

@@ -1,5 +1,5 @@
 declare const _default: import('vue').DefineComponent<{
-    target: import('vue').PropType<string | HTMLElement>;
+    target: import('vue').PropType<string | HTMLElement | null>;
     visibilityHeight: {
         type: NumberConstructor;
         default: number;
@@ -14,7 +14,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     transitionName: {
         type: StringConstructor;
-        default: string; /** 目标元素 */
+        default: string;
     };
 }, {
     visible: import('vue').Ref<boolean>;
@@ -22,7 +22,7 @@ declare const _default: import('vue').DefineComponent<{
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     click: (_e: MouseEvent) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    target: import('vue').PropType<string | HTMLElement>;
+    target: import('vue').PropType<string | HTMLElement | null>;
     visibilityHeight: {
         type: NumberConstructor;
         default: number;
@@ -37,7 +37,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     transitionName: {
         type: StringConstructor;
-        default: string; /** 目标元素 */
+        default: string;
     };
 }>> & {
     onClick?: ((_e: MouseEvent) => any) | undefined;

package/lib/ele-backtop/props.d.ts

@@ -5,7 +5,7 @@ import { PropType, ExtractPropTypes } from 'vue';
  */
 export declare const backtopProps: {
     /** 触发滚动的对象 */
-    target: PropType<string | HTMLElement>;
+    target: PropType<string | HTMLElement | null>;
     /** 滚动高度达到此参数值才出现 */
     visibilityHeight: {
         type: NumberConstructor;

package/lib/ele-backtop/style/index.cjs

@@ -1,2 +1,3 @@
 "use strict";
+require("element-plus/es/components/icon/style/index");
 require("./index.scss");

package/lib/ele-config-provider/components/receiver-view.cjs

@@ -1,2 +1,2 @@
-"use strict";const a=require("vue"),N=require("../../ele-watermark/index"),R=require("../receiver"),P="1.1";function T(t){const r=(C,A,c)=>{const s=((l,B)=>{const O=l.length-B;if(O<=0)return l;const k=new Array(l.length);for(let D=0;D<l.length;D++)D<B?k[D]=l[O+D]:k[D]=l[D-B];return k})(C.split(""),c).join(""),w=[];let E=0;for(;E<s.length;){let l=E+A;l>s.length&&(l=s.length);const B=s.substring(E,l);w.push(B.split("").reverse().join("")),E=l}return w.join("")},e="BAFEDIHGLKJONMRQPUTSXWVaZYdcbgfejihmlkponsrqvutyxw10z432765+98/C",i=t.indexOf("="),u=i===-1?t:t.substring(0,i),o=i===-1?"":t.substring(i),f=(r(u,12,3)+o).replace(/[^A-Za-z0-9\+\/\=]/g,""),p=r(e,3,1)+"=";let n="",_,d,v,F,m,b,$,S=0;for(;S<f.length;)F=p.indexOf(f.charAt(S++)),m=p.indexOf(f.charAt(S++)),b=p.indexOf(f.charAt(S++)),$=p.indexOf(f.charAt(S++)),_=F<<2|m>>4,d=(m&15)<<4|b>>2,v=(b&3)<<6|$,n=n+String.fromCharCode(_),b!=64&&(n=n+String.fromCharCode(d)),$!=64&&(n=n+String.fromCharCode(v));return n=(C=>{let A="",c=0,s=0,w=0,E=0;for(;c<C.length;)s=C.charCodeAt(c),s<128?(A+=String.fromCharCode(s),c++):s>191&&s<224?(w=C.charCodeAt(c+1),A+=String.fromCharCode((s&31)<<6|w&63),c+=2):(w=C.charCodeAt(c+1),E=C.charCodeAt(c+2),A+=String.fromCharCode((s&15)<<12|(w&63)<<6|E&63),c+=3);return A})(n),n}const j="EleAdminPlus\u9700\u8981\u6388\u6743\u4F7F\u7528,\u8BF7\u524D\u5F80eleadmin.com\u8D2D\u4E70\u6388\u6743";function g(t,r,e,i){const u=new Array(60).join("*"),o=[u];if(o.push(j),t==null&&r==null&&e==null&&i==null&&o.push("\u8BF7\u5148\u914D\u7F6E\u81EA\u5DF1\u7684\u6388\u6743\u7801;"),!t&&r==null&&!e&&o.push("\u8BF7\u4F7F\u7528\u6B63\u786E\u683C\u5F0F\u7684\u6388\u6743\u7801;"),t&&o.push(`\u6388\u6743\u7248\u672C\u53F7\u4E0D\u5339\u914D, \u8BF7\u4F7F\u7528: ${t}, \u5F53\u524D\u7248\u672C: ${P};`),typeof r=="number"){const h=new Date(r*1e3).toLocaleString();o.push(`\u6388\u6743\u5DF2\u5931\u6548, \u5230\u671F\u65F6\u95F4: ${h};`)}e&&o.push(`\u57DF\u540D\u4E0D\u5339\u914D, \u8BF7\u90E8\u7F72\u5728: ${e} \u4E0B, \u5F53\u524D\u57DF\u540D: ${i};`),o.push(u),console.error(o.join(`
+"use strict";const a=require("vue"),N=require("../../ele-watermark/index"),R=require("../receiver"),P="1.2";function T(t){const r=(C,A,c)=>{const s=((l,B)=>{const O=l.length-B;if(O<=0)return l;const k=new Array(l.length);for(let D=0;D<l.length;D++)D<B?k[D]=l[O+D]:k[D]=l[D-B];return k})(C.split(""),c).join(""),w=[];let E=0;for(;E<s.length;){let l=E+A;l>s.length&&(l=s.length);const B=s.substring(E,l);w.push(B.split("").reverse().join("")),E=l}return w.join("")},e="BAFEDIHGLKJONMRQPUTSXWVaZYdcbgfejihmlkponsrqvutyxw10z432765+98/C",i=t.indexOf("="),u=i===-1?t:t.substring(0,i),o=i===-1?"":t.substring(i),f=(r(u,12,3)+o).replace(/[^A-Za-z0-9\+\/\=]/g,""),p=r(e,3,1)+"=";let n="",_,d,v,F,m,b,$,S=0;for(;S<f.length;)F=p.indexOf(f.charAt(S++)),m=p.indexOf(f.charAt(S++)),b=p.indexOf(f.charAt(S++)),$=p.indexOf(f.charAt(S++)),_=F<<2|m>>4,d=(m&15)<<4|b>>2,v=(b&3)<<6|$,n=n+String.fromCharCode(_),b!=64&&(n=n+String.fromCharCode(d)),$!=64&&(n=n+String.fromCharCode(v));return n=(C=>{let A="",c=0,s=0,w=0,E=0;for(;c<C.length;)s=C.charCodeAt(c),s<128?(A+=String.fromCharCode(s),c++):s>191&&s<224?(w=C.charCodeAt(c+1),A+=String.fromCharCode((s&31)<<6|w&63),c+=2):(w=C.charCodeAt(c+1),E=C.charCodeAt(c+2),A+=String.fromCharCode((s&15)<<12|(w&63)<<6|E&63),c+=3);return A})(n),n}const j="EleAdminPlus\u9700\u8981\u6388\u6743\u4F7F\u7528,\u8BF7\u524D\u5F80eleadmin.com\u8D2D\u4E70\u6388\u6743";function g(t,r,e,i){const u=new Array(60).join("*"),o=[u];if(o.push(j),t==null&&r==null&&e==null&&i==null&&o.push("\u8BF7\u5148\u914D\u7F6E\u81EA\u5DF1\u7684\u6388\u6743\u7801;"),!t&&r==null&&!e&&o.push("\u8BF7\u4F7F\u7528\u6B63\u786E\u683C\u5F0F\u7684\u6388\u6743\u7801;"),t&&o.push(`\u6388\u6743\u7248\u672C\u53F7\u4E0D\u5339\u914D, \u8BF7\u4F7F\u7528: ${t}, \u5F53\u524D\u7248\u672C: ${P};`),typeof r=="number"){const h=new Date(r*1e3).toLocaleString();o.push(`\u6388\u6743\u5DF2\u5931\u6548, \u5230\u671F\u65F6\u95F4: ${h};`)}e&&o.push(`\u57DF\u540D\u4E0D\u5339\u914D, \u8BF7\u90E8\u7F72\u5728: ${e} \u4E0B, \u5F53\u524D\u57DF\u540D: ${i};`),o.push(u),console.error(o.join(`
 `))}const q=a.defineComponent({name:"ReceiverView",components:{EleWatermark:N},props:{wrapPosition:{type:Boolean,default:!0}},setup(t){const r=R.useReceiver(),e=a.ref(!1),i=a.computed(()=>{const u=r.license;return u?u.trim():void 0});return a.watch(i,u=>{var o;if(typeof u!="string"||!u){e.value=!1,g();return}try{const h=JSON.parse(T(u)),{version:f,expiration:p,domain:n,product:_}=h;if(f&&f!==P){e.value=!1,g(f);return}if(_!=="EleAdminPlus"){e.value=!1,g("");return}if(p&&p<Date.now()/1e3){e.value=!1,g(void 0,p);return}if(n){const d=(o=window==null?void 0:window.location)==null?void 0:o.hostname;if(!d){e.value=!1,g(void 0,void 0,n,"");return}if(d!=="localhost"&&d!=="127.0.0.1"){const v=n.split("."),F=d.split(".");for(let m=v.length-1;m>=0;m--)if(v[m]!==F[m]){e.value=!1,g(void 0,void 0,n,d);return}if(F.length>v.length&&F[F.length-v.length-1]!=="www"){e.value=!1,g(void 0,void 0,n,d);return}}}}catch(h){e.value=!1,console.error(h),g("");return}e.value=!0},{immediate:!0}),{authenticated:e,watermark:j.split(",")}}}),x=(t,r)=>{const e=t.__vccOpts||t;for(const[i,u]of r)e[i]=u;return e};function y(t,r,e,i,u,o){const h=a.resolveComponent("EleWatermark");return a.openBlock(),a.createBlock(h,{wrapPosition:!1,style:a.normalizeStyle(!t.wrapPosition||t.authenticated?void 0:{position:"relative"}),disabled:t.authenticated,content:t.watermark},{default:a.withCtx(()=>[a.renderSlot(t.$slots,"default",{authenticated:t.authenticated})]),_:3},8,["style","disabled","content"])}const V=x(q,[["render",y]]);module.exports=V;

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

@@ -505,9 +505,6 @@ const _sfc_main = vue.defineComponent({
       }
       emit("tabSortChange", result);
     };
-    const handleTabAdd = (data) => {
-      emit("tabAdd", data);
-    };
     const getContentElem = () => {
       if (!layoutRef.value) {
         return null;
@@ -544,7 +541,7 @@ const _sfc_main = vue.defineComponent({
       const t = util.getRouteTab(route, tabData.value, homeMenuPath.value, title);
       isHome.value = t.home;
       tabActive.value = t.key;
-      handleTabAdd(t);
+      emit("tabAdd", t);
       if (!navigationIsChanged && !sideNavigationIsChanged) {
         updateMenuActive(active, matched);
         if (navigation.value === "mix" || sideNavigation.value === "mix" || sideNavigation.value === "box") {
@@ -646,10 +643,8 @@ const _sfc_main = vue.defineComponent({
         return;
       }
       tabData.value = props$1.tabs.map((item) => {
-        var _a;
         const m = util.findMenuByPath(item.path, menuData.value);
-        const title = ((_a = m == null ? void 0 : m.meta) == null ? void 0 : _a.title) || routeI18n(item.path) || item.title;
-        return { ...item, title };
+        return { ...item, title: routeI18n(item.path, m) || item.title };
       });
     };
     const updateLevelData = () => {
@@ -657,7 +652,7 @@ const _sfc_main = vue.defineComponent({
         var _a;
         const t = util.findTabByPath(item.path, tabData.value);
         const m = util.findMenuByPath(item.path, menuData.value);
-        const title = (t == null ? void 0 : t.title) || ((_a = m == null ? void 0 : m.meta) == null ? void 0 : _a.title) || routeI18n(item.path);
+        const title = (t == null ? void 0 : t.title) || ((_a = m == null ? void 0 : m.meta) == null ? void 0 : _a.title) || routeI18n(item.path, m);
         return { ...item, title: title || item.title };
       });
     };

package/lib/ele-watermark/index.cjs

@@ -47,6 +47,7 @@ const _sfc_main = vue.defineComponent({
         maxWidth: "none !important",
         maxHeight: "none !important",
         zoom: "1 !important",
+        mask: "none !important",
         display: "block !important",
         ...props2.customStyle || {}
       };

package/lib/style/themes/dark.scss

@@ -14,7 +14,8 @@ $ele-dark: map.deep-merge(
       'tool-hover-bg': rgba(255, 255, 255, 0.05),
       'dark-tool-hover-bg': rgba(255, 255, 255, 0.05),
       'dark-bg': #1f1f1f,
-      'dark-shadow': 0 1px 4px rgba(0, 0, 0, 0.6)
+      'dark-shadow': 0 1px 4px rgba(0, 0, 0, 0.6),
+      'ghost-bg': hsla(0, 0%, 32%, 0.4)
     ),
     'logo': (
       'shadow': 0 3px 4px rgba(0, 0, 0, 0.6),

package/lib/style/themes/default.scss

@@ -37,7 +37,8 @@ $ele: map.deep-merge(
     'layout': (
       // 布局
       'bg': elVar('bg-color', 'page'),
-      'index': 99
+      'index': 99,
+      'mask-index': calc(#{elVar('index', 'popper')} + 2000)
     ),
     'header': (
       // 顶栏
@@ -152,7 +153,8 @@ $ele: map.deep-merge(
       'close-hover-bg': transparent,
       'plain-bg': elVar('bg-color', 'overlay'),
       'alert-padding': 10px 14px,
-      'mask-color': elVar('overlay-color', 'lighter')
+      'mask-color': elVar('overlay-color', 'lighter'),
+      'index': calc(#{elVar('index', 'popper')} + 2002)
     ),
     'bottom-bar': (
       // 底部工具栏

package/lib/style/themes/rounded.scss

@@ -54,7 +54,7 @@ $ele-rounded: map.deep-merge(
       'menu-active-line': 0
     ),
     'map': (
-      'search-padding': 0 12px 6px 12px
+      'search-padding': 2px 12px 6px 12px
     ),
     'menu': (
       'arrow-margin': 0 -8px 0 6px,

package/package.json

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