ele-admin-plus 1.2.0 → 1.2.1-beta.2

package/es/utils/message.js

@@ -1,4 +1,4 @@
-import { getCurrentInstance, provide, inject, onActivated, onDeactivated, isVNode, h, mergeProps } from "vue";
+import { getCurrentInstance, provide, inject, onActivated, onDeactivated, onBeforeUnmount, isVNode, h, mergeProps } from "vue";
 import { ElMessage } from "element-plus";
 import { useGlobalProps } from "../ele-config-provider/receiver";
 import { useLayoutState } from "../ele-pro-layout/util";
@@ -40,7 +40,7 @@ function getOffsetStyle(offset, userStyle) {
 function isObjOpt(params) {
   return params != null && typeof params === "object" && !isVNode(params);
 }
-function normalizeOption(params, globalOpt, onClose, type, loading, getWrapEl2, groupKey) {
+function normalizeOption(params, globalOpt, onClose, type, loading, getWrapEl2, groupKey, messageId, onMessageDestroy) {
   const opt = { ...globalOpt || {} };
   if (isObjOpt(params)) {
     Object.assign(opt, params);
@@ -89,7 +89,9 @@ function normalizeOption(params, globalOpt, onClose, type, loading, getWrapEl2,
       showClose: opt.showClose,
       dangerouslyUseHTMLString: opt.dangerouslyUseHTMLString,
       loading,
-      onClose
+      messageId,
+      onClose,
+      onMessageDestroy
     },
     { default: isFn ? content : isStr ? void 0 : () => content }
   );
@@ -161,7 +163,8 @@ function useMessage(globalOpt) {
   const globalProps = useGlobalProps("message");
   const appContext = (_b = (_a = getCurrentInstance) == null ? void 0 : _a()) == null ? void 0 : _b.appContext;
   const groupKey = (globalOpt == null ? void 0 : globalOpt.groupKey) || getDefaultGroupKey();
-  const state = { wrapEl: null, isActivated: true };
+  const state = { wrapEl: null, isActivated: true, id: 0 };
+  const instances = /* @__PURE__ */ new Map();
   const hideClass = "is-hide";
   provide(MESSAGE_KEY, { groupKey, getInnerWrap: () => getWrap(true) });
   const parentMsg = inject(MESSAGE_KEY, null);
@@ -173,6 +176,12 @@ function useMessage(globalOpt) {
     state.isActivated = false;
     state.wrapEl && state.wrapEl.classList.add(hideClass);
   });
+  onBeforeUnmount(() => {
+    for (const [_key, ins] of instances) {
+      ins && ins.close && ins.close();
+    }
+    instances.clear();
+  });
   const getWrap = (inner) => {
     if (inner) {
       if (parentMsg != null && parentMsg.groupKey === groupKey) {
@@ -190,49 +199,63 @@ function useMessage(globalOpt) {
     }
     return getWrapEl();
   };
-  const getOption = function(params, onClose, type, loading) {
-    return normalizeOption(
+  const getOpt = function(params, onClose, type, loading) {
+    state.id++;
+    const msgId = `m_${state.id}`;
+    const opt = normalizeOption(
       params,
       { ...globalProps.value || {}, ...globalOpt || {} },
       onClose,
       type,
       loading,
       getWrap,
-      groupKey
+      groupKey,
+      msgId,
+      (messageId) => {
+        messageId && instances.delete(messageId);
+      }
     );
+    return { opt, msgId };
   };
   const message = function(params) {
-    const opt = getOption(params, () => ins.close());
+    const { opt, msgId } = getOpt(params, () => ins.close());
     const ins = ElMessage(opt, appContext);
+    instances.set(msgId, ins);
     return ins;
   };
   message.success = function(params) {
-    const opt = getOption(params, () => ins.close(), "success", false);
+    const { opt, msgId } = getOpt(params, () => ins.close(), "success", false);
     const ins = ElMessage(opt, appContext);
+    instances.set(msgId, ins);
     return ins;
   };
   message.warning = function(params) {
-    const opt = getOption(params, () => ins.close(), "warning", false);
+    const { opt, msgId } = getOpt(params, () => ins.close(), "warning", false);
     const ins = ElMessage(opt, appContext);
+    instances.set(msgId, ins);
     return ins;
   };
   message.error = function(params) {
-    const opt = getOption(params, () => ins.close(), "error", false);
+    const { opt, msgId } = getOpt(params, () => ins.close(), "error", false);
     const ins = ElMessage(opt, appContext);
+    instances.set(msgId, ins);
     return ins;
   };
   message.info = function(params) {
-    const opt = getOption(params, () => ins.close());
+    const { opt, msgId } = getOpt(params, () => ins.close());
     const ins = ElMessage(opt, appContext);
+    instances.set(msgId, ins);
     return ins;
   };
   message.loading = function(params) {
     blurCurrentFocus();
-    const opt = getOption(params, () => ins.close(), void 0, true);
+    const { opt, msgId } = getOpt(params, () => ins.close(), void 0, true);
     const ins = ElMessage(opt, appContext);
+    instances.set(msgId, ins);
     return ins;
   };
   message.closeAll = function(type) {
+    instances.clear();
     return ElMessage.closeAll(type);
   };
   return message;

package/lib/components.cjs

@@ -14,9 +14,8 @@ exports.EleCropperModal = index$3;
 exports.EleMapPicker = index$4;
 exports.EleXgPlayer = index$5;
 Object.keys(coreComponents).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => coreComponents[k]
-    });
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: () => coreComponents[k]
+  });
 });

package/lib/core-export.cjs

@@ -14,51 +14,44 @@ exports.LayoutTool = layoutTool;
 exports.SidebarTool = layoutTool;
 exports.TabDropdown = tabDropdown;
 Object.keys(chartThemeDark).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => chartThemeDark[k]
-    });
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: () => chartThemeDark[k]
+  });
 });
 Object.keys(chartTheme).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => chartTheme[k]
