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

package/es/ele-pro-form-builder/index.js

@@ -57,8 +57,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     };
     const getFormItems = () => {
-      var _a;
-      return ((_a = formProps.value) == null ? void 0 : _a.items) || [];
+      return formProps.value?.items || [];
     };
     const setFormItems = (items) => {
       if (!formProps.value) {
@@ -315,9 +314,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(EleSplitPanel, mergeProps({
-        space: "0px",
-        size: "280px",
-        allowCollapse: true
+        space: 0,
+        size: 280,
+        allowCollapse: true,
+        collapseBtnOffset: 2
       }, _ctx.splitPanelProps || {}, {
         collapse: leftSideCollapse.value,
         "onUpdate:collapse": _cache[8] || (_cache[8] = ($event) => leftSideCollapse.value = $event),
@@ -325,10 +325,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }), {
         body: withCtx(() => [
           createVNode(EleSplitPanel, mergeProps({
-            space: "0px",
-            size: "220px",
+            space: 0,
+            size: 220,
             reverse: true,
-            allowCollapse: true
+            allowCollapse: true,
+            collapseBtnOffset: 2
           }, _ctx.rightSplitPanelProps || {}, {
             collapse: rightSideCollapse.value,
             "onUpdate:collapse": _cache[6] || (_cache[6] = ($event) => rightSideCollapse.value = $event),
@@ -449,63 +450,60 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _: 3
           }, 16, ["collapse"])
         ]),
-        default: withCtx(() => {
-          var _a, _b, _c, _d;
-          return [
-            createVNode(EleTabBar, {
-              modelValue: leftTabActive.value,
-              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => leftTabActive.value = $event),
-              items: [
-                { value: "components", label: "组件库" },
-                { value: "templates", label: "模板库" },
-                { value: "outlines", label: "大纲" }
-              ]
-            }, null, 8, ["modelValue"]),
-            createElementVNode("div", _hoisted_1, [
-              leftTabActive.value === "outlines" ? (openBlock(), createBlock(OutlineTree, {
-                key: 0,
-                formItems: (_a = unref(formProps)) == null ? void 0 : _a.items,
-                currentFormItemId: currentFormItemId.value,
-                "onUpdate:currentFormItemId": _cache[1] || (_cache[1] = ($event) => currentFormItemId.value = $event),
-                componentData: _ctx.componentData,
-                itemTypeData: _ctx.itemTypeData,
-                onUpdateItems: handleUpdateItems,
-                onUpdateItemChildren: handleUpdateItemChildren,
-                onOpenTableTool: handleOpenTableTool,
-                onOpenComponentPicker: handleOpenComponentPicker
-              }, null, 8, ["formItems", "currentFormItemId", "componentData", "itemTypeData"])) : leftTabActive.value === "templates" ? (openBlock(), createBlock(TemplateList, {
-                key: 1,
-                templateData: _ctx.templateData,
-                onImportData: handleImport
-              }, null, 8, ["templateData"])) : (openBlock(), createBlock(ComponentList, {
-                key: 2,
-                formItems: (_b = unref(formProps)) == null ? void 0 : _b.items,
-                draggable: !unref(isMobileDevice) && !unref(isMobile),
-                componentData: _ctx.componentData,
-                itemTypeData: _ctx.itemTypeData,
-                onUpdateItems: handleUpdateItems
-              }, null, 8, ["formItems", "draggable", "componentData", "itemTypeData"]))
-            ]),
-            createVNode(TableToolMenu, {
-              ref_key: "tableToolMenuRef",
-              ref: tableToolMenuRef,
-              formItems: (_c = unref(formProps)) == null ? void 0 : _c.items,
+        default: withCtx(() => [
+          createVNode(EleTabBar, {
+            modelValue: leftTabActive.value,
+            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => leftTabActive.value = $event),
+            items: [
+              { value: "components", label: "组件库" },
+              { value: "templates", label: "模板库" },
+              { value: "outlines", label: "大纲" }
+            ]
+          }, null, 8, ["modelValue"]),
+          createElementVNode("div", _hoisted_1, [
+            leftTabActive.value === "outlines" ? (openBlock(), createBlock(OutlineTree, {
+              key: 0,
+              formItems: unref(formProps)?.items,
+              currentFormItemId: currentFormItemId.value,
+              "onUpdate:currentFormItemId": _cache[1] || (_cache[1] = ($event) => currentFormItemId.value = $event),
               componentData: _ctx.componentData,
-              onUpdateItems: handleUpdateItems
-            }, null, 8, ["formItems", "componentData"]),
-            createVNode(ComponentPicker, {
-              modelValue: componentPickerOption.visible,
-              "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => componentPickerOption.visible = $event),
-              addParentFormItemId: componentPickerOption.addParentFormItemId,
-              editFormItemId: componentPickerOption.editFormItemId,
-              editFormItemType: componentPickerOption.editFormItemType,
-              formItems: (_d = unref(formProps)) == null ? void 0 : _d.items,
+              itemTypeData: _ctx.itemTypeData,
+              onUpdateItems: handleUpdateItems,
+              onUpdateItemChildren: handleUpdateItemChildren,
+              onOpenTableTool: handleOpenTableTool,
+              onOpenComponentPicker: handleOpenComponentPicker
+            }, null, 8, ["formItems", "currentFormItemId", "componentData", "itemTypeData"])) : leftTabActive.value === "templates" ? (openBlock(), createBlock(TemplateList, {
+              key: 1,
+              templateData: _ctx.templateData,
+              onImportData: handleImport
+            }, null, 8, ["templateData"])) : (openBlock(), createBlock(ComponentList, {
+              key: 2,
+              formItems: unref(formProps)?.items,
+              draggable: !unref(isMobileDevice) && !unref(isMobile),
               componentData: _ctx.componentData,
               itemTypeData: _ctx.itemTypeData,
               onUpdateItems: handleUpdateItems
-            }, null, 8, ["modelValue", "addParentFormItemId", "editFormItemId", "editFormItemType", "formItems", "componentData", "itemTypeData"])
-          ];
-        }),
+            }, null, 8, ["formItems", "draggable", "componentData", "itemTypeData"]))
+          ]),
+          createVNode(TableToolMenu, {
+            ref_key: "tableToolMenuRef",
+            ref: tableToolMenuRef,
+            formItems: unref(formProps)?.items,
+            componentData: _ctx.componentData,
+            onUpdateItems: handleUpdateItems
+          }, null, 8, ["formItems", "componentData"]),
+          createVNode(ComponentPicker, {
+            modelValue: componentPickerOption.visible,
+            "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => componentPickerOption.visible = $event),
+            addParentFormItemId: componentPickerOption.addParentFormItemId,
+            editFormItemId: componentPickerOption.editFormItemId,
+            editFormItemType: componentPickerOption.editFormItemType,
+            formItems: unref(formProps)?.items,
+            componentData: _ctx.componentData,
+            itemTypeData: _ctx.itemTypeData,
+            onUpdateItems: handleUpdateItems
+          }, null, 8, ["modelValue", "addParentFormItemId", "editFormItemId", "editFormItemType", "formItems", "componentData", "itemTypeData"])
+        ]),
         _: 3
       }, 16, ["collapse"]);
     };

