ele-admin-plus 1.5.1-beta.3 → 1.6.0-beta.1

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

@@ -25,6 +25,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       closeModal,
       closeAllModal,
       removeModal,
+      removeAllModal,
       updateModalVisible,
       updateModalProps
     } = util.useModalRenderProvider();
@@ -380,10 +381,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           sideData.value = temp;
           return;
         }
+        const isCollapse = sideNavigation.value === "box" || props$1.collapse && !mobile.value;
         boxData.value = temp.map((d) => {
           return {
             ...d,
-            children: props$1.collapse ? d.children : void 0,
+            children: isCollapse ? d.children : void 0,
             tempChildren: d.children
           };
         });
@@ -550,12 +552,27 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
       return layoutRef.value.getContentEl();
     };
+    const getBodyScrollEl = () => {
+      if (props$1.fixedBody) {
+        return getContentElem();
+      }
+      const bProps = backTopProps.value;
+      if (bProps && typeof bProps === "object" && bProps.target) {
+        if (typeof bProps.target === "string") {
+          return document.querySelector(bProps.target);
+        }
+        return bProps.target;
+      }
+      return document.body;
+    };
     const handleRouteChange = (route) => {
       const { path, meta } = route;
       hideFooter.value = !!meta.hideFooter;
-      const contentEl = getContentElem();
-      if (props$1.autoScrollTop && contentEl) {
-        contentEl.scrollTop = 0;
+      if (props$1.autoScrollTop) {
+        const bodyScrollEl = getBodyScrollEl();
+        if (bodyScrollEl) {
+          bodyScrollEl.scrollTop = 0;
+        }
       }
       if (props$1.redirectPath && path.startsWith(props$1.redirectPath)) {
         return;
@@ -566,7 +583,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       hideTabs.value = !!meta.hideTabs;
       const navigationIsChanged = updateNavigation();
       const sideNavigationIsChanged = updateSideNavigation();
-      const { active, title, matched, activeOther } = util$1.getRouteMatched(
+      const { active, title, menu, matched, activeOther } = util$1.getRouteMatched(
         route,
         menuData.value
       );
@@ -577,10 +594,17 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         menuData.value,
         tabData.value
       );
-      const t = util$1.getRouteTab(route, tabData.value, homeMenuPath.value, title);
-      isHome.value = t.home;
-      tabActive.value = t.key;
-      emit("tabAdd", t);
+      const tab = util$1.getRouteTab(
+        route,
+        tabData.value,
+        homeMenuPath.value,
+        title,
+        menu
+      );
+      isHome.value = tab.home;
+      const lastTabActive = tabActive.value;
+      tabActive.value = tab.key;
+      emit("tabAdd", tab, lastTabActive);
       if (!navigationIsChanged && !sideNavigationIsChanged) {
         updateMenuActive(active, matched);
         if (navigation.value === "mix" || sideNavigation.value === "mix" || sideNavigation.value === "box") {
@@ -706,6 +730,75 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         });
       }
     };
+    const handleResize = () => {
+      const el = getContentElem();
+      if (el) {
+        const clientWidth = el.clientWidth || 0;
+        const limitedWidth = 1120;
+        const maxWidth = clientWidth > limitedWidth ? limitedWidth : clientWidth;
+        const width = props$1.fluid ? clientWidth : maxWidth;
+        const height = el.clientHeight;
+        if (width !== state.contentWidth || height !== state.contentHeight) {
+          state.contentWidth = width;
+          state.contentHeight = height;
+          emit("bodySizeChange", { width, height, mobile: mobile.value });
+        }
+      }
+    };
+    hook.useWindowListener(common.debounce(() => handleResize(), 500));
+    const [startBodyResizeTimer] = hook.useTimer(600);
+    const layoutProvide = vue.shallowReactive({
+      keepAlive: props$1.tabBar && props$1.keepAlive,
+      responsive: props$1.responsive,
+      activeMenu: (path) => {
+        updateMenuActive(path, util$1.getMatchedMenus(path, menuData.value));
+        if (navigation.value === "mix" || sideNavigation.value === "mix" || sideNavigation.value === "box") {
+          splitMenuData();
+        }
+      }
+    });
+    vue.provide(props.PRO_LAYOUT_KEY, layoutProvide);
+    const [media, startMedia, stopMedia] = hook.useMediaQuery(hook.mobileMediaQuery, () => {
+      const isMobile = props$1.responsive ? media.matches : false;
+      if (mobile.value !== isMobile) {
+        mobile.value = isMobile;
+        updateCollapse(mobile.value);
+      }
+    });
+    vue.watch(
+      () => props$1.responsive,
+      () => {
+        layoutProvide.responsive = props$1.responsive;
+        if (props$1.responsive) {
+          startMedia();
+        } else {
+          stopMedia();
+        }
+      },
+      { immediate: true }
+    );
+    vue.watch([() => props$1.tabBar, () => props$1.keepAlive], () => {
+      layoutProvide.keepAlive = props$1.tabBar && props$1.keepAlive;
+    });
+    vue.watch([() => props$1.collapse, () => props$1.compact], () => {
+      startBodyResizeTimer(() => {
+        handleResize();
+      });
+    });
+    vue.watch(
+      [
+        routeLayout,
+        routeSideType,
+        routeTabBar,
+        routeMaximized,
+        () => props$1.fluid
+      ],
+      () => {
+        vue.nextTick(() => {
+          handleResize();
+        });
+      }
+    );
     vue.watch(
       () => props$1.menus,
       () => {
@@ -769,75 +862,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       },
       { immediate: true }
     );
-    const layoutProvide = vue.shallowReactive({
-      keepAlive: props$1.tabBar && props$1.keepAlive,
-      responsive: props$1.responsive
-    });
-    vue.provide(props.PRO_LAYOUT_KEY, layoutProvide);
-    vue.watch([() => props$1.tabBar, () => props$1.keepAlive], () => {
-      layoutProvide.keepAlive = props$1.tabBar && props$1.keepAlive;
-    });
-    const [media, startMedia, stopMedia] = hook.useMediaQuery(hook.mobileMediaQuery, () => {
-      const isMobile = props$1.responsive ? media.matches : false;
-      if (mobile.value !== isMobile) {
-        mobile.value = isMobile;
-        updateCollapse(mobile.value);
-      }
-    });
-    vue.watch(
-      () => props$1.responsive,
-      () => {
-        layoutProvide.responsive = props$1.responsive;
-        if (props$1.responsive) {
-          startMedia();
-        } else {
-          stopMedia();
-        }
-      },
-      { immediate: true }
-    );
     hook.useWindowListener("keydown", (e) => {
       if (e.keyCode === 27 && props$1.compressOnEsc && props$1.maximized) {
         e.stopPropagation();
         updateMaximized(false);
       }
     });
-    const handleResize = () => {
-      const el = getContentElem();
-      if (el) {
-        const clientWidth = el.clientWidth || 0;
-        const limitedWidth = 1120;
-        const maxWidth = clientWidth > limitedWidth ? limitedWidth : clientWidth;
-        const width = props$1.fluid ? clientWidth : maxWidth;
-        const height = el.clientHeight;
-        if (width !== state.contentWidth || height !== state.contentHeight) {
-          state.contentWidth = width;
-          state.contentHeight = height;
-          emit("bodySizeChange", { width, height, mobile: mobile.value });
-        }
-      }
-    };
-    hook.useWindowListener(common.debounce(() => handleResize(), 500));
-    const [startBodyResizeTimer] = hook.useTimer(600);
-    vue.watch([() => props$1.collapse, () => props$1.compact], () => {
-      startBodyResizeTimer(() => {
-        handleResize();
-      });
-    });
-    vue.watch(
-      [
-        routeLayout,
-        routeSideType,
-        routeTabBar,
-        routeMaximized,
-        () => props$1.fluid
-      ],
-      () => {
-        vue.nextTick(() => {
-          handleResize();
-        });
-      }
-    );
     vue.onMounted(() => {
       handleResize();
     });
@@ -847,6 +877,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       openModal,
       closeModal,
       closeAllModal,
+      removeModal,
+      removeAllModal,
       updateModalProps
     });
     return (_ctx, _cache) => {
@@ -900,6 +932,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         sideCustomStyle: _ctx.sideCustomStyle,
         tabsCustomStyle: _ctx.tabsCustomStyle,
         contentCustomStyle: _ctx.contentCustomStyle,
+        contentCustomClass: ["ele-pro-layout-content", _ctx.contentCustomClass ?? ""],
         logoStyle: _ctx.logoStyle,
         logoTitleStyle: _ctx.logoTitleStyle,
         headerMenusStyle: _ctx.headerMenusStyle,
@@ -1027,7 +1060,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             ])
           };
         })
