ele-admin-plus 1.2.1-beta.3 → 1.2.1-beta.4

package/es/ele-pro-table/components/tool-print-header-cell.js

@@ -20,8 +20,9 @@ const _sfc_main = defineComponent({
     const renderOpt = computed(() => {
       const { text, column } = props.col;
       const params = [{ column, $index: props.columnIndex }];
-      if (column && "index" !== column.type && column.headerSlot && typeof slots[column.headerSlot] === "function") {
-        return { render: slots[column.headerSlot], params };
+      const slotName = column ? column.printHeaderSlot || column.headerSlot : void 0;
+      if (column && slotName && typeof slots[slotName] === "function") {
+        return { render: slots[slotName], params };
       }
       return { render: () => text, params };
     });

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

@@ -70,12 +70,12 @@ declare const _default: import('vue').DefineComponent<{
     dataType: import('vue').Ref<ExportDataType>;
     colItems: import('vue').Ref<{
         uid: string;
-        label?: string;
-        checked?: boolean;
-        fixed?: boolean | string;
+        label?: string | undefined;
+        checked?: boolean | undefined;
+        fixed?: (boolean | string) | undefined;
         children?: any[] | undefined;
-        type?: string;
-        width?: number | string;
+        type?: string | undefined;
+        width?: (number | string) | undefined;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;

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

@@ -61,7 +61,7 @@ declare const _default: import('vue').DefineComponent<{
     width: (NumberConstructor | StringConstructor)[];
     height: (NumberConstructor | StringConstructor)[];
     size: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        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;
@@ -102,11 +102,11 @@ declare const _default: import('vue').DefineComponent<{
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
-    expandRowKeys: import('vue').PropType<any[] | undefined>;
+    expandRowKeys: import('vue').PropType<string[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import('vue').PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
+    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
     spanMethod: import('vue').PropType<((data: {
         row: any;
         rowIndex: number;
@@ -125,13 +125,11 @@ declare const _default: import('vue').DefineComponent<{
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<{
-            hasChildren?: string | undefined;
-            children?: string | undefined;
-        } | undefined>;
+        type: import('vue').PropType<import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined>;
         default: () => {
             hasChildren: string;
             children: string;
+            checkStrictly: boolean;
         };
     };
     load: import('vue').PropType<((row: any, treeNode: import('element-plus').TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
@@ -141,17 +139,17 @@ declare const _default: import('vue').DefineComponent<{
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
+    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
     columns: {
         type: import('vue').PropType<Columns>;
         required: boolean;
     };
     sticky: BooleanConstructor;
-    headerEllipsis: {
+    slotNormalize: {
         type: BooleanConstructor;
         default: boolean;
     };
-    slotNormalize: {
+    headerEllipsis: {
         type: BooleanConstructor;
         default: boolean;
     };
@@ -167,7 +165,6 @@ declare const _default: import('vue').DefineComponent<{
     reserveCurrent: BooleanConstructor;
     selectedRowKeys: import('vue').PropType<import('../ele-data-table/types').DataKey[]>;
 }, {
-    userColumns: import('vue').ComputedRef<Columns>;
     tableToolsRef: Ref<import('vue').CreateComponentPublicInstance<Readonly<import('vue').ExtractPropTypes<{
         tools: {
             type: import('vue').PropType<TableTool[]>;
@@ -203,14 +200,14 @@ declare const _default: import('vue').DefineComponent<{
             required: true;
         };
     }>> & {
-        "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns) => any) | undefined;
+        "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns, _isReset: boolean) => any) | undefined;
         onReload?: (() => any) | undefined;
         "onUpdate:size"?: ((_size: "" | "small" | "default" | "large" | undefined) => any) | undefined;
         "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;
     }, {
         ownSlots: string[];
         SizeSlackOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
-        MenuOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
+        SizeMiddleOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
         SizeCompactOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
         lang: import('vue').ComputedRef<import('./types').TableLocale>;
         toolExportRef: Ref<import('vue').CreateComponentPublicInstance<Readonly<import('vue').ExtractPropTypes<{
@@ -257,12 +254,12 @@ declare const _default: import('vue').DefineComponent<{
             dataType: Ref<import('./types').ExportDataType>;
             colItems: Ref<{
                 uid: string;
-                label?: string;
-                checked?: boolean;
-                fixed?: boolean | string;
+                label?: string | undefined;
+                checked?: boolean | undefined;
+                fixed?: (boolean | string) | undefined;
                 children?: any[] | undefined;
-                type?: string;
-                width?: number | string;
+                type?: string | undefined;
+                width?: (number | string) | undefined;
             }[]>;
             isCheckAll: Ref<boolean>;
             isIndeterminate: Ref<boolean>;
@@ -371,12 +368,12 @@ declare const _default: import('vue').DefineComponent<{
             dataType: Ref<import('./types').ExportDataType>;
             colItems: Ref<{
                 uid: string;
-                label?: string;
-                checked?: boolean;
-                fixed?: boolean | string;
+                label?: string | undefined;
+                checked?: boolean | undefined;
+                fixed?: (boolean | string) | undefined;
                 children?: any[] | undefined;
-                type?: string;
-                width?: number | string;
+                type?: string | undefined;
+                width?: (number | string) | undefined;
             }[]>;
             isCheckAll: Ref<boolean>;
             isIndeterminate: Ref<boolean>;
@@ -444,12 +441,12 @@ declare const _default: import('vue').DefineComponent<{
             dataType: Ref<import('./types').ExportDataType>;
             colItems: Ref<{
                 uid: string;
-                label?: string;
-                checked?: boolean;
-                fixed?: boolean | string;
+                label?: string | undefined;
+                checked?: boolean | undefined;
+                fixed?: (boolean | string) | undefined;
                 children?: any[] | undefined;
-                type?: string;
-                width?: number | string;
+                type?: string | undefined;
+                width?: (number | string) | undefined;
             }[]>;
             isCheckAll: Ref<boolean>;
             isIndeterminate: Ref<boolean>;
@@ -559,12 +556,12 @@ declare const _default: import('vue').DefineComponent<{
             dataType: Ref<import('./types').ExportDataType>;
             colItems: Ref<{
                 uid: string;
-                label?: string;
-                checked?: boolean;
-                fixed?: boolean | string;
+                label?: string | undefined;
+                checked?: boolean | undefined;
+                fixed?: (boolean | string) | undefined;
                 children?: any[] | undefined;
-                type?: string;
-                width?: number | string;
+                type?: string | undefined;
+                width?: (number | string) | undefined;
             }[]>;
             isCheckAll: Ref<boolean>;
             isIndeterminate: Ref<boolean>;
@@ -594,7 +591,7 @@ declare const _default: import('vue').DefineComponent<{
         placement: import('vue').ComputedRef<"top" | "bottom">;
         reload: () => void;
         updateSize: (size: string) => void;
-        updateColumns: (columns: Columns, tableColumns: Columns) => void;
+        updateColumns: (columns: Columns, tableColumns: Columns, isReset: boolean) => void;
         toggleMaximized: () => void;
         openExportModal: () => void;
         openPrintModal: () => void;
@@ -603,7 +600,7 @@ declare const _default: import('vue').DefineComponent<{
     }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
         reload: () => true;
         'update:size': (_size: TableSize) => true;
-        'update:columns': (_columns: Columns, _tableColumns: Columns) => true;
+        'update:columns': (_columns: Columns, _tableColumns: Columns, _isReset: boolean) => true;
         'update:maximized': (_maximized: boolean) => true;
     }, import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps & Readonly<import('vue').ExtractPropTypes<{
         tools: {
@@ -640,7 +637,7 @@ declare const _default: import('vue').DefineComponent<{
             required: true;
         };
     }>> & {
-        "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns) => any) | undefined;
+        "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns, _isReset: boolean) => any) | undefined;
         onReload?: (() => any) | undefined;
         "onUpdate:size"?: ((_size: "" | "small" | "default" | "large" | undefined) => any) | undefined;
         "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;
@@ -692,14 +689,14 @@ declare const _default: import('vue').DefineComponent<{
             required: true;
         };
     }>> & {
-        "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns) => any) | undefined;
+        "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns, _isReset: boolean) => any) | undefined;
         onReload?: (() => any) | undefined;
         "onUpdate:size"?: ((_size: "" | "small" | "default" | "large" | undefined) => any) | undefined;
         "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;
     }, {
         ownSlots: string[];
         SizeSlackOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
-        MenuOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
+        SizeMiddleOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
         SizeCompactOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
         lang: import('vue').ComputedRef<import('./types').TableLocale>;
         toolExportRef: Ref<import('vue').CreateComponentPublicInstance<Readonly<import('vue').ExtractPropTypes<{
@@ -746,12 +743,12 @@ declare const _default: import('vue').DefineComponent<{
             dataType: Ref<import('./types').ExportDataType>;
             colItems: Ref<{
                 uid: string;
-                label?: string;
-                checked?: boolean;
-                fixed?: boolean | string;
+                label?: string | undefined;
+                checked?: boolean | undefined;
+                fixed?: (boolean | string) | undefined;
                 children?: any[] | undefined;
-                type?: string;
-                width?: number | string;
+                type?: string | undefined;
+                width?: (number | string) | undefined;
             }[]>;
             isCheckAll: Ref<boolean>;
             isIndeterminate: Ref<boolean>;
@@ -860,12 +857,12 @@ declare const _default: import('vue').DefineComponent<{
             dataType: Ref<import('./types').ExportDataType>;
             colItems: Ref<{
                 uid: string;
-                label?: string;
-                checked?: boolean;
-                fixed?: boolean | string;
+                label?: string | undefined;
+                checked?: boolean | undefined;
+                fixed?: (boolean | string) | undefined;
                 children?: any[] | undefined;
-                type?: string;
-                width?: number | string;
+                type?: string | undefined;
+                width?: (number | string) | undefined;
             }[]>;
             isCheckAll: Ref<boolean>;
             isIndeterminate: Ref<boolean>;
@@ -933,12 +930,12 @@ declare const _default: import('vue').DefineComponent<{
             dataType: Ref<import('./types').ExportDataType>;
             colItems: Ref<{
                 uid: string;
-                label?: string;
-                checked?: boolean;
-                fixed?: boolean | string;
+                label?: string | undefined;
+                checked?: boolean | undefined;
+                fixed?: (boolean | string) | undefined;
                 children?: any[] | undefined;
-                type?: string;
-                width?: number | string;
+                type?: string | undefined;
+                width?: (number | string) | undefined;
             }[]>;
             isCheckAll: Ref<boolean>;
             isIndeterminate: Ref<boolean>;
@@ -1048,12 +1045,12 @@ declare const _default: import('vue').DefineComponent<{
             dataType: Ref<import('./types').ExportDataType>;
             colItems: Ref<{
                 uid: string;
-                label?: string;
-                checked?: boolean;
-                fixed?: boolean | string;
+                label?: string | undefined;
+                checked?: boolean | undefined;
+                fixed?: (boolean | string) | undefined;
                 children?: any[] | undefined;
-                type?: string;
-                width?: number | string;
+                type?: string | undefined;
+                width?: (number | string) | undefined;
             }[]>;
             isCheckAll: Ref<boolean>;
             isIndeterminate: Ref<boolean>;
@@ -1083,7 +1080,7 @@ declare const _default: import('vue').DefineComponent<{
         placement: import('vue').ComputedRef<"top" | "bottom">;
         reload: () => void;
         updateSize: (size: string) => void;
-        updateColumns: (columns: Columns, tableColumns: Columns) => void;
+        updateColumns: (columns: Columns, tableColumns: Columns, isReset: boolean) => void;
         toggleMaximized: () => void;
         openExportModal: () => void;
         openPrintModal: () => void;
@@ -1101,7 +1098,7 @@ declare const _default: import('vue').DefineComponent<{
         [x: string]: any;
         [x: number]: any;
         [x: symbol]: any;
-        _isMock?: boolean;
+        _isMock?: boolean | undefined;
     }[]>;
     tableSize: Ref<"" | "small" | "default" | "large" | undefined>;
     tableMaximized: Ref<boolean>;
@@ -1115,7 +1112,7 @@ declare const _default: import('vue').DefineComponent<{
     loadingProps: import('vue').ComputedRef<EleLoadingProps>;
     handleRefresh: () => void;
     handleSizeChange: (size: TableSize) => void;
-    handleColumnsChange: (columns: Columns, tableColumns: Columns) => void;
+    handleColumnsChange: (columns: Columns, tableColumns: Columns, isReset: boolean) => void;
     handleMaximizedChange: (maximized: boolean) => void;
     handlePageSizeChange: (limit: number) => void;
     handlePageCurrentChange: (page: number) => void;
@@ -1145,9 +1142,7 @@ declare const _default: import('vue').DefineComponent<{
     setScrollLeft: (left?: number) => void;
     setCurrentRowKey: (key?: import('../ele-data-table/types').DataKey | null) => void;
     getCurrentRow: () => DataItem | undefined;
-    setSelectedRows: (rows
-    /** 用户的表格列配置 */
-    ?: DataItem[]) => void;
+    setSelectedRows: (rows?: DataItem[]) => void;
     setSelectedRowKeys: (keys?: import('../ele-data-table/types').DataKey[], rows?: DataItem[]) => void;
     toggleRowExpansionAll: (expanded?: boolean) => void;
     updateSelectedAndChecked: () => void;
@@ -1158,7 +1153,7 @@ declare const _default: import('vue').DefineComponent<{
     done: (_result: DoneParams<DataItem>, _parent?: DataItem) => boolean;
     'update:selections': (_selections: DataItem[]) => boolean;
     'update:current': (_current?: DataItem | null) => boolean;
-    columnsChange: (_columns: Columns, _tableColumns: Columns) => boolean;
+    columnsChange: (_columns: Columns, _tableColumns: Columns, _isReset: boolean) => boolean;
     sizeChange: (_size: TableSize) => boolean;
     maximizedChange: (_maximized: boolean) => boolean;
     refresh: () => boolean;
@@ -1240,7 +1235,7 @@ declare const _default: import('vue').DefineComponent<{
     width: (NumberConstructor | StringConstructor)[];
     height: (NumberConstructor | StringConstructor)[];
     size: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        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;
@@ -1281,11 +1276,11 @@ declare const _default: import('vue').DefineComponent<{
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
-    expandRowKeys: import('vue').PropType<any[] | undefined>;
+    expandRowKeys: import('vue').PropType<string[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import('vue').PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
+    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
     spanMethod: import('vue').PropType<((data: {
         row: any;
         rowIndex: number;
@@ -1304,13 +1299,11 @@ declare const _default: import('vue').DefineComponent<{
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<{
-            hasChildren?: string | undefined;
-            children?: string | undefined;
-        } | undefined>;
+        type: import('vue').PropType<import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined>;
         default: () => {
             hasChildren: string;
             children: string;
+            checkStrictly: boolean;
         };
     };
     load: import('vue').PropType<((row: any, treeNode: import('element-plus').TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
@@ -1320,17 +1313,17 @@ declare const _default: import('vue').DefineComponent<{
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
+    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
     columns: {
         type: import('vue').PropType<Columns>;
         required: boolean;
     };
     sticky: BooleanConstructor;
-    headerEllipsis: {
+    slotNormalize: {
         type: BooleanConstructor;
         default: boolean;
     };
-    slotNormalize: {
+    headerEllipsis: {
         type: BooleanConstructor;
         default: boolean;
     };
@@ -1370,7 +1363,7 @@ declare const _default: import('vue').DefineComponent<{
     onRefresh?: (() => any) | undefined;
     "onUpdate:selections"?: ((_selections: DataItem[]) => any) | undefined;
     "onUpdate:current"?: ((_current?: DataItem | null | undefined) => any) | undefined;
-    onColumnsChange?: ((_columns: Columns, _tableColumns: Columns) => any) | undefined;
+    onColumnsChange?: ((_columns: Columns, _tableColumns: Columns, _isReset: boolean) => any) | undefined;
     onSizeChange?: ((_size: "" | "small" | "default" | "large" | undefined) => any) | undefined;
     onMaximizedChange?: ((_maximized: boolean) => any) | undefined;
 }, {
@@ -1386,17 +1379,14 @@ declare const _default: import('vue').DefineComponent<{
     defaultExpandAll: boolean;
     selectOnIndeterminate: boolean;
     indent: number;
-    treeProps: {
-        hasChildren?: string | undefined;
-        children?: string | undefined;
-    } | undefined;
+    treeProps: import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined;
     tableLayout: "fixed" | "auto";
     scrollbarAlwaysOn: boolean;
     flexible: boolean;
     sticky: boolean;
     toolbar: boolean | EleToolbarProps;
-    headerEllipsis: boolean;
     slotNormalize: boolean;
+    headerEllipsis: boolean;
     bottomLine: boolean;
     emptyProps: import('../ele-data-table/types').TableEmptyProps;
     reserveCurrent: boolean;

package/es/ele-pro-table/index.js

@@ -1,5 +1,5 @@
-import { defineComponent, computed, ref, shallowRef, watch, onMounted, nextTick, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps as mergeProps$1, renderSlot, createSlots, renderList, createCommentVNode, createElementBlock, normalizeStyle } from "vue";
-import { mapTree, pick, getValue } from "../utils/core";
+import { defineComponent, ref, shallowRef, computed, watch, onMounted, nextTick, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps as mergeProps$1, renderSlot, createSlots, renderList, createCommentVNode, createElementBlock, normalizeStyle } from "vue";
+import { pick, getValue } from "../utils/core";
 import { useGlobalProps } from "../ele-config-provider/receiver";
 import EleLoading from "../ele-loading/index";
 import ElePagination from "../ele-pagination/index";
@@ -31,16 +31,9 @@ const _sfc_main = defineComponent({
     const events = useEmits(emit);
     const methods = useMethods(() => getTableRef());
     const globalProps = useGlobalProps("table");
-    const userColumns = computed(() => {
-      return mapTree(props.columns, (item) => {
-        if (item.vIf == null || (typeof item.vIf === "function" ? item.vIf() : item.vIf)) {
-          return item;
-        }
-      });
-    });
     const tableState = {
       sorter: props.defaultSort ?? {},
-      filter: getDefaultFilter(userColumns.value),
+      filter: getDefaultFilter(props.columns),
       where: props.where ?? {}
     };
     const tableToolsRef = ref(null);
@@ -323,27 +316,31 @@ const _sfc_main = defineComponent({
       tableSize.value = size;
       emit("sizeChange", size);
     };
-    const handleColumnsChange = (columns, tableColumns) => {
+    const handleColumnsChange = (columns, tableColumns, isReset) => {
       tableCols.value = columns;
-      emit("columnsChange", columns, tableColumns);
+      emit("columnsChange", columns, tableColumns, isReset);
     };
     const handleMaximizedChange = (maximized) => {
       tableMaximized.value = maximized;
       emit("maximizedChange", maximized);
     };
     const handlePageSizeChange = (limit) => {
-      if (tableTotal.value !== "*") {
-        const maxPage = Math.ceil(tableTotal.value / limit);
-        if (maxPage && tablePage.value > maxPage) {
-          tablePage.value = maxPage;
+      if (tableLimit.value !== limit) {
+        tableLimit.value = limit;
+        if (tableTotal.value !== "*") {
+          const maxPage = Math.ceil(tableTotal.value / limit);
+          if (maxPage && tablePage.value > maxPage) {
+            tablePage.value = maxPage;
+          }
         }
+        reload();
       }
-      tableLimit.value = limit;
-      reload();
     };
     const handlePageCurrentChange = (page) => {
-      tablePage.value = page;
-      reload();
+      if (tablePage.value !== page) {
+        tablePage.value = page;
+        reload();
+      }
     };
     const handleSortChange = (sorter) => {
       if (props.loadOnChanged) {
@@ -449,7 +446,7 @@ const _sfc_main = defineComponent({
       }
     };
     watch(
-      userColumns,
+      () => props.columns,
       (columns) => {
         if (columns) {
           tableCols.value = getInitCacheColumns(
@@ -521,7 +518,6 @@ const _sfc_main = defineComponent({
       tableSlotExcludes,
       pageSlotExcludes,
       ...methods,
-      userColumns,
       tableToolsRef,
       tableViewRef,
       tableData,
@@ -579,7 +575,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ref: "tableToolsRef",
             tools: _ctx.toolNames,
             size: _ctx.tableSize,
-            columns: _ctx.userColumns,
+            columns: _ctx.columns,
             columnSortable: _ctx.columnSortable,
             columnFixed: _ctx.columnFixed,
             maximized: _ctx.tableMaximized,

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

@@ -90,7 +90,7 @@ export declare const proTableProps: {
     printConfig: PropType<PrintConfig>;
     load: PropType<((row: any, treeNode: import('element-plus').TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
     size: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -133,11 +133,11 @@ export declare const proTableProps: {
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
-    expandRowKeys: PropType<any[] | undefined>;
+    expandRowKeys: PropType<string[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
     spanMethod: PropType<((data: {
         row: any;
         rowIndex: number;
@@ -156,13 +156,11 @@ export declare const proTableProps: {
         default: number;
     };
     treeProps: {
-        type: PropType<{
-            hasChildren?: string | undefined;
-            children?: string | undefined;
-        } | undefined>;
+        type: PropType<import('element-plus/es/components/table/src/table/defaults').TreeProps | undefined>;
         default: () => {
             hasChildren: string;
             children: string;
+            checkStrictly: boolean;
         };
     };
     tableLayout: {
@@ -171,17 +169,17 @@ export declare const proTableProps: {
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
+    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "transition" | "placement" | "effect" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "popperClass" | "appendTo" | "showArrow">> | undefined>;
     columns: {
         type: PropType<Columns>;
         required: boolean;
     };
     sticky: BooleanConstructor;
-    headerEllipsis: {
+    slotNormalize: {
         type: BooleanConstructor;
         default: boolean;
     };
-    slotNormalize: {
+    headerEllipsis: {
         type: BooleanConstructor;
         default: boolean;
     };
@@ -209,7 +207,7 @@ export declare const proTableEmits: {
     /** 更新单选选中数据 */
     'update:current': (_current?: DataItem | null) => boolean;
     /** 列配置改变事件 */
-    columnsChange: (_columns: Columns, _tableColumns: Columns) => boolean;
+    columnsChange: (_columns: Columns, _tableColumns: Columns, _isReset: boolean) => boolean;
     /** 表格尺寸改变事件 */
     sizeChange: (_size: TableSize) => boolean;
     /** 表格最大化切换事件 */

package/es/ele-pro-table/props.js

@@ -98,7 +98,7 @@ const proTableEmits = {
   /** 更新单选选中数据 */
   "update:current": (_current) => true,
   /** 列配置改变事件 */
-  columnsChange: (_columns, _tableColumns) => true,
+  columnsChange: (_columns, _tableColumns, _isReset) => true,
   /** 表格尺寸改变事件 */
   sizeChange: (_size) => true,
   /** 表格最大化切换事件 */

package/es/ele-segmented/index.d.ts

@@ -11,7 +11,9 @@ declare const _default: import('vue').DefineComponent<{
     size: import('vue').PropType<import('./types').SegmentedSize>;
 }, {
     tabRef: import('vue').Ref<ElTabsInstance>;
+    isEmptyActive: import('vue').ComputedRef<boolean>;
     handleUpdateModelValue: (value: string | number) => void;
+    updateActiveBar: () => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     'update:modelValue': (_value: string | number) => boolean;
     change: (_active: string | number) => boolean;
@@ -25,8 +27,8 @@ declare const _default: import('vue').DefineComponent<{
     };
     size: import('vue').PropType<import('./types').SegmentedSize>;
 }>> & {
-    onChange?: ((_active: string | number) => any) | undefined;
     "onUpdate:modelValue"?: ((_value: string | number) => any) | undefined;
+    onChange?: ((_active: string | number) => any) | undefined;
 }, {
     disabled: boolean;
     block: boolean;