package/es/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/es/ele-pro-layout/components/{pro-iframe.js → iframe-group.js}

@@ -5,8 +5,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__ */ defineComponent({
-  ...{ name: "ProIframe" },
-  __name: "pro-iframe",
+  ...{ name: "IframeGroup" },
+  __name: "iframe-group",
   props: {
     /** 是否支持内嵌缓存 */
     keepAlive: Boolean,
@@ -28,9 +28,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const data = 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 = getIframeSrc(t.fullPath, t.meta.iframe);
           list.push({ id: t.key, src, refresh: t.refresh });
         }

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

@@ -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;
@@ -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/es/ele-pro-layout/index.js

@@ -1,13 +1,14 @@
-import { defineComponent, ref, shallowRef, computed, markRaw, watch, unref, shallowReactive, provide, nextTick, onMounted, createBlock, openBlock, normalizeClass, createSlots, withCtx, renderSlot, createCommentVNode, renderList, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, ref, shallowRef, computed, markRaw, watch, unref, shallowReactive, provide, nextTick, onMounted, createBlock, openBlock, normalizeClass, createSlots, withCtx, renderSlot, createCommentVNode, createVNode, renderList, normalizeProps, guardReactiveProps } from "vue";
 import { useRouter } from "vue-router";
 import { HomeOutlined } from "../icons/index";
-import { useTimer, useMediaQuery, useWindowListener } from "../utils/hook";
+import { useTimer, useMediaQuery, mobileMediaQuery, useWindowListener } from "../utils/hook";
 import { debounce, isExternalLink, mapTree } from "../utils/common";
-import ProIframe from "./components/pro-iframe";
+import EleModalRender from "../ele-modal-render/index";
+import { useModalRenderProvider } from "../ele-modal-render/util";
+import IframeGroup from "./components/iframe-group";
 import { getMenuItems, getRouteMatched, getActiveChilds, findTabByKey, getMatchedLevels, getRouteTab, findMenuByPath, findTabByPath } from "./util";
 import { proLayoutEmits, proLayoutProps, PRO_LAYOUT_KEY } from "./props";
 import EleAdminLayout from "../ele-admin-layout/index";
-const mobileQuery = "(max-width: 768px)";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "EleProLayout" },
   __name: "index",
@@ -17,6 +18,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emit = __emit;
     const { currentRoute, push } = useRouter();
+    const {
+      modals,
+      openModal,
+      closeModal,
+      closeAllModal,
+      removeModal,
+      updateModalVisible,
+      updateModalProps
+    } = useModalRenderProvider();
     const [startTimer, stopTimer] = useTimer(() => props.menuHoverTimeout);
     const state = { navData: [], sideData: [], boxData: [] };
     const layoutRef = ref(null);
@@ -80,7 +90,14 @@ const _sfc_main = /* @__PURE__ */ 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 || {}
+          }
         };
       });
     });
