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

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

@@ -43,7 +43,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     selectedRowKeys: import('vue').PropType<DataKey[]>;
     cacheData: import('vue').PropType<DataItem[]>;
     data: {
-        type: import('vue').PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
+        type: import('vue').PropType<any[]>;
         default: () => never[];
     };
     size: {
@@ -71,23 +71,23 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["summaryMethod"]>;
+    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["rowClassName"]>;
+    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["rowStyle"]>;
+    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["cellClassName"]>;
+    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["cellStyle"]>;
+    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipOptions"]>;
+    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -97,22 +97,22 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
     tableLayout: {
         type: import('vue').PropType<"fixed" | "auto">;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
+    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["showOverflowTooltip"]>;
+    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -122,10 +122,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
 }>, {
     clearSort: () => void;
     clearSelection: () => void;
@@ -213,7 +210,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     selectedRowKeys: import('vue').PropType<DataKey[]>;
     cacheData: import('vue').PropType<DataItem[]>;
     data: {
-        type: import('vue').PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
+        type: import('vue').PropType<any[]>;
         default: () => never[];
     };
     size: {
@@ -241,23 +238,23 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["summaryMethod"]>;
-    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowClassName"]>;
-    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowStyle"]>;
-    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellClassName"]>;
-    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["cellStyle"]>;
-    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowClassName"]>;
-    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerRowStyle"]>;
-    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellClassName"]>;
-    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["headerCellStyle"]>;
+    summaryMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["summaryMethod"]>;
+    rowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["rowClassName"]>;
+    rowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["rowStyle"]>;
+    cellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["cellClassName"]>;
+    cellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["cellStyle"]>;
+    headerRowClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipOptions"]>;
-    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["spanMethod"]>;
+    tooltipOptions: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipOptions"]>;
+    spanMethod: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -267,22 +264,22 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: number;
     };
     treeProps: {
-        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
     tableLayout: {
         type: import('vue').PropType<"fixed" | "auto">;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["showOverflowTooltip"]>;
-    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["tooltipFormatter"]>;
+    showOverflowTooltip: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["showOverflowTooltip"]>;
+    tooltipFormatter: import('vue').PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -292,10 +289,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
 }>> & Readonly<{
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onScroll?: ((_option: {

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

@@ -348,10 +348,13 @@ const index = /* @__PURE__ */ defineComponent({
           var _a;
           return !col.filterIcon ? createVNode(FilterFilled, null, null) : typeof col.filterIcon === "string" && !ownSlots.includes(col.filterIcon) && slots[col.filterIcon] ? (_a = slots[col.filterIcon]) == null ? void 0 : _a.call(slots, slotProps) : h(col.filterIcon);
         },
-        default: (slotProps) => {
+        default: col.children && col.children.length ? () => {
+          var _a, _b;
+          return (_b = (_a = col == null ? void 0 : col.children) == null ? void 0 : _a.map) == null ? void 0 : _b.call(_a, renderTableColumn);
+        } : col.slot && !ownSlots.includes(col.slot) && slots[col.slot] ? (slotProps) => {
           var _a;
-          return col.slot && !ownSlots.includes(col.slot) && slots[col.slot] && (!props.slotNormalize || (slotProps == null ? void 0 : slotProps.$index) != -1) ? (_a = slots[col.slot]) == null ? void 0 : _a.call(slots, slotProps) : col.children && col.children.length ? col.children.map(renderTableColumn) : void 0;
-        }
+          return (!props.slotNormalize || (slotProps == null ? void 0 : slotProps.$index) != -1) && col.slot ? (_a = slots[col.slot]) == null ? void 0 : _a.call(slots, slotProps) : void 0;
+        } : void 0
       });
     };
     return () => createVNode(ElTable, mergeProps({

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

@@ -3,7 +3,7 @@ import { DataKey, DataItem, Column, Columns, Sorter, Filter, TableEmptyProps, Ro
 
 declare const normalizeProps: import('../ele-app/types').Mutable<Omit<{
     data: {
-        type: PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
+        type: PropType<any[]>;
         default: () => never[];
     };
     size: {
@@ -21,31 +21,31 @@ declare const normalizeProps: import('../ele-app/types').Mutable<Omit<{
     };
     stripe: BooleanConstructor;
     border: BooleanConstructor;
-    rowKey: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["rowKey"]>;
+    rowKey: PropType<import('element-plus/es/components/table/index').TableProps<any>["rowKey"]>;
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    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"]>;
+    summaryMethod: PropType<import('element-plus/es/components/table/index').TableProps<any>["summaryMethod"]>;
+    rowClassName: PropType<import('element-plus/es/components/table/index').TableProps<any>["rowClassName"]>;
+    rowStyle: PropType<import('element-plus/es/components/table/index').TableProps<any>["rowStyle"]>;
+    cellClassName: PropType<import('element-plus/es/components/table/index').TableProps<any>["cellClassName"]>;
+    cellStyle: PropType<import('element-plus/es/components/table/index').TableProps<any>["cellStyle"]>;
+    headerRowClassName: PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
-    expandRowKeys: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: PropType<import('element-plus/es/components/table/index').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: PropType<import('element-plus/es/components/table/index').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    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"]>;
+    tooltipOptions: PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipOptions"]>;
+    spanMethod: PropType<import('element-plus/es/components/table/index').TableProps<any>["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/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: PropType<import('element-plus/es/components/table/index').TableProps<any>["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/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
     style: {
         type: PropType<import('vue').CSSProperties>;
         default: () => {};
@@ -78,8 +78,8 @@ declare const normalizeProps: import('../ele-app/types').Mutable<Omit<{
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    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"]>;
+    showOverflowTooltip: PropType<import('element-plus/es/components/table/index').TableProps<any>["showOverflowTooltip"]>;
+    tooltipFormatter: PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -89,10 +89,7 @@ declare const normalizeProps: import('../ele-app/types').Mutable<Omit<{
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
 }, "style">>;
 /**
  * 属性
@@ -150,7 +147,7 @@ export declare const dataTableProps: {
     /** 缓存数据 */
     cacheData: PropType<DataItem[]>;
     data: {
-        type: PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
+        type: PropType<any[]>;
         default: () => never[];
     };
     width: (NumberConstructor | StringConstructor)[];
@@ -178,23 +175,23 @@ export declare const dataTableProps: {
     };
     showSummary: BooleanConstructor;
     sumText: StringConstructor;
-    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"]>;
+    summaryMethod: PropType<import('element-plus/es/components/table/index').TableProps<any>["summaryMethod"]>;
+    rowClassName: PropType<import('element-plus/es/components/table/index').TableProps<any>["rowClassName"]>;
+    rowStyle: PropType<import('element-plus/es/components/table/index').TableProps<any>["rowStyle"]>;
+    cellClassName: PropType<import('element-plus/es/components/table/index').TableProps<any>["cellClassName"]>;
+    cellStyle: PropType<import('element-plus/es/components/table/index').TableProps<any>["cellStyle"]>;
+    headerRowClassName: PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: PropType<import('element-plus/es/components/table/index').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: PropType<import('element-plus/es/components/table/index').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (NumberConstructor | StringConstructor)[];
-    expandRowKeys: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["expandRowKeys"]>;
+    expandRowKeys: PropType<import('element-plus/es/components/table/index').TableProps<any>["expandRowKeys"]>;
     defaultExpandAll: BooleanConstructor;
-    defaultSort: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["defaultSort"]>;
+    defaultSort: PropType<import('element-plus/es/components/table/index').TableProps<any>["defaultSort"]>;
     tooltipEffect: StringConstructor;
-    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"]>;
+    tooltipOptions: PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipOptions"]>;
+    spanMethod: PropType<import('element-plus/es/components/table/index').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -204,22 +201,22 @@ export declare const dataTableProps: {
         default: number;
     };
     treeProps: {
-        type: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["treeProps"]>;
+        type: PropType<import('element-plus/es/components/table/index').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
             checkStrictly: boolean;
         };
     };
-    load: PropType<import('element-plus/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
+    load: PropType<import('element-plus/es/components/table/index').TableProps<any>["load"]>;
     tableLayout: {
         type: PropType<"fixed" | "auto">;
         default: string;
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    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"]>;
+    showOverflowTooltip: PropType<import('element-plus/es/components/table/index').TableProps<any>["showOverflowTooltip"]>;
+    tooltipFormatter: PropType<import('element-plus/es/components/table/index').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
         type: (NumberConstructor | StringConstructor)[];
@@ -229,10 +226,7 @@ export declare const dataTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
 };
 export type DataTableProps = ExtractPropTypes<typeof dataTableProps>;
 /**

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

@@ -183,8 +183,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     close: () => void;
     open: () => void;
     "update:modelValue": (value: boolean) => void;
-    closed: () => void;
     opened: () => void;
+    closed: () => void;
     openAutoFocus: () => void;
     closeAutoFocus: () => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
@@ -361,8 +361,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onClose?: (() => any) | undefined;
     onOpen?: (() => any) | undefined;
     "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
-    onClosed?: (() => any) | undefined;
     onOpened?: (() => any) | undefined;
+    onClosed?: (() => any) | undefined;
     onOpenAutoFocus?: (() => any) | undefined;
     onCloseAutoFocus?: (() => any) | undefined;
 }>, {

package/es/ele-drawer/index.js

@@ -1,13 +1,14 @@
 import { defineComponent, ref, computed, onActivated, onDeactivated, createBlock, openBlock, Teleport, createVNode, unref, mergeProps, createSlots, withCtx, normalizeStyle, renderSlot, createElementVNode, createElementBlock, createCommentVNode, createTextVNode, toDisplayString } from "vue";
 import { drawerEmits, ElDrawer, ElIcon } from "element-plus";
 import { CloseOutlined } from "../icons/index";
+import { pick } from "../utils/common";
 import ReceiverView from "../ele-config-provider/components/receiver-view";
 import { useLayoutState } from "../ele-pro-layout/util";
 import { getModalContainer } from "../ele-modal/util";
-import { drawerProps } from "./props";
+import { drawerProps, elDrawerPropKeys } from "./props";
 const _hoisted_1 = ["onClick"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...{ name: "EleDrawer" },
+  ...{ name: "EleDrawer", inheritAttrs: false },
   __name: "index",
   props: drawerProps,
   emits: drawerEmits,
@@ -87,7 +88,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         to: teleportTo.value,
         disabled: teleportDisabled.value
       }, [
-        createVNode(unref(ElDrawer), mergeProps(_ctx.$attrs, {
+        createVNode(unref(ElDrawer), mergeProps({ ..._ctx.$attrs, ...unref(pick)(_ctx.$props, unref(elDrawerPropKeys)) }, {
           ref_key: "drawerRef",
           ref: drawerRef,
           modelValue: _ctx.modelValue,

package/es/ele-drawer/props.d.ts

@@ -1,4 +1,5 @@
 import { PropType, ExtractPropTypes } from 'vue';
+import { drawerProps as elDrawerProps } from 'element-plus';
 import { StyleValue } from '../ele-app/types';
 
 /**
@@ -182,3 +183,8 @@ export declare const drawerProps: {
     };
 };
 export type DrawerProps = ExtractPropTypes<typeof drawerProps>;
+export type ElDrawerPropKeys = Array<keyof typeof elDrawerProps>;
+/**
+ * 抽屉组件属性名
+ */
+export declare const elDrawerPropKeys: ElDrawerPropKeys;

package/es/ele-drawer/props.js

@@ -14,6 +14,10 @@ const drawerProps = {
   /** 是否限制在主体内部 */
   inner: Boolean
 };
+const elDrawerPropKeys = Object.keys(
+  drawerProps$1
+);
 export {
-  drawerProps
+  drawerProps,
+  elDrawerPropKeys
 };

package/es/ele-dropdown/components/pro-dropdown.d.ts

@@ -29,7 +29,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     id: StringConstructor;
     type: {
-        readonly type: PropType<"" | "text" | "success" | "warning" | "info" | "default" | "primary" | "danger">;
+        readonly type: PropType<"" | "text" | "primary" | "success" | "warning" | "info" | "default" | "danger">;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -66,6 +66,14 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         readonly default: true;
     };
     disabled: BooleanConstructor;
+    tabindex: {
+        readonly type: PropType<string | number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 0;
+    };
     persistent: {
         readonly type: PropType<boolean>;
         readonly required: false;
@@ -123,14 +131,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     } & {
         readonly default: 150;
     };
-    tabindex: {
-        readonly type: PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
     maxHeight: {
         readonly type: PropType<string | number>;
         readonly required: false;
@@ -154,13 +154,13 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         __epPropKey: true;
     };
     size: PropType<import('../../ele-app/el').ElButtonProps["size"]>;
-    ariaLabel: StringConstructor;
     appendTo: {
         readonly type: PropType<string | HTMLElement>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
+    ariaLabel: StringConstructor;
     offset: {
         readonly type: PropType<number>;
         readonly required: false;
@@ -240,11 +240,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     command: (_command: (string | number | Record<string, any>) | undefined) => void;
     "update:modelValue": (_value: (string | number | Record<string, any>) | undefined) => void;
     "update:visible": (value: boolean) => void;
-    visibleChange: (_visible: boolean) => void;
-    "before-enter": () => void;
     "before-leave": () => void;
-    "after-enter": () => void;
     "after-leave": () => void;
+    "before-enter": () => void;
+    "after-enter": () => void;
+    visibleChange: (_visible: boolean) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 当前选中菜单项 */
     selected: PropType<DropdownItem | null>;
@@ -266,7 +266,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     id: StringConstructor;
     type: {
-        readonly type: PropType<"" | "text" | "success" | "warning" | "info" | "default" | "primary" | "danger">;
+        readonly type: PropType<"" | "text" | "primary" | "success" | "warning" | "info" | "default" | "danger">;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -303,6 +303,14 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         readonly default: true;
     };
     disabled: BooleanConstructor;
+    tabindex: {
+        readonly type: PropType<string | number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 0;
+    };
     persistent: {
         readonly type: PropType<boolean>;
         readonly required: false;
@@ -360,14 +368,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     } & {
         readonly default: 150;
     };
-    tabindex: {
-        readonly type: PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
     maxHeight: {
         readonly type: PropType<string | number>;
         readonly required: false;
@@ -391,13 +391,13 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         __epPropKey: true;
     };
     size: PropType<import('../../ele-app/el').ElButtonProps["size"]>;
-    ariaLabel: StringConstructor;
     appendTo: {
         readonly type: PropType<string | HTMLElement>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
+    ariaLabel: StringConstructor;
     offset: {
         readonly type: PropType<number>;
         readonly required: false;
@@ -471,19 +471,20 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onCommand?: ((_command: (string | number | Record<string, any>) | undefined) => any) | undefined;
     "onUpdate:modelValue"?: ((_value: (string | number | Record<string, any>) | undefined) => any) | undefined;
     "onUpdate:visible"?: ((value: boolean) => any) | undefined;
-    onVisibleChange?: ((_visible: boolean) => any) | undefined;
-    "onBefore-enter"?: (() => any) | undefined;
     "onBefore-leave"?: (() => any) | undefined;
-    "onAfter-enter"?: (() => any) | undefined;
     "onAfter-leave"?: (() => any) | undefined;
+    "onBefore-enter"?: (() => any) | undefined;
+    "onAfter-enter"?: (() => any) | undefined;
+    onVisibleChange?: ((_visible: boolean) => any) | undefined;
 }>, {
     effect: import('element-plus').PopperEffect;
     placement: import('element-plus').Placement;
     popperClass: string;
     teleported: boolean;
     disabled: boolean;
-    offset: number;
+    tabindex: string | number;
     validateEvent: boolean;
+    offset: number;
     persistent: boolean;
     visible: boolean | null;
     trigger: import('element-plus').TooltipTriggerType | import('element-plus').TooltipTriggerType[];
@@ -494,7 +495,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     loop: boolean;
     showTimeout: number;
     hideTimeout: number;
-    tabindex: string | number;
     maxHeight: string | number;
     role: "dialog" | "menu" | "grid" | "listbox" | "tooltip" | "tree" | "group" | "navigation";
     showArrow: boolean;