ele-admin-plus 1.3.0 → 1.4.0-beta.1

package/es/ele-dashboard/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot } from "vue";
+import { defineComponent, computed, createElementBlock, openBlock, normalizeStyle, normalizeClass, createElementVNode, renderSlot } from "vue";
 import { dashboardProps } from "./props";
 const _hoisted_1 = { class: "ele-dashboard-inner" };
 const _sfc_main = /* @__PURE__ */ defineComponent({

package/es/ele-dashboard/style/index.scss

@@ -28,7 +28,6 @@
   width: 100%;
   height: 100%;
   color: var(--ele-dashboard-color);
-  background: elVar('bg-color');
   border-radius: 50%;
   display: flex;
   align-items: center;
@@ -42,6 +41,7 @@
 .ele-dashboard-outer {
   width: calc(100% - var(--ele-dashboard-space));
   height: calc(100% - var(--ele-dashboard-space));
+  box-sizing: border-box;
   position: absolute;
   top: 50%;
   left: 50%;
@@ -53,7 +53,9 @@
     left: 0;
     width: 100%;
     height: 100%;
-    background: var(--ele-dashboard-color);
+    box-sizing: border-box;
+    border: calc(var(--ele-dashboard-space) / 2) solid
+      var(--ele-dashboard-color);
     animation: eleAnimDashboard 8s infinite linear;
     border-radius: 46% 46% 42% 44%;
     opacity: 0.3;

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

@@ -71,23 +71,23 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    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"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    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"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -97,21 +97,22 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     tableLayout: {
         type: import('vue').PropType<"fixed" | "auto">;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
+    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"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -121,10 +122,14 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    preserveExpandedContent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>, {
     clearSort: () => void;
     clearSelection: () => void;
-    toggleRowSelection: (row: DataItem, selected?: boolean) => void;
+    toggleRowSelection: (row: DataItem, selected?: boolean, ignoreSelectable?: boolean) => void;
     setCurrentRow: (row?: DataItem | null) => void;
     setCurrentRowKey: (key?: DataKey | null) => void;
     getCurrentRow: () => DataItem | undefined;
@@ -236,23 +241,23 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    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"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    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"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -262,21 +267,22 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     tableLayout: {
         type: import('vue').PropType<"fixed" | "auto">;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
+    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"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -286,6 +292,10 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    preserveExpandedContent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & Readonly<{
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onScroll?: ((_option: {
@@ -330,6 +340,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     flexible: boolean;
     scrollbarTabindex: string | number;
     allowDragLastColumn: boolean;
+    preserveExpandedContent: boolean;
     sticky: boolean;
     headerEllipsis: boolean;
     slotNormalize: boolean;

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

@@ -1,9 +1,9 @@
 import { defineComponent, ref, computed, watch, nextTick, onMounted, createVNode, mergeProps, h } from "vue";
 import { ElTable, ElEmpty, ElTableColumn } from "element-plus";
-import { FilterFilled } from "../icons";
-import { pick, omit, getValue, eachTree } from "../utils/core";
-import { useEmits, useMethods, useStickyHeader, isReserveChecked, getGlobalTooltipProps, getStateCols, getBodyRowClass, getHeadRowClass, isDisableRow, getTableFilter, getRowKeys, valueIsChanged, getRowByKey, arrayIsChanged, getKeysAndList, toggleRowSelectionPro, getCellClass, getFilterPopperClass, getTooltipProps } from "./util";
-import { dataTableProps, dataTableEmits, tablePropKeys } from "./props";
+import { FilterFilled } from "../icons/index";
+import { omit, pick, getValue, eachTree } from "../utils/common";
+import { useEmits, useMethods, useStickyHeader, isReserveChecked, getGlobalTooltipProps, getStateCols, getHeadRowClass, getBodyRowClass, isDisableRow, getTableFilter, getRowKeys, valueIsChanged, getRowByKey, arrayIsChanged, getKeysAndList, toggleRowSelectionPro, getTooltipProps, getFilterPopperClass, getCellClass } from "./util";
+import { dataTableEmits, dataTableProps, tablePropKeys } from "./props";
 const ownSlots = ["default", "append", "empty"];
 const index = /* @__PURE__ */ defineComponent({
   name: "EleDataTable",
@@ -36,6 +36,15 @@ const index = /* @__PURE__ */ defineComponent({
       var _a;
       return ((_a = props.treeProps) == null ? void 0 : _a.children) || "children";
     });
+    const borderKey = computed(() => {
+      if (tableCols.value.some((col) => {
+        var _a;
+        return (_a = col.children) == null ? void 0 : _a.length;
+      })) {
+        return 1;
+      }
+      return props.border ? 1 : 0;
+    });
     const tableProps = computed(() => {
       const propKeys = tablePropKeys.filter((k) => !["currentRowKey", "showOverflowTooltip", "tooltipOptions", "tooltipEffect"].includes(k));
       return {
@@ -104,8 +113,8 @@ const index = /* @__PURE__ */ defineComponent({
     const clearSelection = () => {
       updateCheckedState([]);
     };
-    const toggleRowSelection = (row, selected) => {
-      methods.toggleRowSelection(row, selected);
+    const toggleRowSelection = (row, selected, ignoreSelectable) => {
+      methods.toggleRowSelection(row, selected, ignoreSelectable);
       const selection = methods.getSelectionRows() || [];
       updateCheckedState(getRowKeys(selection, props.rowKey), selection);
     };
@@ -283,6 +292,9 @@ const index = /* @__PURE__ */ defineComponent({
     watch([() => props.data, () => props.cacheData], () => {
       nextTick(() => {
         updateSelectedAndChecked();
+        if (props.defaultExpandAll) {
+          toggleRowExpansionAll(true);
+        }
       });
     });
     watch(() => props.currentRowKey, (key) => {
@@ -342,7 +354,9 @@ const index = /* @__PURE__ */ defineComponent({
         }
       });
     };
-    return () => createVNode(ElTable, mergeProps(tableProps.value, {
+    return () => createVNode(ElTable, mergeProps({
+      "key": borderKey.value
+    }, tableProps.value, {
       "ref": tableRef,
       "emptyText": props.errorText || props.emptyText,
       "rowClassName": (param) => getBodyRowClass(props.rowClassName, param),

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

@@ -21,31 +21,31 @@ declare const normalizeProps: import('../ele-app/types').Mutable<Omit<{
     };
     stripe: BooleanConstructor;
     border: BooleanConstructor;
-    rowKey: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowKey"]>;
+    rowKey: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowKey"]>;
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
+    rowClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
+    rowStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
+    cellClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
+    cellStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
+    headerRowClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
+    headerRowStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
+    headerCellClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
+    headerCellStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
-    expandRowKeys: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
+    spanMethod: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -55,7 +55,7 @@ declare const normalizeProps: import('../ele-app/types').Mutable<Omit<{
         default: number;
     };
     treeProps: {
-        type: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
@@ -63,7 +63,7 @@ declare const normalizeProps: import('../ele-app/types').Mutable<Omit<{
         };
     };
     lazy: BooleanConstructor;
-    load: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     style: {
         type: PropType<import('vue').CSSProperties>;
         default: () => {};
@@ -78,7 +78,8 @@ declare const normalizeProps: import('../ele-app/types').Mutable<Omit<{
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
+    showOverflowTooltip: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
+    tooltipFormatter: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -88,6 +89,10 @@ declare const normalizeProps: import('../ele-app/types').Mutable<Omit<{
         type: BooleanConstructor;
         default: boolean;
     };
+    preserveExpandedContent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, "style">>;
 /**
  * 属性
@@ -144,12 +149,12 @@ export declare const dataTableProps: {
     selectedRowKeys: PropType<DataKey[]>;
     /** 缓存数据 */
     cacheData: PropType<DataItem[]>;
-    width: (NumberConstructor | StringConstructor)[];
-    height: (NumberConstructor | StringConstructor)[];
     data: {
         type: PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
         default: () => never[];
     };
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
     size: {
         readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
         readonly required: false;
@@ -173,23 +178,23 @@ export declare const dataTableProps: {
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
+    rowClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
+    rowStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
+    cellClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
+    cellStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
+    headerRowClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
+    headerRowStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
+    headerCellClassName: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
+    headerCellStyle: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
+    spanMethod: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -199,21 +204,22 @@ export declare const dataTableProps: {
         default: number;
     };
     treeProps: {
-        type: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     tableLayout: {
         type: PropType<"fixed" | "auto">;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<import('element-plus').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
+    showOverflowTooltip: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
+    tooltipFormatter: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -223,6 +229,10 @@ export declare const dataTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
+    preserveExpandedContent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 };
 export type DataTableProps = ExtractPropTypes<typeof dataTableProps>;
 /**

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

@@ -1,5 +1,5 @@
 import elTableProps from "element-plus/es/components/table/src/table/defaults";
-import { omit } from "../utils/core";
+import { omit } from "../utils/common";
 const normalizeProps = omit(elTableProps, ["style"]);
 const dataTableProps = {
   ...normalizeProps,

package/es/ele-data-table/style/index.scss

@@ -72,6 +72,10 @@
     }
   }
 
+  .el-table__expanded-cell {
+    background: eleVar('table', 'tr-bg');
+  }
+
   /* 表头单元格 */
   .cell > .ele-cell-title {
     flex: 1;
@@ -204,6 +208,21 @@
     color: elVar('color-primary');
   }
 
+  /* 左右固定列 */
+  &.el-table:not(.is-scrolling-none):not(.is-scrolling-left) {
+    .ele-table-head-tr > .el-table-fixed-column--left,
+    .ele-table-tr > .el-table-fixed-column--left {
+      backdrop-filter: eleVar('table', 'fixed-backdrop-filter');
+    }
+  }
+
+  &.el-table:not(.is-scrolling-none):not(.is-scrolling-right) {
+    .ele-table-head-tr > .el-table-fixed-column--right,
+    .ele-table-tr > .el-table-fixed-column--right {
+      backdrop-filter: eleVar('table', 'fixed-backdrop-filter');
+    }
+  }
+
   /* 行高 */
   .ele-table-tr > .el-table__cell > .cell,
   .ele-table-head-tr > .el-table__cell > .cell {
@@ -446,18 +465,6 @@
 /* Tooltip */
 body .ele-popper.el-popper.ele-tooltip.ele-table-tooltip {
   padding: eleVar('tooltip', 'padding');
-
-  &::after {
-    content: '';
-    background: inherit;
-    border-radius: inherit;
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-  }
 }
 
 .ele-table-tr > .el-table__cell > .cell.el-tooltip {

package/es/ele-data-table/types.d.ts

@@ -126,7 +126,11 @@ export type GetInstance = () => ElTableInstance | undefined | null;
 export interface TableMethods {
   clearSelection: () => void;
   getSelectionRows: () => DataItem[] | undefined;
-  toggleRowSelection: (row: DataItem, selected?: boolean) => void;
+  toggleRowSelection: (
+    row: DataItem,
+    selected?: boolean,
+    ignoreSelectable?: boolean
+  ) => void;
   toggleAllSelection: () => void;
   toggleRowExpansion: (row: DataItem, expanded?: boolean) => void;
   setCurrentRow: (row?: DataItem | null) => void;

package/es/ele-data-table/util.d.ts

@@ -1,8 +1,10 @@
 import { Emitter } from '../ele-app/types';
 import { ElTableInstance } from '../ele-app/el';
+import { getValue } from '../utils/common';
 import { DataTableEmitsType } from './props';
 import { DataKey, DataItem, Column, Columns, Sorter, Filter, GetInstance, TableMethods, ShowOverflowTooltip, TooltipEffect, TooltipOptions, RowClass, RowKey } from './types';
 
+export { getValue };
 /**
  * 获取行的类名
  * @param rowClass 自定义行类名

package/es/ele-data-table/util.js

@@ -1,5 +1,6 @@
 import { unref, computed } from "vue";
-import { mapTree, findTree, eachTree, getValue } from "../utils/core";
+import { mapTree, findTree, eachTree, getValue } from "../utils/common";
+import { getValue as getValue2 } from "../utils/common";
 import { useComponentEvents } from "../utils/hook";
 import { useLayoutState } from "../ele-pro-layout/util";
 import { elDataTableEmits } from "./props";
@@ -299,6 +300,7 @@ export {
   getStateCols,
   getTableFilter,
   getTooltipProps,
+  getValue2 as getValue,
   isDisableRow,
   isReserveChecked,
   mergeTooltipProps,

package/es/ele-dot/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, toDisplayString, createCommentVNode } from "vue";
+import { defineComponent, createElementBlock, openBlock, normalizeClass, createElementVNode, createCommentVNode, normalizeStyle, toDisplayString } from "vue";
 import { dotProps } from "./props";
 const _hoisted_1 = {
   key: 0,