ele-admin-plus 1.1.9-beta.9 → 1.2.0-beta.1

package/es/ele-pro-layout/style/layout.scss

@@ -19,14 +19,21 @@
     transition: width $ele-transition;
   }
 
-  .ele-admin-content {
+  .ele-admin-wrapper {
     flex: auto;
     display: flex;
     flex-direction: column;
+    position: relative;
+
+    & > .el-backtop {
+      z-index: calc(#{eleVar('layout', 'index')} + 1);
+    }
   }
 
-  & > .el-backtop {
-    z-index: eleVar('layout', 'index');
+  .ele-admin-content {
+    flex: auto;
+    display: flex;
+    flex-direction: column;
   }
 }
 
@@ -58,17 +65,40 @@
 }
 
 /* iframe */
+.ele-admin-iframe-wrap {
+  flex-shrink: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  pointer-events: none;
+  overflow: hidden;
+}
+
 .ele-admin-iframe {
+  flex-shrink: 0;
   width: 100%;
   height: 100%;
-  box-sizing: border-box;
-  display: block;
   border: none;
+  box-sizing: border-box;
+  pointer-events: auto;
 }
 
-.ele-admin-iframe-wrap {
+/* 弹窗容器 */
+.ele-admin-modals {
+  flex-shrink: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
   width: 100%;
   height: 100%;
-  flex-shrink: 0;
-  overflow: hidden;
+  pointer-events: none;
+  z-index: eleVar('layout', 'index');
 }

package/es/ele-pro-layout/style/sidebar.scss

@@ -103,7 +103,6 @@
         }
 
         & > .el-sub-menu.is-active > .el-sub-menu__title {
-          background: eleVar('menu-item', 'active-bg');
           transition: none;
         }
 

package/es/ele-pro-layout/style/tabs.scss

@@ -15,6 +15,25 @@
   /* 固定主页页签 */
   &.is-fixed-home {
     padding-left: eleVar('page', 'padding');
+
+    &.is-tag .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
+      padding-left: eleVar('tab', 'tag-space');
+    }
+
+    &.is-button .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
+      padding-left: eleVar('tab', 'button-space');
+    }
+  }
+
+  /* 页签风格适配 */
+  &.is-tag {
+    padding-right: eleVar('tab', 'tag-space');
+  }
+
+  &.is-button {
+    padding-right: eleVar('page', 'padding');
+    background: eleVar('layout', 'bg');
+    box-shadow: none;
   }
 }
 
@@ -24,14 +43,3 @@
     box-shadow: 0 -0.8px 0 eleVar('header', 'line-color') inset;
   }
 }
-
-/* 按钮风格页签 */
-.ele-admin-tab-card .ele-admin-tabs {
-  padding-right: eleVar('page', 'padding');
-  background: eleVar('layout', 'bg');
-  box-shadow: none;
-
-  &.is-fixed-home .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
-    padding-left: eleVar('tab-button', 'space');
-  }
-}

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

@@ -1,4 +1,4 @@
-import type { RouteMeta, RouteLocationMatched } from 'vue-router';
+import type { RouteLocationMatched } from 'vue-router';
 import type { ElMenuProps, ElBreadcrumbProps } from '../ele-app/el';
 import type { EleMenuItemProps } from '../ele-app/plus';
 import type TabTitle from '../ele-tabs/components/tab-title';
@@ -7,11 +7,11 @@ export type MenuItemProps = EleMenuItemProps;
 /**
  * 菜单元数据
  */
