fix: use headerStyle in transpose listable

VisActor · Feb 23, 2024 · 43450d3 · 43450d3
1 parent 5934140
commit 43450d3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/packages/vtable/src/core/BaseTable.ts b/packages/vtable/src/core/BaseTable.ts
@@ -2986,6 +2986,16 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
           this.options.autoWrapText
         );
       } else {
+        let defaultStyle;
+        if (layoutMap.isColumnHeader(col, row) || layoutMap.isBottomFrozenRow(col, row)) {
+          defaultStyle = this.theme.headerStyle;
+        } else if (this.internalProps.transpose && layoutMap.isRowHeader(col, row)) {
+          defaultStyle = this.theme.headerStyle;
+        } else if (layoutMap.isRowHeader(col, row) || layoutMap.isRightFrozenColumn(col, row)) {
+          defaultStyle = this.theme.rowHeaderStyle;
+        } else {
+          defaultStyle = this.theme.cornerHeaderStyle;
+        }
         // const styleClass = hd.headerType.StyleClass; //BaseHeader文件
         // const { style } = hd;
         const style = hd?.style || {};
@@ -2994,11 +3004,12 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
         }
         cacheStyle = <FullExtendStyle>headerStyleContents.of(
           style,
-          layoutMap.isColumnHeader(col, row) || layoutMap.isBottomFrozenRow(col, row)
-            ? this.theme.headerStyle
-            : layoutMap.isRowHeader(col, row) || layoutMap.isRightFrozenColumn(col, row)
-            ? this.theme.rowHeaderStyle
-            : this.theme.cornerHeaderStyle,
+          defaultStyle,
+          // layoutMap.isColumnHeader(col, row) || layoutMap.isBottomFrozenRow(col, row)
+          //   ? this.theme.headerStyle
+          //   : layoutMap.isRowHeader(col, row) || layoutMap.isRightFrozenColumn(col, row)
+          //   ? this.theme.rowHeaderStyle
+          //   : this.theme.cornerHeaderStyle,
           {
             col,
             row,

diff --git a/packages/vtable/src/scenegraph/scenegraph.ts b/packages/vtable/src/scenegraph/scenegraph.ts
@@ -1497,7 +1497,11 @@ export class Scenegraph {
     );
     createFrameBorder(
       this.rowHeaderGroup,
-      this.isPivot ? this.table.theme.rowHeaderStyle.frameStyle : this.table.theme.bodyStyle.frameStyle,
+      this.isPivot
+        ? this.table.theme.rowHeaderStyle.frameStyle
+        : this.table.internalProps.transpose
+        ? this.table.theme.headerStyle.frameStyle
+        : this.table.theme.bodyStyle.frameStyle,
       this.rowHeaderGroup.role,
       isListTableWithFrozen ? [true, false, true, true] : undefined
     );