ele-admin-plus 1.1.5 → 1.1.6-beta.2

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

@@ -54,12 +54,11 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     headerStyle: {
-        /** 面包屑数据 */
         type: import("vue").PropType<import("./types").HeaderStyle>;
-        default: string;
-    };
+        default: string; /** 页签数据 */
+    }; /** 页签数据 */
     sidebarStyle: {
-        type: import("vue").PropType<import("./types").SidebarStyle>; /** 页签选中 */
+        type: import("vue").PropType<import("./types").SidebarStyle>;
         default: string;
     };
     tabStyle: {
@@ -77,12 +76,13 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     logoInHeader: BooleanConstructor;
-    colorfulIcon: BooleanConstructor; /** 侧栏一级菜单数据 */
+    colorfulIcon: BooleanConstructor;
     uniqueOpened: {
         type: BooleanConstructor;
         default: boolean;
     };
     expanded: BooleanConstructor;
+    /** 侧栏是否隐藏 */
     compressOnEsc: BooleanConstructor;
     fixedHome: {
         type: BooleanConstructor;
@@ -91,7 +91,6 @@ declare const _default: import("vue").DefineComponent<{
     homePath: StringConstructor;
     redirectPath: {
         type: StringConstructor;
-        /** 主页地址 */
         default: string;
     };
     locale: StringConstructor;
@@ -99,15 +98,15 @@ declare const _default: import("vue").DefineComponent<{
     sidebarOpeneds: import("vue").PropType<string[]>;
     tabContextMenu: import("vue").PropType<boolean | import("../ele-app/types/components").EleDropdownProps>;
     tabContextMenus: import("vue").PropType<import("../ele-tabs/types").ContextMenus>;
-    tabSortable: BooleanConstructor; /** 是否混合导航布局 */
+    tabSortable: BooleanConstructor;
     autoScrollTop: {
         type: BooleanConstructor;
-        default: boolean;
-    }; /** 是否双侧栏布局 */
+        default: boolean; /** 是否双侧栏布局 */
+    };
     headerTitleSlot: {
         type: StringConstructor;
         default: string;
-    };
+    }; /** 是否显示双侧栏一级 */
     headerIconSlot: {
         type: StringConstructor;
         default: string;
@@ -125,7 +124,7 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     sideboxIconSlot: {
-        type: StringConstructor; /** 布局类名 */
+        type: StringConstructor;
         default: string;
     };
     tooltipEffect: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
@@ -245,12 +244,11 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     headerStyle: {
-        /** 面包屑数据 */
         type: import("vue").PropType<import("./types").HeaderStyle>;
-        default: string;
-    };
+        default: string; /** 页签数据 */
+    }; /** 页签数据 */
     sidebarStyle: {
-        type: import("vue").PropType<import("./types").SidebarStyle>; /** 页签选中 */
+        type: import("vue").PropType<import("./types").SidebarStyle>;
         default: string;
     };
     tabStyle: {
@@ -268,12 +266,13 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     logoInHeader: BooleanConstructor;
-    colorfulIcon: BooleanConstructor; /** 侧栏一级菜单数据 */
+    colorfulIcon: BooleanConstructor;
     uniqueOpened: {
         type: BooleanConstructor;
         default: boolean;
     };
     expanded: BooleanConstructor;
+    /** 侧栏是否隐藏 */
     compressOnEsc: BooleanConstructor;
     fixedHome: {
         type: BooleanConstructor;
@@ -282,7 +281,6 @@ declare const _default: import("vue").DefineComponent<{
     homePath: StringConstructor;
     redirectPath: {
         type: StringConstructor;
-        /** 主页地址 */
         default: string;
     };
     locale: StringConstructor;
@@ -290,15 +288,15 @@ declare const _default: import("vue").DefineComponent<{
     sidebarOpeneds: import("vue").PropType<string[]>;
     tabContextMenu: import("vue").PropType<boolean | import("../ele-app/types/components").EleDropdownProps>;
     tabContextMenus: import("vue").PropType<import("../ele-tabs/types").ContextMenus>;
-    tabSortable: BooleanConstructor; /** 是否混合导航布局 */
+    tabSortable: BooleanConstructor;
     autoScrollTop: {
         type: BooleanConstructor;
-        default: boolean;
-    }; /** 是否双侧栏布局 */
+        default: boolean; /** 是否双侧栏布局 */
+    };
     headerTitleSlot: {
         type: StringConstructor;
         default: string;
-    };
+    }; /** 是否显示双侧栏一级 */
     headerIconSlot: {
         type: StringConstructor;
         default: string;
@@ -316,7 +314,7 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     sideboxIconSlot: {
-        type: StringConstructor; /** 布局类名 */
+        type: StringConstructor;
         default: string;
     };
     tooltipEffect: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;

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

@@ -309,7 +309,7 @@ const _sfc_main = vue.defineComponent({
         };
       });
       splitMenuData();
-      homeMenuPath.value = util.getHomePath((temp == null ? void 0 : temp.path) ?? props2.homePath);
+      homeMenuPath.value = util.getHomePath(props2.homePath ?? (temp == null ? void 0 : temp.path));
     };
     const updateTabData = () => {
       if (!props2.tabs) {
@@ -627,7 +627,20 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       onClsoe: _ctx.onHeadMenuClose,
       onItemClick: _ctx.onNavItemClick
     }, vue.createSlots({ _: 2 }, [
-      vue.renderList(Object.keys(_ctx.$slots), (name) => {
+      vue.renderList(Object.keys(_ctx.$slots).filter(
+        (k) => ![
+          "default",
+          "top",
+          "bottom",
+          "boxTop",
+          "boxBottom",
+          "footer",
+          "tabTitle",
+          "tabContext",
+          "tabExtra",
+          "tabHome"
+        ].includes(k)
+      ), (name) => {
         return {
           name,
           fn: vue.withCtx((slotProps) => [
@@ -658,7 +671,23 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           iconSlot: _ctx.sideboxIconSlot,
           onItemClick: _ctx.onBoxItemClick
         }, vue.createSlots({ _: 2 }, [
-          vue.renderList(Object.keys(_ctx.$slots), (name) => {
+          vue.renderList(Object.keys(_ctx.$slots).filter(
+            (k) => ![
+              "default",
+              "logo",
+              "left",
+              "right",
+              "center",
+              "breadcrumb",
+              "top",
+              "bottom",
+              "footer",
+              "tabTitle",
+              "tabContext",
+              "tabExtra",
+              "tabHome"
+            ].includes(k)
+          ), (name) => {
             return {
               name,
               fn: vue.withCtx((slotProps) => [
@@ -684,7 +713,23 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           onClsoe: _ctx.onSideMenuClose,
           onItemClick: _ctx.onMenuItemClick
         }, vue.createSlots({ _: 2 }, [
-          vue.renderList(Object.keys(_ctx.$slots), (name) => {
+          vue.renderList(Object.keys(_ctx.$slots).filter(
+            (k) => ![
+              "default",
+              "logo",
+              "left",
+              "right",
+              "center",
+              "breadcrumb",
+              "boxTop",
+              "boxBottom",
+              "footer",
+              "tabTitle",
+              "tabContext",
+              "tabExtra",
+              "tabHome"
+            ].includes(k)
+          ), (name) => {
             return {
               name,
               fn: vue.withCtx((slotProps) => [
@@ -710,7 +755,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             onTabContextMenu: _ctx.onTabContextMenu,
             onTabSortChange: _ctx.onTabSortChange
           }, vue.createSlots({ _: 2 }, [
-            vue.renderList(Object.keys(_ctx.$slots), (name) => {
+            vue.renderList(Object.keys(_ctx.$slots).filter(
+              (k) => ["tabTitle", "tabContext", "tabExtra", "tabHome"].includes(k)
+            ), (name) => {
               return {
                 name,
                 fn: vue.withCtx((slotProps) => [

package/lib/ele-pro-layout/props.js

@@ -23,7 +23,7 @@ const proLayoutProps = {
   },
   /** 面包屑导航分隔符 */
   breadcrumbSeparator: {
-    type: [String, Object],
+    type: [String, Object, Function],
     default: "/"
   },
   /** 是否需要返回顶部 */

package/lib/ele-pro-layout/style/layout-mobile.scss

@@ -20,6 +20,10 @@
     display: block !important;
   }
 
+  &:not(.ele-admin-collapse) .ele-admin-header {
+    z-index: auto !important;
+  }
+
   .ele-admin-body,
   .ele-admin-header {
     padding-left: 0 !important;

package/lib/ele-pro-layout/style/sidebar.scss

@@ -129,6 +129,13 @@
   }
 }
 
+.ele-admin-sidebox-popup.ele-menu {
+  & > .el-menu--popup-container > .el-menu--popup {
+    margin-left: eleVar('sidebox', 'padding');
+    margin-right: eleVar('sidebox', 'padding');
+  }
+}
+
 /* 操作按钮 */
 .ele-sidebar-tool {
   height: eleVar('sidebar', 'tool-height');

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

@@ -86,6 +86,11 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    emptyText: StringConstructor;
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     stripe: {
         type: BooleanConstructor;
         default: null;
@@ -111,7 +116,6 @@ declare const _default: import("vue").DefineComponent<{
     headerCellStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
-    emptyText: StringConstructor;
     expandRowKeys: import("vue").PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
@@ -130,10 +134,6 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    indent: {
-        type: NumberConstructor;
-        default: number;
-    };
     treeProps: {
         type: import("vue").PropType<{
             hasChildren?: string | undefined;
@@ -316,6 +316,11 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    emptyText: StringConstructor;
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     stripe: {
         type: BooleanConstructor;
         default: null;
@@ -341,7 +346,6 @@ declare const _default: import("vue").DefineComponent<{
     headerCellStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
-    emptyText: StringConstructor;
     expandRowKeys: import("vue").PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
@@ -360,10 +364,6 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    indent: {
-        type: NumberConstructor;
-        default: number;
-    };
     treeProps: {
         type: import("vue").PropType<{
             hasChildren?: string | undefined;
@@ -431,6 +431,7 @@ declare const _default: import("vue").DefineComponent<{
     lazy: boolean;
     data: any[];
     scrollbarAlwaysOn: boolean;
+    indent: number;
     stripe: boolean;
     border: boolean;
     showHeader: boolean;
@@ -438,7 +439,6 @@ declare const _default: import("vue").DefineComponent<{
     highlightCurrentRow: boolean;
     defaultExpandAll: boolean;
     selectOnIndeterminate: boolean;
-    indent: number;
     treeProps: {
         hasChildren?: string | undefined;
         children?: string | undefined;

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

@@ -110,6 +110,11 @@ export declare const proTableProps: {
         default: boolean;
     };
     showOverflowTooltip: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    emptyText: StringConstructor;
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     stripe: {
         type: BooleanConstructor;
         default: null;
@@ -135,7 +140,6 @@ export declare const proTableProps: {
     headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
-    emptyText: StringConstructor;
     expandRowKeys: PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
@@ -154,10 +158,6 @@ export declare const proTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    indent: {
-        type: NumberConstructor;
-        default: number;
-    };
     treeProps: {
         type: PropType<{
             hasChildren?: string | undefined;

package/lib/ele-tabs/components/tab-title.js

@@ -62,15 +62,16 @@ const _export_sfc = (sfc, props) => {
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleDropdown = vue.resolveComponent("EleDropdown");
-  return vue.openBlock(), vue.createBlock(_component_EleDropdown, vue.mergeProps(!_ctx.contextMenu || typeof _ctx.contextMenu == "boolean" ? {} : _ctx.contextMenu, {
-    ref: "dropdownRef",
-    trigger: "contextmenu",
+  return vue.openBlock(), vue.createBlock(_component_EleDropdown, vue.mergeProps({
     placement: "bottom-start",
-    disabled: !_ctx.contextMenu,
     popperClass: "ele-tab-popup",
     popperOptions: {
       modifiers: [{ name: "offset", options: { offset: [0, 8] } }]
-    },
+    }
+  }, !_ctx.contextMenu || typeof _ctx.contextMenu == "boolean" ? {} : _ctx.contextMenu, {
+    ref: "dropdownRef",
+    trigger: "contextmenu",
+    disabled: !_ctx.contextMenu,
     items: _ctx.contextMenus,
     onCommand: _ctx.onContextMenu,
     onVisibleChange: _ctx.onContextVisible

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

@@ -865,7 +865,7 @@
         margin-left: $space;
       }
 
-      &:hover {
+      &:not(.is-tab):hover {
         box-shadow: eleVar('tab-button', 'active-shadow');
       }
 

package/lib/ele-virtual-table/props.d.ts

@@ -65,6 +65,11 @@ export declare const virtualTableProps: {
         default: boolean;
     };
     showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    emptyText: StringConstructor;
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -82,7 +87,6 @@ export declare const virtualTableProps: {
     headerCellStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
-    emptyText: StringConstructor;
     expandRowKeys: import("vue").PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
@@ -101,10 +105,6 @@ export declare const virtualTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    indent: {
-        type: NumberConstructor;
-        default: number;
-    };
     treeProps: {
         type: import("vue").PropType<{
             hasChildren?: string | undefined;

package/lib/ele-watermark/index.js

@@ -49,6 +49,7 @@ const _sfc_main = vue.defineComponent({
         transform: "none !important",
         filter: "none !important",
         visibility: "visible !important",
+        transition: "none !important",
         maxWidth: "none !important",
         maxHeight: "none !important",
         zoom: "1 !important",

package/lib/style/themes/default.scss

@@ -327,13 +327,13 @@ $ele: map.deep-merge(
       'arrow-margin': 0 -4px 0 6px,
       'bg': elVar('bg-color'),
       'border-color': elVar('border-color', 'light'),
-      'padding': 2px 0,
+      'padding': 4px 0,
       'base-level': 16px,
       'child-bg': rgba(0, 0, 0, 0.02),
       'collapse-width': 58px,
       'collapse-icon-size': 18px,
       'item-height': 40px,
-      'item-margin': 8px,
+      'item-margin': 6px,
       'item-padding': 0,
       'item-radius': 0,
       'item-color': elVar('text-color', 'primary'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.1.5",
+  "version": "1.1.6-beta.2",
   "description": "EleAdminPlus Library",
   "main": "lib/index.js",
   "module": "es/index.js",