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

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');
@@ -82,33 +82,7 @@
   }
 
   /* 圆角 */
-  & > thead > tr:first-child > th:first-child,
-  & > thead > tr:first-child > td:first-child {
-    border-top-left-radius: eleVar('table', 'radius');
-  }
-
-  & > thead > tr:first-child > th:last-child,
-  & > thead > tr:first-child > td:last-child {
-    border-top-right-radius: eleVar('table', 'radius');
-  }
-
-  & > tfoot > tr:last-child > td:first-child {
-    border-bottom-left-radius: eleVar('table', 'radius');
-  }
-
-  & > tfoot > tr:last-child > td:last-child {
-    border-bottom-right-radius: eleVar('table', 'radius');
-  }
-
-  &.has-header {
-    border-top-left-radius: eleVar('table', 'radius');
-    border-top-right-radius: eleVar('table', 'radius');
-  }
-
-  &.has-footer {
-    border-bottom-left-radius: eleVar('table', 'radius');
-    border-bottom-right-radius: eleVar('table', 'radius');
-  }
+  @include table-radius(eleVar('table', 'radius'));
 
   /* 斑马纹 */
   &.is-stripe {
@@ -151,33 +125,7 @@
       }
     }
 
-    & > thead > tr:first-child > th:first-child,
-    & > thead > tr:first-child > td:first-child {
-      border-top-left-radius: eleVar('table', 'lg-radius');
-    }
-
-    & > thead > tr:first-child > th:last-child,
-    & > thead > tr:first-child > td:last-child {
-      border-top-right-radius: eleVar('table', 'lg-radius');
-    }
-
-    & > tfoot > tr:last-child > td:first-child {
-      border-bottom-left-radius: eleVar('table', 'lg-radius');
-    }
-
-    & > tfoot > tr:last-child > td:last-child {
-      border-bottom-right-radius: eleVar('table', 'lg-radius');
-    }
-
-    &.has-header {
-      border-top-left-radius: eleVar('table', 'lg-radius');
-      border-top-right-radius: eleVar('table', 'lg-radius');
-    }
-
-    &.has-footer {
-      border-bottom-left-radius: eleVar('table', 'lg-radius');
-      border-bottom-right-radius: eleVar('table', 'lg-radius');
-    }
+    @include table-radius(eleVar('table', 'lg-radius'));
   }
 
   /* 小型尺寸 */
@@ -193,33 +141,7 @@
       }
     }
 
-    & > thead > tr:first-child > th:first-child,
-    & > thead > tr:first-child > td:first-child {
-      border-top-left-radius: eleVar('table', 'sm-radius');
-    }
-
-    & > thead > tr:first-child > th:last-child,
-    & > thead > tr:first-child > td:last-child {
-      border-top-right-radius: eleVar('table', 'sm-radius');
-    }
-
-    & > tfoot > tr:last-child > td:first-child {
-      border-bottom-left-radius: eleVar('table', 'sm-radius');
-    }
-
-    & > tfoot > tr:last-child > td:last-child {
-      border-bottom-right-radius: eleVar('table', 'sm-radius');
-    }
-
-    &.has-header {
-      border-top-left-radius: eleVar('table', 'sm-radius');
-      border-top-right-radius: eleVar('table', 'sm-radius');
-    }
-
-    &.has-footer {
-      border-bottom-left-radius: eleVar('table', 'sm-radius');
-      border-bottom-right-radius: eleVar('table', 'sm-radius');
-    }
+    @include table-radius(eleVar('table', 'sm-radius'));
   }
 
   /* 全边框 */
@@ -238,6 +160,10 @@
     }
   }
 
+  &:not(.has-header) {
+    border-top: 1px solid eleVar('table', 'border-color');
+  }
+
   /* 表格内组件样式优化 */
   @include table-common-style();
 }

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-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-tour/index.cjs

