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

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

@@ -3,49 +3,49 @@ import { DataKey, DataItem, Column, Columns, Sorter, Filter, TableEmptyProps, Ro
 
 declare const normalizeProps: Omit<{
     data: {
-        type: PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
+        type: PropType<any[]>;
         default: () => never[];
     };
     size: {
-        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;
-    };
-    width: (NumberConstructor | StringConstructor)[];
-    height: (NumberConstructor | StringConstructor)[];
-    maxHeight: (NumberConstructor | StringConstructor)[];
+        type: PropType<import('element-plus').TableProps<Record<string, any>>["size"]>;
+    };
+    width: (StringConstructor | NumberConstructor)[];
+    height: (StringConstructor | NumberConstructor)[];
+    maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
     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').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').TableProps<any>["summaryMethod"]>;
+    rowClassName: PropType<import('element-plus').TableProps<any>["rowClassName"]>;
+    rowStyle: PropType<import('element-plus').TableProps<any>["rowStyle"]>;
+    cellClassName: PropType<import('element-plus').TableProps<any>["cellClassName"]>;
+    cellStyle: PropType<import('element-plus').TableProps<any>["cellStyle"]>;
+    headerRowClassName: PropType<import('element-plus').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: PropType<import('element-plus').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: PropType<import('element-plus').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: PropType<import('element-plus').TableProps<any>["headerCellStyle"]>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (NumberConstructor | StringConstructor)[];
+    currentRowKey: (StringConstructor | NumberConstructor)[];
     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').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"]>;