-    });
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: () => chartTheme[k]
+  });
 });
 Object.keys(core).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => core[k]
-    });
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: () => core[k]
+  });
 });
 Object.keys(menuUtil).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => menuUtil[k]
-    });
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: () => menuUtil[k]
+  });
 });
 Object.keys(message).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => message[k]
-    });
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: () => message[k]
+  });
 });
 Object.keys(messageBox).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => messageBox[k]
-    });
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: () => messageBox[k]
+  });
 });
 Object.keys(validate).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => validate[k]
-    });
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: () => validate[k]
+  });
 });

package/lib/core.cjs

@@ -8,16 +8,14 @@ Object.defineProperty(exports, "default", {
   get: () => coreInstaller.installer
 });
 Object.keys(coreComponents).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => coreComponents[k]
-    });
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: () => coreComponents[k]
+  });
 });
 Object.keys(coreExport).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => coreExport[k]
-    });
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: () => coreExport[k]
+  });
 });

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

@@ -323,42 +323,22 @@ const _export_sfc = (sfc, props2) => {
   }
   return target;
 };
-const _hoisted_1 = {
-  key: 0,
-  class: "ele-admin-logo"
-};
-const _hoisted_2 = ["src"];
-const _hoisted_3 = {
+const _hoisted_1 = ["src"];
+const _hoisted_2 = {
   key: 1,
   class: "ele-admin-tools"
 };
-const _hoisted_4 = {
+const _hoisted_3 = {
   key: 2,
   class: "ele-admin-breadcrumb"
 };
-const _hoisted_5 = {
-  key: 3,
-  class: "ele-admin-menus"
-};
-const _hoisted_6 = {
+const _hoisted_4 = {
   key: 5,
   class: "ele-admin-tools"
 };
+const _hoisted_5 = ["src"];
+const _hoisted_6 = ["src"];
 const _hoisted_7 = {
-  key: 0,
-  class: "ele-admin-logo"
-};
-const _hoisted_8 = ["src"];
-const _hoisted_9 = {
-  key: 0,
-  class: "ele-admin-logo-title"
-};
-const _hoisted_10 = {
-  key: 1,
-  class: "ele-admin-logo"
-};
-const _hoisted_11 = ["src"];
-const _hoisted_12 = {
   ref: "modalsRef",
   class: "ele-admin-modals"
 };
@@ -399,24 +379,32 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         onMouseenter: _cache[0] || (_cache[0] = (...args) => _ctx.handleHeadMouseenter && _ctx.handleHeadMouseenter(...args)),
         onMouseleave: _cache[1] || (_cache[1] = (...args) => _ctx.handleHeadMouseleave && _ctx.handleHeadMouseleave(...args))
       }, [
-        _ctx.isHeaderLogo && (_ctx.logoSrc || _ctx.logoTitle || _ctx.$slots.logo || _ctx.$slots.logoTitle) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
+        _ctx.isHeaderLogo && (_ctx.logoSrc || _ctx.logoTitle || _ctx.$slots.logo || _ctx.$slots.logoTitle) ? (vue.openBlock(), vue.createElementBlock("div", {
+          key: 0,
+          class: "ele-admin-logo",
+          style: vue.normalizeStyle(_ctx.logoStyle)
+        }, [
           _ctx.logoSrc || _ctx.$slots.logo ? vue.renderSlot(_ctx.$slots, "logo", { key: 0 }, () => [
-            vue.createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_2)
+            vue.createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_1)
           ]) : vue.createCommentVNode("", true),
           _ctx.logoTitle || _ctx.$slots.logoTitle ? vue.renderSlot(_ctx.$slots, "logoTitle", { key: 1 }, () => [
             vue.createElementVNode("h1", null, vue.toDisplayString(_ctx.logoTitle), 1)
           ]) : vue.createCommentVNode("", true)
-        ])) : vue.createCommentVNode("", true),
-        _ctx.$slots.left ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3, [
+        ], 4)) : vue.createCommentVNode("", true),
+        _ctx.$slots.left ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, [
           vue.renderSlot(_ctx.$slots, "left")
         ])) : vue.createCommentVNode("", true),
