Merge remote-tracking branch 'origin/dev/0.11.0' into feat/pivot-chart

VisActor · Sep 19, 2023 · cc735cd · cc735cd
2 parents f66a622 + 1923a5d
commit cc735cd
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/...s/@visactor/vtable/338-bug-container-resize-chart-display-exception_2023-09-18-11-24.json b/...s/@visactor/vtable/338-bug-container-resize-chart-display-exception_2023-09-18-11-24.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: the width and height of the container is changed, chart display exception. #338\n\n",
+      "type": "patch",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}
diff --git a/...s/@visactor/vtable/338-bug-container-resize-chart-display-exception_2023-09-19-02-27.json b/...s/@visactor/vtable/338-bug-container-resize-chart-display-exception_2023-09-19-02-27.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: chart shake when after resize container #344\n\n",
+      "type": "patch",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}
diff --git a/packages/vtable/src/scenegraph/layout/compute-col-width.ts b/packages/vtable/src/scenegraph/layout/compute-col-width.ts
@@ -89,7 +89,7 @@ export function computeColsWidth(table: BaseTableAPI, colStart?: number, colEnd?
           totalDrawWidth -
           (update
             ? newWidths.reduce((acr, cur, index) => {
-                if (index >= table.rowHeaderLevelCount && index !== newWidths.length - 1) {
+                if (index >= table.rowHeaderLevelCount && index <= table.colCount - table.rightFrozenColCount - 2) {
                   return acr + cur;
                 }
                 return acr;

diff --git a/packages/vtable/src/scenegraph/layout/compute-row-height.ts b/packages/vtable/src/scenegraph/layout/compute-row-height.ts
@@ -152,7 +152,7 @@ export function computeRowsHeight(
           totalDrawHeight -
           (update
             ? newHeights.reduce((acr, cur, index) => {
-                if (index >= table.frozenRowCount && index !== newHeights.length - 1) {
+                if (index >= table.frozenRowCount && index <= table.rowCount - table.bottomFrozenRowCount - 2) {
                   return acr + cur;
                 }
                 return acr;

diff --git a/packages/vtable/src/scenegraph/scenegraph.ts b/packages/vtable/src/scenegraph/scenegraph.ts
@@ -729,7 +729,7 @@ export class Scenegraph {
    * @return {*}
    */
   updateColWidth(col: number, detaX: number) {
-    updateColWidth(this, col, detaX);
+    updateColWidth(this, col, Math.round(detaX));
     // this.updateContainerWidth(col, detaX);
     this.updateContainer();
   }
@@ -851,6 +851,7 @@ export class Scenegraph {
   }
 
   updateRowHeight(row: number, detaY: number) {
+    detaY = Math.round(detaY);
     updateRowHeight(this, row, detaY);
     this.updateContainerHeight(row, detaY);
   }