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

package/lib/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/lib/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/lib/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/lib/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/lib/ele-pro-table/index.cjs

@@ -91,6 +91,7 @@ const _sfc_main = vue.defineComponent({
         pageIndex: tableIndex.value,
         emptyProps: tableEmptyProps.value,
         rowHeight: props2.virtual ? props2.rowHeight : void 0,
+        rowKey: util$1.getRowKey(props2.rowKey),
         style: props2.tableStyle,
         class: "ele-pro-table-view",
         ...events,
@@ -112,7 +113,11 @@ const _sfc_main = vue.defineComponent({
       const option = {
         ...props2.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;
@@ -149,7 +154,11 @@ const _sfc_main = vue.defineComponent({
           tableLimit.value
         );
         cacheData.value = props2.datasource;
-        tableData.value = data;
+        tableData.value = util$1.addDefaultRowKey(
+          data,
+          util$1.getDefaultRowKey(props2.rowKey),
+          tablePage.value
+        );
         tablePage.value = page;
         tableTotal.value = total;
         onDone({ data, page, total, response: props2.datasource });
@@ -217,7 +226,11 @@ const _sfc_main = vue.defineComponent({
             return;
           }
         }
-        tableData.value = data;
+        tableData.value = util$1.addDefaultRowKey(
+          data,
+          util$1.getDefaultRowKey(props2.rowKey),
+          tablePage.value
+        );
         tableTotal.value = total || data.length;
       }
       tableLoading.value = false;
@@ -308,14 +321,19 @@ const _sfc_main = vue.defineComponent({
       return tableData.value;
     };
     const setData = (data) => {
-      tableData.value = data;
+      tableData.value = util$1.addDefaultRowKey(
+        data,
+        util$1.getDefaultRowKey(props2.rowKey),
+        tablePage.value
+      );
     };
     const goPageByRowKey = (key) => {
-      if (!props2.rowKey || !paginationProps.value || tableLimit.value == null || isFunctionSource.value) {
+      if (!paginationProps.value || tableLimit.value == null || isFunctionSource.value) {
         return;
       }
+      const rowKey = util$1.getRowKey(props2.rowKey);
       const data = util$1.sortData(props2.datasource, tableState.sorter);
-      const index2 = data.findIndex((d) => util.getValue(d, props2.rowKey) === key);
+      const index2 = data.findIndex((d) => util.getValue(d, rowKey) === key);
       const page = Math.floor(index2 / tableLimit.value) + 1;
       if (tablePage.value !== page) {
         reload({ page });
@@ -378,13 +396,15 @@ const _sfc_main = vue.defineComponent({
     vue.watch(
       () => props2.current,
       (current) => {
-        methods.setCurrentRowKey(util.getValue(current, props2.rowKey));
+        methods.setCurrentRowKey(util.getValue(current, util$1.getRowKey(props2.rowKey)));
       }
     );
     vue.watch(
       () => props2.selections,
       (selections) => {
-        methods.setSelectedRowKeys(util.getRowKeys(selections, props2.rowKey));
+        methods.setSelectedRowKeys(
+          util.getRowKeys(selections, util$1.getRowKey(props2.rowKey))
+        );
       }
     );
     vue.watch(

package/lib/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/lib/ele-pro-table/props.cjs

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

package/lib/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/lib/ele-pro-table/style/index.scss

@@ -4,18 +4,71 @@
 
 @include set-pro-table-var($ele);
 
-.ele-pro-table {
-  /* 工具栏 */
-  & > .ele-toolbar {
-    border-bottom: none;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
+/* 工具栏 */
+.ele-pro-table > .ele-toolbar {
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+
+  & + .ele-toolbar {
+    border-top: none;
+  }
+}
+
+.ele-pro-table:not(.is-border) > .ele-toolbar {
+  border-top: none;
+  border-left: none;
+  border-right: none;
+}
+
+.ele-pro-table.is-border > .ele-toolbar {
+  border-bottom: none;
+}
+
+/* 取消表格上边圆角 */
+.ele-pro-table > .ele-toolbar.is-default {
+  & + .ele-data-table > .el-table__inner-wrapper > .el-table__header-wrapper,
+  & + .ele-data-table.el-table--border > .el-table__inner-wrapper::after,
+  &
+    + .ele-data-table.el-table--border.hide-header
+    > .el-table__inner-wrapper
+    > .el-table__body-wrapper,
+  &
+    + .ele-virtual-table
+    > .el-table-v2
+    > .el-table-v2__main
+    > .el-table-v2__header-wrapper,
+  & + .ele-virtual-table.is-border > .el-table-v2::after,
+  &
+    + .ele-virtual-table.is-border.hide-header
+    > .el-table-v2
+    > .el-table-v2__main
+    > .el-table-v2__body
+    > div:not(.el-virtual-scrollbar) {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+  }
+
+  & + .ele-data-table.el-table--border::before,
+  & + .ele-virtual-table.is-border::before {
+    border-top-left-radius: 0;
   }
 
-  /* 加载图标 */
-  & > .ele-loading-spinner {
-    background: transparent;
+  & + .ele-data-table.el-table--border::after,
+  & + .ele-virtual-table.is-border::after {
+    border-top-right-radius: 0;
   }
+
+  &
+    + .ele-data-table.hide-header:not(.el-table--border)
+    > .el-table__inner-wrapper::after,
+  & + .ele-virtual-table.hide-header:not(.is-border) > .el-table-v2::after {
+    display: none;
+  }
+}
+
+/* 加载图标 */
+.ele-pro-table > .ele-loading-spinner {
+  background: transparent;
 }
 
 /* 底栏 */

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

@@ -361,12 +361,30 @@ function getCacheSize(cacheKey) {
     }
   }
 }
+function getDefaultRowKey(rowKey) {
+  return rowKey ? void 0 : "_rowKey";
+}
+function getRowKey(rowKey) {
+  return rowKey ?? getDefaultRowKey();
+}
+function addDefaultRowKey(data, rowKey, page) {
+  if (rowKey == null) {
+    return data;
+  }
+  return data.map((d, i) => {
+    const item = { ...d };
+    item[rowKey] = `${page}-${i}`;
+    return item;
+  });
+}
+exports.addDefaultRowKey = addDefaultRowKey;
 exports.getCacheCols = getCacheCols;
 exports.getCacheSize = getCacheSize;
 exports.getCheckedColumns = getCheckedColumns;
 exports.getColId = getColId;
 exports.getColsCacheKey = getColsCacheKey;
 exports.getDefaultFilter = getDefaultFilter;
+exports.getDefaultRowKey = getDefaultRowKey;
 exports.getInitCacheColumns = getInitCacheColumns;
 exports.getInitColumns = getInitColumns;
 exports.getOrderItems = getOrderItems;
@@ -377,6 +395,7 @@ exports.getRequestOrders = getRequestOrders;
 exports.getResponseData = getResponseData;
 exports.getResponseName = getResponseName;
 exports.getResponseResult = getResponseResult;
+exports.getRowKey = getRowKey;
 exports.getSettingCols = getSettingCols;
 exports.getSizeCacheKey = getSizeCacheKey;
 exports.getTableLimit = getTableLimit;

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

@@ -1,5 +1,5 @@
 import type { ElePaginationProps } from '../ele-app/plus';
-import type { DataItem, Column, Columns, Sorter, Filter, TableSize, TreeProps } from '../ele-data-table/types';
+import type { DataItem, Column, Columns, Sorter, Filter, TableSize, TreeProps, RowKey } from '../ele-data-table/types';
 import type { Orders, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, ColItem, ProProps } from './types';
 /**
  * 合并复合属性
@@ -153,3 +153,20 @@ export declare function getSizeCacheKey(cacheKey: string): string;
  * @param cacheKey 缓存的名称
  */
 export declare function getCacheSize(cacheKey?: string): TableSize;
+/**
+ * 获取默认 rowKey
+ * @param rowKey 自定义 rowKey
+ */
+export declare function getDefaultRowKey(rowKey?: RowKey): "_rowKey" | undefined;
+/**
+ * 获取 rowKey
+ * @param rowKey 自定义 rowKey
+ */
+export declare function getRowKey(rowKey?: RowKey): string | ((row: DataItem) => string) | undefined;
+/**
+ * 数据添加默认的 rowKey 字段
+ * @param data 数据
+ * @param rowKey 字段名
+ * @param page 页码
+ */
+export declare function addDefaultRowKey(data: DataItem[], rowKey: string | undefined, page: number): DataItem[];

package/lib/ele-segmented/index.cjs

@@ -49,9 +49,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     "onUpdate:modelValue": _ctx.onUpdateModelValue
   }, {
     default: vue.withCtx(() => [
-      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.items, (item) => {
+      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.items, (item, index2) => {
         return vue.openBlock(), vue.createBlock(_component_ElTabPane, {
-          key: item.value,
+          key: index2 + "-" + item.value + "-" + item.label,
           name: item.value,
           disabled: _ctx.disabled || item.disabled
         }, {

package/lib/ele-table/style/css-var.scss

@@ -6,3 +6,49 @@
     @include set-ele-var('table', $var);
   }
 }
+
+/* 静态表格圆角 */
+@mixin table-radius($radius) {
+  & > thead > tr:first-child > th:first-child,
+  & > thead > tr:first-child > td:first-child,
+  &.is-border:not(.has-header) > tr:first-child > td:first-child,
+  &.is-border:not(.has-header) > tbody > tr:first-child > td:first-child {
+    border-top-left-radius: $radius;
+  }
+
+  & > thead > tr:first-child > th:last-child,
+  & > thead > tr:first-child > td:last-child,
+  &.is-border:not(.has-header) > tr:first-child > td:last-child,
+  &.is-border:not(.has-header) > tbody > tr:first-child > td:last-child {
+    border-top-right-radius: $radius;
+  }
+
+  &.is-border:not(.has-footer) > tr:last-child > td:first-child,
+  &.is-border:not(.has-footer) > tbody > tr:last-child > td:first-child,
+  & > tfoot > tr:last-child > td:first-child {
+    border-bottom-left-radius: $radius;
+  }
+
+  &.is-border:not(.has-footer) > tr:last-child > td:last-child,
+  &.is-border:not(.has-footer) > tbody > tr:last-child > td:last-child,
+  & > tfoot > tr:last-child > td:last-child {
+    border-bottom-right-radius: $radius;
+  }
+
+  &.has-header {
+    border-top-left-radius: $radius;
+    border-top-right-radius: $radius;
+  }
+
+  &.has-footer {
+    border-bottom-left-radius: $radius;
+    border-bottom-right-radius: $radius;
+  }
+
+  &.is-border {
+    border-top-left-radius: $radius;
+    border-top-right-radius: $radius;
+    border-bottom-left-radius: $radius;
+    border-bottom-right-radius: $radius;
+  }
+}