feat: add enum in textStick config

VisActor · Aug 6, 2024 · 017cfa3 · 017cfa3
1 parent 6b517da
commit 017cfa3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/common/changes/@visactor/vtable/feat-stick-enum_2024-08-06-13-33.json b/common/changes/@visactor/vtable/feat-stick-enum_2024-08-06-13-33.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vtable",
+      "comment": "feat: add enum in textStick config",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vtable"
+}
diff --git a/packages/vtable/src/scenegraph/stick-text/index.ts b/packages/vtable/src/scenegraph/stick-text/index.ts
@@ -47,7 +47,7 @@ export function handleTextStick(table: BaseTableAPI) {
     }
     [colStart, colEnd].forEach((col: number) => {
       const style = table._getCellStyle(col, row);
-      if (style?.textStick) {
+      if (style?.textStick && style?.textStick !== 'vertical') {
         const cellGroup = table.scenegraph.getCell(col, row);
         // adjust cell Horizontal
         adjustCellContentHorizontalLayout(
@@ -69,7 +69,11 @@ export function handleTextStick(table: BaseTableAPI) {
     }
     [rowStart, rowEnd].forEach((row: number) => {
       const style = table._getCellStyle(col, row);
-      if (style?.textStick && (table.internalProps.layoutMap as PivotHeaderLayoutMap).rowHierarchyType !== 'tree') {
+      if (
+        style?.textStick &&
+        (table.internalProps.layoutMap as PivotHeaderLayoutMap).rowHierarchyType !== 'tree' &&
+        style?.textStick !== 'horizontal'
+      ) {
         const cellGroup = table.scenegraph.getCell(col, row);
         // adjust cell vertical
         adjustCellContentVerticalLayout(
@@ -91,7 +95,7 @@ export function handleTextStick(table: BaseTableAPI) {
     }
     [rowStart, rowEnd].forEach((row: number) => {
       const style = table._getCellStyle(col, row);
-      if (style?.textStick) {
+      if (style?.textStick && style?.textStick !== 'horizontal') {
         const cellGroup = table.scenegraph.getCell(col, row);
         // adjust cell vertical
         adjustCellContentVerticalLayout(
@@ -105,13 +109,13 @@ export function handleTextStick(table: BaseTableAPI) {
       }
     });
   }
-  for (let row = rowStart; row < rowEnd; row++) {
+  for (let row = rowStart; row <= rowEnd; row++) {
     if (colEnd < colStart) {
       break;
     }
     [colStart, colEnd].forEach((col: number) => {
       const style = table._getCellStyle(col, row);
-      if (table._getCellStyle(col, row)?.textStick) {
+      if (style?.textStick && style?.textStick !== 'vertical') {
         const cellGroup = table.scenegraph.getCell(col, row);
         // adjust cell Horizontal
         adjustCellContentHorizontalLayout(

diff --git a/packages/vtable/src/ts-types/column/style.ts b/packages/vtable/src/ts-types/column/style.ts
@@ -93,7 +93,7 @@ export interface IStyleOption {
   // dropDownHoverIcon?: IconPropertyDefine;
   cursor?: CursorPropertyDefine;
 
-  textStick?: boolean;
+  textStick?: boolean | 'vertical' | 'horizontal';
   textStickBaseOnAlign?: boolean;
 
   marked?: MarkedPropertyDefine;
@@ -121,7 +121,7 @@ export type ColumnStyleOption =
   | ((styleArg: StylePropertyFunctionArg) => IStyleOption | ITextStyleOption | IImageStyleOption);
 
 export type HeaderStyleOption =
-  | (IStyleOption & { textStick?: boolean }) //表头可以配置吸附
+  | (IStyleOption & { textStick?: boolean | 'vertical' | 'horizontal' }) //表头可以配置吸附
   | ITextStyleOption
   | IImageStyleOption
   // | ISortHeaderStyleOption