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

package/lib/ele-upload-list/props.d.ts

@@ -1,4 +1,5 @@
 import { PropType, ExtractPropTypes } from 'vue';
+import { StyleValue } from '../ele-app/types';
 import { ElProgressProps, ElImageProps } from '../ele-app/el';
 import { UploadItem, UploadLocale } from './types';
 
@@ -32,12 +33,12 @@ export declare const uploadListProps: {
         default: string;
     };
     /** 自定义条目样式 */
-    itemStyle: PropType<Partial<import('vue').CSSProperties>>;
+    itemStyle: PropType<StyleValue>;
     /** 自定义上传按钮样式 */
-    buttonStyle: PropType<Partial<import('vue').CSSProperties>>;
+    buttonStyle: PropType<StyleValue>;
     /** 是否开启拖拽排序 */
     sortable: {
-        type: PropType<boolean | Record<string | number | symbol, any>>;
+        type: PropType<boolean | Record<keyof any, any>>;
         default: boolean;
     };
     /** 自定义图片属性 */

package/lib/ele-upload-list/style/index.scss

@@ -117,6 +117,10 @@
     &.sortable-ghost {
       opacity: 0;
     }
+
+    &.sortable-chosen {
+      user-select: none;
+    }
   }
 
   .ele-upload-button {

package/lib/ele-virtual-table/components/body-cell.d.ts

@@ -1,6 +1,6 @@
 import { PropType } from 'vue';
 import { StyleValues } from '../../ele-app/types';
-import { DataItem, Column } from '../../ele-data-table/types';
+import { DataItem, Column, TableSize, CellClass, CellStyle, SpanMethod, ShowOverflowTooltip } from '../../ele-data-table/types';
 import { BodyColumn, CustomRenderProps, ColSize } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
@@ -30,21 +30,13 @@ declare const _default: import('vue').DefineComponent<{
         required: true;
     };
     /** 单元格类名自定义 */
-    bodyCellClass: PropType<import('element-plus').CellCls<DataItem> | undefined>;
+    bodyCellClass: PropType<CellClass>;
     /** 单元格样式自定义 */
-    bodyCellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
+    bodyCellStyle: PropType<CellStyle>;
     /** 单元格合并行列方法 */
-    spanMethod: PropType<((data: {
-        row: DataItem;
-        rowIndex: number;
-        column: import('element-plus').TableColumnCtx<DataItem>;
-        columnIndex: number;
-    }) => number[] | {
-        rowspan: number;
-        colspan: number;
-    } | undefined) | undefined>;
+    spanMethod: PropType<SpanMethod>;
     /** 溢出提示组件全局属性 */
-    tableTooltipProps: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tableTooltipProps: PropType<ShowOverflowTooltip>;
     /** 序号列起始编号 */
     pageIndex: NumberConstructor;
     /** 表格行高 */
@@ -54,7 +46,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 多选当前行是否禁用 */
     isDisabled: BooleanConstructor;
     /** 表格尺寸 */
-    tableSize: PropType<"" | "small" | "default" | "large" | undefined>;
+    tableSize: PropType<TableSize>;
     /** 树表格展开图标的列 */
     expandColumnKey: StringConstructor;
     /** 树表格当前行是否有子级 */
@@ -126,21 +118,13 @@ declare const _default: import('vue').DefineComponent<{
         required: true;
     };
     /** 单元格类名自定义 */
-    bodyCellClass: PropType<import('element-plus').CellCls<DataItem> | undefined>;
+    bodyCellClass: PropType<CellClass>;
     /** 单元格样式自定义 */
-    bodyCellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
+    bodyCellStyle: PropType<CellStyle>;
     /** 单元格合并行列方法 */
-    spanMethod: PropType<((data: {
-        row: DataItem;
-        rowIndex: number;
-        column: import('element-plus').TableColumnCtx<DataItem>;
-        columnIndex: number;
-    }) => number[] | {
-        rowspan: number;
-        colspan: number;
-    } | undefined) | undefined>;
+    spanMethod: PropType<SpanMethod>;
     /** 溢出提示组件全局属性 */
-    tableTooltipProps: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tableTooltipProps: PropType<ShowOverflowTooltip>;
     /** 序号列起始编号 */
     pageIndex: NumberConstructor;
     /** 表格行高 */
@@ -150,7 +134,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 多选当前行是否禁用 */
     isDisabled: BooleanConstructor;
     /** 表格尺寸 */
-    tableSize: PropType<"" | "small" | "default" | "large" | undefined>;
+    tableSize: PropType<TableSize>;
     /** 树表格展开图标的列 */
     expandColumnKey: StringConstructor;
     /** 树表格当前行是否有子级 */

package/lib/ele-virtual-table/components/body-row.d.ts

@@ -1,5 +1,5 @@
 import { PropType } from 'vue';
-import { DataKey, DataItem, Column } from '../../ele-data-table/types';
+import { DataKey, DataItem, Column, TableSize, CellClass, CellStyle, SpanMethod, ShowOverflowTooltip, TableLoad } from '../../ele-data-table/types';
 import { BodyColumns, ColSize, VirtualRow } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
@@ -28,27 +28,19 @@ declare const _default: import('vue').DefineComponent<{
     /** 表格多选选中的值 */
     checkedRowKeys: PropType<Set<DataKey>>;
     /** 单元格类名自定义 */
-    bodyCellClass: PropType<import('element-plus').CellCls<DataItem> | undefined>;
+    bodyCellClass: PropType<CellClass>;
     /** 单元格样式自定义 */
-    bodyCellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
+    bodyCellStyle: PropType<CellStyle>;
     /** 单元格合并行列方法 */
-    spanMethod: PropType<((data: {
-        row: DataItem; /** 树表格当前行是否有子级 */
-        rowIndex: number;
-        column: import('element-plus').TableColumnCtx<DataItem>;
-        columnIndex: number;
-    }) => number[] | {
-        rowspan: number;
-        colspan: number;
-    } | undefined) | undefined>;
+    spanMethod: PropType<SpanMethod>;
     /** 溢出提示组件全局属性 */
-    tableTooltipProps: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tableTooltipProps: PropType<ShowOverflowTooltip>;
     /** 序号列起始编号 */
     pageIndex: NumberConstructor;
     /** 表格行高 */
     rowHeight: NumberConstructor;
     /** 表格尺寸 */
-    tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
+    tableSize: PropType<TableSize>;
     /** 树表格展开图标的列 */
     expandColumnKey: StringConstructor;
     /** 表格展开行的值 */
@@ -56,7 +48,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 树表格是否懒加载子级 */
     lazy: BooleanConstructor;
     /** 树表格懒加载方法 */
-    load: PropType<((row: DataItem, treeNode: import('element-plus').TreeNode, resolve: (data: DataItem[]) => void) => void) | undefined>;
+    load: PropType<TableLoad>;
     /** 树表格行数据缩进级别 */
     level: NumberConstructor;
     /** 树表格每一级行缩进大小 */
@@ -119,27 +111,19 @@ declare const _default: import('vue').DefineComponent<{
     /** 表格多选选中的值 */
     checkedRowKeys: PropType<Set<DataKey>>;
     /** 单元格类名自定义 */
-    bodyCellClass: PropType<import('element-plus').CellCls<DataItem> | undefined>;
+    bodyCellClass: PropType<CellClass>;
     /** 单元格样式自定义 */
-    bodyCellStyle: PropType<import('element-plus').CellStyle<DataItem> | undefined>;
+    bodyCellStyle: PropType<CellStyle>;
     /** 单元格合并行列方法 */
-    spanMethod: PropType<((data: {
-        row: DataItem; /** 树表格当前行是否有子级 */
-        rowIndex: number;
-        column: import('element-plus').TableColumnCtx<DataItem>;
-        columnIndex: number;
-    }) => number[] | {
-        rowspan: number;
-        colspan: number;
-    } | undefined) | undefined>;
+    spanMethod: PropType<SpanMethod>;
     /** 溢出提示组件全局属性 */
-    tableTooltipProps: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tableTooltipProps: PropType<ShowOverflowTooltip>;
     /** 序号列起始编号 */
     pageIndex: NumberConstructor;
     /** 表格行高 */
     rowHeight: NumberConstructor;
     /** 表格尺寸 */
-    tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
+    tableSize: PropType<TableSize>;
     /** 树表格展开图标的列 */
     expandColumnKey: StringConstructor;
     /** 表格展开行的值 */
@@ -147,7 +131,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 树表格是否懒加载子级 */
     lazy: BooleanConstructor;
     /** 树表格懒加载方法 */
-    load: PropType<((row: DataItem, treeNode: import('element-plus').TreeNode, resolve: (data: DataItem[]) => void) => void) | undefined>;
+    load: PropType<TableLoad>;
     /** 树表格行数据缩进级别 */
     level: NumberConstructor;
     /** 树表格每一级行缩进大小 */

package/lib/ele-virtual-table/components/cell-checkbox.d.ts

@@ -1,4 +1,5 @@
 import { PropType } from 'vue';
+import { TableSize } from '../../ele-data-table/types';
 
 declare const _default: import('vue').DefineComponent<{
     /** 是否是选中状态 */
@@ -8,7 +9,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否是禁用状态 */
     disabled: BooleanConstructor;
     /** 尺寸 */
-    size: PropType<"" | "default" | "small" | "large" | undefined>;
+    size: PropType<TableSize>;
 }, {
     handleUpdateModelValue: (modelValue: boolean) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
@@ -22,7 +23,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否是禁用状态 */
     disabled: BooleanConstructor;
     /** 尺寸 */
-    size: PropType<"" | "default" | "small" | "large" | undefined>;
+    size: PropType<TableSize>;
 }>> & {
     onChange?: ((_checked: boolean) => any) | undefined;
 }, {

package/lib/ele-virtual-table/components/cell-filter.d.ts

@@ -1,6 +1,6 @@
 import { PropType } from 'vue';
-import { FilterValue } from '../../ele-data-table/types';
-import { EleTooltipInstance } from '../../ele-app/plus';
+import { Column, FilterValue } from '../../ele-data-table/types';
+import { EleTooltipProps, EleTooltipInstance } from '../../ele-app/plus';
 
 declare const _default: import('vue').DefineComponent<{
     /** 选中项 */
@@ -8,10 +8,10 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否多选 */
     filterMultiple: BooleanConstructor;
     /** 数据项 */
-    filters: PropType<import('element-plus/es/components/table/src/table-column/defaults').Filters | undefined>;
+    filters: PropType<Column["filters"]>;
     /** 弹出框定位 */
     filterPlacement: {
-        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
+        type: PropType<EleTooltipProps["placement"]>;
         default: string;
     };
 }, {
@@ -35,10 +35,10 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否多选 */
     filterMultiple: BooleanConstructor;
     /** 数据项 */
-    filters: PropType<import('element-plus/es/components/table/src/table-column/defaults').Filters | undefined>;
+    filters: PropType<Column["filters"]>;
     /** 弹出框定位 */
     filterPlacement: {
-        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
+        type: PropType<EleTooltipProps["placement"]>;
         default: string;
     };
 }>> & {

package/lib/ele-virtual-table/components/footer-row.d.ts

@@ -1,5 +1,5 @@
 import { PropType } from 'vue';
-import { DataItem } from '../../ele-data-table/types';
+import { SummaryMethod } from '../../ele-data-table/types';
 import { BodyColumns, SumCol, ColSize, VirtualRow } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
@@ -25,7 +25,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 合计行文本 */
     sumText: StringConstructor;
     /** 合计行自定义方法 */
-    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
+    summaryMethod: PropType<SummaryMethod>;
 }, {
     sumCols: import('vue').ComputedRef<SumCol[]>;
     handleMouseenter: (e: MouseEvent) => void;
@@ -55,7 +55,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 合计行文本 */
     sumText: StringConstructor;
     /** 合计行自定义方法 */
-    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
+    summaryMethod: PropType<SummaryMethod>;
 }>> & {
     onMouseenter?: ((_e: MouseEvent) => any) | undefined;
 }, {}, {}>;

package/lib/ele-virtual-table/components/header-cell.d.ts

@@ -1,6 +1,6 @@
 import { PropType } from 'vue';
 import { StyleValues } from '../../ele-app/types';
-import { Column, FilterValue } from '../../ele-data-table/types';
+import { Column, FilterValue, TableSize, HeaderCellClass, HeaderCellStyle } from '../../ele-data-table/types';
 import { HeaderColumn, SortBy, CellFilterChangeParams, CustomRenderProps, ColSize } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
@@ -23,11 +23,11 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否禁用表头选择框 */
     disabledCheckbox: BooleanConstructor;
     /** 表格尺寸 */
-    tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
+    tableSize: PropType<TableSize>;
     /** 单元格类名自定义 */
-    headerCellClass: PropType<import('element-plus').CellCls<import('../../ele-data-table/types').DataItem> | undefined>;
+    headerCellClass: PropType<HeaderCellClass>;
     /** 单元格样式自定义 */
-    headerCellStyle: PropType<import('element-plus').CellStyle<import('../../ele-data-table/types').DataItem> | undefined>;
+    headerCellStyle: PropType<HeaderCellStyle>;
     /** 表头单元格是否溢出省略 */
     headerEllipsis: BooleanConstructor;
     /** 表格行高 */
@@ -74,11 +74,11 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否禁用表头选择框 */
     disabledCheckbox: BooleanConstructor;
     /** 表格尺寸 */
-    tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
+    tableSize: PropType<TableSize>;
     /** 单元格类名自定义 */
-    headerCellClass: PropType<import('element-plus').CellCls<import('../../ele-data-table/types').DataItem> | undefined>;
+    headerCellClass: PropType<HeaderCellClass>;
     /** 单元格样式自定义 */
-    headerCellStyle: PropType<import('element-plus').CellStyle<import('../../ele-data-table/types').DataItem> | undefined>;
+    headerCellStyle: PropType<HeaderCellStyle>;
     /** 表头单元格是否溢出省略 */
     headerEllipsis: BooleanConstructor;
     /** 表格行高 */

package/lib/ele-virtual-table/components/header-row.d.ts

@@ -1,5 +1,5 @@
 import { PropType } from 'vue';
-import { Column, Filter } from '../../ele-data-table/types';
+import { Column, Filter, TableSize, HeaderCellClass, HeaderCellStyle } from '../../ele-data-table/types';
 import { VirtualColumn, HeaderColumns, SortBy, CellFilterChangeParams, ColSize } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
@@ -20,11 +20,11 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否禁用表头选择框 */
     disabledCheckbox: BooleanConstructor;
     /** 表格尺寸 */
-    tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
+    tableSize: PropType<TableSize>;
     /** 表头单元格类名自定义 */
-    headerCellClass: PropType<import('element-plus').CellCls<import('../../ele-data-table/types').DataItem> | undefined>;
+    headerCellClass: PropType<HeaderCellClass>;
     /** 表头单元样式自定义 */
-    headerCellStyle: PropType<import('element-plus').CellStyle<import('../../ele-data-table/types').DataItem> | undefined>;
+    headerCellStyle: PropType<HeaderCellStyle>;
     /** 表头单元格是否溢出省略 */
     headerEllipsis: BooleanConstructor;
     /** 表格行高 */
@@ -66,11 +66,11 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否禁用表头选择框 */
     disabledCheckbox: BooleanConstructor;
     /** 表格尺寸 */
-    tableSize: PropType<"" | "default" | "small" | "large" | undefined>;
+    tableSize: PropType<TableSize>;
     /** 表头单元格类名自定义 */
-    headerCellClass: PropType<import('element-plus').CellCls<import('../../ele-data-table/types').DataItem> | undefined>;
+    headerCellClass: PropType<HeaderCellClass>;
     /** 表头单元样式自定义 */
-    headerCellStyle: PropType<import('element-plus').CellStyle<import('../../ele-data-table/types').DataItem> | undefined>;
+    headerCellStyle: PropType<HeaderCellStyle>;
     /** 表头单元格是否溢出省略 */
     headerEllipsis: BooleanConstructor;
     /** 表格行高 */

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

@@ -14,7 +14,7 @@ declare const _default: import('vue').DefineComponent<{
         default: null;
     };
     rowKey: {
-        type: import('vue').PropType<string | ((row: DataItem) => string) | undefined>;
+        type: import('vue').PropType<import('../ele-data-table/types').RowKey>;
         required: boolean;
     };
     columns: {
@@ -54,14 +54,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[];
@@ -82,13 +82,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;
@@ -109,7 +109,7 @@ declare const _default: import('vue').DefineComponent<{
     treeProps: {
         type: import('vue').PropType<{
             hasChildren?: string | undefined;
-            children?: string | undefined; /** 是否钉住左侧固定列 */
+            children?: string | undefined;
         } | undefined>;
         default: () => {
             hasChildren: string;
@@ -123,7 +123,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>;
 }, {
     ownSlots: string[];
     rootRef: Ref<HTMLElement | null>;
@@ -212,12 +212,11 @@ declare const _default: import('vue').DefineComponent<{
     headerContextmenu: (_column: Column, _e: MouseEvent) => boolean;
     sortChange: (_sorter: import('../ele-data-table/types').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<{
     rowHeight: NumberConstructor;
     stripe: {
@@ -229,7 +228,7 @@ declare const _default: import('vue').DefineComponent<{
         default: null;
     };
     rowKey: {
-        type: import('vue').PropType<string | ((row: DataItem) => string) | undefined>;
+        type: import('vue').PropType<import('../ele-data-table/types').RowKey>;
         required: boolean;
     };
     columns: {
@@ -269,14 +268,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[];
@@ -297,13 +296,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;
@@ -324,7 +323,7 @@ declare const _default: import('vue').DefineComponent<{
     treeProps: {
         type: import('vue').PropType<{
             hasChildren?: string | undefined;
-            children?: string | undefined; /** 是否钉住左侧固定列 */
+            children?: string | undefined;
         } | undefined>;
         default: () => {
             hasChildren: string;
@@ -338,7 +337,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;
@@ -375,7 +374,7 @@ declare const _default: import('vue').DefineComponent<{
     indent: number;
     treeProps: {
         hasChildren?: string | undefined;
-        children?: string | undefined; /** 是否钉住左侧固定列 */
+        children?: string | undefined;
     } | undefined;
     tableLayout: "auto" | "fixed";
     scrollbarAlwaysOn: boolean;

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

@@ -15,7 +15,7 @@ export declare const virtualTableProps: {
         default: null;
     };
     rowKey: {
-        type: import('vue').PropType<string | ((row: import('../ele-data-table/types').DataItem) => string) | undefined>;
+        type: import('vue').PropType<import('../ele-data-table/types').RowKey>;
         required: boolean;
     };
     columns: {
@@ -45,14 +45,14 @@ export declare const virtualTableProps: {
     reserveCurrent: BooleanConstructor;
     selectedRowKeys: import('vue').PropType<import('../ele-data-table/types').DataKey[]>;
     cacheData: import('vue').PropType<import('../ele-data-table/types').DataItem[]>;
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
     data: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
     };
     size: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -61,7 +61,7 @@ export declare const virtualTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
@@ -83,13 +83,13 @@ export declare const virtualTableProps: {
     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;
@@ -124,7 +124,7 @@ export declare const virtualTableProps: {
     };
     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>;
 };
 export type VirtualTableProps = ExtractPropTypes<typeof virtualTableProps>;
 /**
@@ -146,9 +146,9 @@ export declare const virtualTableEmits: {
     headerContextmenu: (_column: import('../ele-data-table/types').Column, _e: MouseEvent) => boolean;
     sortChange: (_sorter: import('../ele-data-table/types').Sorter) => boolean;
     filterChange: (_filter: import('../ele-data-table/types').Filter) => boolean;
-    currentChange: (_current?: import('../ele-data-table/types').DataItem | null | undefined, _old?: import('../ele-data-table/types').DataItem | null | undefined) => boolean;
+    currentChange: (_current?: import('../ele-data-table/types').DataItem | null, _old?: import('../ele-data-table/types').DataItem | null) => boolean;
     headerDragend: (_width: number, _old: number, _column: import('../ele-data-table/types').Column, _e: MouseEvent) => boolean;
     expandChange: (_row: import('../ele-data-table/types').DataItem, _expanded: boolean) => boolean;
-    'update:currentRowKey': (_currentRowKey?: import('../ele-data-table/types').DataKey | undefined) => boolean;
-    'update:selectedRowKeys': (_selectedRowKeys?: import('../ele-data-table/types').DataKey[] | undefined) => boolean;
+    'update:currentRowKey': (_currentRowKey?: import('../ele-data-table/types').DataKey) => boolean;
+    'update:selectedRowKeys': (_selectedRowKeys?: import('../ele-data-table/types').DataKey[]) => boolean;
 };

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

@@ -1,4 +1,5 @@
 import { Ref } from 'vue';
+import { StyleValue } from '../ele-app/types';
 
 declare const _default: import('vue').DefineComponent<{
     width: NumberConstructor;
@@ -14,12 +15,12 @@ declare const _default: import('vue').DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    customStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    customStyle: import('vue').PropType<Exclude<StyleValue, string>>;
     fixed: BooleanConstructor;
     wrapPosition: {
         type: BooleanConstructor;
         default: boolean;
-    }; /** 根节点 */
+    };
     disabled: BooleanConstructor;
 }, {
     rootKey: Ref<number>;
@@ -40,12 +41,12 @@ declare const _default: import('vue').DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    customStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    customStyle: import('vue').PropType<Exclude<StyleValue, string>>;
     fixed: BooleanConstructor;
     wrapPosition: {
         type: BooleanConstructor;
         default: boolean;
-    }; /** 根节点 */
+    };
     disabled: BooleanConstructor;
 }>>, {
     lineGap: number;

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

@@ -1,4 +1,5 @@
 import { PropType, ExtractPropTypes } from 'vue';
+import { StyleValue } from '../ele-app/types';
 import { WatermarkGap, WatermarkOffset, WatermarkFont } from './types';
 
 export declare const watermarkProps: {
@@ -26,7 +27,7 @@ export declare const watermarkProps: {
         default: number;
     };
     /** 自定义样式 */
-    customStyle: PropType<Partial<import('vue').CSSProperties>>;
+    customStyle: PropType<Exclude<StyleValue, string>>;
     /** 是否使用固定定位 */
     fixed: BooleanConstructor;
     /** 是否为外层添加定位样式 */