-      ]), 1032, ["height", "headerMenus", "headerActive", "sidebarMenus", "sidebarActive", "sideboxMenus", "sideboxActive", "tabs", "tabActive", "levels", "collapse", "compact", "maximized", "tabBar", "breadcrumb", "backTop", "headerMenuProps", "sidebarMenuProps", "sideboxMenuProps", "layout", "sidebarLayout", "headerStyle", "sidebarStyle", "mixSidebarStyle", "tabStyle", "fixedHeader", "fixedSidebar", "fixedBody", "logoInHeader", "fixedHome", "homePath", "isHome", "tabContextMenu", "tabContextMenus", "tabSortable", "headerTitleSlot", "headerIconSlot", "sidebarTitleSlot", "sidebarIconSlot", "sideboxTitleSlot", "sideboxIconSlot", "headerCustomStyle", "sidebarCustomStyle", "sideboxCustomStyle", "sideCustomStyle", "tabsCustomStyle", "contentCustomStyle", "logoStyle", "logoTitleStyle", "headerMenusStyle", "sidebarMenusStyle", "sideboxMenusStyle", "logoSrc", "logoTitle", "menuScrollToActive", "mobile", "class"]);
+      ]), 1032, ["height", "headerMenus", "headerActive", "sidebarMenus", "sidebarActive", "sideboxMenus", "sideboxActive", "tabs", "tabActive", "levels", "collapse", "compact", "maximized", "tabBar", "breadcrumb", "backTop", "headerMenuProps", "sidebarMenuProps", "sideboxMenuProps", "layout", "sidebarLayout", "headerStyle", "sidebarStyle", "mixSidebarStyle", "tabStyle", "fixedHeader", "fixedSidebar", "fixedBody", "logoInHeader", "fixedHome", "homePath", "isHome", "tabContextMenu", "tabContextMenus", "tabSortable", "headerTitleSlot", "headerIconSlot", "sidebarTitleSlot", "sidebarIconSlot", "sideboxTitleSlot", "sideboxIconSlot", "headerCustomStyle", "sidebarCustomStyle", "sideboxCustomStyle", "sideCustomStyle", "tabsCustomStyle", "contentCustomStyle", "contentCustomClass", "logoStyle", "logoTitleStyle", "headerMenusStyle", "sidebarMenusStyle", "sideboxMenusStyle", "logoSrc", "logoTitle", "menuScrollToActive", "mobile", "class"]);
     };
   }
 });

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