-export interface MenuMeta extends RouteMeta {
+export interface MenuMeta extends Record<string, any> {
   /** 菜单标题 */
   title?: string;
   /** 菜单图标 */
-  icon?: EleMenuItemProps['icon'];
+  icon?: any;
   /** 菜单是否隐藏 */
   hide?: boolean;
   /** 选中其它菜单 */
@@ -31,7 +31,7 @@ export interface MenuMeta extends RouteMeta {
   /** 是否在面包屑中显示 */
   breadcrumb?: boolean;
   /** 菜单组件其它属性 */
-  props?: EleMenuItemProps;
+  props?: Record<string, any>;
   /** 是否需要外层布局 */
   layout?: boolean;
   /** 路由地址 */
@@ -117,7 +117,7 @@ export type SidebarStyle = 'light' | 'dark';
 /**
  * 页签风格
  */
-export type TabStyle = 'simple' | 'indicator' | 'button';
+export type TabStyle = 'simple' | 'indicator' | 'button' | 'tag';
 
 /**
  * 菜单标题国际化方法

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

@@ -1,6 +1,7 @@
-import type { RouteLocationMatched } from 'vue-router';
-import type { ProLayoutProps } from './props';
-import type { MenuMeta, MenuItem, TabItem, LevelItem, CurrentRoute, WindowListenerOption, MatchedResult, MixActiveResult } from './types';
+import { MenuMeta, MenuItem, TabItem, LevelItem, CurrentRoute, WindowListenerOption, MatchedResult, MixActiveResult } from './types';
+import { ProLayoutProps } from './props';
+import { RouteLocationMatched } from 'vue-router';
+
 /**
  * 判断路由是否是主页
  * @param route 路由信息
@@ -57,11 +58,10 @@ export declare function getMatchedComponents(matched: RouteLocationMatched[]): s
  * @param current 路由信息
  * @param tabs 当前页签数据
  * @param homePath 主页地址
- * @param fixedHome 是否固定主页
  * @param repeatableTabs 可重复打开的页签
  * @param routeTitle 路由对应的标题
  */
-export declare function getRouteTab(current: CurrentRoute, tabs: TabItem[], homePath: string, fixedHome?: boolean, routeTitle?: string): TabItem;
+export declare function getRouteTab(current: CurrentRoute, tabs: TabItem[], homePath: string, routeTitle?: string): TabItem;
 /**
  * 获取混合导航布局选中
  * @param matched 路由匹配的菜单层级数据
@@ -95,4 +95,4 @@ export declare function useDisableTransition(): {
  * @param menus 菜单数据
  * @param link 是否使用超链接
  */
-export declare function getMenuItems(menus: MenuItem[], link: boolean): Partial<import("../ele-menus/types").MenuItem>[];
+export declare function getMenuItems(menus: MenuItem[], link: boolean): Partial<import('../ele-menus/types').MenuItem>[];

package/es/ele-pro-layout/util.js

@@ -109,14 +109,13 @@ function getMatchedComponents(matched) {
   });
   return components;
 }
-function getRouteTab(current, tabs, homePath, fixedHome, routeTitle) {
+function getRouteTab(current, tabs, homePath, routeTitle) {
   const { path, fullPath, meta, matched } = current;
   const key = meta.tabUnique === false ? fullPath : path;
   const t = findTabByPath(key, tabs);
   const title = (t == null ? void 0 : t.title) || routeTitle;
   const home = isHomeRoute(current, homePath);
-  const isFixedHome = fixedHome && home;
-  const closable = isFixedHome ? false : (t == null ? void 0 : t.closable) ?? meta.closable !== false;
+  const closable = (t == null ? void 0 : t.closable) ?? meta.closable !== false;
   const components = getMatchedComponents(matched);
   return { key, path, fullPath, title, closable, home, components, meta };
 }

package/es/ele-pro-table/components/table-tools.d.ts

@@ -1,7 +1,8 @@
-import type { PropType } from 'vue';
-import type { Columns, TableSize, DataItem } from '../../ele-data-table/types';
-import type { TableLocale, FetchFunction, ExportConfig, PrintConfig } from '../types';
-declare const _default: import("vue").DefineComponent<{
+import { TableLocale, FetchFunction, ExportConfig, PrintConfig } from '../types';
+import { Columns, TableSize, DataItem } from '../../ele-data-table/types';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 工具按钮布局 */
     tools: {
         type: PropType<string[]>;
@@ -27,30 +28,34 @@ declare const _default: import("vue").DefineComponent<{
     pageData: PropType<DataItem[]>;
     /** 单元格合并行列方法 */
     spanMethod: PropType<((data: {
-        row: DataItem; /** 提示方向 */
+        row: DataItem;
         rowIndex: number;
-        column: import("element-plus/es/components/table/src/table-column/defaults").TableColumnCtx<DataItem>;
+        column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
     }) => number[] | {
         rowspan: number;
         colspan: number;
     } | undefined) | undefined>;
+    /** 表格是否有表头 */
+    tableHeader: BooleanConstructor;
     /** 是否显示合计行 */
     showSummary: BooleanConstructor;
     /** 合计行文本 */
     sumText: StringConstructor;
     /** 合计行自定义方法 */
-    summaryMethod: PropType<import("element-plus/es/components/table/src/table/defaults").SummaryMethod<DataItem> | undefined>;
+    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
     /** 单元格样式 */
-    cellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<DataItem> | undefined>;
+    cellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
     /** 单元格类名自定义 */
-    cellClassName: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<DataItem> | undefined>;
+    cellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 单元格样式 */
-    headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<DataItem> | undefined>;
+    headerCellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
     /** 单元格类名自定义 */
-    headerCellClassName: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<DataItem> | undefined>;
+    headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
+    /** 子级字段名 */
+    childrenField: StringConstructor;
     /** 表格请求数据方法 */
     fetch: PropType<FetchFunction>;
     /** 导出配置 */
@@ -64,18 +69,18 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
     };
 }, {
-    lang: import("vue").ComputedRef<TableLocale>;
-    placement: import("vue").ComputedRef<"top" | "bottom">;
+    lang: import('vue').ComputedRef<TableLocale>;
+    placement: import('vue').ComputedRef<"top" | "bottom">;
     reload: () => void;
     updateSize: (size: string) => void;
     updateColumns: (columns: Columns) => void;
     toggleMaximized: () => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     reload: () => true;
     'update:size': (_size: TableSize) => true;
     'update:columns': (_columns: Columns) => true;
     'update:maximized': (_maximized: boolean) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 工具按钮布局 */
     tools: {
         type: PropType<string[]>;
@@ -101,30 +106,34 @@ declare const _default: import("vue").DefineComponent<{
     pageData: PropType<DataItem[]>;
     /** 单元格合并行列方法 */
     spanMethod: PropType<((data: {
-        row: DataItem; /** 提示方向 */
+        row: DataItem;
         rowIndex: number;
-        column: import("element-plus/es/components/table/src/table-column/defaults").TableColumnCtx<DataItem>;
+        column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
     }) => number[] | {
         rowspan: number;
         colspan: number;
     } | undefined) | undefined>;
+    /** 表格是否有表头 */
+    tableHeader: BooleanConstructor;
     /** 是否显示合计行 */
     showSummary: BooleanConstructor;
     /** 合计行文本 */
     sumText: StringConstructor;
     /** 合计行自定义方法 */
-    summaryMethod: PropType<import("element-plus/es/components/table/src/table/defaults").SummaryMethod<DataItem> | undefined>;
+    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
     /** 单元格样式 */
-    cellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<DataItem> | undefined>;
+    cellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
     /** 单元格类名自定义 */
-    cellClassName: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<DataItem> | undefined>;
+    cellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 单元格样式 */
-    headerCellStyle: PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<DataItem> | undefined>;
+    headerCellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
     /** 单元格类名自定义 */
-    headerCellClassName: PropType<import("element-plus/es/components/table/src/table/defaults").CellCls<DataItem> | undefined>;
+    headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
+    /** 子级字段名 */
+    childrenField: StringConstructor;
     /** 表格请求数据方法 */
     fetch: PropType<FetchFunction>;
     /** 导出配置 */
@@ -140,12 +149,13 @@ declare const _default: import("vue").DefineComponent<{
 }>> & {
     "onUpdate:columns"?: ((_columns: Columns) => any) | undefined;
     onReload?: (() => any) | undefined;
-    "onUpdate:size"?: ((_size: "" | "default" | "small" | "large" | undefined) => any) | undefined;
+    "onUpdate:size"?: ((_size: "" | "small" | "default" | "large" | undefined) => any) | undefined;
     "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;
 }, {
     showSummary: boolean;
     maximized: boolean;
     columnSortable: boolean;
     columnFixed: boolean;
+    tableHeader: boolean;
 }, {}>;
 export default _default;

package/es/ele-pro-table/components/table-tools.js

@@ -48,6 +48,8 @@ const _sfc_main = defineComponent({
     pageData: Array,
     /** 单元格合并行列方法 */
     spanMethod: Function,
+    /** 表格是否有表头 */
+    tableHeader: Boolean,
     /** 是否显示合计行 */
     showSummary: Boolean,
     /** 合计行文本 */
@@ -64,6 +66,8 @@ const _sfc_main = defineComponent({
     headerCellClassName: [String, Function],
     /** 序号列起始索引 */
     pageIndex: Number,
+    /** 子级字段名 */
+    childrenField: String,
     /** 表格请求数据方法 */
     fetch: Function,
     /** 导出配置 */
@@ -213,53 +217,36 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       }, 1032, ["placement", "title", "onClick"])) : tool === "export" ? (openBlock(), createBlock(_component_ToolExport, {
         key: index + "-export",
         placement: _ctx.placement,
-        title: _ctx.lang.export,
-        checkAllText: _ctx.lang.columnTitle,
-        resetText: _ctx.lang.columnReset,
-        untitledText: _ctx.lang.columnUntitled,
-        fileNameText: _ctx.lang.exportFileName,
-        fileNamePlaceholderText: _ctx.lang.exportFileNamePlaceholder,
-        selectDataText: _ctx.lang.exportSelectData,
-        selectColumnText: _ctx.lang.exportSelectColumn,
-        dataTypePageText: _ctx.lang.exportDataTypePage,
-        dataTypeSelectedText: _ctx.lang.exportDataTypeSelected,
-        dataTypeAllText: _ctx.lang.exportDataTypeAll,
-        cancelText: _ctx.lang.exportCancel,
-        okText: _ctx.lang.exportOk,
+        locale: _ctx.lang,
         modalProps: _ctx.exportConfig.modalProps,
         columns: _ctx.columns,
         selections: _ctx.selections,
         pageData: _ctx.pageData,
         datasource: _ctx.exportConfig.datasource,
         spanMethod: _ctx.spanMethod,
+        tableHeader: _ctx.tableHeader,
         showSummary: _ctx.showSummary,
         sumText: _ctx.sumText,
         summaryMethod: _ctx.summaryMethod,
         pageIndex: _ctx.pageIndex,
+        childrenField: _ctx.childrenField,
         fetch: _ctx.fetch,
         defaultFileName: _ctx.exportConfig.fileName,
         defaultDataType: _ctx.exportConfig.dataType,
         beforeExport: _ctx.exportConfig.beforeExport
-      }, null, 8, ["placement", "title", "checkAllText", "resetText", "untitledText", "fileNameText", "fileNamePlaceholderText", "selectDataText", "selectColumnText", "dataTypePageText", "dataTypeSelectedText", "dataTypeAllText", "cancelText", "okText", "modalProps", "columns", "selections", "pageData", "datasource", "spanMethod", "showSummary", "sumText", "summaryMethod", "pageIndex", "fetch", "defaultFileName", "defaultDataType", "beforeExport"])) : tool === "print" ? (openBlock(), createBlock(_component_ToolPrint, {
+      }, null, 8, ["placement", "locale", "modalProps", "columns", "selections", "pageData", "datasource", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "pageIndex", "childrenField", "fetch", "defaultFileName", "defaultDataType", "beforeExport"])) : tool === "print" ? (openBlock(), createBlock(_component_ToolPrint, {
         key: index + "-print",
         placement: _ctx.placement,
-        title: _ctx.lang.print,
-        checkAllText: _ctx.lang.columnTitle,
-        resetText: _ctx.lang.columnReset,
-        untitledText: _ctx.lang.columnUntitled,
-        selectDataText: _ctx.lang.exportSelectData,
-        selectColumnText: _ctx.lang.exportSelectColumn,
-        dataTypePageText: _ctx.lang.exportDataTypePage,
-        dataTypeSelectedText: _ctx.lang.exportDataTypeSelected,
-        dataTypeAllText: _ctx.lang.exportDataTypeAll,
-        cancelText: _ctx.lang.exportCancel,
-        okText: _ctx.lang.exportOk,
+        locale: _ctx.lang,
         modalProps: _ctx.printConfig.modalProps,
+        printerProps: _ctx.printConfig.printerProps,
+        tableProps: _ctx.printConfig.tableProps,
         columns: _ctx.columns,
         selections: _ctx.selections,
         pageData: _ctx.pageData,
         datasource: _ctx.printConfig.datasource,
         spanMethod: _ctx.spanMethod,
+        tableHeader: _ctx.tableHeader,
         showSummary: _ctx.showSummary,
         sumText: _ctx.sumText,
         summaryMethod: _ctx.summaryMethod,
@@ -268,6 +255,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         headerCellStyle: _ctx.headerCellStyle,
         headerCellClassName: _ctx.headerCellClassName,
         pageIndex: _ctx.pageIndex,
+        childrenField: _ctx.childrenField,
         fetch: _ctx.fetch,
         defaultDataType: _ctx.printConfig.dataType,
         beforePrint: _ctx.printConfig.beforePrint
@@ -280,7 +268,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ])
           };
         })
-      ]), 1032, ["placement", "title", "checkAllText", "resetText", "untitledText", "selectDataText", "selectColumnText", "dataTypePageText", "dataTypeSelectedText", "dataTypeAllText", "cancelText", "okText", "modalProps", "columns", "selections", "pageData", "datasource", "spanMethod", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "fetch", "defaultDataType", "beforePrint"])) : tool && tool !== "default" && _ctx.$slots[tool] ? renderSlot(_ctx.$slots, tool, {
+      ]), 1032, ["placement", "locale", "modalProps", "printerProps", "tableProps", "columns", "selections", "pageData", "datasource", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "childrenField", "fetch", "defaultDataType", "beforePrint"])) : tool && !["default", "printTop", "printBottom"].includes(tool) && _ctx.$slots[tool] ? renderSlot(_ctx.$slots, tool, {
         key: 6,
         pageIndex: _ctx.pageIndex,
         fetch: _ctx.fetch

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

@@ -1,6 +1,7 @@
-import type { PropType } from 'vue';
-import type { ColItem } from '../types';
-declare const _default: import("vue").DefineComponent<{
+import { ColItem } from '../types';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 列配置数据 */
     data: PropType<ColItem[]>;
     /** 父级数据 */
@@ -19,14 +20,14 @@ declare const _default: import("vue").DefineComponent<{
     onChildSortChange: (colItems: ColItem[], parent?: ColItem) => void;
     onChildFixedLeftTooltip: (el: HTMLElement) => void;
     onChildFixedRightTooltip: (el: HTMLElement) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     sortChange: (_colItems: ColItem[], _parent?: ColItem) => true;
     checkedChange: (_item: ColItem, _checked: boolean) => true;
     fixedLeft: (_item: ColItem) => true;
     fixedRight: (_item: ColItem) => true;
     fixedLeftTooltip: (_el: HTMLElement) => true;
     fixedRightTooltip: (_el: HTMLElement) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 列配置数据 */
     data: PropType<ColItem[]>;
     /** 父级数据 */

package/es/ele-pro-table/components/tool-column-list.js

@@ -1,4 +1,4 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createElementBlock, createVNode, createCommentVNode, createTextVNode, toDisplayString, normalizeClass } from "vue";
+import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createElementBlock, createVNode, createCommentVNode, normalizeClass } from "vue";
 import VueDraggable from "vuedraggable";
 import { ElCheckbox, ElIcon } from "element-plus";
 import { HolderOutlined, VerticalRightOutlined, VerticalLeftOutlined } from "../../icons";
@@ -122,14 +122,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ])) : createCommentVNode("", true),
           createElementVNode("div", _hoisted_4, [
             createVNode(_component_ElCheckbox, {
+              label: d.label,
               modelValue: d.checked,
               "onUpdate:modelValue": (v) => _ctx.onCheckedChange(d, v)
-            }, {
-              default: withCtx(() => [
-                createTextVNode(toDisplayString(d.label), 1)
-              ]),
-              _: 2
-            }, 1032, ["modelValue", "onUpdate:modelValue"])
+            }, null, 8, ["label", "modelValue", "onUpdate:modelValue"])
           ]),
           _ctx.allowFixed ? (openBlock(), createElementBlock("div", _hoisted_5, [
             createElementVNode("div", {

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

@@ -1,11 +1,12 @@
-import type { PropType } from 'vue';
-import type { Columns } from '../../ele-data-table/types';
-import type { ColItem } from '../types';
-declare const _default: import("vue").DefineComponent<{
+import { ColItem } from '../types';
+import { Columns } from '../../ele-data-table/types';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 提示文字 */
     title: StringConstructor;
     /** 提示位置 */
-    placement: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
+    placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
     /** 全选文字 */
     checkAllText: StringConstructor;
     /** 重置文字 */
@@ -25,17 +26,18 @@ declare const _default: import("vue").DefineComponent<{
     /** 列配置缓存本地的名称 */
     cacheKey: StringConstructor;
 }, {
-    data: import("vue").Ref<{
+    data: import('vue').Ref<{
         uid: string;
         label?: string | undefined;
         checked?: boolean | undefined;
         fixed?: string | boolean | undefined;
         children?: any[] | undefined;
+        type?: string | undefined;
     }[]>;
-    isCheckAll: import("vue").Ref<boolean>;
-    isIndeterminate: import("vue").Ref<boolean>;
-    tooltipContent: import("vue").Ref<string>;
-    virtualRef: import("vue").Ref<any>;
+    isCheckAll: import('vue').Ref<boolean>;
+    isIndeterminate: import('vue').Ref<boolean>;
+    tooltipContent: import('vue').Ref<string>;
+    virtualRef: import('vue').Ref<any>;
     onCheckedChange: (item: ColItem, checked: boolean) => void;
     onCheckAllChange: (checked: boolean) => void;
     onReset: () => void;
@@ -44,13 +46,13 @@ declare const _default: import("vue").DefineComponent<{
     onFixedRight: (colItem: ColItem) => void;
     onFixedLeftTooltip: (el: HTMLElement) => void;
     onFixedRightTooltip: (el: HTMLElement) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     'update:columns': (_columns: Columns) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 提示文字 */
     title: StringConstructor;
     /** 提示位置 */
-    placement: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
+    placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
     /** 全选文字 */
     checkAllText: StringConstructor;
     /** 重置文字 */

package/es/ele-pro-table/components/tool-column.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, normalizeClass, createTextVNode, toDisplayString, createCommentVNode } from "vue";
+import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, normalizeClass, toDisplayString, createCommentVNode } from "vue";
 import { ElCheckbox, ElIcon } from "element-plus";
 import { SettingOutlined } from "../../icons";
 import { eachTree } from "../../utils/core";
@@ -241,15 +241,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             createElementVNode("div", _hoisted_1, [
               createElementVNode("div", _hoisted_2, [
                 createVNode(_component_ElCheckbox, {
+                  label: _ctx.checkAllText,
                   modelValue: _ctx.isCheckAll,
                   indeterminate: _ctx.isIndeterminate,
                   "onUpdate:modelValue": _ctx.onCheckAllChange
-                }, {
-                  default: withCtx(() => [
-                    createTextVNode(toDisplayString(_ctx.checkAllText), 1)
-                  ]),
-                  _: 1
-                }, 8, ["modelValue", "indeterminate", "onUpdate:modelValue"])
+                }, null, 8, ["label", "modelValue", "indeterminate", "onUpdate:modelValue"])
               ]),
               createElementVNode("div", {
                 class: "ele-tool-column-link",