@@ -35,7 +35,7 @@ const _sfc_main = vue.defineComponent({
       showMask.value = mask ?? props2.mask;
       const el = typeof target === "function" ? target() : target;
       if (el) {
-        el.focus();
+        util.scrollIntoView(el);
         const { width, height } = el.getBoundingClientRect();
         const { top, left } = util.getOffset(el);
         const space = padding ?? props2.padding ?? 0;

package/lib/ele-tour/util.cjs

@@ -31,5 +31,13 @@ function getPopperProps(visible, modal, props) {
     popperClass: classes.join(" ")
   };
 }
+function scrollIntoView(el) {
+  if (typeof el["scrollIntoViewIfNeeded"] === "function") {
+    el.scrollIntoViewIfNeeded(true);
+  } else {
+    el.scrollIntoView({ behavior: "instant", block: "nearest" });
+  }
+}
 exports.getOffset = getOffset;
 exports.getPopperProps = getPopperProps;
+exports.scrollIntoView = scrollIntoView;

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

@@ -12,3 +12,8 @@ export declare function getOffset(el: HTMLElement): Offset;
  * @param props 自定义属性
  */
 export declare function getPopperProps(visible?: boolean, modal?: boolean, props?: EleTooltipProps): EleTooltipProps;
+/**
+ * 让元素可见
+ * @param el 元素
+ */
+export declare function scrollIntoView(el: HTMLElement): void;

package/lib/ele-upload-list/components/list-item.cjs

@@ -98,7 +98,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         })
       ]))
     ]),