-        _ctx.breadcrumb ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4, [
+        _ctx.breadcrumb ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3, [
           vue.renderSlot(_ctx.$slots, "breadcrumb", {}, () => [
             _ctx.levels && _ctx.levels.length ? (vue.openBlock(), vue.createBlock(_component_EleBreadcrumb, vue.mergeProps({ key: 0 }, _ctx.breadcrumb === true ? {} : _ctx.breadcrumb, { items: _ctx.levels }), null, 16, ["items"])) : vue.createCommentVNode("", true)
           ])
         ])) : vue.createCommentVNode("", true),
         vue.renderSlot(_ctx.$slots, "center"),
-        !_ctx.showHeaderTabs || _ctx.showHeaderMenus ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5, [
+        !_ctx.showHeaderTabs || _ctx.showHeaderMenus ? (vue.openBlock(), vue.createElementBlock("div", {
+          key: 3,
+          class: "ele-admin-menus",
+          style: vue.normalizeStyle(_ctx.headerMenusStyle)
+        }, [
           _ctx.showHeaderMenus && _ctx.headerMenus ? (vue.openBlock(), vue.createBlock(_component_EleMenus, vue.mergeProps({
             key: 0,
             mode: "horizontal",
@@ -446,7 +434,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               key: "1"
             } : void 0
           ]), 1040, ["theme", "popupTheme", "defaultActive", "items", "onOpen", "onClose", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : vue.createCommentVNode("", true)
-        ])) : vue.createCommentVNode("", true),
+        ], 4)) : vue.createCommentVNode("", true),
         _ctx.showHeaderTabs ? (vue.openBlock(), vue.createBlock(_component_LayoutTabs, {
           key: 4,
           tabs: _ctx.tabs,
@@ -476,7 +464,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             };
           })
         ]), 1032, ["tabs", "active", "fixedHome", "homePath", "isHome", "tabStyle", "tabContextMenu", "tabContextMenus", "tabSortable", "class", "style", "onTabClick", "onTabRemove", "onTabContextMenu", "onTabSortChange"])) : vue.createCommentVNode("", true),
-        _ctx.$slots.right ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_6, [
+        _ctx.$slots.right ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4, [
           vue.renderSlot(_ctx.$slots, "right")
         ])) : vue.createCommentVNode("", true)
       ], 38)) : vue.createCommentVNode("", true)
@@ -508,13 +496,20 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           onMouseenter: _cache[2] || (_cache[2] = (...args) => _ctx.handleBoxMouseEnter && _ctx.handleBoxMouseEnter(...args)),
           onMouseleave: _cache[3] || (_cache[3] = (...args) => _ctx.handleBoxMouseLeave && _ctx.handleBoxMouseLeave(...args))
         }, [
-          !_ctx.isHeaderLogo && (_ctx.logoSrc || _ctx.$slots.logo) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7, [
+          !_ctx.isHeaderLogo && (_ctx.logoSrc || _ctx.$slots.logo) ? (vue.openBlock(), vue.createElementBlock("div", {
+            key: 0,
+            class: "ele-admin-logo",
+            style: vue.normalizeStyle(_ctx.logoStyle)
+          }, [
             vue.renderSlot(_ctx.$slots, "logo", {}, () => [
-              vue.createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_8)
+              vue.createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_5)
             ])
-          ])) : vue.createCommentVNode("", true),
+          ], 4)) : vue.createCommentVNode("", true),
           vue.renderSlot(_ctx.$slots, "boxTop"),