+    rowExpandable: {
+        type: PropType<import('element-plus').TableProps<any>["rowExpandable"]>;
+    };
+    defaultSort: PropType<import('element-plus').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').TableProps<any>["tooltipOptions"]>;
+    spanMethod: PropType<import('element-plus').TableProps<any>["spanMethod"]>;
     selectOnIndeterminate: {
         type: BooleanConstructor;
         default: boolean;
@@ -55,7 +55,7 @@ declare const normalizeProps: 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').TableProps<any>["treeProps"]>;
         default: () => {
             hasChildren: string;
             children: string;
@@ -63,9 +63,9 @@ declare const normalizeProps: 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').TableProps<any>["load"]>;
     style: {
-        type: PropType<import('vue').CSSProperties>;
+        type: PropType<import('element-plus').TableProps<any>["style"]>;
         default: () => {};
     };
     className: {
@@ -73,26 +73,27 @@ declare const normalizeProps: Omit<{
         default: string;
     };
     tableLayout: {
-        type: PropType<"fixed" | "auto">;
+        type: PropType<import('element-plus').TableProps<Record<string, any>>["tableLayout"]>;
         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: {
+        type: PropType<import('element-plus').TableProps<any>["showOverflowTooltip"]>;
+        default: undefined;
+    };
+    tooltipFormatter: PropType<import('element-plus').TableProps<any>["tooltipFormatter"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: undefined;
     };
     allowDragLastColumn: {
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
 }, "style">;
 /**
  * 属性
@@ -149,32 +150,59 @@ export declare const dataTableProps: {
     selectedRowKeys: PropType<DataKey[]>;
     /** 缓存数据 */
     cacheData: PropType<DataItem[]>;
-    data: {
-        type: PropType<import('element-plus/es/components/table/src/table/defaults').DefaultRow[]>;
-        default: () => never[];
+    size: {
+        type: PropType<import('element-plus').TableProps<Record<string, any>>["size"]>;
+    };
+    summaryMethod: PropType<import('element-plus').TableProps<any>["summaryMethod"]>;
+    rowClassName: PropType<import('element-plus').TableProps<any>["rowClassName"]>;
+    rowStyle: PropType<import('element-plus').TableProps<any>["rowStyle"]>;
+    cellClassName: PropType<import('element-plus').TableProps<any>["cellClassName"]>;
+    cellStyle: PropType<import('element-plus').TableProps<any>["cellStyle"]>;
+    headerRowClassName: PropType<import('element-plus').TableProps<any>["headerRowClassName"]>;
+    headerRowStyle: PropType<import('element-plus').TableProps<any>["headerRowStyle"]>;
+    headerCellClassName: PropType<import('element-plus').TableProps<any>["headerCellClassName"]>;
+    headerCellStyle: PropType<import('element-plus').TableProps<any>["headerCellStyle"]>;
+    expandRowKeys: PropType<import('element-plus').TableProps<any>["expandRowKeys"]>;
+    rowExpandable: {
+        type: PropType<import('element-plus').TableProps<any>["rowExpandable"]>;
+    };
+    defaultSort: PropType<import('element-plus').TableProps<any>["defaultSort"]>;
+    tooltipOptions: PropType<import('element-plus').TableProps<any>["tooltipOptions"]>;
+    className: {
+        type: StringConstructor;
+        default: string;
+    };
+    spanMethod: PropType<import('element-plus').TableProps<any>["spanMethod"]>;
+    treeProps: {
+        type: PropType<import('element-plus').TableProps<any>["treeProps"]>;
+        default: () => {
+            hasChildren: string;
+            children: string;
+            checkStrictly: boolean;
+        };
     };
-    height: (NumberConstructor | StringConstructor)[];
-    maxHeight: (NumberConstructor | StringConstructor)[];
+    load: PropType<import('element-plus').TableProps<any>["load"]>;
     tableLayout: {
-        type: PropType<"fixed" | "auto">;
+        type: PropType<import('element-plus').TableProps<Record<string, any>>["tableLayout"]>;
         default: string;
     };
-    width: (NumberConstructor | StringConstructor)[];
-    size: {
-        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;
+    showOverflowTooltip: {
+        type: PropType<import('element-plus').TableProps<any>["showOverflowTooltip"]>;
+        default: undefined;
+    };
+    tooltipFormatter: PropType<import('element-plus').TableProps<any>["tooltipFormatter"]>;
+    data: {
+        type: PropType<any[]>;
+        default: () => never[];
     };
+    height: (StringConstructor | NumberConstructor)[];
+    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
     lazy: BooleanConstructor;
-    className: {
-        type: StringConstructor;
-        default: string;
-    };
     emptyText: StringConstructor;
     showHeader: {
         type: BooleanConstructor;
@@ -182,23 +210,10 @@ 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"]>;
     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"]>;
+    currentRowKey: (StringConstructor | NumberConstructor)[];
     defaultExpandAll: BooleanConstructor;
-    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/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;
@@ -207,32 +222,19 @@ export declare const dataTableProps: {
         type: NumberConstructor;
         default: number;
     };
-    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/es/components/table/index').TableProps<import('element-plus/es/components/table/src/table/defaults').DefaultRow>["load"]>;
     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"]>;
     appendFilterPanelTo: StringConstructor;
     scrollbarTabindex: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: undefined;
     };
     allowDragLastColumn: {
         type: BooleanConstructor;
         default: boolean;
     };
-    preserveExpandedContent: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
+    preserveExpandedContent: BooleanConstructor;
+    nativeScrollbar: BooleanConstructor;
 };
 export type DataTableProps = ExtractPropTypes<typeof dataTableProps>;
 /**

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

@@ -200,6 +200,7 @@
       color: eleVar('table', 'icon-color');
       font-size: eleVar('table', 'filter-size');
       transition: (color $transition-base, font-size $transition-base);
+      pointer-events: none;
     }
 
     &:hover {

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

@@ -1,3 +1,4 @@
+import type { VNode } from 'vue';
 import type { Sort } from 'element-plus/es/components/table';
 import type {
   ElTableProps,
@@ -29,7 +30,44 @@ export type TableColumn = Partial<ElColumnProps>;
 /**
  * 列属性
  */
-export interface Column extends Omit<TableColumn, 'filterPlacement'> {
+export interface ColumnBase extends Omit<
+  TableColumn,
+  | 'id'
+  | 'realWidth'
+  | 'level'
+  | 'isColumnGroup'
+  | 'isSubColumn'
+  | 'columns'
+  | 'no'
+  | 'filterOpened'
+  | 'renderHeader'
+  | 'showOverflowTooltip'
+  | 'tooltipFormatter'
+  | 'formatter'
+  | 'filterMethod'
+  | 'filterPlacement'
+  | 'filterable'
+  | 'children'
+> {
+  renderHeader?: (data: {
+    column: ColumnBase;
+    $index: number;
+    store: any;
+    _self: any;
+  }) => VNode;
+  showOverflowTooltip?: boolean | Record<string, any>;
+  tooltipFormatter?: (data: {
+    row: DataItem;
+    column: ColumnBase;
+    cellValue: any;
+  }) => VNode | string;
+  formatter?: (
+    row: DataItem,
+    column: ColumnBase,
+    cellValue: any,
+    index: number
+  ) => VNode | string;
+  filterMethod?: (value: string, row: DataItem, column: ColumnBase) => void;
   filterPlacement?: EleTooltipProps['placement'];
   /** 唯一标识 */
   uid?: string;
@@ -51,8 +89,14 @@ export interface Column extends Omit<TableColumn, 'filterPlacement'> {
   printSlot?: string;
   /** 打印表头插槽名称 */
   printHeaderSlot?: string;
+}
+
+/**
+ * 列属性
+ */
+export interface Column extends ColumnBase {
   /** 子级 */
-  children?: Columns;
+  children?: ColumnBase[];
 }
 
 /**

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

@@ -72,7 +72,7 @@ export declare function getStateCols(cols: Columns, sorter?: Sorter, filter?: Fi
  * 获取判断多选是否可选择的方法
  * @param columns 列配置
  */
-export declare function getSelectableFunction(columns?: Columns): ((row: any, index: number) => boolean) | null | undefined;
+export declare function getSelectableFunction(columns?: Columns): ((row: Record<string, any>, index: number) => boolean) | null | undefined;
 /**
  * 判断行是否禁止多选
  * @param row 行数据
@@ -154,6 +154,7 @@ export declare function useEmits(emit: Emitter<DataTableEmitsType>): {
     'onUpdate:currentRowKey': (currentRowKey?: DataKey) => void;
     'onUpdate:selectedRowKeys': (selectedRowKeys: DataKey[]) => void;
     onSelect: (_selection: DataItem[], _row: DataItem) => any;
+    onExpandChange: (_row: DataItem, _expanded: boolean) => any;
     onScroll: (_option: {
         scrollLeft: number;
         scrollTop: number;
@@ -174,5 +175,4 @@ export declare function useEmits(emit: Emitter<DataTableEmitsType>): {
     onFilterChange: (_filter: Filter) => any;
     onCurrentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any;
     onHeaderDragend: (_width: number, _old: number, _column: Column, _e: MouseEvent) => any;
-    onExpandChange: (_row: DataItem, _expanded: boolean) => any;
 };

package/lib/ele-drawer/index.cjs

@@ -140,7 +140,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           onCloseAutoFocus: handleDrawerCloseAutoFocus,
           "onUpdate:modelValue": updateModelValue
         }), vue.createSlots({
-          header: vue.withCtx(({ close }) => [
+          header: vue.withCtx(({ close, titleId, titleClass }) => [
             vue.createElementVNode("div", {
               class: "ele-drawer-header",
               style: vue.normalizeStyle(_ctx.headerStyle)
@@ -150,7 +150,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 class: "ele-drawer-title",
                 style: vue.normalizeStyle(_ctx.titleStyle)
               }, [
-                vue.renderSlot(_ctx.$slots, "header", {}, () => [
+                vue.renderSlot(_ctx.$slots, "header", {
+                  close,
+                  titleId,
+                  titleClass
+                }, () => [
                   vue.createTextVNode(vue.toDisplayString(_ctx.title), 1)
                 ])
               ], 4),
@@ -158,7 +162,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 key: 0,
                 class: "ele-drawer-close",
                 style: vue.normalizeStyle(_ctx.closeBtnStyle),
-                onClick: close
+                onClick: ($event) => close()
               }, [
                 vue.renderSlot(_ctx.$slots, "closeBtn", {}, () => [
                   vue.createVNode(vue.unref(elementPlus.ElIcon), null, {