ele-admin-plus 1.5.1-beta.4 → 1.6.0-beta.2

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

@@ -112,6 +112,7 @@ export declare const proLayoutProps: {
         type: PropType<boolean | import('../ele-app/plus').EleBreadcrumbProps>;
         default: boolean;
     };
+    breadcrumbStyle: PropType<import('../ele-app/types').StyleValues>;
     backTop: {
         type: PropType<boolean | import('../ele-app/plus').EleBacktopProps>;
         default: boolean;
@@ -181,6 +182,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 +202,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,31 @@ 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: getIframeTitle(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 +130,21 @@ 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 getIframeTitle(title) {
+  try {
+    return decodeURIComponent((Array.isArray(title) ? title[0] : title) || "");
+  } catch (e) {
+    console.error(e);
+  }
+  return String(title || "");
+}
+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 +157,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 +166,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 +188,8 @@ exports.findTabByKey = findTabByKey;
 exports.findTabByPath = findTabByPath;
 exports.getActiveChilds = getActiveChilds;
 exports.getIframeSrc = getIframeSrc;
+exports.getIframeTitle = getIframeTitle;
+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,22 @@ 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 title 动态路由参数传递的标题
+ */
+export declare function getIframeTitle(title?: string | Array<string>): string;
+/**
+ * 拼接内嵌地址合并路由参数
+ * @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/index.cjs

@@ -695,11 +695,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             selections: _ctx.selections,
             pageData: tableData.value,
             datasource: toolExportConfig.value.datasource,
-            spanMethod: _ctx.spanMethod,
+            spanMethod: toolExportConfig.value.spanMethod || _ctx.spanMethod,
             tableHeader: toolExportConfig.value.showHeader ?? _ctx.showHeader,
             showSummary: _ctx.showSummary,
             sumText: _ctx.sumText,
-            summaryMethod: _ctx.summaryMethod,
+            summaryMethod: toolExportConfig.value.summaryMethod || _ctx.summaryMethod,
             pageIndex: tableIndex.value,
             treeProps: _ctx.treeProps,
             fetch,
@@ -723,11 +723,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             selections: _ctx.selections,
             pageData: tableData.value,
             datasource: toolPrintConfig.value.datasource,
-            spanMethod: _ctx.spanMethod,
+            spanMethod: toolPrintConfig.value.spanMethod || _ctx.spanMethod,
             tableHeader: toolPrintConfig.value.showHeader ?? _ctx.showHeader,
             showSummary: _ctx.showSummary,
             sumText: _ctx.sumText,
-            summaryMethod: _ctx.summaryMethod,
+            summaryMethod: toolPrintConfig.value.summaryMethod || _ctx.summaryMethod,
             tableStyle: _ctx.tableStyle,
             cellStyle: _ctx.cellStyle,
             cellClassName: _ctx.cellClassName,

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

@@ -63,7 +63,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     height: (NumberConstructor | StringConstructor)[];
     maxHeight: (NumberConstructor | StringConstructor)[];
     tableLayout: {
-        type: import('vue').PropType<"fixed" | "auto">;
+        type: import('vue').PropType<import('element-plus').TableProps<Record<string, any>>["tableLayout"]>;
         default: string;
     };
     width: (NumberConstructor | StringConstructor)[];
@@ -76,20 +76,18 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         required: boolean;
     };
     size: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
+        type: import('vue').PropType<import('element-plus').TableProps<Record<string, any>>["size"]>;
+    };
+    className: {
+        type: StringConstructor;
+        default: string;
     };
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
     lazy: BooleanConstructor;
-    className: {
-        type: StringConstructor;
-        default: string;
-    };
+    load: import('vue').PropType<import('element-plus').TableProps<any>["load"]>;
     emptyText: StringConstructor;
     stripe: {
         type: BooleanConstructor;
@@ -101,23 +99,26 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: import('vue').PropType<import('element-plus').TableProps<any>["summaryMethod"]>;
+    rowClassName: import('vue').PropType<import('element-plus').TableProps<any>["rowClassName"]>;
+    rowStyle: import('vue').PropType<import('element-plus').TableProps<any>["rowStyle"]>;
+    cellClassName: import('vue').PropType<import('element-plus').TableProps<any>["cellClassName"]>;
+    cellStyle: import('vue').PropType<import('element-plus').TableProps<any>["cellStyle"]>;
+    headerRowClassName: import('vue').PropType<import('element-plus').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: import('vue').PropType<import('element-plus').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: import('vue').PropType<import('element-plus').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: import('vue').PropType<import('element-plus').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: import('vue').PropType<import('element-plus').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    rowExpandable: {
+        type: import('vue').PropType<import('element-plus').TableProps<any>["rowExpandable"]>;
+    };
+    defaultSort: import('vue').PropType<import('element-plus').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: import('vue').PropType<import('element-plus').TableProps<any>["tooltipOptions"]>;
+    spanMethod: import('vue').PropType<import('element-plus').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -127,18 +128,20 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
+    showOverflowTooltip: {
+        type: import('vue').PropType<import('element-plus').TableProps<any>["showOverflowTooltip"]>;
+        default: undefined;
+    };
+    tooltipFormatter: import('vue').PropType<import('element-plus').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -148,10 +151,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
     sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;
@@ -220,6 +221,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     select: (_selection: DataItem[], _row: DataItem) => void;
     done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => void;
+    expandChange: (_row: DataItem, _expanded: boolean) => void;
     scroll: (_params: import('element-plus/es/components/table-v2/src/composables/use-scrollbar').ScrollPos) => void;
     "update:currentRowKey": (_currentRowKey?: import('../ele-data-table/types').DataKey | undefined) => void;
     "update:selectedRowKeys": (_selectedRowKeys?: import('../ele-data-table/types').DataKey[] | undefined) => void;
@@ -239,7 +241,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     filterChange: (_filter: Filter) => void;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => void;
     headerDragend: (_width: number, _old: number, _column: Column, _e: MouseEvent) => void;
-    expandChange: (_row: DataItem, _expanded: boolean) => void;
     endEeached: (_params: any) => void;
     rowsRendered: (_params: any) => void;
     refresh: () => void;
@@ -308,7 +309,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     height: (NumberConstructor | StringConstructor)[];
     maxHeight: (NumberConstructor | StringConstructor)[];
     tableLayout: {
-        type: import('vue').PropType<"fixed" | "auto">;
+        type: import('vue').PropType<import('element-plus').TableProps<Record<string, any>>["tableLayout"]>;
         default: string;
     };
     width: (NumberConstructor | StringConstructor)[];
@@ -321,20 +322,18 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         required: boolean;
     };
     size: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
+        type: import('vue').PropType<import('element-plus').TableProps<Record<string, any>>["size"]>;
+    };
+    className: {
+        type: StringConstructor;
+        default: string;
     };
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
     lazy: BooleanConstructor;
-    className: {
-        type: StringConstructor;
-        default: string;
-    };
+    load: import('vue').PropType<import('element-plus').TableProps<any>["load"]>;
     emptyText: StringConstructor;
     stripe: {
         type: BooleanConstructor;
@@ -346,23 +345,26 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: import('vue').PropType<import('element-plus').TableProps<any>["summaryMethod"]>;
+    rowClassName: import('vue').PropType<import('element-plus').TableProps<any>["rowClassName"]>;
+    rowStyle: import('vue').PropType<import('element-plus').TableProps<any>["rowStyle"]>;
+    cellClassName: import('vue').PropType<import('element-plus').TableProps<any>["cellClassName"]>;
+    cellStyle: import('vue').PropType<import('element-plus').TableProps<any>["cellStyle"]>;
+    headerRowClassName: import('vue').PropType<import('element-plus').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: import('vue').PropType<import('element-plus').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: import('vue').PropType<import('element-plus').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: import('vue').PropType<import('element-plus').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: import('vue').PropType<import('element-plus').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    rowExpandable: {
+        type: import('vue').PropType<import('element-plus').TableProps<any>["rowExpandable"]>;
+    };
+    defaultSort: import('vue').PropType<import('element-plus').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: import('vue').PropType<import('element-plus').TableProps<any>["tooltipOptions"]>;
+    spanMethod: import('vue').PropType<import('element-plus').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -372,18 +374,20 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
+    showOverflowTooltip: {
+        type: import('vue').PropType<import('element-plus').TableProps<any>["showOverflowTooltip"]>;
+        default: undefined;
+    };
+    tooltipFormatter: import('vue').PropType<import('element-plus').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -393,10 +397,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
     sticky: BooleanConstructor;
     headerEllipsis: {
         type: BooleanConstructor;
@@ -420,6 +422,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }>> & Readonly<{
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onDone?: ((_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => any) | undefined;
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onScroll?: ((_params: import('element-plus/es/components/table-v2/src/composables/use-scrollbar').ScrollPos) => any) | undefined;
     "onUpdate:currentRowKey"?: ((_currentRowKey?: import('../ele-data-table/types').DataKey | undefined) => any) | undefined;
     "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: import('../ele-data-table/types').DataKey[] | undefined) => any) | undefined;
@@ -439,7 +442,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onEndEeached?: ((_params: any) => any) | undefined;
     onRowsRendered?: ((_params: any) => any) | undefined;
     onRefresh?: (() => any) | undefined;
@@ -450,12 +452,12 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onMaximizedChange?: ((_maximized: boolean) => any) | undefined;
     "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;
 }>, {
-    tableLayout: "fixed" | "auto";
+    tableLayout: ("fixed" | "auto") | undefined;
     border: boolean;
+    className: string;
     loading: boolean;
     fit: boolean;
     lazy: boolean;
-    className: string;
     stripe: boolean;
     showHeader: boolean;
     showSummary: boolean;
@@ -466,9 +468,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     treeProps: import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined;
     scrollbarAlwaysOn: boolean;
     flexible: boolean;
+    showOverflowTooltip: boolean | Partial<Pick<import('element-plus').UseTooltipProps, "offset" | "transition" | "effect" | "enterable" | "popperClass" | "placement" | "popperOptions" | "showArrow" | "appendTo" | "showAfter" | "hideAfter">> | undefined;
     scrollbarTabindex: string | number;
     allowDragLastColumn: boolean;
     preserveExpandedContent: boolean;
+    nativeScrollbar: boolean;
     sticky: boolean;
     toolbar: boolean | EleToolbarProps;
     tools: boolean | string[];
@@ -478,11 +482,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     bottomLine: boolean;
     emptyProps: import('../ele-data-table/types').TableEmptyProps;
     reserveCurrent: boolean;
+    pagination: boolean | import('./types').TablePagination;
     loadOnCreated: boolean;
     loadOnChanged: boolean;
     columnSortable: boolean;
     columnFixed: boolean;
-    pagination: boolean | import('./types').TablePagination;
     virtual: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;