ele-admin-plus 1.1.9-beta.11 → 1.1.9-beta.12

package/lib/ele-pro-layout/components/pro-iframe.cjs

@@ -19,8 +19,6 @@ const _sfc_main = vue.defineComponent({
   },
   setup(props) {
     const state = { timer: null };
-    const visible = vue.ref(false);
-    const active = vue.ref(null);
     const data = vue.computed(() => {
       const list = [];
       props.tabData.forEach((t) => {
@@ -32,25 +30,29 @@ const _sfc_main = vue.defineComponent({
       });
       return list.sort((a, b) => a.id === b.id ? 0 : a.id > b.id ? 1 : -1);
     });
+    const dataActive = vue.computed(() => {
+      if (!props.tabActive || !data.value.length || !data.value.some((d) => d.id === props.tabActive)) {
+        return;
+      }
+      return props.tabActive;
+    });
+    const active = vue.ref(dataActive.value);
     const onAfterLeave = (delay) => {
-      if (props.tabActive && data.value.length && data.value.some((d) => d.id === props.tabActive)) {
-        if (delay) {
-          clearTimer();
-          state.timer = setTimeout(() => {
-            state.timer = null;
-            visible.value = true;
-            vue.nextTick(() => {
-              active.value = props.tabActive;
-            });
-          }, delay);
-        } else {
-          visible.value = true;
-          active.value = props.tabActive;
-        }
-      } else {
-        visible.value = false;
+      if (!dataActive.value) {
         active.value = null;
+        return;
       }
+      if (!delay) {
+        active.value = dataActive.value;
+        return;
+      }
+      clearTimer();
+      state.timer = setTimeout(() => {
+        state.timer = null;
+        vue.nextTick(() => {
+          active.value = dataActive.value;
+        });
+      }, delay);
     };
     const clearTimer = () => {
       if (state.timer != null) {
@@ -58,30 +60,20 @@ const _sfc_main = vue.defineComponent({
         state.timer = null;
       }
     };
-    vue.watch(
-      () => props.tabActive,
-      () => {
-        clearTimer();
-        if (visible.value) {
-          if (!props.transitionName) {
-            onAfterLeave();
-          } else {
-            active.value = null;
-          }
-          return;
-        }
+    vue.watch(dataActive, () => {
+      clearTimer();
+      if (active.value == null) {
         onAfterLeave(props.transitionName ? props.transitionDelay : void 0);
+      } else if (!props.transitionName) {
+        onAfterLeave();
+      } else {
+        active.value = null;
       }
-    );
+    });
     vue.onBeforeUnmount(() => {
       clearTimer();
     });
-    return {
-      active,
-      visible,
-      data,
-      onAfterLeave
-    };
+    return { active, data, onAfterLeave };
   }
 });
 const _export_sfc = (sfc, props) => {
@@ -95,7 +87,7 @@ const _hoisted_1 = { class: "ele-admin-iframe-wrap" };
 const _hoisted_2 = ["data-id", "src"];
 const _hoisted_3 = ["data-id", "src"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return vue.withDirectives((vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
+  return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
     !_ctx.transitionName ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(_ctx.data, (item) => {
       return vue.openBlock(), vue.createElementBlock(vue.Fragment, {
         key: item.id
@@ -133,8 +125,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ]),
       _: 1
     }, 8, ["name"]))
-  ], 512)), [
-    [vue.vShow, _ctx.visible]
   ]);
 }
 const proIframe = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

package/lib/ele-pro-layout/components/pro-iframe.d.ts

@@ -16,11 +16,10 @@ declare const _default: import('vue').DefineComponent<{
     /** 页签选中 */
     tabActive: StringConstructor;
 }, {
-    active: import("vue").Ref<string | null | undefined>;
-    visible: import("vue").Ref<boolean>;
-    data: import("vue").ComputedRef<IframeItem[]>;
+    active: import('vue').Ref<string | null | undefined>;
+    data: import('vue').ComputedRef<IframeItem[]>;
     onAfterLeave: (delay?: number) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 是否支持内链缓存 */
     keepAlive: BooleanConstructor;
     /** 内链切换动画 */

package/lib/ele-pro-layout/components/pro-sidebar.d.ts

@@ -21,7 +21,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 默认展开的父级菜单 */
     defaultOpeneds: PropType<string[]>;
     /** 菜单折叠提示气泡主题 */
-    popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    popperEffect: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 菜单标题插槽名称 */
@@ -29,22 +29,22 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import('../../ele-tooltip/props').TooltipProps> | undefined>;
 }, {
-    menusRef: import("vue").Ref<ElScrollbarInstance>;
-    menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
+    menusRef: import('vue').Ref<ElScrollbarInstance>;
+    menuItems: import('vue').ComputedRef<Partial<import('../../ele-menus/types').MenuItem>[]>;
     onOpen: (index: string, indexPath: string[]) => void;
     onClose: (index: string, indexPath: string[]) => void;
     onItemClick: (item: MenuItemProps, e: MouseEvent) => void;
     onMouseenter: (e: MouseEvent) => void;
     onMouseleave: (e: MouseEvent) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     open: (_index: string, _indexPath: string[]) => true;
     close: (_index: string, _indexPath: string[]) => true;
     itemClick: (_item: MenuItemProps, _e: MouseEvent) => true;
     mouseEnter: (_e: MouseEvent) => true;
     mouseLeave: (_e: MouseEvent) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 菜单数据 */
     menus: {
         type: PropType<MenuItem[]>;
@@ -63,7 +63,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 默认展开的父级菜单 */
     defaultOpeneds: PropType<string[]>;
     /** 菜单折叠提示气泡主题 */
-    popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    popperEffect: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 菜单标题插槽名称 */
@@ -71,11 +71,11 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import('../../ele-tooltip/props').TooltipProps> | undefined>;
 }>> & {
     onOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
-    onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
+    onItemClick?: ((_item: Partial<import('../../ele-menus/types').MenuItem>, _e: MouseEvent) => any) | undefined;
     onMouseEnter?: ((_e: MouseEvent) => any) | undefined;
     onMouseLeave?: ((_e: MouseEvent) => any) | undefined;
 }, {

package/lib/ele-pro-layout/components/pro-sidebox.d.ts

@@ -19,7 +19,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 二级侧栏是否折叠 */
     collapse: BooleanConstructor;
     /** 菜单折叠提示气泡主题 */
-    popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    popperEffect: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 菜单标题插槽名称 */
@@ -27,22 +27,22 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import('../../ele-tooltip/props').TooltipProps> | undefined>;
 }, {
-    menusRef: import("vue").Ref<ElScrollbarInstance>;
-    menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
+    menusRef: import('vue').Ref<ElScrollbarInstance>;
+    menuItems: import('vue').ComputedRef<Partial<import('../../ele-menus/types').MenuItem>[]>;
     onItemClick: (item: MenuItemProps, e: MouseEvent) => void;
     onItemMouseenter: (item: MenuItemProps, e: MouseEvent) => void;
     onItemMouseleave: (item: MenuItemProps, e: MouseEvent) => void;
     onMouseenter: (e: MouseEvent) => void;
     onMouseleave: (e: MouseEvent) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     itemClick: (_item: MenuItemProps, _e: MouseEvent) => true;
     itemMouseenter: (_item: MenuItemProps, _e: MouseEvent) => true;
     itemMouseleave: (_item: MenuItemProps, _e: MouseEvent) => true;
     mouseEnter: (_e: MouseEvent) => true;
     mouseLeave: (_e: MouseEvent) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 菜单数据 */
     menus: {
         type: PropType<MenuItem[]>;
@@ -59,7 +59,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 二级侧栏是否折叠 */
     collapse: BooleanConstructor;
     /** 菜单折叠提示气泡主题 */
-    popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    popperEffect: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 菜单标题插槽名称 */
@@ -67,11 +67,11 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import('../../ele-tooltip/props').TooltipProps> | undefined>;
 }>> & {
-    onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
-    onItemMouseenter?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
-    onItemMouseleave?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
+    onItemClick?: ((_item: Partial<import('../../ele-menus/types').MenuItem>, _e: MouseEvent) => any) | undefined;
+    onItemMouseenter?: ((_item: Partial<import('../../ele-menus/types').MenuItem>, _e: MouseEvent) => any) | undefined;
+    onItemMouseleave?: ((_item: Partial<import('../../ele-menus/types').MenuItem>, _e: MouseEvent) => any) | undefined;
     onMouseEnter?: ((_e: MouseEvent) => any) | undefined;
     onMouseLeave?: ((_e: MouseEvent) => any) | undefined;
 }, {

package/lib/ele-pro-layout/components/pro-tabs.d.ts

@@ -29,21 +29,21 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否支持拖动排序 */
     tabSortable: BooleanConstructor;
 }, {
-    homeRef: import("vue").Ref<TabTitleInstance>;
-    tabRef: import("vue").Ref<EleTabsInstance>;
-    items: import("vue").ComputedRef<TabPaneItem[]>;
-    contextMenus: import("vue").ComputedRef<import("../../ele-dropdown/types").DropdownItem[] | undefined>;
+    homeRef: import('vue').Ref<TabTitleInstance>;
+    tabRef: import('vue').Ref<EleTabsInstance>;
+    items: import('vue').ComputedRef<TabPaneItem[]>;
+    contextMenus: import('vue').ComputedRef<import('../../ele-dropdown/types').DropdownItem[] | undefined>;
     onTabRemove: (key: string) => void;
     onTabItemClick: (opt: TabEventOption) => void;
     onTabContextMenu: (opt: TabEventOption) => void;
     onTabContextOpen: (ref: EleDropdownInstance) => void;
     onTabSortChange: (data: TabPaneItem[]) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     tabClick: (_opt: TabItemEventOption) => true;
     tabRemove: (_opt: TabItemEventOption) => true;
     tabContextMenu: (_opt: TabItemEventOption) => true;
     tabSortChange: (_data: TabItem[]) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 页签数据 */
     tabs: {
         type: PropType<TabItem[]>;

package/lib/ele-pro-layout/components/sidebar-tool.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
+declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
 export default _default;

package/lib/ele-pro-layout/components/tab-dropdown.d.ts

@@ -13,11 +13,11 @@ declare const _default: import('vue').DefineComponent<{
         default: boolean;
     };
 }, {
-    dropdownRef: import("vue").Ref<EleDropdownInstance>;
+    dropdownRef: import('vue').Ref<EleDropdownInstance>;
     onCommand: (command: string) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     menuClick: (_command: string) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 右键菜单 */
     items: PropType<DropdownItem[]>;
     /** 右键菜单属性 */

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

@@ -195,7 +195,6 @@ const _sfc_main = vue.defineComponent({
         current,
         tabData.value,
         homeMenuPath.value,
-        props2.fixedHome,
         title
       );
       isHome.value = t.home;
@@ -703,6 +702,24 @@ const _sfc_main = vue.defineComponent({
       },
       { immediate: true }
     );
+    vue.watch([() => props2.tabBar, () => props2.keepAlive], () => {
+      layoutProvide.keepAlive = props2.tabBar && props2.keepAlive;
+    });
+    vue.watch(
+      () => props2.responsive,
+      () => {
+        layoutProvide.responsive = props2.responsive;
+      }
+    );
+    vue.watch(modalsRef, () => {
+      layoutProvide.modalsEl = modalsRef.value;
+    });
+    const layoutProvide = vue.shallowReactive({
+      keepAlive: props2.tabBar && props2.keepAlive,
+      responsive: props2.responsive,
+      modalsEl: modalsRef.value
+    });
+    vue.provide(receiver.LAYOUT_KEY, layoutProvide);
     util.useWindowListener(
       {
         onEscKeydown: (e) => {
@@ -727,24 +744,6 @@ const _sfc_main = vue.defineComponent({
       },
       props2
     );
-    const layoutProvide = vue.computed(() => {
-      const state2 = {
-        mobile: mobile.value,
-        collapse: props2.collapse,
-        compact: props2.compact,
-        topLayout: topLayout.value,
-        mixSidebar: mixSidebar.value,
-        maximized: props2.maximized,
-        expanded: props2.expanded,
-        tabBar: props2.tabBar,
-        sidebar: sidebar.value,
-        keepAlive: props2.tabBar && props2.keepAlive,
-        responsive: props2.responsive,
-        modalsEl: modalsRef.value
-      };
-      return state2;
-    });
-    vue.provide(receiver.LAYOUT_KEY, layoutProvide);
     return {
       contentRef,
       modalsRef,