-          vue.createVNode(_component_ElScrollbar, { class: "ele-admin-menus" }, {
+          vue.createVNode(_component_ElScrollbar, {
+            class: "ele-admin-menus",
+            style: vue.normalizeStyle(_ctx.sideboxMenusStyle)
+          }, {
             default: vue.withCtx(() => [
               _ctx.sideboxMenus ? (vue.openBlock(), vue.createBlock(_component_EleMenus, vue.mergeProps({
                 key: 0,
@@ -548,7 +543,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ]), 1040, ["theme", "defaultActive", "collapse", "items", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : vue.createCommentVNode("", true)
             ]),
             _: 3
-          }),
+          }, 8, ["style"]),
           vue.renderSlot(_ctx.$slots, "boxBottom")
         ], 38)) : vue.createCommentVNode("", true),
         !_ctx.isBoxSidebar ? (vue.openBlock(), vue.createElementBlock("div", {
@@ -565,21 +560,32 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           onMouseleave: _cache[5] || (_cache[5] = (...args) => _ctx.handleSideMouseLeave && _ctx.handleSideMouseLeave(...args))
         }, [
           _ctx.isMixSidebar ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
-            !_ctx.isHeaderLogo && (_ctx.logoTitle || _ctx.$slots.logoTitle) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_9, [
+            !_ctx.isHeaderLogo && (_ctx.logoTitle || _ctx.$slots.logoTitle) ? (vue.openBlock(), vue.createElementBlock("div", {
+              key: 0,
+              class: "ele-admin-logo-title",
+              style: vue.normalizeStyle(_ctx.logoTitleStyle)
+            }, [
               vue.renderSlot(_ctx.$slots, "logoTitle", {}, () => [
                 vue.createElementVNode("h1", null, vue.toDisplayString(_ctx.logoTitle), 1)
               ])
-            ])) : vue.createCommentVNode("", true)
-          ], 64)) : !_ctx.isHeaderLogo && (_ctx.logoSrc || _ctx.logoTitle || _ctx.$slots.logo || _ctx.$slots.logoTitle) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_10, [
+            ], 4)) : vue.createCommentVNode("", true)
+          ], 64)) : !_ctx.isHeaderLogo && (_ctx.logoSrc || _ctx.logoTitle || _ctx.$slots.logo || _ctx.$slots.logoTitle) ? (vue.openBlock(), vue.createElementBlock("div", {
+            key: 1,
+            class: "ele-admin-logo",
+            style: vue.normalizeStyle(_ctx.logoStyle)
+          }, [
             _ctx.logoSrc || _ctx.$slots.logo ? vue.renderSlot(_ctx.$slots, "logo", { key: 0 }, () => [
-              vue.createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_11)
+              vue.createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_6)
             ]) : vue.createCommentVNode("", true),
             _ctx.logoTitle || _ctx.$slots.logoTitle ? vue.renderSlot(_ctx.$slots, "logoTitle", { key: 1 }, () => [
               vue.createElementVNode("h1", null, vue.toDisplayString(_ctx.logoTitle), 1)
             ]) : vue.createCommentVNode("", true)
-          ])) : vue.createCommentVNode("", true),
+          ], 4)) : vue.createCommentVNode("", true),
           vue.renderSlot(_ctx.$slots, "top"),
-          vue.createVNode(_component_ElScrollbar, { class: "ele-admin-menus" }, {
+          vue.createVNode(_component_ElScrollbar, {
+            class: "ele-admin-menus",
+            style: vue.normalizeStyle(_ctx.sidebarMenusStyle)
+          }, {
             default: vue.withCtx(() => [
               _ctx.sidebarMenus ? (vue.openBlock(), vue.createBlock(_component_EleMenus, vue.mergeProps({
                 key: 0,
@@ -612,7 +618,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ]), 1040, ["theme", "defaultActive", "collapse", "items", "onOpen", "onClose", "onItemClick"])) : vue.createCommentVNode("", true)
             ]),
             _: 3
-          }),
+          }, 8, ["style"]),
           vue.renderSlot(_ctx.$slots, "bottom")
         ], 38)) : vue.createCommentVNode("", true)
       ], 6)) : vue.createCommentVNode("", true)
