ele-admin-plus 1.1.7-beta.4 → 1.1.8-beta.1

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-qr-code/index.d.ts

@@ -31,7 +31,7 @@ declare const _default: import("vue").DefineComponent<{
     render: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     done: () => boolean;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     value: StringConstructor;
     size: {
         type: NumberConstructor;

package/lib/ele-qr-code-svg/index.d.ts

@@ -34,7 +34,7 @@ declare const _default: import("vue").DefineComponent<{
     render: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     done: () => boolean;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     value: StringConstructor;
     size: {
         type: NumberConstructor;

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-segmented/index.d.ts

@@ -14,7 +14,7 @@ declare const _default: import("vue").DefineComponent<{
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:modelValue': (_value: string | number) => boolean;
     change: (_active: string | number) => boolean;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: (StringConstructor | NumberConstructor)[];
     block: BooleanConstructor;
     disabled: BooleanConstructor;

package/lib/ele-split-panel/index.d.ts

@@ -29,7 +29,7 @@ declare const _default: import("vue").DefineComponent<{
     onResize: (event: MouseEvent) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:collapse': (_collapse: boolean) => boolean;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     size: StringConstructor;
     minSize: NumberConstructor;
     maxSize: NumberConstructor;

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

@@ -34,7 +34,7 @@ declare const _default: import("vue").DefineComponent<{
         readonly items?: import("./types").StepItem[] | undefined;
         readonly simple?: import("element-plus/es/utils/index").EpPropMergeType<BooleanConstructor, unknown, unknown> | undefined;
     } & {}>, "type" | "items">>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     items: {
         type: import("vue").PropType<import("./types").StepItem[]>;
         required: boolean;

package/lib/ele-tab-tool/index.d.ts

@@ -1,7 +1,7 @@
 declare const _default: import("vue").DefineComponent<{
     tab: BooleanConstructor;
     active: BooleanConstructor;
-}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     tab: BooleanConstructor;
     active: BooleanConstructor;
 }>>, {

package/lib/ele-tab-wrap/index.d.ts

@@ -1,7 +1,7 @@
 declare const _default: import("vue").DefineComponent<{
     size: import("vue").PropType<import("../ele-tabs/types").TabSize>;
     type: import("vue").PropType<import("../ele-tabs/types").TabType>;
-}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     size: import("vue").PropType<import("../ele-tabs/types").TabSize>;
     type: import("vue").PropType<import("../ele-tabs/types").TabType>;
 }>>, {}, {}>;

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

@@ -7,7 +7,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     hasFooter: BooleanConstructor;
-}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     stripe: BooleanConstructor;
     border: BooleanConstructor;
     size: import("vue").PropType<"" | "default" | "small" | "large" | undefined>;

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

@@ -18,7 +18,7 @@
     & > th,
     & > td {
       color: eleVar('table', 'color');
-      font-size: eleVar('table', 'font-szie');
+      font-size: eleVar('table', 'font-size');
       font-weight: normal;
       line-height: eleVar('table', 'line-height');
       padding: eleVar('table', 'padding');

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

@@ -98,7 +98,7 @@ declare const _default: import("vue").DefineComponent<{
     blur: (_e: FocusEvent) => boolean;
     select: (_item: DataItem | DataItem[]) => boolean;
     filterChange: (_value: string) => boolean;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: {
         type: import("vue").PropType<SelectValue>;
         default: () => null;

package/lib/ele-tabs/components/tab-title.d.ts

@@ -26,7 +26,7 @@ declare const _default: import("vue").DefineComponent<{
     itemClick: (_opt: TabEventOption) => true;
     contextMenu: (_option: TabEventOption) => true;
     contextOpen: (_ref: EleDropdownInstance) => true;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 当前选中页签 */
     active: (StringConstructor | NumberConstructor)[];
     /** 页签标识 */

package/lib/ele-tabs/index.cjs

@@ -232,7 +232,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     default: vue.withCtx(() => [
       (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.items, (item, index2) => {
         return vue.openBlock(), vue.createBlock(_component_ElTabPane, vue.mergeProps({
-          key: index2 + "-" + item.name
+          key: index2 + "-" + item.name + "-" + item.label
         }, _ctx.omit(item, ["slot", "meta"])), vue.createSlots({
           label: vue.withCtx(() => [
             vue.createVNode(_component_TabTitle, {

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

@@ -90,7 +90,7 @@ declare const _default: import("vue").DefineComponent<{
     edit: (paneName: TabPaneName | undefined, action: "add" | "remove") => boolean;
     tabRemove: (name: TabPaneName) => boolean;
     tabAdd: () => boolean;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     items: {
         type: import("vue").PropType<TabPaneItem[]>;
         required: boolean;

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

@@ -12,7 +12,7 @@ declare const _default: import("vue").DefineComponent<{
     icon: import("vue").PropType<import("./types").TextIcon>;
     iconProps: import("vue").PropType<import("../ele-app/el").ElIconProps>;
     iconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
-}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     tag: {
         type: StringConstructor;
         default: string;

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

@@ -11,7 +11,7 @@ declare const _default: import("vue").DefineComponent<{
     onClick: (e: MouseEvent) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     click: (_e: MouseEvent) => true;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     title: StringConstructor;
     placement: {
         type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;

package/lib/ele-toolbar/index.cjs

@@ -17,7 +17,11 @@ const _export_sfc = (sfc, props2) => {
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleText = vue.resolveComponent("EleText");
   return vue.openBlock(), vue.createElementBlock("div", {
-    class: vue.normalizeClass(["ele-toolbar", { "is-plain": "plain" === _ctx.theme }])
+    class: vue.normalizeClass([
+      "ele-toolbar",
+      { "is-default": "plain" !== _ctx.theme },
+      { "is-plain": "plain" === _ctx.theme }
+    ])
   }, [
     _ctx.title || _ctx.subtitle ? (vue.openBlock(), vue.createElementBlock("div", {
       key: 0,

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

@@ -8,7 +8,7 @@ declare const _default: import("vue").DefineComponent<{
     titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     toolsStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
-}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     title: StringConstructor;
     subtitle: StringConstructor;
     theme: {

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

@@ -60,7 +60,7 @@ declare const _default: import("vue").DefineComponent<{
     onPopHide: (e: Event) => void;
     onPopOpen: (e: any) => void;
     onPopClose: (e: any) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("./props").TooltipEmits, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("./props").TooltipEmits, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     bg: StringConstructor;
     arrowBg: StringConstructor;

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

@@ -32,7 +32,7 @@ declare const _default: import("vue").DefineComponent<{
     onFinish: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:modelValue': (_value?: number | null | undefined) => boolean;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: NumberConstructor;
     steps: {
         type: import("vue").PropType<TourStep[]>;

package/lib/ele-tree-select/index.d.ts

@@ -80,7 +80,7 @@ declare const _default: import("vue").DefineComponent<{
     clear: () => boolean;
     focus: (_e: FocusEvent) => boolean;
     blur: (_e: FocusEvent) => boolean;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: {
         type: import("vue").PropType<SelectValue>;
         default: () => null;

package/lib/ele-upload-list/components/list-item.d.ts

@@ -26,7 +26,7 @@ declare const _default: import("vue").DefineComponent<{
     itemClick: (_item: UploadItem) => true;
     remove: (_item: UploadItem) => true;
     retry: (_item: UploadItem) => true;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 数据 */
     item: {
         type: PropType<UploadItem>;

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

@@ -48,7 +48,7 @@ declare const _default: import("vue").DefineComponent<{
     upload: (_item: UploadItem) => boolean;
     remove: (_item: UploadItem) => boolean;
     retry: (_item: UploadItem) => boolean;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: {
         type: import("vue").PropType<UploadItem[]>;
         required: boolean;

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

@@ -82,7 +82,7 @@ declare const _default: import("vue").DefineComponent<{
     mouseenter: (_row: DataItem, _col: Column, _e: MouseEvent) => true;
     /** 鼠标移出事件 */
     mouseleave: (_row: DataItem, _col: Column, _e: MouseEvent) => true;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 当前列配置 */
     column: PropType<Partial<import("element-plus").Column<DataItem>>>;
     /** 当前列索引 */

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

@@ -81,7 +81,7 @@ declare const _default: import("vue").DefineComponent<{
     cellMouseenter: (_row: DataItem, _col: Column, _e: MouseEvent) => true;
     /** 单元格鼠标移出事件 */
     cellMouseleave: (_row: DataItem, _col: Column, _e: MouseEvent) => true;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 主体列配置 */
     bodyCols: PropType<BodyColumns>;
     /** 表格主体列宽 */

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

@@ -13,7 +13,7 @@ declare const _default: import("vue").DefineComponent<{
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     /** 选中改变事件 */
     change: (_checked: boolean) => true;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 是否是选中状态 */
     checked: BooleanConstructor;
     /** 是否是半选状态 */

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

@@ -28,7 +28,7 @@ declare const _default: import("vue").DefineComponent<{
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     /** 选中改变事件 */
     change: (_filtered: FilterValue) => true;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 选中项 */
     filtered: PropType<FilterValue>;
     /** 是否多选 */

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

@@ -7,7 +7,7 @@ declare const _default: import("vue").DefineComponent<{
     rowIndex: NumberConstructor;
     /** 行数据 */
     rowData: PropType<DataItem>;
-}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 列配置 */
     column: PropType<Partial<import("element-plus").Column<DataItem>>>;
     /** 行索引 */

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

@@ -22,7 +22,7 @@ declare const _default: import("vue").DefineComponent<{
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     /** 单元格鼠标移入事件 */
     mouseenter: (_e: MouseEvent) => true;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 表格主体列配置 */
     bodyCols: PropType<BodyColumns>;
     /** 表格主体列宽 */

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

@@ -53,7 +53,7 @@ declare const _default: import("vue").DefineComponent<{
     contextmenu: (_col: Column, _e: MouseEvent) => true;
     /** 鼠标移入事件 */
     mouseenter: (_col: Column, _e: MouseEvent) => true;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 当前列配置 */
     column: PropType<HeaderColumn>;
     /** 当前列索引 */

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

@@ -47,7 +47,7 @@ declare const _default: import("vue").DefineComponent<{
     cellContextmenu: (_col: Column, _e: MouseEvent) => true;
     /** 单元格鼠标移入事件 */
     cellMouseenter: (_col: Column, _e: MouseEvent) => true;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 表头行配置 */
     headerCols: PropType<HeaderColumns>;
     /** 表头所有行列宽 */

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

@@ -215,7 +215,7 @@ declare const _default: import("vue").DefineComponent<{
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
     'update:currentRowKey': (_currentRowKey?: DataKey | undefined) => boolean;
     'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean; /** 表格宽度 */
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     rowHeight: NumberConstructor;
     stripe: {
         type: BooleanConstructor;

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

@@ -41,7 +41,7 @@
   }
 }
 
-/* 虚拟表格单元格 */
+/* 虚拟表格全部行单元格 */
 @mixin virtual-table-td {
   @include virtual-table-tr {
     & > .ele-table-td {
@@ -50,31 +50,53 @@
   }
 }
 
-/* 虚拟表格圆角样式 */
+/* 虚拟表格单元格间距 */
+@mixin virtual-table-padding($padding) {
+  @include virtual-table-td {
+    padding: $padding;
+    padding-right: 0;
+    padding-left: 0;
+
+    & > .ele-table-cell {
+      padding: $padding;
+      padding-bottom: 0;
+      padding-top: 0;
+    }
+  }
+}
+
+/* 虚拟表格圆角 */
 @mixin virtual-table-radius($radius) {
-  & > .el-table-v2 > .el-table-v2__main > .el-table-v2__header-wrapper {
+  & > .el-table-v2 > .el-table-v2__main > .el-table-v2__header-wrapper,
+  &.is-border > .el-table-v2::after,
+  &.is-border.hide-header
+    > .el-table-v2
+    > .el-table-v2__main
+    > .el-table-v2__body
+    > div:not(.el-virtual-scrollbar) {
     border-top-left-radius: $radius;
     border-top-right-radius: $radius;
   }
 
-  & > .el-table-v2 > .el-table-v2__footer {
+  & > .el-table-v2 > .el-table-v2__footer,
+  &.is-border > .el-table-v2::before,
+  &.is-border:not(.has-footer)
+    > .el-table-v2
+    > .el-table-v2__main
+    > .el-table-v2__body
+    > div:not(.el-virtual-scrollbar) {
     border-bottom-left-radius: $radius;
     border-bottom-right-radius: $radius;
   }
-}
 
-/* 设置单元格间距 */
-@mixin virtual-table-padding($padding) {
-  @include virtual-table-td {
-    padding: $padding;
-    padding-left: 0;
-    padding-right: 0;
+  &.is-border::before {
+    border-bottom-left-radius: $radius;
+    border-top-left-radius: $radius;
+  }
 
-    & > .ele-table-cell {
-      padding: $padding;
-      padding-top: 0;
-      padding-bottom: 0;
-    }
+  &.is-border::after {
+    border-bottom-right-radius: $radius;
+    border-top-right-radius: $radius;
   }
 }
 

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

@@ -22,8 +22,9 @@
   }
 
   & > .el-table-v2 {
-    position: static;
+    font-size: eleVar('table', 'font-size');
     box-sizing: border-box;
+    position: static;
 
     & > .el-table-v2__main,
     & > .el-table-v2__footer {
@@ -345,23 +346,38 @@
     &::before,
     &::after {
       position: absolute;
+      box-sizing: border-box;
+      pointer-events: none;
       z-index: 5;
     }
   }
 
-  & > .el-table-v2 {
+  & > .el-table-v2::before,
+  & > .el-table-v2::after {
+    left: 0;
+    right: 0;
+    width: 100%;
+    height: calc(1px + #{eleVar('table', 'radius')});
+  }
+
+  & > .el-table-v2::before {
+    content: '';
+    bottom: 0;
+    border-bottom: 1px solid eleVar('table', 'border-color');
+  }
+
+  &.is-border > .el-table-v2::after,
+  &.hide-header > .el-table-v2::after {
+    content: '';
+    top: 0;
+    border-top: 1px solid eleVar('table', 'border-color');
+  }
+
+  &.is-border > .el-table-v2 {
     &::before,
     &::after {
-      left: 0;
-      right: 0;
-      height: 0;
-      width: 100%;
-      border-top: 1px solid eleVar('table', 'border-color');
-    }
-
-    &::before {
-      content: '';
-      bottom: 0;
+      border-right: 1px solid transparent;
+      border-left: 1px solid transparent;
     }
   }
 
@@ -370,12 +386,6 @@
     display: none;
   }
 
-  &.hide-header > .el-table-v2::after,
-  &.is-border > .el-table-v2::after {
-    content: '';
-    top: 0;
-  }
-
   /* 全边框 */
   &.is-border {
     &::before,
@@ -383,17 +393,20 @@
       content: '';
       top: 0;
       bottom: 0;
-      width: 0;
       height: 100%;
-      border-left: 1px solid eleVar('table', 'border-color');
+      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');
     }
 
     @include virtual-table-td {
@@ -407,30 +420,28 @@
 
   /* 隐藏表头 */
   &.hide-header > .el-table-v2 {
-    & > .el-table-v2__table > .el-table-v2__header-wrapper {
+    & > .el-table-v2__main > .el-table-v2__header-wrapper {
       display: none;
     }
   }
 
   /* 粘性表头 */
-  &.is-sticky > .el-table-v2 > .el-table-v2__main {
-    & > .el-table-v2__header-wrapper {
+  &.is-sticky > .el-table-v2 {
+    & > .el-table-v2__main > .el-table-v2__header-wrapper {
       position: sticky;
       top: eleVar('table', 'sticky-top');
     }
   }
 
   /* 圆角 */
-  &:not(.is-border) {
-    @include virtual-table-radius(eleVar('table', 'radius'));
+  @include virtual-table-radius(eleVar('table', 'radius'));
 
-    &.is-large {
-      @include virtual-table-radius(eleVar('table', 'lg-radius'));
-    }
+  &.is-large {
+    @include virtual-table-radius(eleVar('table', 'lg-radius'));
+  }
 
-    &.is-small {
-      @include virtual-table-radius(eleVar('table', 'sm-radius'));
-    }
+  &.is-small {
+    @include virtual-table-radius(eleVar('table', 'sm-radius'));
   }
 
   /* 大型尺寸 */