ele-admin-plus 1.4.1 → 1.5.0-beta.2

package/lib/ele-pro-form-builder/style/index.scss

@@ -10,61 +10,46 @@
 .ele-pro-form-builder-main-wrapper.ele-split-panel {
   height: 100%;
 
-  & > .ele-split-panel-wrap,
-  & > .ele-split-panel-body {
-    overflow: hidden;
-  }
+  & > .ele-split-panel-wrap {
+    & > .ele-split-panel-side {
+      display: flex;
+      flex-direction: column;
 
-  & > .ele-split-panel-wrap > .ele-split-panel-side {
-    display: flex;
-    flex-direction: column;
+      & > .ele-tab-bar {
+        flex-shrink: 0;
+        padding: 0 16px;
 
-    & > .ele-tab-bar {
-      flex-shrink: 0;
-      padding: 0 16px;
+        .ele-tab-item + .ele-tab-item {
+          margin-left: 22px;
+        }
+      }
 
-      .ele-tab-item + .ele-tab-item {
-        margin-left: 22px;
+      & > .ele-pro-form-builder-tab-body {
+        flex: 1 1 60px;
+        overflow: hidden;
+        display: flex;
+        flex-direction: column;
+        box-sizing: border-box;
+        position: relative;
       }
     }
 
-    & > .ele-pro-form-builder-tab-body {
-      flex: 1;
-      overflow: hidden;
-      display: flex;
-      flex-direction: column;
-      box-sizing: border-box;
-      position: relative;
+    & > .ele-split-panel-tools > .ele-split-panel-collapse-btn {
+      z-index: 99;
     }
   }
-
-  &.is-responsive > .ele-split-panel-wrap > div.ele-split-panel-side {
-    background: none;
-  }
-
-  & > .ele-split-collapse-button {
-    z-index: 99;
-  }
 }
 
 .ele-pro-form-builder-wrapper.ele-split-panel {
   & > .ele-split-panel-wrap > .ele-split-panel-side {
     border-width: 0 1px 0 0;
   }
-
-  &.is-collapse > .ele-split-collapse-button {
-    margin-left: 2px;
-  }
 }
 
 .ele-pro-form-builder-main-wrapper.ele-split-panel {
   & > .ele-split-panel-wrap > .ele-split-panel-side {
     border-width: 0 0 0 1px;
   }
-
-  &.is-collapse > .ele-split-collapse-button {
-    margin-right: 2px;
-  }
 }
 
 /* 主体 */
@@ -75,7 +60,7 @@
 }
 
 .ele-pro-form-builder-body {
-  flex: 1;
+  flex: 1 1 60px;
   display: flex;
   flex-direction: column;
   padding: 12px;
@@ -224,7 +209,7 @@
   }
 }
 
-@media screen and (max-width: 992px) {
+@media screen and (max-width: #{$pad-max-width}) {
   .ele-pro-form-builder-header > .ele-pro-form-builder-screen-radio {
     display: none;
   }

package/lib/ele-pro-layout/components/{pro-iframe.cjs → iframe-group.cjs}

@@ -6,8 +6,8 @@ const _hoisted_1 = { class: "ele-admin-iframe-wrap" };
 const _hoisted_2 = ["data-id", "src"];
 const _hoisted_3 = ["data-id", "src"];
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
-  ...{ name: "ProIframe" },
-  __name: "pro-iframe",
+  ...{ name: "IframeGroup" },
+  __name: "iframe-group",
   props: {
     /** 是否支持内嵌缓存 */
     keepAlive: Boolean,
@@ -29,9 +29,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const data = vue.computed(() => {
       const list = [];
       props.tabData.forEach((t) => {
-        var _a, _b;
-        const isAlive = ((_a = t.meta) == null ? void 0 : _a.keepAlive) !== false;
-        if (t.key && ((_b = t.meta) == null ? void 0 : _b.iframe) && isAlive) {
+        const isAlive = t.meta?.keepAlive !== false;
+        if (t.key && t.meta?.iframe && isAlive) {
           const src = util.getIframeSrc(t.fullPath, t.meta.iframe);
           list.push({ id: t.key, src, refresh: t.refresh });
         }

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

@@ -4,11 +4,12 @@ const vueRouter = require("vue-router");
 const index = require("../icons/index");
 const hook = require("../utils/hook");
 const common = require("../utils/common");
-const ProIframe = require("./components/pro-iframe");
-const util = require("./util");
+const EleModalRender = require("../ele-modal-render/index");
+const util = require("../ele-modal-render/util");
+const IframeGroup = require("./components/iframe-group");
+const util$1 = require("./util");
 const props = require("./props");
 const EleAdminLayout = require("../ele-admin-layout/index");
-const mobileQuery = "(max-width: 768px)";
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ name: "EleProLayout" },
   __name: "index",
@@ -18,6 +19,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const props$1 = __props;
     const emit = __emit;
     const { currentRoute, push } = vueRouter.useRouter();
+    const {
+      modals,
+      openModal,
+      closeModal,
+      closeAllModal,
+      removeModal,
+      updateModalVisible,
+      updateModalProps
+    } = util.useModalRenderProvider();
     const [startTimer, stopTimer] = hook.useTimer(() => props$1.menuHoverTimeout);
     const state = { navData: [], sideData: [], boxData: [] };
     const layoutRef = vue.ref(null);
@@ -63,15 +73,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const sideNavigation = vue.ref(computedSideNavigation());
     const layoutHeaders = vue.computed(() => {
       const navRoute = props$1.navTrigger !== "click" && props$1.navTrigger !== "hover";
-      return util.getMenuItems(navData.value, navRoute);
+      return util$1.getMenuItems(navData.value, navRoute);
     });
     const layoutSidebars = vue.computed(() => {
       const menuRoute = props$1.itemTrigger !== "click" && props$1.itemTrigger !== "hover";
-      return util.getMenuItems(sideData.value, menuRoute);
+      return util$1.getMenuItems(sideData.value, menuRoute);
     });
     const layoutSideboxs = vue.computed(() => {
       const boxRoute = props$1.boxTrigger !== "click" && props$1.boxTrigger !== "hover";
-      return util.getMenuItems(boxData.value, boxRoute);
+      return util$1.getMenuItems(boxData.value, boxRoute);
     });
     const layoutTabs = vue.computed(() => {
       const data = props$1.fixedHome ? tabData.value.filter((t) => !t.home) : tabData.value;
@@ -81,7 +91,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           name: d.key,
           label: d.title,
           closable: onlyOne && d.home ? false : d.closable,
-          meta: d.meta
+          meta: {
+            path: d.path,
+            fullPath: d.fullPath,
+            home: d.home,
+            components: d.components,
+            refresh: d.refresh,
+            ...d.meta || {}
+          }
         };
       });
     });
@@ -287,7 +304,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleHeadMenuClose = (index2, indexPath) => {
       emit("headMenuClose", index2, indexPath);
     };
-    const handleHeadMenuItemClick = (item, e) => {
+    const handleHeadMenuItemClick = (item, e, type) => {
       const path = item.index;
       const trigger = props$1.navTrigger;
       if (!path || trigger !== "click" && trigger !== "hover") {
@@ -298,14 +315,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         if (props$1.beforeClick && props$1.beforeClick(item, e) === false) {
           return;
         }
+        if (type === "parent" || type === "group") {
+          return;
+        }
         window.open(path);
         return;
       }
-      const childMenus = util.getActiveChilds(navData.value, path, "tempChildren");
-      const isChild = !childMenus.some((d) => {
-        var _a;
-        return !((_a = d.meta) == null ? void 0 : _a.hide);
-      });
+      const childMenus = util$1.getActiveChilds(navData.value, path, "tempChildren");
+      const isChild = !childMenus.some((d) => !d.meta?.hide);
       if (trigger !== "click" && !isChild) {
         e.stopPropagation();
         return;
@@ -313,6 +330,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (props$1.beforeClick && props$1.beforeClick(item, e) === false) {
         return;
       }
+      if (type === "parent" || type === "group") {
+        return;
+      }
       if (isChild && path !== vue.unref(currentRoute).fullPath) {
         push(path);
         return;
@@ -348,13 +368,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (!common.isExternalLink(path) && props$1.beforeClick && props$1.beforeClick(item, e) === false) {
         return;
       }
-      const temp = util.getActiveChilds(navData.value, path, "tempChildren");
+      const temp = util$1.getActiveChilds(navData.value, path, "tempChildren");
       if (navActive.value !== path) {
         state.isHover = true;
-        navActive.value = temp.some((d) => {
-          var _a;
-          return !((_a = d.meta) == null ? void 0 : _a.hide);
-        }) ? path : void 0;
+        navActive.value = temp.some((d) => !d.meta?.hide) ? path : void 0;
         const isMixSide = sideNavigation.value === "mix" || sideNavigation.value === "box";
         if (!isMixSide) {
           sideData.value = temp;
@@ -375,7 +392,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleHeadMouseleave = () => {
       resetMenuState();
     };
-    const handleBoxMenuItemClick = (item, e) => {
+    const handleBoxMenuItemClick = (item, e, type) => {
       const path = item.index;
       const trigger = props$1.boxTrigger;
       if (!path || trigger !== "click" && trigger !== "hover") {
@@ -386,6 +403,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         if (props$1.beforeClick && props$1.beforeClick(item, e) === false) {
           return;
         }
+        if (type === "parent" || type === "group") {
+          return;
+        }
         window.open(path);
         return;
       }
@@ -393,16 +413,16 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         if (props$1.beforeClick && props$1.beforeClick(item, e) === false) {
           return;
         }
+        if (type === "parent" || type === "group") {
+          return;
+        }
         if (path !== vue.unref(currentRoute).fullPath) {
           push(path);
         }
         return;
       }
-      const childMenus = util.getActiveChilds(boxData.value, path, "tempChildren");
-      const isChild = !childMenus.some((d) => {
-        var _a;
-        return !((_a = d.meta) == null ? void 0 : _a.hide);
-      });
+      const childMenus = util$1.getActiveChilds(boxData.value, path, "tempChildren");
+      const isChild = !childMenus.some((d) => !d.meta?.hide);
       if (trigger !== "click" && !isChild) {
         e.stopPropagation();
         return;
@@ -410,6 +430,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (props$1.beforeClick && props$1.beforeClick(item, e) === false) {
         return;
       }
+      if (type === "parent" || type === "group") {
+        return;
+      }
       if (isChild && path !== vue.unref(currentRoute).fullPath) {
         push(path);
         return;
@@ -433,13 +456,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (!common.isExternalLink(path) && props$1.beforeClick && props$1.beforeClick(item, e) === false) {
         return;
       }
-      const temp = util.getActiveChilds(boxData.value, path, "tempChildren");
+      const temp = util$1.getActiveChilds(boxData.value, path, "tempChildren");
       if (boxActive.value !== path) {
         state.isHover = true;
-        boxActive.value = temp.some((d) => {
-          var _a;
-          return !((_a = d.meta) == null ? void 0 : _a.hide);
-        }) ? path : void 0;
+        boxActive.value = temp.some((d) => !d.meta?.hide) ? path : void 0;
         sideData.value = temp;
       }
     };
@@ -455,7 +475,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleSideMenuClose = (index2, indexPath) => {
       emit("sideMenuClose", index2, indexPath);
     };
-    const handleSideMenuItemClick = (item, e) => {
+    const handleSideMenuItemClick = (item, e, type) => {
       const path = item.index;
       const trigger = props$1.itemTrigger;
       if (!path || trigger !== "click" && trigger !== "hover") {
@@ -464,6 +484,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (props$1.beforeClick && props$1.beforeClick(item, e) === false) {
         return;
       }
+      if (type === "parent" || type === "group") {
+        return;
+      }
       if (common.isExternalLink(path)) {
         e.stopPropagation();
         window.open(path);
@@ -482,19 +505,19 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const handleTabClick = (option) => {
       const key = option.name;
-      const item = util.findTabByKey(key, props$1.tabs);
+      const item = util$1.findTabByKey(key, props$1.tabs);
       const opt = { key, item, active: tabActive.value };
       emit("tabClick", opt);
     };
     const handleTabRemove = (key) => {
-      const item = util.findTabByKey(key, props$1.tabs);
+      const item = util$1.findTabByKey(key, props$1.tabs);
       const opt = { key, item, active: tabActive.value };
       emit("tabRemove", opt);
     };
     const handleTabContextMenu = (option) => {
       const opt = {
         key: option.name,
-        item: util.findTabByKey(option.name, props$1.tabs),
+        item: util$1.findTabByKey(option.name, props$1.tabs),
         active: tabActive.value,
         command: option.command
       };
@@ -502,7 +525,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const handleTabSortChange = (data) => {
       const result = data.map((d) => {
-        return util.findTabByKey(d.name, props$1.tabs);
+        return util$1.findTabByKey(d.name, props$1.tabs);
       });
       if (props$1.fixedHome && props$1.tabs != null) {
         const homeTab = props$1.tabs.find((t) => t.home);
@@ -534,18 +557,18 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       hideTabs.value = !!meta.hideTabs;
       const navigationIsChanged = updateNavigation();
       const sideNavigationIsChanged = updateSideNavigation();
-      const { active, title, matched, activeOther } = util.getRouteMatched(
+      const { active, title, matched, activeOther } = util$1.getRouteMatched(
         route,
         menuData.value
       );
-      levelData.value = util.getMatchedLevels(
+      levelData.value = util$1.getMatchedLevels(
         matched,
         activeOther,
         route,
         menuData.value,
         tabData.value
       );
-      const t = util.getRouteTab(route, tabData.value, homeMenuPath.value, title);
+      const t = util$1.getRouteTab(route, tabData.value, homeMenuPath.value, title);
       isHome.value = t.home;
       tabActive.value = t.key;
       emit("tabAdd", t);
@@ -560,7 +583,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     };
     const updateMenuActive = (active, matched) => {
-      const [active1, active2] = (matched == null ? void 0 : matched.length) ? [matched[0].path, (matched[1] ?? matched[0]).path] : [];
+      const [active1, active2] = matched?.length ? [matched[0].path, (matched[1] ?? matched[0]).path] : [];
       if (navigation.value === "top") {
         navActive.value = active;
         boxActive.value = void 0;
@@ -577,12 +600,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       state.sideActive = sideActive.value;
     };
     const splitMenuData = () => {
-      var _a;
       const isTopNav = navigation.value === "top";
       const isMixNav = navigation.value === "mix";
       const isMixSide = sideNavigation.value === "mix" || sideNavigation.value === "box";
       const isCollapse = sideNavigation.value === "box" || props$1.collapse && !mobile.value;
-      if (!((_a = menuData.value) == null ? void 0 : _a.length)) {
+      if (!menuData.value?.length) {
         navData.value = [];
         boxData.value = [];
         sideData.value = [];
@@ -594,7 +616,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         navData.value = menuData.value.map((d) => {
           return { ...d, children: void 0, tempChildren: d.children };
         });
-        const childMenus = util.getActiveChilds(menuData.value, navActive.value);
+        const childMenus = util$1.getActiveChilds(menuData.value, navActive.value);
         if (!childMenus.length) {
           boxData.value = [];
           sideData.value = [];
@@ -606,7 +628,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               tempChildren: d.children
             };
           });
-          sideData.value = util.getActiveChilds(childMenus, boxActive.value);
+          sideData.value = util$1.getActiveChilds(childMenus, boxActive.value);
         } else {
           boxData.value = [];
           sideData.value = childMenus;
@@ -621,7 +643,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               tempChildren: d.children
             };
           });
-          sideData.value = util.getActiveChilds(menuData.value, boxActive.value);
+          sideData.value = util$1.getActiveChilds(menuData.value, boxActive.value);
         } else {
           boxData.value = [];
           sideData.value = menuData.value;
@@ -634,15 +656,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const updateMenuData = () => {
       let home;
       menuData.value = common.mapTree(props$1.menus, (item) => {
-        var _a, _b;
-        if (!home && !((_a = item.children) == null ? void 0 : _a.length)) {
+        if (!home && !item.children?.length) {
           home = item;
         }
-        const title = routeI18n(item.path, item) || ((_b = item.meta) == null ? void 0 : _b.title);
+        const title = routeI18n(item.path, item) || item.meta?.title;
         return { ...item, meta: { ...item.meta, title } };
       });
       splitMenuData();
-      homeMenuPath.value = props$1.homePath || (home == null ? void 0 : home.path) || "/";
+      homeMenuPath.value = props$1.homePath || home?.path || "/";
     };
     const updateTabData = () => {
       if (!props$1.tabs) {
@@ -650,7 +671,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         return;
       }
       tabData.value = props$1.tabs.map((item) => {
-        const m = util.findMenuByPath(item.path, menuData.value);
+        const m = util$1.findMenuByPath(item.path, menuData.value);
         return {
           ...item,
           title: routeI18n(item.path, m, item) || item.title
@@ -659,10 +680,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const updateLevelData = () => {
       levelData.value = levelData.value.map((item) => {
-        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, m, t, item);
+        const t = util$1.findTabByPath(item.path, tabData.value);
+        const m = util$1.findMenuByPath(item.path, menuData.value);
+        const title = t?.title || m?.meta?.title || routeI18n(item.path, m, t, item);
         return { ...item, title: title || item.title };
       });
     };
@@ -703,7 +723,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     );
     vue.watch([navigation, sideNavigation], () => {
       const route = vue.unref(currentRoute);
-      const { active, matched } = util.getRouteMatched(route, menuData.value);
+      const { active, matched } = util$1.getRouteMatched(route, menuData.value);
       updateMenuActive(active, matched);
       splitMenuData();
     });
@@ -748,7 +768,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     vue.watch([() => props$1.tabBar, () => props$1.keepAlive], () => {
       layoutProvide.keepAlive = props$1.tabBar && props$1.keepAlive;
     });
-    const [media, startMedia, stopMedia] = hook.useMediaQuery(mobileQuery, () => {
+    const [media, startMedia, stopMedia] = hook.useMediaQuery(hook.mobileMediaQuery, () => {
       const isMobile = props$1.responsive ? media.matches : false;
       if (mobile.value !== isMobile) {
         mobile.value = isMobile;
@@ -813,7 +833,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       handleResize();
     });
     __expose({
-      layoutRef
+      layoutRef,
+      // 弹窗操作
+      openModal,
+      closeModal,
+      closeAllModal,
+      updateModalProps
     });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(EleAdminLayout, {
@@ -899,14 +924,20 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         onTabSortChange: handleTabSortChange
       }, vue.createSlots({
         body: vue.withCtx(() => [
-          _ctx.tabBar && _ctx.keepAlive ? (vue.openBlock(), vue.createBlock(ProIframe, {
+          _ctx.tabBar && _ctx.keepAlive ? (vue.openBlock(), vue.createBlock(IframeGroup, {
             key: 0,
             keepAlive: _ctx.keepAlive,
             transitionName: _ctx.transitionName,
             transitionDelay: _ctx.transitionDelay,
             tabData: tabData.value,
             tabActive: tabActive.value
-          }, null, 8, ["keepAlive", "transitionName", "transitionDelay", "tabData", "tabActive"])) : vue.createCommentVNode("", true)
+          }, null, 8, ["keepAlive", "transitionName", "transitionDelay", "tabData", "tabActive"])) : vue.createCommentVNode("", true),
+          vue.createVNode(vue.unref(EleModalRender), {
+            modals: vue.unref(modals),
+            onRemoveItem: vue.unref(removeModal),
+            onUpdateItemVisible: vue.unref(updateModalVisible),
+            onUpdateItemProps: vue.unref(updateModalProps)
+          }, null, 8, ["modals", "onRemoveItem", "onUpdateItemVisible", "onUpdateItemProps"])
         ]),
         default: vue.withCtx(() => [
           vue.renderSlot(_ctx.$slots, "default"),

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

@@ -31,7 +31,7 @@ declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & {
 };
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     height: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: null;
     };
     menus: import('vue').PropType<MenuItem[] | null>;
@@ -93,7 +93,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     layout: import('vue').PropType<Layout>;
     compact: BooleanConstructor;
     maximized: import('vue').PropType<Maximized>;
-    headerStyle: import('vue').PropType<import('./types').HeaderStyle>;
     tabBar: {
         type: import('vue').PropType<TabBar>;
         default: boolean;
@@ -110,6 +109,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     sidebarMenuProps: import('vue').PropType<EleMenusProps>;
     sideboxMenuProps: import('vue').PropType<EleMenusProps>;
     sidebarLayout: import('vue').PropType<SidebarLayout>;
+    headerStyle: import('vue').PropType<import('./types').HeaderStyle>;
     sidebarStyle: {
         type: import('vue').PropType<import('./types').SidebarStyle>;
         default: string;
@@ -183,6 +183,10 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
 }>, {
     layoutRef: import('vue').Ref<EleAdminLayoutInstance, EleAdminLayoutInstance>;
+    openModal: (option: import('../ele-modal-render/types').ModalItem) => import('../ele-modal-render/types').ModalItemId;
+    closeModal: (modalId?: import('../ele-modal-render/types').ModalItemId) => void;
+    closeAllModal: () => void;
+    updateModalProps: (modalId?: import('../ele-modal-render/types').ModalItemId, option?: Record<string, any>) => void;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     tabContextMenu: (_option: TabItemEventOption) => void;
     "update:maximized": (_maximized: boolean) => void;
@@ -199,7 +203,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     bodySizeChange: (_option: import('./types').BodySizeChangeOption) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     height: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: null;
     };
     menus: import('vue').PropType<MenuItem[] | null>;
@@ -261,7 +265,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     layout: import('vue').PropType<Layout>;
     compact: BooleanConstructor;
     maximized: import('vue').PropType<Maximized>;
-    headerStyle: import('vue').PropType<import('./types').HeaderStyle>;
     tabBar: {
         type: import('vue').PropType<TabBar>;
         default: boolean;
@@ -278,6 +281,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     sidebarMenuProps: import('vue').PropType<EleMenusProps>;
     sideboxMenuProps: import('vue').PropType<EleMenusProps>;
     sidebarLayout: import('vue').PropType<SidebarLayout>;
+    headerStyle: import('vue').PropType<import('./types').HeaderStyle>;
     sidebarStyle: {
         type: import('vue').PropType<import('./types').SidebarStyle>;
         default: string;
@@ -365,13 +369,12 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onBodySizeChange?: ((_option: import('./types').BodySizeChangeOption) => any) | undefined;
 }>, {
     height: string | number;
+    transitionDelay: number;
+    expanded: boolean;
     uniqueOpened: boolean;
     collapse: boolean;
     ellipsis: boolean;
-    expanded: boolean;
     compact: boolean;
-    transitionDelay: number;
-    responsive: boolean;
     tabBar: TabBar;
     breadcrumb: boolean | EleBreadcrumbProps;
     backTop: boolean | EleBacktopProps;
@@ -391,6 +394,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     sideboxIconSlot: string;
     menuScrollToActive: boolean;
     keepAlive: boolean;
+    responsive: boolean;
     redirectPath: string;
     fluid: boolean;
     compressOnEsc: boolean;

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

@@ -11,7 +11,7 @@ type ProLayoutKey = InjectionKey<ProLayoutProvide>;
 export declare const proLayoutProps: {
     /** 高度 */
     height: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: null;
     };
     /** 菜单数据 */
@@ -104,7 +104,6 @@ export declare const proLayoutProps: {
     layout: PropType<import('./types').Layout>;
     compact: BooleanConstructor;
     maximized: PropType<import('../ele-admin-layout/types').Maximized>;
-    headerStyle: PropType<import('./types').HeaderStyle>;
     tabBar: {
         type: PropType<import('./types').TabBar>;
         default: boolean;
@@ -121,6 +120,7 @@ export declare const proLayoutProps: {
     sidebarMenuProps: PropType<EleMenusProps>;
     sideboxMenuProps: PropType<EleMenusProps>;
     sidebarLayout: PropType<import('./types').SidebarLayout>;
+    headerStyle: PropType<import('./types').HeaderStyle>;
     sidebarStyle: {
         type: PropType<import('./types').SidebarStyle>;
         default: string;

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

@@ -1,3 +1,4 @@
 "use strict";
 require("../../ele-admin-layout/style/index");
+require("../../ele-modal-render/style/index");
 require("./index.scss");

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

@@ -10,8 +10,14 @@
   }
 
   /* 面包屑导航 */
-  &.is-mobile > .ele-admin-main > .ele-admin-header > .ele-admin-breadcrumb {
-    display: none;
+  &.is-mobile > .ele-admin-main > .ele-admin-header {
+    & > .ele-admin-breadcrumb {
+      display: none;
+    }
+
+    & > .ele-admin-tools:first-child {
+      padding-right: 0;
+    }
   }
 }