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

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;
     /** 表格行高 */
@@ -32,11 +32,11 @@ declare const _default: import('vue').DefineComponent<{
 }, {
     getKey: (column: VirtualColumn, columnIndex: number) => string;
     getFiltered: (column: VirtualColumn) => import('../../ele-data-table/types').FilterValue;
-    onCellCheckedChange: (checked: boolean) => void;
-    onCellFilterChange: (params: CellFilterChangeParams) => void;
-    onCellClick: (col: Column, e: MouseEvent) => void;
-    onCellContextmenu: (col: Column, e: MouseEvent) => void;
-    onCellMouseenter: (col: Column, e: MouseEvent) => void;
+    handleCellCheckedChange: (checked: boolean) => void;
+    handleCellFilterChange: (params: CellFilterChangeParams) => void;
+    handleCellClick: (col: Column, e: MouseEvent) => void;
+    handleCellContextmenu: (col: Column, e: MouseEvent) => void;
+    handleCellMouseenter: (col: Column, e: MouseEvent) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     /** 多选框选中改变事件 */
     checkedChange: (_checked: boolean) => true;
@@ -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.cjs

@@ -10,6 +10,7 @@ const BodyRow = require("./components/body-row");
 const ExpandRow = require("./components/expand-row");
 const FooterRow = require("./components/footer-row");
 const props = require("./props");
+const ownSlots = ["default", "empty", "append"];
 const _sfc_main = vue.defineComponent({
   name: "EleVirtualTable",
   components: {
@@ -266,20 +267,20 @@ const _sfc_main = vue.defineComponent({
       tableTooltipProps.visible = false;
       tableTooltipProps.disabled = true;
     };
-    const onTableFilterChange = (params) => {
+    const handleTableFilterChange = (params) => {
       const key = util$1.getColKey(params.column);
       if (key) {
         filtered[key] = params.value;
         events.onFilterChange(filtered);
       }
     };
-    const onCellCheckedChange = (row, checked) => {
+    const handleCellCheckedChange = (row, checked) => {
       toggleSelected(row.rowData, row.rowId, checked);
       const selection = getSelectionRows();
       events.onSelect(selection, row.rowData);
       events.onSelectionChange(selection);
     };
-    const onCellExpandChange = (row, expanded, children) => {
+    const handleCellExpandChange = (row, expanded, children) => {
       if (expanded && children != null) {
         const childs = util$1.transformTableData(
           children,
@@ -306,7 +307,7 @@ const _sfc_main = vue.defineComponent({
       }
       toggleRowExpansion(row, expanded);
     };
-    const onCellClick = (row, col, e) => {
+    const handleCellClick = (row, col, e) => {
       const cell = e.currentTarget;
       const rowData = row.rowData;
       const rowDataKey = row.rowId;
@@ -331,26 +332,26 @@ const _sfc_main = vue.defineComponent({
       }
       events.onRowClick(rowData, col, e);
     };
-    const onCellDblclick = (row, col, e) => {
+    const handleCellDblclick = (row, col, e) => {
       const cell = e.currentTarget;
       events.onCellDblclick(row.rowData, col, cell, e);
       events.onRowDblclick(row.rowData, col, e);
     };
-    const onCellContextmenu = (row, col, e) => {
+    const handleCellContextmenu = (row, col, e) => {
       const cell = e.currentTarget;
       events.onCellContextmenu(row.rowData, col, cell, e);
       events.onRowContextmenu(row.rowData, col, e);
     };
-    const onCellMouseenter = (row, col, e) => {
+    const handleCellMouseenter = (row, col, e) => {
       const cell = e.currentTarget;
       triggerTooltip(cell, col);
       events.onCellMouseEnter(row.rowData, col, cell, e);
     };
-    const onCellMouseleave = (row, col, e) => {
+    const handleCellMouseleave = (row, col, e) => {
       const cell = e.currentTarget;
       events.onCellMouseLeave(row.rowData, col, cell, e);
     };
-    const onHeaderCellClick = (col, e) => {
+    const handleHeaderCellClick = (col, e) => {
       if (col && (col.sortable === true || col.sortable === "custom")) {
         sortBy.value = util$1.getSortBy(sortBy.value, col);
         events.onSortChange({
@@ -361,22 +362,22 @@ const _sfc_main = vue.defineComponent({
       }
       events.onHeaderClick(col, e);
     };
-    const onHeaderCellContextmenu = (col, e) => {
+    const handleHeaderCellContextmenu = (col, e) => {
       events.onHeaderContextmenu(col, e);
     };
-    const onHeaderCellMouseenter = () => {
+    const handleHeaderCellMouseenter = () => {
       hideTooltip();
     };
-    const onFooterCellMouseenter = (e) => {
+    const handleFooterCellMouseenter = (e) => {
       triggerTooltip(e.currentTarget, { showOverflowTooltip: true });
     };
-    const onExpandCellMouseenter = () => {
+    const handleExpandCellMouseenter = () => {
       hideTooltip();
     };
-    const onTableMouseleave = () => {
+    const handleTableMouseleave = () => {
       hideTooltip();
     };
-    const onTableScroll = (option) => {
+    const handleTableScroll = (option) => {
       tableState.scrollTop = option.scrollTop;
       const scrollLeft = option.scrollLeft;
       if (tableScrollLeft.value !== scrollLeft) {
@@ -897,6 +898,7 @@ const _sfc_main = vue.defineComponent({
       }
     );
     return {
+      ownSlots,
       rootRef,
       tableRef,
       tableKey,
@@ -929,21 +931,21 @@ const _sfc_main = vue.defineComponent({
       tableEmptyProps,
       isLayoutFixedHead,
       isLayoutMaximized,
-      onTableFilterChange,
-      onCellCheckedChange,
-      onCellExpandChange,
-      onCellClick,
-      onCellDblclick,
-      onCellContextmenu,
-      onCellMouseenter,
-      onCellMouseleave,
-      onHeaderCellClick,
-      onHeaderCellContextmenu,
-      onHeaderCellMouseenter,
-      onFooterCellMouseenter,
-      onExpandCellMouseenter,
-      onTableMouseleave,
-      onTableScroll,
+      handleTableFilterChange,
+      handleCellCheckedChange,
+      handleCellExpandChange,
+      handleCellClick,
+      handleCellDblclick,
+      handleCellContextmenu,
+      handleCellMouseenter,
+      handleCellMouseleave,
+      handleHeaderCellClick,
+      handleHeaderCellContextmenu,
+      handleHeaderCellMouseenter,
+      handleFooterCellMouseenter,
+      handleExpandCellMouseenter,
+      handleTableMouseleave,
+      handleTableScroll,
       updateWrapSize,
       updateTableData,
       updateSelectedAndChecked,
@@ -1007,12 +1009,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       { "is-small": _ctx.size === "small" },
       { "is-large": _ctx.size === "large" }
     ]),
-    onMouseleave: _cache[1] || (_cache[1] = (...args) => _ctx.onTableMouseleave && _ctx.onTableMouseleave(...args))
+    onMouseleave: _cache[1] || (_cache[1] = (...args) => _ctx.handleTableMouseleave && _ctx.handleTableMouseleave(...args))
   }, [
     _ctx.tableProps.width ? (vue.openBlock(), vue.createBlock(_component_ElTableV2, vue.mergeProps({ key: 0 }, _ctx.tableProps, {
       key: _ctx.tableKey,
       ref: "tableRef",
-      onScroll: _ctx.onTableScroll
+      onScroll: _ctx.handleTableScroll
     }), vue.createSlots({
       header: vue.withCtx((headerProps) => [
         headerProps && _ctx.headerRows[headerProps.headerIndex] ? (vue.openBlock(), vue.createBlock(_component_HeaderRow, {
@@ -1031,13 +1033,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           headerEllipsis: true,
           rowHeight: _ctx.tableRowHeight,
           onCheckedChange: _cache[0] || (_cache[0] = ($event) => _ctx.toggleAllSelection()),
-          onFilterChange: _ctx.onTableFilterChange,
-          onCellClick: _ctx.onHeaderCellClick,
-          onCellContextmenu: _ctx.onHeaderCellContextmenu,
-          onCellMouseenter: _ctx.onHeaderCellMouseenter
+          onFilterChange: _ctx.handleTableFilterChange,
+          onCellClick: _ctx.handleHeaderCellClick,
+          onCellContextmenu: _ctx.handleHeaderCellContextmenu,
+          onCellMouseenter: _ctx.handleHeaderCellMouseenter
         }, vue.createSlots({ _: 2 }, [
           vue.renderList(Object.keys(_ctx.$slots).filter(
-            (k) => !["default", "empty", "append"].includes(k)
+            (k) => !_ctx.ownSlots.includes(k)
           ), (name) => {
             return {
               name,
@@ -1056,10 +1058,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             column: (_a = _ctx.tableExpandCol) == null ? void 0 : _a.originalCol,
             rowIndex: rowProps.rowData.rowIndex,
             rowData: rowProps.rowData.rowData,
-            onMouseenter: _ctx.onExpandCellMouseenter
+            onMouseenter: _ctx.handleExpandCellMouseenter
           }, vue.createSlots({ _: 2 }, [
             vue.renderList(Object.keys(_ctx.$slots).filter(
-              (k) => !["default", "empty", "append"].includes(k)
+              (k) => !_ctx.ownSlots.includes(k)
             ), (name) => {
               return {
                 name,
@@ -1091,16 +1093,16 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             indent: _ctx.indent,
             fixedCellHeight: _ctx.hasExpandCol,
             autoRowHeight: _ctx.autoRowHeight,
-            onCellCheckedChange: _ctx.onCellCheckedChange,
-            onCellExpandChange: _ctx.onCellExpandChange,
-            onCellClick: _ctx.onCellClick,
-            onCellDblclick: _ctx.onCellDblclick,
-            onCellContextmenu: _ctx.onCellContextmenu,
-            onCellMouseenter: _ctx.onCellMouseenter,
-            onCellMouseleave: _ctx.onCellMouseleave
+            onCellCheckedChange: _ctx.handleCellCheckedChange,
+            onCellExpandChange: _ctx.handleCellExpandChange,
+            onCellClick: _ctx.handleCellClick,
+            onCellDblclick: _ctx.handleCellDblclick,
+            onCellContextmenu: _ctx.handleCellContextmenu,
+            onCellMouseenter: _ctx.handleCellMouseenter,
+            onCellMouseleave: _ctx.handleCellMouseleave
           }, vue.createSlots({ _: 2 }, [
             vue.renderList(Object.keys(_ctx.$slots).filter(
-              (k) => !["default", "empty", "append"].includes(k)
+              (k) => !_ctx.ownSlots.includes(k)
             ), (name) => {
               return {
                 name,
@@ -1133,7 +1135,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             rowHeight: _ctx.tableRowHeight,
             sumText: _ctx.tableSumText,
             summaryMethod: _ctx.summaryMethod,
-            onMouseenter: _ctx.onFooterCellMouseenter
+            onMouseenter: _ctx.handleFooterCellMouseenter
           }, null, 8, ["bodyCols", "colSizes", "sumWidth", "tableData", "rowHeight", "sumText", "summaryMethod", "onMouseenter"])
         ]),
         key: "0"

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: {
@@ -52,16 +52,16 @@ declare const _default: import('vue').DefineComponent<{
     };
     fit: {
         type: BooleanConstructor;
-        default: boolean; /** 表格是否有展开列 */
+        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;
@@ -123,8 +123,9 @@ 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>;
     tableRef: Ref<ElTableV2Instance>;
     tableKey: Ref<number>;
@@ -157,21 +158,21 @@ declare const _default: import('vue').DefineComponent<{
     tableEmptyProps: import('vue').ComputedRef<import('../ele-app/el').ElEmptyProps>;
     isLayoutFixedHead: import('vue').ComputedRef<boolean | undefined>;
     isLayoutMaximized: import('vue').ComputedRef<boolean | undefined>;
-    onTableFilterChange: (params: CellFilterChangeParams) => void;
-    onCellCheckedChange: (row: VirtualRow, checked: boolean) => void;
-    onCellExpandChange: (row: VirtualRow, expanded: boolean, children?: DataItem[]) => void;
-    onCellClick: (row: VirtualRow, col: Column, e: MouseEvent) => void;
-    onCellDblclick: (row: VirtualRow, col: Column, e: MouseEvent) => void;
-    onCellContextmenu: (row: VirtualRow, col: Column, e: MouseEvent) => void;
-    onCellMouseenter: (row: VirtualRow, col: Column, e: MouseEvent) => void;
-    onCellMouseleave: (row: VirtualRow, col: Column, e: MouseEvent) => void;
-    onHeaderCellClick: (col: Column | undefined, e: MouseEvent) => void;
-    onHeaderCellContextmenu: (col: Column, e: MouseEvent) => void;
-    onHeaderCellMouseenter: () => void;
-    onFooterCellMouseenter: (e: MouseEvent) => void;
-    onExpandCellMouseenter: () => void;
-    onTableMouseleave: () => void;
-    onTableScroll: (option: ScrollPos) => void;
+    handleTableFilterChange: (params: CellFilterChangeParams) => void;
+    handleCellCheckedChange: (row: VirtualRow, checked: boolean) => void;
+    handleCellExpandChange: (row: VirtualRow, expanded: boolean, children?: DataItem[]) => void;
+    handleCellClick: (row: VirtualRow, col: Column, e: MouseEvent) => void;
+    handleCellDblclick: (row: VirtualRow, col: Column, e: MouseEvent) => void;
+    handleCellContextmenu: (row: VirtualRow, col: Column, e: MouseEvent) => void;
+    handleCellMouseenter: (row: VirtualRow, col: Column, e: MouseEvent) => void;
+    handleCellMouseleave: (row: VirtualRow, col: Column, e: MouseEvent) => void;
+    handleHeaderCellClick: (col: Column | undefined, e: MouseEvent) => void;
+    handleHeaderCellContextmenu: (col: Column, e: MouseEvent) => void;
+    handleHeaderCellMouseenter: () => void;
+    handleFooterCellMouseenter: (e: MouseEvent) => void;
+    handleExpandCellMouseenter: () => void;
+    handleTableMouseleave: () => void;
+    handleTableScroll: (option: ScrollPos) => void;
     updateWrapSize: () => void;
     updateTableData: () => void;
     updateSelectedAndChecked: () => void;
@@ -208,14 +209,14 @@ declare const _default: import('vue').DefineComponent<{
     rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     headerClick: (_column: Column, _e: MouseEvent) => boolean;
-    headerContextmenu: (_column: Column, _e: MouseEvent) => boolean; /** 表格组件 */
+    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: {
@@ -227,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: {
@@ -265,16 +266,16 @@ declare const _default: import('vue').DefineComponent<{
     };
     fit: {
         type: BooleanConstructor;
-        default: boolean; /** 表格是否有展开列 */
+        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[];
@@ -295,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;
@@ -336,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;

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-virtual-table/util.cjs

@@ -102,9 +102,9 @@ function analyseColumns(columns) {
     return { cols, rows };
   }
   const sortedCols = [...columns];
-  sortedCols.sort((a, b) => {
-    return util.getColFixedNumber(a.fixed) - util.getColFixedNumber(b.fixed);
-  });
+  sortedCols.sort(
+    (a, b) => util.getColFixedNumber(a.fixed) - util.getColFixedNumber(b.fixed)
+  );
   generateRowCols(sortedCols, cols, rows, 0);
   computeFixedCols(cols);
   rows.forEach((row, i) => {

package/lib/ele-watermark/index.cjs

@@ -48,6 +48,7 @@ const _sfc_main = vue.defineComponent({
         maxHeight: "none !important",
         zoom: "1 !important",
         mask: "none !important",
+        clipPath: "none !important",
         display: "block !important",
         ...props2.customStyle || {}
       };

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;
     /** 是否为外层添加定位样式 */

package/lib/ele-xg-player/index.d.ts

@@ -1,9 +1,9 @@
 import { PropType } from 'vue';
-import { default as Player } from 'xgplayer';
+import { default as Player, IPlayerOptions } from 'xgplayer';
 
 declare const _default: import('vue').DefineComponent<{
     config: {
-        type: PropType<import('xgplayer/es/defaultConfig').IPlayerOptions>;
+        type: PropType<IPlayerOptions>;
         required: true;
     };
 }, {
@@ -13,7 +13,7 @@ declare const _default: import('vue').DefineComponent<{
     player: (_player: Player | null) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     config: {
-        type: PropType<import('xgplayer/es/defaultConfig').IPlayerOptions>;
+        type: PropType<IPlayerOptions>;
         required: true;
     };
 }>> & {