@@ -170,6 +170,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     sideCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
     tabsCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
     contentCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    contentCustomClass: import('vue').PropType<import('../ele-app/types').ClassValues>;
     logoStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
     logoTitleStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
     headerMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
@@ -183,17 +184,19 @@ 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;
+    openModal: <T extends import('../ele-modal-render/types').ModalItemType, P extends Record<string, any>>(option: import('../ele-modal-render/types').ModalItem<T, P>) => 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;
+    removeModal: (modalId?: import('../ele-modal-render/types').ModalItemId) => void;
+    removeAllModal: () => void;
+    updateModalProps: <T extends import('../ele-modal-render/types').ModalItemType>(modalId?: import('../ele-modal-render/types').ModalItemId, option?: import('../ele-modal-render/types').ModalItemProps<T>) => void;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     tabContextMenu: (_option: TabItemEventOption) => void;
     "update:maximized": (_maximized: boolean) => void;
     tabSortChange: (_data: TabItem[]) => void;
     tabClick: (_option: TabItemEventOption) => void;
     tabRemove: (_option: TabItemEventOption) => void;
-    tabAdd: (_data: TabItem) => void;
+    tabAdd: (_data: TabItem, _active?: string | undefined) => void;
     "update:collapse": (_collapse: boolean) => void;
     logoClick: (_isHome: boolean, _e: MouseEvent) => void;
     headMenuOpen: (_index: string, _indexPath: string[]) => void;
