ele-admin-plus 1.1.7 → 1.1.8-beta.2

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

@@ -17,6 +17,14 @@ $ele-expand-path: 'M362 811 662 512 362 213' !default;
   z-index: 4;
 }
 
+/* 底部间距补丁 */
+.ele-data-table.el-table > .el-table__inner-wrapper > .el-table__body-wrapper {
+  & > .el-scrollbar > .el-scrollbar__wrap {
+    padding-bottom: eleVar('table', 'fix-height');
+    box-sizing: border-box;
+  }
+}
+
 .ele-data-table {
   /* 单元格背景 */
   & > .el-table__inner-wrapper {
@@ -269,27 +277,57 @@ $ele-expand-path: 'M362 811 662 512 362 213' !default;
     }
   }
 
+  /* 表尾 */
+  & > .el-table__inner-wrapper > .el-table__footer-wrapper {
+    border-top: 1px solid eleVar('table', 'border-color');
+    margin-top: -1px;
+    z-index: 3;
+
+    td.el-table__cell {
+      border-bottom-color: transparent;
+    }
+  }
+
   /* 边框线 */
-  &.el-table--border::after,
-  &.el-table--border::before {
-    top: 0;
-    bottom: 0;
-    width: 0;
-    border-left: 1px solid eleVar('table', 'border-color');
-    z-index: 5;
+  &.el-table--border,
+  &.el-table > .el-table__inner-wrapper {
+    &::before,
+    &::after {
+      background: none;
+      position: absolute;
+      box-sizing: border-box;
+      pointer-events: none;
+      z-index: 5;
+    }
   }
 
   &.el-table > .el-table__inner-wrapper::before,
-  &.el-table--border > .el-table__inner-wrapper::after {
+  &.el-table > .el-table__inner-wrapper::after {
+    left: 0;
     right: 0;
-    height: 0;
+    width: 100%;
+    height: calc(1px + #{eleVar('table', 'radius')});
+  }
+
+  &.el-table > .el-table__inner-wrapper::before {
+    content: '';
+    bottom: 0;
+    border-bottom: 1px solid eleVar('table', 'border-color');
+  }
+
+  &.el-table.el-table--border > .el-table__inner-wrapper::after,
+  &.el-table.hide-header > .el-table__inner-wrapper::after {
+    content: '';
+    top: 0;
     border-top: 1px solid eleVar('table', 'border-color');
-    z-index: 5;
   }
 
-  &.el-table:not(.has-footer) > .el-table__inner-wrapper::before {
-    bottom: eleVar('table', 'fix-height');
-    box-shadow: 0 0.8px 0 eleVar('table', 'tr-bg');
+  &.el-table--border > .el-table__inner-wrapper {
+    &::before,
+    &::after {
+      border-right: 1px solid transparent;
+      border-left: 1px solid transparent;
+    }
   }
 
   & > .el-table__inner-wrapper > .el-table__border-left-patch,
@@ -298,32 +336,51 @@ $ele-expand-path: 'M362 811 662 512 362 213' !default;
     display: none;
   }
 
-  & > .el-table__inner-wrapper > .el-table__footer-wrapper td.el-table__cell {
-    border-bottom-color: transparent;
+  /* 全边框 */
+  &.el-table--border {
+    &::before,
+    &::after {
+      content: '';
+      top: 0;
+      bottom: 0;
+      height: 100%;
+      width: calc(1px + #{eleVar('table', 'radius')});
+      border-bottom: 1px solid transparent;
+      border-top: 1px solid transparent;
+    }
+
+    &::before {
+      left: 0;
+      border-left: 1px solid eleVar('table', 'border-color');
+    }
+
+    &::after {
+      right: 0;
+      border-right: 1px solid eleVar('table', 'border-color');
+    }
   }
 
-  & > .el-table__inner-wrapper > .el-table__footer-wrapper {
-    margin-top: -1px;
+  /* 适配底部间距补丁 */
+  &.el-table:not(.has-footer) > .el-table__inner-wrapper::before {
+    bottom: eleVar('table', 'fix-height');
+    box-shadow: 0 0.8px 0 eleVar('table', 'tr-bg');
   }
 
-  &.el-table > .el-table__inner-wrapper > .el-table__body-wrapper {
-    & > .el-scrollbar > .el-scrollbar__wrap {
-      padding-bottom: eleVar('table', 'fix-height');
-      box-sizing: border-box;
-    }
+  &.el-table--border:not(.has-footer)::before,
+  &.el-table--border:not(.has-footer)::after {
+    bottom: eleVar('table', 'fix-height');
+    height: auto;
   }
 
   /* 圆角 */
-  &:not(.el-table--border) {
-    @include data-table-radius(eleVar('table', 'radius'));
+  @include data-table-radius(eleVar('table', 'radius'));
 
-    &.el-table--large {
-      @include data-table-radius(eleVar('table', 'lg-radius'));
-    }
+  &.el-table--large {
+    @include data-table-radius(eleVar('table', 'lg-radius'));
+  }
 
-    &.el-table--small {
-      @include data-table-radius(eleVar('table', 'sm-radius'));
-    }
+  &.el-table--small {
+    @include data-table-radius(eleVar('table', 'sm-radius'));
   }
 
   /* 内部组件 */

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

@@ -140,11 +140,11 @@ declare const _default: import("vue").DefineComponent<{
 }>> & {
     onOpen?: (() => any) | undefined;
     onClose?: (() => any) | undefined;
-    onOpenAutoFocus?: (() => any) | undefined;
-    onCloseAutoFocus?: (() => any) | undefined;
     "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
     onOpened?: (() => any) | undefined;
     onClosed?: (() => any) | undefined;
+    onOpenAutoFocus?: (() => any) | undefined;
+    onCloseAutoFocus?: (() => any) | undefined;
 }, {
     size: import("element-plus/es/utils/index").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
     center: boolean;

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

@@ -35,6 +35,9 @@ declare const _default: import("vue").DefineComponent<{
     popperOffset: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 6, boolean>;
     ellipsisIcon: import("element-plus/es/utils/index").EpPropFinalized<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown, () => any, boolean>;
     popperEffect: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, "light" | "dark", unknown, "dark", boolean>;
+    popperClass: StringConstructor;
+    showTimeout: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
+    hideTimeout: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
 }, {
     menuRef: import("vue").Ref<ElMenuInstance>;
     open: (index: string) => void;
@@ -78,12 +81,17 @@ declare const _default: import("vue").DefineComponent<{
     popperOffset: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 6, boolean>;
     ellipsisIcon: import("element-plus/es/utils/index").EpPropFinalized<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown, () => any, boolean>;
     popperEffect: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, "light" | "dark", unknown, "dark", boolean>;
+    popperClass: StringConstructor;
+    showTimeout: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
+    hideTimeout: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
 }>> & {
     onOpen?: ((index: string, indexPath: string[]) => any) | undefined;
     onClose?: ((index: string, indexPath: string[]) => any) | undefined;
     onSelect?: ((index: string, indexPath: string[], item: MenuItemClicked, routerResult?: Promise<void | NavigationFailure> | undefined) => any) | undefined;
     onItemClick?: ((_item: import("./types").MenuItem) => any) | undefined;
 }, {
+    showTimeout: number;
+    hideTimeout: number;
     mode: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "horizontal" | "vertical", unknown>;
     defaultActive: string;
     defaultOpeneds: string[];

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

@@ -46,6 +46,9 @@ export declare const menusProps: {
     popperOffset: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 6, boolean>;
     ellipsisIcon: import("element-plus/es/utils/index").EpPropFinalized<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown, () => any, boolean>;
     popperEffect: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, "light" | "dark", unknown, "dark", boolean>;
+    popperClass: StringConstructor;
+    showTimeout: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
+    hideTimeout: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
 };
 export type MenusProps = ExtractPropTypes<typeof menusProps>;
 export type MenuPropKeys = Array<keyof typeof menuProps>;

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

@@ -200,11 +200,11 @@ declare const _default: import("vue").DefineComponent<{
 }>> & {
     onOpen?: (() => any) | undefined;
     onClose?: (() => any) | undefined;
-    onOpenAutoFocus?: (() => any) | undefined;
-    onCloseAutoFocus?: (() => any) | undefined;
     "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
     onOpened?: (() => any) | undefined;
     onClosed?: (() => any) | undefined;
+    onOpenAutoFocus?: (() => any) | undefined;
+    onCloseAutoFocus?: (() => any) | undefined;
     "onUpdate:fullscreen"?: ((_fullscreen: boolean) => any) | undefined;
 }, {
     form: boolean;

package/es/ele-page/style/index.scss

@@ -15,32 +15,12 @@
   &.is-multi-card {
     padding-bottom: 0;
 
+    .ele-card,
     .el-card {
       margin-bottom: eleVar('page', 'padding');
     }
   }
 
-  /* 内部表格高度铺满 */
-  &.is-flex-table {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
-
-    & > .ele-pro-table {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      overflow: auto;
-
-      & > .ele-pro-table-view {
-        flex: 1;
-        height: 100%;
-        overflow: hidden;
-      }
-    }
-  }
-
   /* 关闭页脚 */
   &.is-hide-footer + .ele-footer {
     display: none;
@@ -52,6 +32,31 @@
   flex: auto;
 }
 
+.ele-page.is-hide-footer {
+  flex: none;
+}
+
+/* 内部表格高度铺满 */
+.ele-page.is-flex-table {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: auto;
+
+  & > .ele-pro-table {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+
+    & > .ele-pro-table-view {
+      flex: 1;
+      height: 100%;
+      overflow: hidden;
+    }
+  }
+}
+
 /* 内容定宽 */
 .ele-admin-limited .ele-page:not(.is-plain) {
   margin: 0 auto;

package/es/ele-pagination/style/index.scss

@@ -92,20 +92,29 @@
       width: 50px;
     }
 
-    .el-pagination__sizes .el-input {
-      width: 96px;
+    .el-pagination__sizes {
+      .el-input,
+      .el-select {
+        width: 96px;
 
-      .el-input__wrapper {
+        .el-select__caret {
+          margin-left: 0;
+        }
+      }
+
+      .el-input .el-input__wrapper,
+      .el-select .el-select__wrapper {
         padding-left: 1px;
         padding-right: 7px;
       }
 
-      .el-select__caret {
-        margin-left: 0;
+      .el-select__selected-item {
+        text-align: center;
       }
     }
 
-    .el-input__inner {
+    .el-input__inner,
+    .el-select__selected-item > span {
       font-size: eleVar('pagination', 'sm-font-size');
     }
 
@@ -161,19 +170,24 @@
         width: 44px;
       }
 
-      .el-pagination__sizes .el-input {
-        width: 88px;
+      .el-pagination__sizes {
+        .el-input,
+        .el-select {
+          width: 88px;
 
-        .el-input__wrapper {
-          padding-right: 6px;
+          .el-select__caret {
+            font-size: 12px;
+          }
         }
 
-        .el-select__caret {
-          font-size: 12px;
+        .el-input .el-input__wrapper,
+        .el-select .el-select__wrapper {
+          padding-right: 6px;
         }
       }
 
-      .el-input__inner {
+      .el-input__inner,
+      .el-select__selected-item > span {
         font-size: eleVar('pagination', 'sm-font-size');
       }
 

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

@@ -3,6 +3,10 @@ import type { EleLoadingProps, ElePaginationProps, EleDataTableProps } from '../
 import type { DataItem, Columns, Sorter, Filter, TableSize } from '../ele-data-table/types';
 import type { ReloadFunction, DoneParams, FetchCallback, TableViewInstance } from './types';
 declare const _default: import("vue").DefineComponent<{
+    rowKey: {
+        type: import("vue").PropType<string | ((row: DataItem) => string) | undefined>;
+        required: boolean;
+    };
     loading: BooleanConstructor;
     datasource: {
         type: import("vue").PropType<import("./types").Datasource>;
@@ -68,7 +72,6 @@ declare const _default: import("vue").DefineComponent<{
     };
     width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
-    rowKey: import("vue").PropType<string | ((row: any) => string) | undefined>;
     columns: {
         type: import("vue").PropType<Columns>;
         required: boolean;
@@ -78,7 +81,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     emptyText: StringConstructor;
     indent: {
         type: NumberConstructor;
@@ -113,7 +116,7 @@ declare const _default: import("vue").DefineComponent<{
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     spanMethod: import("vue").PropType<((data: {
         row: any;
         rowIndex: number;
@@ -223,16 +226,21 @@ declare const _default: import("vue").DefineComponent<{
     rowClick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
     rowContextmenu: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    headerClick: (_column: import("./types").Column, _e: MouseEvent) => boolean; /** 当前页数据 */
-    headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean; /** 当前页码 */
+    headerClick: (_column: import("./types").Column, _e: MouseEvent) => boolean;
+    headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean;
     sortChange: (_sorter: Sorter) => boolean;
-    filterChange: (_filter: Filter) => boolean;
+    filterChange: (_filter: Filter) => boolean; /** 每页显示数量 */
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
     headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => boolean;
+    /** 数据请求状态 */
     expandChange: (_row: 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;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    rowKey: {
+        type: import("vue").PropType<string | ((row: DataItem) => string) | undefined>;
+        required: boolean;
+    };
     loading: BooleanConstructor;
     datasource: {
         type: import("vue").PropType<import("./types").Datasource>;
@@ -298,7 +306,6 @@ declare const _default: import("vue").DefineComponent<{
     };
     width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
-    rowKey: import("vue").PropType<string | ((row: any) => string) | undefined>;
     columns: {
         type: import("vue").PropType<Columns>;
         required: boolean;
@@ -308,7 +315,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     emptyText: StringConstructor;
     indent: {
         type: NumberConstructor;
@@ -343,7 +350,7 @@ declare const _default: import("vue").DefineComponent<{
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     spanMethod: import("vue").PropType<((data: {
         row: any;
         rowIndex: number;

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

@@ -9,7 +9,7 @@ import EleDataTable from "../ele-data-table/index";
 import EleVirtualTable from "../ele-virtual-table/index";
 import EleToolbar from "../ele-toolbar/index";
 import TableTools from "./components/table-tools";
-import { getDefaultFilter, getTablePage, getTableLimit, getTableSize, getPaginationProps, mergeProps, getInitCacheColumns, reloadData, getRequestOrders, getRequestFilters, getResponseResult, getResponseName, isAutoAmend, sortData } from "./util";
+import { getDefaultFilter, getTablePage, getTableLimit, getTableSize, getPaginationProps, mergeProps, getRowKey, getInitCacheColumns, reloadData, addDefaultRowKey, getDefaultRowKey, getRequestOrders, getRequestFilters, getResponseResult, getResponseName, isAutoAmend, sortData } from "./util";
 import { proTableProps, proTableEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "EleProTable",
@@ -90,6 +90,7 @@ const _sfc_main = defineComponent({
         pageIndex: tableIndex.value,
         emptyProps: tableEmptyProps.value,
         rowHeight: props.virtual ? props.rowHeight : void 0,
+        rowKey: getRowKey(props.rowKey),
         style: props.tableStyle,
         class: "ele-pro-table-view",
         ...events,
@@ -111,7 +112,11 @@ const _sfc_main = defineComponent({
       const option = {
         ...props.loadingProps || {},
         loading: tableLoading.value,
-        class: ["ele-pro-table", { "is-maximized": tableMaximized.value }],
+        class: [
+          "ele-pro-table",
+          { "is-maximized": tableMaximized.value },
+          { "is-border": tableProps.value.border }
+        ],
         style: tableMaximized.value ? { zIndex } : void 0
       };
       return option;
@@ -148,7 +153,11 @@ const _sfc_main = defineComponent({
           tableLimit.value
         );
         cacheData.value = props.datasource;
-        tableData.value = data;
+        tableData.value = addDefaultRowKey(
+          data,
+          getDefaultRowKey(props.rowKey),
+          tablePage.value
+        );
         tablePage.value = page;
         tableTotal.value = total;
         onDone({ data, page, total, response: props.datasource });
@@ -216,7 +225,11 @@ const _sfc_main = defineComponent({
             return;
           }
         }
-        tableData.value = data;
+        tableData.value = addDefaultRowKey(
+          data,
+          getDefaultRowKey(props.rowKey),
+          tablePage.value
+        );
         tableTotal.value = total || data.length;
       }
       tableLoading.value = false;
@@ -307,14 +320,19 @@ const _sfc_main = defineComponent({
       return tableData.value;
     };
     const setData = (data) => {
-      tableData.value = data;
+      tableData.value = addDefaultRowKey(
+        data,
+        getDefaultRowKey(props.rowKey),
+        tablePage.value
+      );
     };
     const goPageByRowKey = (key) => {
-      if (!props.rowKey || !paginationProps.value || tableLimit.value == null || isFunctionSource.value) {
+      if (!paginationProps.value || tableLimit.value == null || isFunctionSource.value) {
         return;
       }
+      const rowKey = getRowKey(props.rowKey);
       const data = sortData(props.datasource, tableState.sorter);
-      const index2 = data.findIndex((d) => getValue(d, props.rowKey) === key);
+      const index2 = data.findIndex((d) => getValue(d, rowKey) === key);
       const page = Math.floor(index2 / tableLimit.value) + 1;
       if (tablePage.value !== page) {
         reload({ page });
@@ -377,13 +395,15 @@ const _sfc_main = defineComponent({
     watch(
       () => props.current,
       (current) => {
-        methods.setCurrentRowKey(getValue(current, props.rowKey));
+        methods.setCurrentRowKey(getValue(current, getRowKey(props.rowKey)));
       }
     );
     watch(
       () => props.selections,
       (selections) => {
-        methods.setSelectedRowKeys(getRowKeys(selections, props.rowKey));
+        methods.setSelectedRowKeys(
+          getRowKeys(selections, getRowKey(props.rowKey))
+        );
       }
     );
     watch(

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

@@ -6,6 +6,10 @@ import type { Where, Datasource, RequestOption, ResponseOption, ParseData, DoneP
  * 属性
  */
 export declare const proTableProps: {
+    rowKey: {
+        type: PropType<string | ((row: DataItem) => string) | undefined>;
+        required: boolean;
+    };
     /** 数据请求状态 */
     loading: BooleanConstructor;
     /** 数据源 */
@@ -95,7 +99,6 @@ export declare const proTableProps: {
     };
     width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
-    rowKey: PropType<string | ((row: any) => string) | undefined>;
     columns: {
         type: PropType<Columns>;
         required: boolean;
@@ -105,7 +108,7 @@ export declare const proTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    showOverflowTooltip: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     emptyText: StringConstructor;
     indent: {
         type: NumberConstructor;
@@ -140,7 +143,7 @@ export declare const proTableProps: {
     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, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     spanMethod: PropType<((data: {
         row: any;
         rowIndex: number;
@@ -176,7 +179,7 @@ export declare const proTableProps: {
     };
     slotNormalize: {
         type: BooleanConstructor;
-        default: boolean;
+        default: boolean; /** 自定义请求参数名称 */
     };
     sticky: BooleanConstructor;
     bottomLine: {
@@ -226,8 +229,8 @@ export declare const proTableEmits: {
     sortChange: (_sorter: import("./types").Sorter) => boolean;
     filterChange: (_filter: import("./types").Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
-    headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    expandChange: (_row: DataItem, _expanded: boolean) => boolean; /** 数组数据源时刷新按钮点击事件 */
+    headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => boolean; /** 表格最大化切换事件 */
+    expandChange: (_row: 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;
 };

package/es/ele-pro-table/props.js

@@ -2,6 +2,10 @@ import { omit } from "../utils/core";
 import { dataTableProps, dataTableEmits } from "../ele-data-table/props";
 const proTableProps = {
   ...omit(dataTableProps, ["data", "pageIndex", "errorText", "cacheData"]),
+  rowKey: {
+    type: [String, Function],
+    required: false
+  },
   /** 数据请求状态 */
   loading: Boolean,
   /** 数据源 */