Merge pull request #837 from VisActor/836-refactor-listtable-use-bott…

…omfrozenstyle 836 refactor listtable use bottomfrozenstyle
VisActor · Jan 3, 2024 · e9b8476 · e9b8476
2 parents eb0e650 + fa05312
commit e9b8476
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/...anges/@visactor/vtable/836-refactor-listtable-use-bottomfrozenstyle_2024-01-02-11-02.json b/...anges/@visactor/vtable/836-refactor-listtable-use-bottomfrozenstyle_2024-01-02-11-02.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "refactor: list table bottom row can not use bottomFrozenStyle #836\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}
diff --git a/packages/vtable/src/ListTable.ts b/packages/vtable/src/ListTable.ts
@@ -141,6 +141,7 @@ export class ListTable extends BaseTable implements ListTableAPI {
     this.scenegraph.clearCells();
     this.headerStyleCache = new Map();
     this.bodyStyleCache = new Map();
+    this.bodyBottomStyleCache = new Map();
     this.scenegraph.createSceneGraph();
     this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row);
     this.renderAsync();

diff --git a/packages/vtable/src/core/BaseTable.ts b/packages/vtable/src/core/BaseTable.ts
@@ -149,6 +149,7 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
 
   headerStyleCache: any;
   bodyStyleCache: any;
+  bodyBottomStyleCache: any;
   container: HTMLElement;
   isReleased: boolean = false;
 
@@ -359,6 +360,7 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
 
     this.headerStyleCache = new Map();
     this.bodyStyleCache = new Map();
+    this.bodyBottomStyleCache = new Map();
 
     internalProps.stick = { changedCells: [] };
 
@@ -2937,7 +2939,12 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
     } else {
       cacheKey = row;
     }
-    let cacheStyle = this.bodyStyleCache.get(cacheKey);
+    let cacheStyle;
+    if (layoutMap.isBottomFrozenRow(row)) {
+      cacheStyle = this.bodyBottomStyleCache.get(cacheKey);
+    } else {
+      cacheStyle = this.bodyStyleCache.get(cacheKey);
+    }
     if (cacheStyle) {
       return cacheStyle;
     }
@@ -2947,7 +2954,11 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
     const style = column?.style;
     cacheStyle = <FullExtendStyle>columnStyleContents.of(
       style,
-      this.theme.bodyStyle,
+      layoutMap.isBottomFrozenRow(row) && this.theme.bottomFrozenStyle
+        ? this.theme.bottomFrozenStyle
+        : layoutMap.isRightFrozenColumn(col) && this.theme.rightFrozenStyle
+        ? this.theme.rightFrozenStyle
+        : this.theme.bodyStyle,
       {
         col,
         row,
@@ -2960,13 +2971,18 @@ export abstract class BaseTable extends EventTarget implements BaseTableAPI {
       this.options.autoWrapText
     );
     if (!isFunction(style)) {
-      this.bodyStyleCache.set(cacheKey, cacheStyle);
+      if (layoutMap.isBottomFrozenRow(row)) {
+        this.bodyBottomStyleCache.set(cacheKey, cacheStyle);
+      } else {
+        this.bodyStyleCache.set(cacheKey, cacheStyle);
+      }
     }
     return cacheStyle;
   }
   clearCellStyleCache() {
     this.headerStyleCache.clear();
     this.bodyStyleCache.clear();
+    this.bodyBottomStyleCache.clear();
   }
   /**
    * 清除行高度缓存对象