@@ -342,6 +345,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     sideCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
     tabsCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
     contentCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    contentCustomClass: import('vue').PropType<import('../ele-app/types').ClassValues>;
     logoStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
     logoTitleStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
     headerMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
@@ -359,7 +363,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onTabSortChange?: ((_data: TabItem[]) => any) | undefined;
     onTabClick?: ((_option: TabItemEventOption) => any) | undefined;
     onTabRemove?: ((_option: TabItemEventOption) => any) | undefined;
-    onTabAdd?: ((_data: TabItem) => any) | undefined;
+    onTabAdd?: ((_data: TabItem, _active?: string | undefined) => any) | undefined;
     "onUpdate:collapse"?: ((_collapse: boolean) => any) | undefined;
     onLogoClick?: ((_isHome: boolean, _e: MouseEvent) => any) | undefined;
     onHeadMenuOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
@@ -370,11 +374,13 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }>, {
     height: string | number;
     transitionDelay: number;
-    expanded: boolean;
     uniqueOpened: boolean;
     collapse: boolean;
     ellipsis: boolean;
+    expanded: boolean;
     compact: boolean;
+    keepAlive: boolean;
+    responsive: boolean;
     tabBar: TabBar;
     breadcrumb: boolean | EleBreadcrumbProps;
     backTop: boolean | EleBacktopProps;
@@ -393,8 +399,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     sideboxTitleSlot: string;
     sideboxIconSlot: string;
     menuScrollToActive: boolean;
-    keepAlive: boolean;
-    responsive: boolean;
     redirectPath: string;
     fluid: boolean;
     compressOnEsc: boolean;

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

@@ -112,7 +112,7 @@ const proLayoutProps = {
 const proLayoutEmits = {
   "update:collapse": (_collapse) => true,
   "update:maximized": (_maximized) => true,
-  tabAdd: (_data) => true,
+  tabAdd: (_data, _active) => true,
   tabClick: (_option) => true,
   tabRemove: (_option) => true,
   tabContextMenu: (_option) => true,
@@ -124,7 +124,7 @@ const proLayoutEmits = {
   sideMenuClose: (_index, _indexPath) => true,
   bodySizeChange: (_option) => true
 };
-const PRO_LAYOUT_KEY = Symbol("proLayout");
+const PRO_LAYOUT_KEY = /* @__PURE__ */ Symbol("proLayout");
 exports.PRO_LAYOUT_KEY = PRO_LAYOUT_KEY;
 exports.proLayoutEmits = proLayoutEmits;
 exports.proLayoutProps = proLayoutProps;

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

@@ -181,6 +181,7 @@ export declare const proLayoutProps: {
     sideCustomStyle: PropType<import('../ele-app/types').StyleValue | null>;
     tabsCustomStyle: PropType<import('../ele-app/types').StyleValue | null>;
     contentCustomStyle: PropType<import('../ele-app/types').StyleValue | null>;
+    contentCustomClass: PropType<import('../ele-app/types').ClassValues>;
     logoStyle: PropType<import('../ele-app/types').StyleValue | null>;
     logoTitleStyle: PropType<import('../ele-app/types').StyleValue | null>;
     headerMenusStyle: PropType<import('../ele-app/types').StyleValue | null>;
@@ -200,7 +201,7 @@ export type ProLayoutProps = ExtractPropTypes<typeof proLayoutProps>;
 export declare const proLayoutEmits: {
     'update:collapse': (_collapse: boolean) => boolean;
     'update:maximized': (_maximized: boolean) => boolean;
-    tabAdd: (_data: TabItem) => boolean;
+    tabAdd: (_data: TabItem, _active?: string) => boolean;
     tabClick: (_option: TabItemEventOption) => boolean;
     tabRemove: (_option: TabItemEventOption) => boolean;
     tabContextMenu: (_option: TabItemEventOption) => boolean;

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

@@ -42,8 +42,14 @@ export interface MenuMeta extends Record<string, any> {
   props?: Record<string, any>;
   /** 是否需要外层布局 */
   layout?: boolean;
+  /** 页签滚动位置 */
+  tabScrollTop?: number;
   /** 路由地址 */
   routePath?: string;
+  /** 打开位置, _slef 当前窗口打开, _blank 新窗口打开 */
+  openTarget?: '_slef' | '_blank';
+  /** 打开方式, iframe 内嵌, external 外链 */
+  openType?: 'iframe' | 'external';
   /** 内嵌地址, 内部属性 */
   iframe?: string;
 }
@@ -149,6 +155,8 @@ export interface MatchedResult {
   active: string;
   /** 菜单标题 */
   title?: string;
+  /** 路由对应的菜单 */
+  menu?: MenuItem;
   /** 匹配的菜单数据 */
   matched?: MenuItem[];
   /** 是否选中非本身 */
@@ -212,6 +220,8 @@ export interface ProLayoutProvide {
   keepAlive?: boolean;
   /** 是否开启响应式 */
   responsive?: boolean;
+  /** 设置选中菜单 */
+  activeMenu?: (path: string) => void;
 }
 
 /**

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

@@ -38,6 +38,7 @@ function getRouteMatched(route, menus) {
       active: meta.active,
       activeOther: true,
       title: m2?.meta?.title ?? meta.title,
+      menu: m2,
       matched: getMatchedMenus(meta.active, menus)
     };
   }
@@ -46,6 +47,7 @@ function getRouteMatched(route, menus) {
     return {
       active: fullPath,
       title: fm.meta?.title ?? meta.title,
+      menu: fm,
       matched: getMatchedMenus(fullPath, menus)
     };
   }
@@ -53,6 +55,7 @@ function getRouteMatched(route, menus) {
   return {
     active: path,
     title: m?.meta?.title ?? meta.title,
+    menu: m,
     matched: getMatchedMenus(path, menus)
   };
 }
@@ -87,15 +90,33 @@ function getMatchedComponents(matched) {
   });
   return components;
 }
-function getRouteTab(route, tabs, homePath, routeTitle) {
-  const { path, fullPath, meta, matched } = route;
+function getRouteTab(route, tabs, homePath, routeTitle, routeMenu) {
+  const { path, fullPath, meta, matched, params } = route;
   const key = meta.tabUnique === false ? fullPath : path;
   const t = findTabByPath(key, tabs);
   const title = t?.title || routeTitle;
   const home = path === homePath || fullPath === homePath;
   const closable = t?.closable ?? meta.closable !== false;
   const components = getMatchedComponents(matched);
-  return { key, path, fullPath, title, closable, home, components, meta };
+  const { iframe, iframeTitle } = meta.iframe || meta.openType === "iframe" ? {
+    iframe: getIframeUrl(params, meta.iframe),
+    iframeTitle: decodeURIComponent(
+      (Array.isArray(params.title) ? params.title[0] : params.title) || ""
+    )
+  } : {
+    iframe: meta.iframe,
+    iframeTitle: void 0
+  };
+  return {
+    key,
+    path,
+    fullPath,
+    title: iframeTitle || title,
+    closable,
+    home,
+    components,
+    meta: { ...routeMenu?.meta || {}, ...meta, iframe }
+  };
 }
 function getActiveChilds(menus, active, childrenName) {
   const field = childrenName || "children";
@@ -111,8 +132,13 @@ function getActiveChilds(menus, active, childrenName) {
   }
   return m[field] || [];
 }
-function getIframeSrc(routePath, iframeUrl) {
-  const [_path1, query1 = ""] = (routePath ?? "").split("?");
+function getIframeUrl(routeParams, defaultUrl) {
+  const { url } = routeParams;
+  const pathUrl = Array.isArray(url) ? url[0] : url;
+  return (pathUrl ? decodeURIComponent(pathUrl) : void 0) || defaultUrl;
+}
+function getIframeSrc(routeFullPath, iframeUrl) {
+  const [_path1, query1 = ""] = (routeFullPath ?? "").split("?");
   const [path2, query2 = ""] = (iframeUrl ?? "").split("?");
   const params1 = new URLSearchParams(query1);
   const params2 = new URLSearchParams(query2);
@@ -125,7 +151,7 @@ function getIframeSrc(routePath, iframeUrl) {
 function getMenuItems(menus, link) {
   return common.mapTree(menus, (m) => {
     const { path, meta } = m;
-    const { hide, icon, title, props: props2 } = meta ?? {};
+    const { hide, icon, title, props: props2, openTarget } = meta ?? {};
     if (hide) {
       return;
     }
@@ -134,6 +160,7 @@ function getMenuItems(menus, link) {
       icon,
       path: link ? path : void 0,
       index: path,
+      pathTarget: openTarget,
       ...common.omit(props2, ["title", "icon", "path", "index"]),
       meta
     };
@@ -155,6 +182,7 @@ exports.findTabByKey = findTabByKey;
 exports.findTabByPath = findTabByPath;
 exports.getActiveChilds = getActiveChilds;
 exports.getIframeSrc = getIframeSrc;
+exports.getIframeUrl = getIframeUrl;
 exports.getMatchedComponents = getMatchedComponents;
 exports.getMatchedLevels = getMatchedLevels;
 exports.getMatchedMenus = getMatchedMenus;

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

@@ -53,8 +53,9 @@ export declare function getMatchedComponents(matched: RouteLocationMatched[]): s
  * @param tabs 当前页签数据
  * @param homePath 主页地址
  * @param routeTitle 路由对应的标题
+ * @param routeMenu 路由对应的菜单
  */
-export declare function getRouteTab(route: RouteLocationNormalizedLoaded, tabs: TabItem[], homePath: string | undefined, routeTitle?: string): TabItem;
+export declare function getRouteTab(route: RouteLocationNormalizedLoaded, tabs: TabItem[], homePath: string | undefined, routeTitle?: string, routeMenu?: MenuItem): TabItem;
 /**
  * 获取选中菜单的子级
  * @param menus 菜单数据
@@ -63,11 +64,17 @@ export declare function getRouteTab(route: RouteLocationNormalizedLoaded, tabs:
  */
 export declare function getActiveChilds(menus: MenuItem[], active?: string, childrenName?: string): MenuItem[];
 /**
- * 拼接内嵌地址
- * @param routePath 路由地址含参数
+ * 获取内嵌地址
+ * @param routeParams 动态路由参数
+ * @param defaultUrl 默认地址
+ */
+export declare function getIframeUrl(routeParams: Record<string, any>, defaultUrl?: string): string | undefined;
+/**
+ * 拼接内嵌地址合并路由参数
+ * @param routeFullPath 路由地址含参数
  * @param iframeUrl 内嵌地址
  */
-export declare function getIframeSrc(routePath?: string, iframeUrl?: string): string;
+export declare function getIframeSrc(routeFullPath?: string, iframeUrl?: string): string;
 /**
  * 菜单数据转换
  * @param menus 菜单数据

package/lib/ele-pro-table/components/tool-column-list.cjs

@@ -45,7 +45,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     fixedRight: (_item) => true,
     fixedLeftTooltip: (_el) => true,
     fixedRightTooltip: (_el) => true,
-    colWidthChange: (_item, _width) => true
+    colWidthChange: (_item, _width) => true,
+    sortStart: () => true,
+    sortEnd: () => true
   },
   setup(__props, { emit: __emit }) {
     const props = __props;
@@ -89,6 +91,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleSortChange = (colItems) => {
       handleChildSortChange(colItems, props.parent);
     };
+    const handleSortStart = () => {
+      emit("sortStart");
+    };
+    const handleSortEnd = () => {
+      emit("sortEnd");
+    };
     return (_ctx, _cache) => {
       const _component_ToolColumnList = vue.resolveComponent("ToolColumnList", true);
       return vue.openBlock(), vue.createBlock(vue.unref(VueDraggable), {
@@ -99,7 +107,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         handle: ".ele-tool-column-handle",
         componentData: { class: "ele-tool-column-list" },
         forceFallback: true,
-        "onUpdate:modelValue": handleSortChange
+        "onUpdate:modelValue": handleSortChange,
+        onStart: handleSortStart,
+        onEnd: handleSortEnd
       }, {
         item: vue.withCtx(({ element: d }) => [
           vue.createElementVNode("div", _hoisted_1, [
@@ -168,7 +178,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               onFixedRight: handleFixedRight,
               onFixedLeftTooltip: handleChildFixedLeftTooltip,
               onFixedRightTooltip: handleChildFixedRightTooltip,
-              onColWidthChange: handleColWidthChange
+              onColWidthChange: handleColWidthChange,
+              onSortStart: handleSortStart,
+              onSortEnd: handleSortEnd
             }, null, 8, ["data", "parent", "sortable", "allowWidth", "columnWidthPlaceholder"])) : vue.createCommentVNode("", true)
           ])
         ]),

package/lib/ele-pro-table/components/tool-column-list.d.ts

@@ -22,6 +22,8 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     fixedLeftTooltip: (_el: HTMLElement) => void;
     fixedRightTooltip: (_el: HTMLElement) => void;
     colWidthChange: (_item: ColItem, _width?: string | number | undefined) => void;
+    sortStart: () => void;
+    sortEnd: () => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 列配置数据 */
     data: PropType<ColItem[]>;
@@ -43,6 +45,8 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     onFixedLeftTooltip?: ((_el: HTMLElement) => any) | undefined;
     onFixedRightTooltip?: ((_el: HTMLElement) => any) | undefined;
     onColWidthChange?: ((_item: ColItem, _width?: string | number | undefined) => any) | undefined;
+    onSortStart?: (() => any) | undefined;
+    onSortEnd?: (() => any) | undefined;
 }>, {
     sortable: boolean;
     allowFixed: boolean;

package/lib/ele-pro-table/components/tool-column.cjs

@@ -39,6 +39,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const colItems = vue.ref([]);
     const isCheckAll = vue.ref(false);
     const isIndeterminate = vue.ref(false);
+    const isDragging = vue.ref(false);
     const initColItems = () => {
       const { cols, checkAll, indeterminate } = util.getColItems(
         props.columns,
@@ -163,6 +164,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       initColItems();
       updateColumns(true);
     };
+    const handleSortStart = () => {
+      isDragging.value = true;
+    };
+    const handleSortEnd = () => {
+      isDragging.value = false;
+    };
     vue.watch(
       [() => props.columns, () => props.locale],
       () => {
@@ -194,7 +201,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           }, {
             body: vue.withCtx(() => [
               vue.createElementVNode("div", {
-                class: vue.normalizeClass(["ele-popover-body ele-tool-column", { "is-sortable": __props.sortable }])
+                class: vue.normalizeClass(["ele-popover-body ele-tool-column", [{ "is-sortable": __props.sortable }, { "is-dragging": isDragging.value }]])
               }, [
                 vue.createElementVNode("div", _hoisted_1, [
                   vue.createElementVNode("div", _hoisted_2, [
@@ -220,7 +227,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   onFixedLeft: handleFixedLeft,
                   onFixedRight: handleFixedRight,
                   onFixedLeftTooltip: handleFixedLeftTooltip,
-                  onFixedRightTooltip: handleFixedRightTooltip
+                  onFixedRightTooltip: handleFixedRightTooltip,
+                  onSortStart: handleSortStart,
+                  onSortEnd: handleSortEnd
                 }, null, 8, ["data", "sortable", "allowFixed"])) : vue.createCommentVNode("", true)
               ], 2)
             ]),