@@ -666,7 +672,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         target: _ctx.fixedBody && _ctx.contentRef ? _ctx.contentRef : void 0,
         style: _ctx.fixedBody ? { position: "absolute" } : void 0
       }, _ctx.backTop === true ? {} : _ctx.backTop), null, 16, ["target", "style"])) : vue.createCommentVNode("", true),
-      vue.createElementVNode("div", _hoisted_12, null, 512)
+      vue.createElementVNode("div", _hoisted_7, null, 512)
     ]),
     default: vue.withCtx(() => [
       vue.createElementVNode("div", {

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

@@ -3,7 +3,10 @@ import { MenuItem } from '../ele-menus/types';
 import { TabPaneItem, TabEventOption } from '../ele-tabs/types';
 
 declare const _default: import('vue').DefineComponent<{
-    height: (StringConstructor | NumberConstructor)[];
+    height: {
+        type: (StringConstructor | NumberConstructor)[];
+        default: string;
+    };
     headerMenus: import('vue').PropType<MenuItem[]>;
     headerActive: StringConstructor;
     sidebarMenus: import('vue').PropType<MenuItem[]>;
@@ -28,6 +31,7 @@ declare const _default: import('vue').DefineComponent<{
     sidebarStyle: import('vue').PropType<import('./types').SidebarStyle>;
     tabStyle: {
         type: import('vue').PropType<import('./types').TabStyle>;
+        /** 是否禁用过渡动画 */
         default: string;
     };
     fixedHeader: BooleanConstructor;
@@ -42,8 +46,8 @@ declare const _default: import('vue').DefineComponent<{
     tabSortable: BooleanConstructor;
     headerTitleSlot: {
         type: StringConstructor;
-        default: string;
-    };
+        default: string; /** 是否仅侧栏导航布局 */
+    }; /** 是否仅侧栏导航布局 */
     headerIconSlot: {
         type: StringConstructor;
         default: string;
@@ -56,13 +60,13 @@ declare const _default: import('vue').DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    /** 是否双侧栏布局 */
     sideboxTitleSlot: {
         type: StringConstructor;
         default: string;
     };
     sideboxIconSlot: {
         type: StringConstructor;
+        /** 是否是移动端风格 */
         default: string;
     };
     headerCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
@@ -70,13 +74,18 @@ declare const _default: import('vue').DefineComponent<{
     sideboxCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     tabsCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     contentCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    logoStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    logoTitleStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    headerMenusStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    sidebarMenusStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    sideboxMenusStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     logoSrc: StringConstructor;
     logoTitle: StringConstructor;
     menuScrollToActive: {
         type: BooleanConstructor;
         default: boolean;
     };
-    mobile: BooleanConstructor;
+    mobile: BooleanConstructor; /** 是否是暗色侧栏 */
 }, {
     ownSlots: string[];
     tabSlots: string[];
@@ -150,13 +159,16 @@ declare const _default: import('vue').DefineComponent<{
     sideMenuItemClick: (_item: MenuItem, _e: MouseEvent) => boolean;
     sideMouseenter: (_e: MouseEvent) => boolean;
     sideMouseleave: (_e: MouseEvent) => boolean;
-    tabClick: (_option: TabEventOption) => boolean; /** 是否是移动端风格折叠状态 */
+    tabClick: (_option: TabEventOption) => boolean;
     tabRemove: (_name: string) => boolean;
     tabContextMenu: (_option: TabEventOption) => boolean;
     tabSortChange: (_data: TabPaneItem[]) => boolean;
     contentMounted: (_contentEl: HTMLElement, _modalsEl: HTMLElement) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    height: (StringConstructor | NumberConstructor)[];
+    height: {
+        type: (StringConstructor | NumberConstructor)[];
+        default: string;
+    };
     headerMenus: import('vue').PropType<MenuItem[]>;
     headerActive: StringConstructor;
     sidebarMenus: import('vue').PropType<MenuItem[]>;
@@ -181,6 +193,7 @@ declare const _default: import('vue').DefineComponent<{
     sidebarStyle: import('vue').PropType<import('./types').SidebarStyle>;
     tabStyle: {
         type: import('vue').PropType<import('./types').TabStyle>;
+        /** 是否禁用过渡动画 */
         default: string;
     };
     fixedHeader: BooleanConstructor;
@@ -195,8 +208,8 @@ declare const _default: import('vue').DefineComponent<{
     tabSortable: BooleanConstructor;
     headerTitleSlot: {
         type: StringConstructor;
-        default: string;
-    };
+        default: string; /** 是否仅侧栏导航布局 */
+    }; /** 是否仅侧栏导航布局 */
     headerIconSlot: {
         type: StringConstructor;
         default: string;
@@ -209,13 +222,13 @@ declare const _default: import('vue').DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    /** 是否双侧栏布局 */
     sideboxTitleSlot: {
         type: StringConstructor;
         default: string;
     };
     sideboxIconSlot: {
         type: StringConstructor;
+        /** 是否是移动端风格 */
         default: string;
     };
     headerCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
@@ -223,13 +236,18 @@ declare const _default: import('vue').DefineComponent<{
     sideboxCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     tabsCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     contentCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    logoStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    logoTitleStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    headerMenusStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    sidebarMenusStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    sideboxMenusStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     logoSrc: StringConstructor;
     logoTitle: StringConstructor;
     menuScrollToActive: {
         type: BooleanConstructor;
         default: boolean;
     };
-    mobile: BooleanConstructor;
+    mobile: BooleanConstructor; /** 是否是暗色侧栏 */
 }>> & {
     onTabClick?: ((_option: TabEventOption) => any) | undefined;
     onTabRemove?: ((_name: string) => any) | undefined;
@@ -256,6 +274,7 @@ declare const _default: import('vue').DefineComponent<{
     onSideMouseleave?: ((_e: MouseEvent) => any) | undefined;
     onContentMounted?: ((_contentEl: HTMLElement, _modalsEl: HTMLElement) => any) | undefined;
 }, {
+    height: string | number;
     collapse: boolean;
     compact: boolean;
     tabStyle: import('./types').TabStyle;

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

@@ -2,7 +2,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const adminLayoutProps = {
   /** 高度 */
-  height: [String, Number],
+  height: {
+    type: [String, Number],
+    default: "100%"
+  },
   /** 顶栏菜单数据 */
   headerMenus: Array,
   /** 顶栏菜单选中 */
@@ -112,6 +115,16 @@ const adminLayoutProps = {
   tabsCustomStyle: Object,
   /** 内容区样式 */
   contentCustomStyle: Object,
+  /** logo样式 */
+  logoStyle: Object,
+  /** logo文字样式 */
+  logoTitleStyle: Object,
+  /** 顶栏菜单样式 */
+  headerMenusStyle: Object,
+  /** 侧栏菜单样式 */
+  sidebarMenusStyle: Object,
+  /** 双侧栏一级菜单样式 */
+  sideboxMenusStyle: Object,
   /** logo图片地址 */
   logoSrc: String,
   /** logo文字 */

package/lib/ele-admin-layout/props.d.ts

@@ -10,7 +10,10 @@ import { Layout, SidebarLayout, HeaderStyle, SidebarStyle, TabStyle, TabBar, Max
  */
 export declare const adminLayoutProps: {
     /** 高度 */
-    height: (StringConstructor | NumberConstructor)[];
+    height: {
+        type: (StringConstructor | NumberConstructor)[];
+        default: string;
+    };
     /** 顶栏菜单数据 */
     headerMenus: PropType<MenuItem[]>;
     /** 顶栏菜单选中 */
@@ -120,6 +123,16 @@ export declare const adminLayoutProps: {
     tabsCustomStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 内容区样式 */
     contentCustomStyle: PropType<Partial<import('vue').CSSProperties>>;
+    /** logo样式 */
+    logoStyle: PropType<Partial<import('vue').CSSProperties>>;
+    /** logo文字样式 */
+    logoTitleStyle: PropType<Partial<import('vue').CSSProperties>>;
+    /** 顶栏菜单样式 */
+    headerMenusStyle: PropType<Partial<import('vue').CSSProperties>>;
+    /** 侧栏菜单样式 */
+    sidebarMenusStyle: PropType<Partial<import('vue').CSSProperties>>;
+    /** 双侧栏一级菜单样式 */
+    sideboxMenusStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** logo图片地址 */
     logoSrc: StringConstructor;
     /** logo文字 */