-    !_ctx.readonly && !_ctx.disabled ? (vue.openBlock(), vue.createElementBlock("div", {
+    !_ctx.readonly && !_ctx.disabled && !_ctx.item.readonly ? (vue.openBlock(), vue.createElementBlock("div", {
       key: 0,
       class: "ele-upload-remove",
       onClick: _cache[0] || (_cache[0] = vue.withModifiers((...args) => _ctx.onRemove && _ctx.onRemove(...args), ["stop"]))

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

@@ -14,6 +14,8 @@ export interface UploadItem extends Record<keyof any, any> {
   progress?: number;
   /** 选择的文件 */
   file?: File;
+  /** 是否只读 */
+  readonly?: boolean;
 }
 
 /**

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

@@ -30,7 +30,7 @@ declare const _default: import("vue").DefineComponent<{
         colspan: number;
     } | undefined) | undefined>;
     /** 溢出提示组件全局属性 */
-    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     /** 序号列起始编号 */
     pageIndex: NumberConstructor;
     /** 表格行高 */
@@ -110,7 +110,7 @@ declare const _default: import("vue").DefineComponent<{
         colspan: number;
     } | undefined) | undefined>;
     /** 溢出提示组件全局属性 */
-    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     /** 序号列起始编号 */
     pageIndex: NumberConstructor;
     /** 表格行高 */

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

@@ -29,7 +29,7 @@ declare const _default: import("vue").DefineComponent<{
         colspan: number;
     } | undefined) | undefined>;
     /** 溢出提示组件全局属性 */
-    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     /** 序号列起始编号 */
     pageIndex: NumberConstructor;
     /** 表格行高 */
@@ -109,7 +109,7 @@ declare const _default: import("vue").DefineComponent<{
         colspan: number;
     } | undefined) | undefined>;
     /** 溢出提示组件全局属性 */
-    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     /** 序号列起始编号 */
     pageIndex: NumberConstructor;
     /** 表格行高 */

package/lib/ele-virtual-table/index.cjs

@@ -894,6 +894,19 @@ const _sfc_main = vue.defineComponent({
       },
       { deep: true }
     );
+    vue.watch(
+      () => props2.showHeader,
+      (showHeader) => {
+        if (showHeader) {
+          vue.nextTick(() => {
+            const left = tableScrollLeft.value;
+            if (left) {
+              setScrollLeft(left - 1);
+            }
+          });
+        }
+      }
+    );
     return {
       rootRef,
       tableRef,

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

@@ -12,6 +12,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: null;
     };
+    rowKey: {
+        type: import("vue").PropType<string | ((row: DataItem) => string) | undefined>;
+        required: boolean;
+    };
     columns: {
         type: import("vue").PropType<import("../ele-data-table/types").Columns>;
         required: boolean;
@@ -48,7 +52,7 @@ declare const _default: import("vue").DefineComponent<{
     maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
-        default: boolean; /** 是否是树形数据 */
+        default: boolean;
     };
     className: {
         type: StringConstructor;
@@ -56,7 +60,6 @@ declare const _default: import("vue").DefineComponent<{
     };
     width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
-    rowKey: import("vue").PropType<string | ((row: any) => string) | undefined>;
     data: {
         type: import("vue").PropType<any[]>;
         default: () => never[];
@@ -66,9 +69,10 @@ 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;
         default: number;
     };
@@ -93,7 +97,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;
@@ -203,18 +207,18 @@ declare const _default: import("vue").DefineComponent<{
     cellDblclick: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     cellContextmenu: (_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => boolean;
     rowClick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
-    rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
+    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;
     sortChange: (_sorter: import("../ele-data-table/types").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: Column, _e: MouseEvent) => boolean;
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
     'update:currentRowKey': (_currentRowKey?: DataKey | undefined) => boolean;
-    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean; /** 表格宽度 */
+    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     rowHeight: NumberConstructor;
     stripe: {
@@ -225,6 +229,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: null;
     };
+    rowKey: {
+        type: import("vue").PropType<string | ((row: DataItem) => string) | undefined>;
+        required: boolean;
+    };
     columns: {
         type: import("vue").PropType<import("../ele-data-table/types").Columns>;
         required: boolean;
@@ -261,7 +269,7 @@ declare const _default: import("vue").DefineComponent<{
     maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
-        default: boolean; /** 是否是树形数据 */
+        default: boolean;
     };
     className: {
         type: StringConstructor;
@@ -269,7 +277,6 @@ declare const _default: import("vue").DefineComponent<{
     };
     width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
-    rowKey: import("vue").PropType<string | ((row: any) => string) | undefined>;
     data: {
         type: import("vue").PropType<any[]>;
         default: () => never[];
@@ -279,9 +286,10 @@ 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;
         default: number;
     };
@@ -306,7 +314,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-virtual-table/props.d.ts

@@ -13,6 +13,10 @@ export declare const virtualTableProps: {
         type: BooleanConstructor;
         default: null;
     };
+    rowKey: {
+        type: import("vue").PropType<string | ((row: import("../ele-data-table/types").DataItem) => string) | undefined>;
+        required: boolean;
+    };
     columns: {
         type: import("vue").PropType<import("../ele-data-table/types").Columns>;
         required: boolean;
@@ -57,7 +61,6 @@ export declare const virtualTableProps: {
     };
     width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
-    rowKey: import("vue").PropType<string | ((row: any) => string) | undefined>;
     data: {
         type: import("vue").PropType<any[]>;
         default: () => never[];
@@ -67,7 +70,7 @@ export declare const virtualTableProps: {
         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;
@@ -94,7 +97,7 @@ export declare const virtualTableProps: {
     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-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'));
   }
 
   /* 大型尺寸 */

package/lib/ele-watermark/index.cjs

@@ -3,7 +3,6 @@ const vue = require("vue");
 const util = require("./util");
 const props = require("./props");
 const SIZE = 2;
-const GAP = 3;
 const _sfc_main = vue.defineComponent({
   name: "EleWatermark",
   props: props.watermarkProps,
@@ -84,10 +83,9 @@ const _sfc_main = vue.defineComponent({
       if (props2.image || !ctx.measureText) {
         return 64;
       }
-      const content = props2.content;
-      const contents = Array.isArray(content) ? content : [content];
+      const lines = Array.isArray(props2.content) ? props2.content.length : 1;
       const { fontSize } = util.getFont(props2.font);
-      return fontSize * contents.length + (contents.length - 1) * GAP;
+      return fontSize * lines + (lines - 1) * props2.lineGap;
     };
     const getMarkSize = (ctx) => {
       const width = props2.width;
@@ -111,7 +109,7 @@ const _sfc_main = vue.defineComponent({
         ctx.fillText(
           item ?? "",
           drawX,
-          drawY + index2 * (mergedFontSize + GAP * ratio)
+          drawY + index2 * (mergedFontSize + props2.lineGap * ratio)
         );
       });
     };