@@ -286,7 +303,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleHeadMenuClose = (index, indexPath) => {
       emit("headMenuClose", index, indexPath);
     };
-    const handleHeadMenuItemClick = (item, e) => {
+    const handleHeadMenuItemClick = (item, e, type) => {
       const path = item.index;
       const trigger = props.navTrigger;
       if (!path || trigger !== "click" && trigger !== "hover") {
@@ -297,14 +314,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (props.beforeClick && props.beforeClick(item, e) === false) {
           return;
         }
+        if (type === "parent" || type === "group") {
+          return;
+        }
         window.open(path);
         return;
       }
       const childMenus = getActiveChilds(navData.value, path, "tempChildren");
-      const isChild = !childMenus.some((d) => {
-        var _a;
-        return !((_a = d.meta) == null ? void 0 : _a.hide);
-      });
+      const isChild = !childMenus.some((d) => !d.meta?.hide);
       if (trigger !== "click" && !isChild) {
         e.stopPropagation();
         return;
@@ -312,6 +329,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.beforeClick && props.beforeClick(item, e) === false) {
         return;
       }
+      if (type === "parent" || type === "group") {
+        return;
+      }
       if (isChild && path !== unref(currentRoute).fullPath) {
         push(path);
         return;
@@ -350,10 +370,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const temp = 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;
@@ -374,7 +391,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleHeadMouseleave = () => {
       resetMenuState();
     };
-    const handleBoxMenuItemClick = (item, e) => {
+    const handleBoxMenuItemClick = (item, e, type) => {
       const path = item.index;
       const trigger = props.boxTrigger;
       if (!path || trigger !== "click" && trigger !== "hover") {
@@ -385,6 +402,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (props.beforeClick && props.beforeClick(item, e) === false) {
           return;
         }
+        if (type === "parent" || type === "group") {
+          return;
+        }
         window.open(path);
         return;
       }
@@ -392,16 +412,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (props.beforeClick && props.beforeClick(item, e) === false) {
           return;
         }
+        if (type === "parent" || type === "group") {
+          return;
+        }
         if (path !== unref(currentRoute).fullPath) {
           push(path);
         }
         return;
       }
       const childMenus = getActiveChilds(boxData.value, path, "tempChildren");
-      const isChild = !childMenus.some((d) => {
-        var _a;
-        return !((_a = d.meta) == null ? void 0 : _a.hide);
-      });
+      const isChild = !childMenus.some((d) => !d.meta?.hide);
       if (trigger !== "click" && !isChild) {
         e.stopPropagation();
         return;
@@ -409,6 +429,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.beforeClick && props.beforeClick(item, e) === false) {
         return;
       }
+      if (type === "parent" || type === "group") {
+        return;
+      }
       if (isChild && path !== unref(currentRoute).fullPath) {
         push(path);
         return;
@@ -435,10 +458,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const temp = 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;
       }
     };
@@ -454,7 +474,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleSideMenuClose = (index, indexPath) => {
       emit("sideMenuClose", index, indexPath);
     };
-    const handleSideMenuItemClick = (item, e) => {
+    const handleSideMenuItemClick = (item, e, type) => {
       const path = item.index;
       const trigger = props.itemTrigger;
       if (!path || trigger !== "click" && trigger !== "hover") {
@@ -463,6 +483,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.beforeClick && props.beforeClick(item, e) === false) {
         return;
       }
+      if (type === "parent" || type === "group") {
+        return;
+      }
       if (isExternalLink(path)) {
         e.stopPropagation();
         window.open(path);
@@ -559,7 +582,7 @@ const _sfc_main = /* @__PURE__ */ 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;
@@ -576,12 +599,11 @@ const _sfc_main = /* @__PURE__ */ 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.collapse && !mobile.value;
-      if (!((_a = menuData.value) == null ? void 0 : _a.length)) {
+      if (!menuData.value?.length) {
         navData.value = [];
         boxData.value = [];
         sideData.value = [];
@@ -633,15 +655,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const updateMenuData = () => {
       let home;
       menuData.value = mapTree(props.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.homePath || (home == null ? void 0 : home.path) || "/";
+      homeMenuPath.value = props.homePath || home?.path || "/";
     };
     const updateTabData = () => {
       if (!props.tabs) {
@@ -658,10 +679,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const updateLevelData = () => {
       levelData.value = levelData.value.map((item) => {
-        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, m, t, item);
+        const title = t?.title || m?.meta?.title || routeI18n(item.path, m, t, item);
         return { ...item, title: title || item.title };
       });
     };
@@ -747,7 +767,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     watch([() => props.tabBar, () => props.keepAlive], () => {
       layoutProvide.keepAlive = props.tabBar && props.keepAlive;
     });
-    const [media, startMedia, stopMedia] = useMediaQuery(mobileQuery, () => {
+    const [media, startMedia, stopMedia] = useMediaQuery(mobileMediaQuery, () => {
       const isMobile = props.responsive ? media.matches : false;
       if (mobile.value !== isMobile) {
         mobile.value = isMobile;
@@ -812,7 +832,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       handleResize();
     });
     __expose({
-      layoutRef
+      layoutRef,
+      // 弹窗操作
+      openModal,
+      closeModal,
+      closeAllModal,
+      updateModalProps
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(EleAdminLayout, {
@@ -898,14 +923,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         onTabSortChange: handleTabSortChange
       }, createSlots({
         body: withCtx(() => [
-          _ctx.tabBar && _ctx.keepAlive ? (openBlock(), createBlock(ProIframe, {
+          _ctx.tabBar && _ctx.keepAlive ? (openBlock(), 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"])) : createCommentVNode("", true)
+          }, null, 8, ["keepAlive", "transitionName", "transitionDelay", "tabData", "tabActive"])) : createCommentVNode("", true),
+          createVNode(unref(EleModalRender), {
+            modals: unref(modals),
+            onRemoveItem: unref(removeModal),
+            onUpdateItemVisible: unref(updateModalVisible),
+            onUpdateItemProps: unref(updateModalProps)
+          }, null, 8, ["modals", "onRemoveItem", "onUpdateItemVisible", "onUpdateItemProps"])
         ]),
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "default"),

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

@@ -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/es/ele-pro-layout/style/index.js

@@ -1,2 +1,3 @@
 import "../../ele-admin-layout/style/index";
+import "../../ele-modal-render/style/index";
 import "./index.scss";

package/es/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;
+    }
   }
 }