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

package/lib/ele-cropper/index.cjs

@@ -34,42 +34,42 @@ const _sfc_main = vue.defineComponent({
       state.instance && state.instance.destroy();
       state.instance = null;
     };
-    const onZoomIn = () => {
+    const handleZoomIn = () => {
       state.instance && state.instance.zoom(0.1);
     };
-    const onZoomOut = () => {
+    const handleZoomOut = () => {
       state.instance && state.instance.zoom(-0.1);
     };
-    const onMoveLeft = () => {
+    const handleMoveLeft = () => {
       state.instance && state.instance.move(-10, 0);
     };
-    const onMoveRight = () => {
+    const handleMoveRight = () => {
       state.instance && state.instance.move(10, 0);
     };
-    const onMoveUp = () => {
+    const handleMoveUp = () => {
       state.instance && state.instance.move(0, -10);
     };
-    const onMoveDown = () => {
+    const handleMoveDown = () => {
       state.instance && state.instance.move(0, 10);
     };
-    const onRotateLeft = () => {
+    const handleRotateLeft = () => {
       state.instance && state.instance.rotate(-45);
     };
-    const onRotateRight = () => {
+    const handleRotateRight = () => {
       state.instance && state.instance.rotate(45);
     };
-    const onFlipX = () => {
+    const handleFlipX = () => {
       state.instance && state.instance.scaleX(state.scaleXValue);
       state.scaleXValue = -state.scaleXValue;
     };
-    const onFlipY = () => {
+    const handleFlipY = () => {
       state.instance && state.instance.scaleY(state.scaleYValue);
       state.scaleYValue = -state.scaleYValue;
     };
-    const onReset = () => {
+    const handleReset = () => {
       state.instance && state.instance.reset();
     };
-    const onUpload = ({ data, type }) => {
+    const handleUpload = ({ data, type }) => {
       state.imageType = type;
       if (state.instance) {
         state.instance.replace(data);
@@ -82,7 +82,7 @@ const _sfc_main = vue.defineComponent({
         render();
       }
     };
-    const onOk = () => {
+    const handleOk = () => {
       if (!state.instance) {
         emit("done");
         return;
@@ -135,19 +135,19 @@ const _sfc_main = vue.defineComponent({
       imageRef,
       previewRef,
       isResponsive,
-      onZoomIn,
-      onZoomOut,
-      onMoveLeft,
-      onMoveRight,
-      onMoveUp,
-      onMoveDown,
-      onRotateLeft,
-      onRotateRight,
-      onFlipX,
-      onFlipY,
-      onReset,
-      onUpload,
-      onOk
+      handleZoomIn,
+      handleZoomOut,
+      handleMoveLeft,
+      handleMoveRight,
+      handleMoveUp,
+      handleMoveDown,
+      handleRotateLeft,
+      handleRotateRight,
+      handleFlipX,
+      handleFlipY,
+      handleReset,
+      handleUpload,
+      handleOk
     };
   }
 });
@@ -190,19 +190,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       locale: _ctx.locale,
       tooltip: _ctx.tooltip,
       tooltipProps: _ctx.tooltipProps,
-      onZoomIn: _ctx.onZoomIn,
-      onZoomOut: _ctx.onZoomOut,
-      onMoveLeft: _ctx.onMoveLeft,
-      onMoveRight: _ctx.onMoveRight,
-      onMoveUp: _ctx.onMoveUp,
-      onMoveDown: _ctx.onMoveDown,
-      onRotateLeft: _ctx.onRotateLeft,
-      onRotateRight: _ctx.onRotateRight,
-      onFlipX: _ctx.onFlipX,
-      onFlipY: _ctx.onFlipY,
-      onReset: _ctx.onReset,
-      onUpload: _ctx.onUpload,
-      onOk: _ctx.onOk
+      onZoomIn: _ctx.handleZoomIn,
+      onZoomOut: _ctx.handleZoomOut,
+      onMoveLeft: _ctx.handleMoveLeft,
+      onMoveRight: _ctx.handleMoveRight,
+      onMoveUp: _ctx.handleMoveUp,
+      onMoveDown: _ctx.handleMoveDown,
+      onRotateLeft: _ctx.handleRotateLeft,
+      onRotateRight: _ctx.handleRotateRight,
+      onFlipX: _ctx.handleFlipX,
+      onFlipY: _ctx.handleFlipY,
+      onReset: _ctx.handleReset,
+      onUpload: _ctx.handleUpload,
+      onOk: _ctx.handleOk
     }, null, 8, ["tools", "accept", "locale", "tooltip", "tooltipProps", "onZoomIn", "onZoomOut", "onMoveLeft", "onMoveRight", "onMoveUp", "onMoveDown", "onRotateLeft", "onRotateRight", "onFlipX", "onFlipY", "onReset", "onUpload", "onOk"])
   ], 2);
 }

package/lib/ele-cropper/index.d.ts

@@ -33,7 +33,7 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    tooltipProps: import('vue').PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: import('vue').PropType<import('../ele-app/plus').EleTooltipProps>;
     responsive: {
         type: BooleanConstructor;
         default: null;
@@ -43,24 +43,24 @@ declare const _default: import('vue').DefineComponent<{
     imageRef: Ref<HTMLImageElement | null>;
     previewRef: Ref<PreviewInstance>;
     isResponsive: import('vue').ComputedRef<boolean>;
-    onZoomIn: () => void;
-    onZoomOut: () => void;
-    onMoveLeft: () => void;
-    onMoveRight: () => void;
-    onMoveUp: () => void;
-    onMoveDown: () => void;
-    onRotateLeft: () => void;
-    onRotateRight: () => void;
-    onFlipX: () => void;
-    onFlipY: () => void;
-    onReset: () => void;
-    onUpload: ({ data, type }: {
+    handleZoomIn: () => void;
+    handleZoomOut: () => void;
+    handleMoveLeft: () => void;
+    handleMoveRight: () => void;
+    handleMoveUp: () => void;
+    handleMoveDown: () => void;
+    handleRotateLeft: () => void;
+    handleRotateRight: () => void;
+    handleFlipX: () => void;
+    handleFlipY: () => void;
+    handleReset: () => void;
+    handleUpload: ({ data, type }: {
         data: string;
         type: string;
     }) => void;
-    onOk: () => void;
+    handleOk: () => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    done: (_result?: string | Blob | null | undefined) => boolean;
+    done: (_result?: Blob | string | null) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     height: StringConstructor;
     src: StringConstructor;
@@ -91,7 +91,7 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    tooltipProps: import('vue').PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: import('vue').PropType<import('../ele-app/plus').EleTooltipProps>;
     responsive: {
         type: BooleanConstructor;
         default: null;

package/lib/ele-cropper/props.d.ts

@@ -1,4 +1,5 @@
 import { PropType, ExtractPropTypes } from 'vue';
+import { EleTooltipProps } from '../ele-app/plus';
 import { CropperOptions, CroppedOptions, CropperLocale } from './types';
 
 /**
@@ -46,7 +47,7 @@ export declare const cropperProps: {
         default: boolean;
     };
     /** tooltip属性 */
-    tooltipProps: PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: PropType<EleTooltipProps>;
     /** 是否开启响应式 */
     responsive: {
         type: BooleanConstructor;

package/lib/ele-cropper-modal/index.cjs

@@ -14,10 +14,10 @@ const _sfc_main = vue.defineComponent({
     const updateModelValue = (value) => {
       emit("update:modelValue", value);
     };
-    const onDone = (result) => {
+    const handleDone = (result) => {
       emit("done", result);
     };
-    return { lang, updateModelValue, onDone };
+    return { lang, updateModelValue, handleDone };
   }
 });
 const _export_sfc = (sfc, props2) => {
@@ -53,7 +53,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         tooltipProps: _ctx.tooltipProps,
         responsive: _ctx.responsive,
         locale: _ctx.locale,
-        onDone: _ctx.onDone
+        onDone: _ctx.handleDone
       }, null, 8, ["height", "src", "imageType", "accept", "tools", "preview", "previewWidth", "toBlob", "options", "croppedOptions", "tooltip", "tooltipProps", "responsive", "locale", "onDone"])
     ]),
     _: 2

package/lib/ele-cropper-modal/index.d.ts

@@ -32,7 +32,7 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    tooltipProps: import('vue').PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: import('vue').PropType<import('../ele-app/plus').EleTooltipProps>;
     responsive: {
         type: BooleanConstructor;
         default: null;
@@ -41,10 +41,10 @@ declare const _default: import('vue').DefineComponent<{
 }, {
     lang: import('vue').ComputedRef<CropperLocale>;
     updateModelValue: (value: boolean) => void;
-    onDone: (result: Blob | string | null) => void;
+    handleDone: (result: Blob | string | null) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    done: (_result: string | Blob | null) => boolean;
-    'update:modelValue': (_value: boolean) => boolean; /** 更新绑定值 */
+    done: (_result: Blob | string | null) => boolean;
+    'update:modelValue': (_value: boolean) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     modelValue: BooleanConstructor;
     modalProps: import('vue').PropType<Partial<Omit<import('../ele-app/plus').EleModalProps, "modelValue">>>;
@@ -77,7 +77,7 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    tooltipProps: import('vue').PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: import('vue').PropType<import('../ele-app/plus').EleTooltipProps>;
     responsive: {
         type: BooleanConstructor;
         default: null;

package/lib/ele-cropper-modal/props.d.ts

@@ -17,9 +17,6 @@ export declare const cropperModalProps: {
     };
     accept: {
         type: StringConstructor;
-        /**
-         * 事件
-         */
         default: string;
     };
     tools: {
@@ -41,7 +38,7 @@ export declare const cropperModalProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    tooltipProps: PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: PropType<import('../ele-app/plus').EleTooltipProps>;
     responsive: {
         type: BooleanConstructor;
         default: null;

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

@@ -11,7 +11,7 @@ declare const _default: import('vue').DefineComponent<{
         default: null;
     };
     rowKey: {
-        type: import('vue').PropType<string | ((row: DataItem) => string) | undefined>;
+        type: import('vue').PropType<import('./types').RowKey>;
         required: boolean;
     };
     columns: {
@@ -51,14 +51,14 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
         default: string;
     };
-    height: (StringConstructor | NumberConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
     data: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
@@ -79,13 +79,13 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: import('vue').PropType<import('element-plus').CellCls<any> | undefined>;
     headerCellStyle: import('vue').PropType<import('element-plus').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     expandRowKeys: import('vue').PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import('vue').PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
     spanMethod: import('vue').PropType<((data: {
         row: any;
         rowIndex: number;
@@ -120,7 +120,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
 }, {
     clearSort: () => void;
     clearSelection: () => void;
@@ -135,13 +135,13 @@ declare const _default: import('vue').DefineComponent<{
     tableRef: import('vue').Ref<ElTableInstance>;
     getSelectionRows: () => DataItem[] | undefined;
     toggleAllSelection: () => void;
-    toggleRowExpansion: (row: DataItem, expanded?: boolean | undefined) => void;
-    clearFilter: (columnKeys?: string[] | undefined) => void;
+    toggleRowExpansion: (row: DataItem, expanded?: boolean) => void;
+    clearFilter: (columnKeys?: string[]) => void;
     doLayout: () => void;
     sort: (prop: string, order: string) => void;
-    scrollTo: (options: number | ScrollToOptions, yCoord?: number | undefined) => void;
-    setScrollTop: (top?: number | undefined) => void;
-    setScrollLeft: (left?: number | undefined) => void;
+    scrollTo: (options: number | ScrollToOptions, yCoord?: number) => void;
+    setScrollTop: (top?: number) => void;
+    setScrollLeft: (left?: number) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     select: (_selection: DataItem[], _row: DataItem) => boolean;
     selectAll: (_selection: DataItem[]) => boolean;
@@ -158,11 +158,11 @@ declare const _default: import('vue').DefineComponent<{
     headerContextmenu: (_column: Column, _e: MouseEvent) => boolean;
     sortChange: (_sorter: Sorter) => boolean;
     filterChange: (_filter: Filter) => boolean;
-    currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean; /** 获取单选选中行 */
+    currentChange: (_current?: DataItem | null, _old?: DataItem | null) => boolean;
     headerDragend: (_width: number, _old: number, _column: Column, _e: MouseEvent) => boolean;
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
-    'update:currentRowKey': (_currentRowKey?: DataKey | undefined) => boolean;
-    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean;
+    'update:currentRowKey': (_currentRowKey?: DataKey) => boolean;
+    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[]) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     stripe: {
         type: BooleanConstructor;
@@ -173,7 +173,7 @@ declare const _default: import('vue').DefineComponent<{
         default: null;
     };
     rowKey: {
-        type: import('vue').PropType<string | ((row: DataItem) => string) | undefined>;
+        type: import('vue').PropType<import('./types').RowKey>;
         required: boolean;
     };
     columns: {
@@ -213,14 +213,14 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
         default: string;
     };
-    height: (StringConstructor | NumberConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
     data: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
@@ -241,13 +241,13 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: import('vue').PropType<import('element-plus').CellCls<any> | undefined>;
     headerCellStyle: import('vue').PropType<import('element-plus').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     expandRowKeys: import('vue').PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import('vue').PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
     spanMethod: import('vue').PropType<((data: {
         row: any;
         rowIndex: number;
@@ -282,7 +282,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
 }>> & {
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;

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

@@ -1,5 +1,5 @@
 import { PropType, ExtractPropTypes } from 'vue';
-import { DataKey, DataItem, Column, Columns, Sorter, Filter, TableEmptyProps, RowClickChecked } from './types';
+import { DataKey, DataItem, Column, Columns, Sorter, Filter, TableEmptyProps, RowClickChecked, RowKey } from './types';
 
 declare const normalizeProps: Omit<{
     data: {
@@ -7,14 +7,14 @@ declare const normalizeProps: Omit<{
         default: () => never[];
     };
     size: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
+        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -38,13 +38,13 @@ declare const normalizeProps: Omit<{
     headerCellClassName: PropType<import('element-plus/es/components/table/src/table/defaults').CellCls<any> | undefined>;
     headerCellStyle: PropType<import('element-plus/es/components/table/src/table/defaults').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     expandRowKeys: PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: PropType<import('element-plus/es/components/table/src/table/defaults').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
     spanMethod: PropType<((data: {
         row: any;
         rowIndex: number;
@@ -88,7 +88,7 @@ declare const normalizeProps: Omit<{
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
 }, "style">;
 /**
  * 属性
@@ -103,7 +103,7 @@ export declare const dataTableProps: {
         default: null;
     };
     rowKey: {
-        type: PropType<string | ((row: DataItem) => string) | undefined>;
+        type: PropType<RowKey>;
         required: boolean;
     };
     /** 列配置 */
@@ -145,14 +145,14 @@ export declare const dataTableProps: {
     selectedRowKeys: PropType<DataKey[]>;
     /** 缓存数据 */
     cacheData: PropType<DataItem[]>;
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
     data: {
         type: PropType<any[]>;
         default: () => never[];
     };
     size: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
+        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -161,7 +161,7 @@ export declare const dataTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
@@ -183,13 +183,13 @@ export declare const dataTableProps: {
     headerCellClassName: PropType<import('element-plus/es/components/table/src/table/defaults').CellCls<any> | undefined>;
     headerCellStyle: PropType<import('element-plus/es/components/table/src/table/defaults').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     expandRowKeys: PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: PropType<import('element-plus/es/components/table/src/table/defaults').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
     spanMethod: PropType<((data: {
         row: any;
         rowIndex: number;
@@ -224,7 +224,7 @@ export declare const dataTableProps: {
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
 };
 export type DataTableProps = ExtractPropTypes<typeof dataTableProps>;
 /**

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

@@ -306,7 +306,7 @@
     > .el-table__body
     > .el-table__body-footer {
     border-top: 1px solid eleVar('table', 'border-color');
-    margin-top: -1px;
+    margin-top: calc(-1px - eleVar('table', 'fix-height'));
     z-index: 3;
 
     td.el-table__cell {

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

@@ -48,6 +48,8 @@ export interface Column extends Omit<TableColumn, 'filterPlacement'> {
   printSlot?: string;
   /** 子级 */
   children?: Columns;
+  /** 显示条件 */
+  vIf?: any;
 }
 
 /**

package/lib/ele-data-table/util.cjs

@@ -22,7 +22,11 @@ function getCols(cols, pageIndex, slots, slotNormalize, globalTooltip) {
               "headerSlot",
               "hideInTable",
               "hideInSetting",
-              "children"
+              "hideInExport",
+              "hideInPrint",
+              "printSlot",
+              "children",
+              "vIf"
             ]),
             showOverflowTooltip: getTooltipProps(
               col.showOverflowTooltip,
@@ -32,7 +36,7 @@ function getCols(cols, pageIndex, slots, slotNormalize, globalTooltip) {
             columnKey: col.columnKey ?? col.prop,
             className: getCellClass(col),
             index: col.index ?? pageIndex,
-            key: col.uid
+            key: col.uid ?? col.columnKey ?? col.prop
           },
           {
             default: (slotProps) => {

package/lib/ele-drawer/index.cjs

@@ -47,22 +47,22 @@ const _sfc_main = vue.defineComponent({
     const updateModelValue = (value) => {
       emit("update:modelValue", value);
     };
-    const onOpen = () => {
+    const handleDrawerOpen = () => {
       emit("open");
     };
-    const onOpened = () => {
+    const handleDrawerOpened = () => {
       emit("opened");
     };
-    const onClose = () => {
+    const handleDrawerClose = () => {
       emit("close");
     };
-    const onClosed = () => {
+    const handleDrawerClosed = () => {
       emit("closed");
     };
-    const onOpenAutoFocus = () => {
+    const handleDrawerOpenAutoFocus = () => {
       emit("openAutoFocus");
     };
-    const onCloseAutoFocus = () => {
+    const handleDrawerCloseAutoFocus = () => {
       emit("closeAutoFocus");
     };
     vue.onActivated(() => {
@@ -77,12 +77,12 @@ const _sfc_main = vue.defineComponent({
       teleportTo,
       handleClose,
       updateModelValue,
-      onOpen,
-      onOpened,
-      onClose,
-      onClosed,
-      onOpenAutoFocus,
-      onCloseAutoFocus
+      handleDrawerOpen,
+      handleDrawerOpened,
+      handleDrawerClose,
+      handleDrawerClosed,
+      handleDrawerOpenAutoFocus,
+      handleDrawerCloseAutoFocus
     };
   }
 });
@@ -123,12 +123,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       modalClass: _ctx.drawerClass,
       zIndex: _ctx.zIndex,
       headerAriaLevel: _ctx.headerAriaLevel,
-      onOpen: _ctx.onOpen,
-      onOpened: _ctx.onOpened,
-      onClose: _ctx.onClose,
-      onClosed: _ctx.onClosed,
-      onOpenAutoFocus: _ctx.onOpenAutoFocus,
-      onCloseAutoFocus: _ctx.onCloseAutoFocus,
+      onOpen: _ctx.handleDrawerOpen,
+      onOpened: _ctx.handleDrawerOpened,
+      onClose: _ctx.handleDrawerClose,
+      onClosed: _ctx.handleDrawerClosed,
+      onOpenAutoFocus: _ctx.handleDrawerOpenAutoFocus,
+      onCloseAutoFocus: _ctx.handleDrawerCloseAutoFocus,
       "onUpdate:modelValue": _ctx.updateModelValue
     }), vue.createSlots({
       header: vue.withCtx(({ close }) => [