Merge pull request #460 from VisActor/dev/0.13.0

Dev/0.13.0
VisActor · Oct 25, 2023 · 62e39f4 · 62e39f4
2 parents b49299a + b49d4ad
commit 62e39f4
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 13 deletions.
diff --git a/common/changes/@visactor/vtable/458-bug-set-records-blank-scroll-error_2023-10-25-04-01.json b/common/changes/@visactor/vtable/458-bug-set-records-blank-scroll-error_2023-10-25-04-01.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: [Bug] set records blank scroll error #458\n\n",
+      "type": "patch",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}
diff --git a/packages/vtable/src/scenegraph/graphic/chart.ts b/packages/vtable/src/scenegraph/graphic/chart.ts
@@ -153,10 +153,10 @@ export class Chart extends Group {
     // to avoid async render when chart is releasd
     this.activeChartInstance.updateViewBox(
       {
-        x1: -2000,
-        x2: -1000,
-        y1: -2000,
-        y2: -1000
+        x1: -1000,
+        x2: -800,
+        y1: -1000,
+        y2: -800
       },
       false,
       false

diff --git a/packages/vtable/src/scenegraph/group-creater/progress/create-group-for-first-screen.ts b/packages/vtable/src/scenegraph/group-creater/progress/create-group-for-first-screen.ts
@@ -173,7 +173,7 @@ export async function createGroupForFirstScreen(
   );
 
   // update progress information
-  if (!bodyGroup.firstChild) {
+  if (!bodyGroup.firstChild && !colHeaderGroup.firstChild) {
     // 无数据
     proxy.currentRow = proxy.totalRow;
     proxy.rowEnd = proxy.currentRow;
@@ -190,7 +190,8 @@ export async function createGroupForFirstScreen(
     proxy.rowUpdatePos = proxy.rowEnd;
     proxy.referenceRow = proxy.rowStart + Math.floor((proxy.rowEnd - proxy.rowStart) / 2);
 
-    proxy.currentCol = (bodyGroup.lastChild as Group)?.col ?? proxy.totalCol;
+    proxy.currentCol =
+      (bodyGroup.lastChild as Group)?.col ?? (colHeaderGroup.lastChild as Group)?.col ?? proxy.totalCol;
     proxy.colEnd = proxy.currentCol;
     proxy.colUpdatePos = proxy.colEnd;
     proxy.referenceCol = proxy.colStart + Math.floor((proxy.colEnd - proxy.colStart) / 2);

diff --git a/packages/vtable/src/scenegraph/group-creater/progress/proxy.ts b/packages/vtable/src/scenegraph/group-creater/progress/proxy.ts
@@ -103,7 +103,7 @@ export class SceneProxy {
     // 确定首屏高度范围
     const widthLimit = this.table.tableNoFrameWidth * 5;
     this.screenColCount = Math.ceil(this.table.tableNoFrameWidth / defaultColWidth);
-    this.firstScreenColLimit = this.bodyLeftCol + Math.ceil(widthLimit / defaultColWidth);
+    this.firstScreenColLimit = this.bodyLeftCol + Math.min(this.colLimit, Math.ceil(widthLimit / defaultColWidth));
     // this.firstScreenRowLimit = this.bodyBottomRow;
 
     this.colUpdatePos = this.bodyRightCol;
@@ -132,7 +132,7 @@ export class SceneProxy {
     // 确定首屏高度范围
     const heightLimit = this.table.tableNoFrameHeight * 5;
     this.screenRowCount = Math.ceil(this.table.tableNoFrameHeight / defaultRowHeight);
-    this.firstScreenRowLimit = this.bodyTopRow + Math.ceil(heightLimit / defaultRowHeight);
+    this.firstScreenRowLimit = this.bodyTopRow + Math.min(this.rowLimit, Math.ceil(heightLimit / defaultRowHeight));
     // this.firstScreenRowLimit = this.bodyBottomRow;
 
     this.rowUpdatePos = this.bodyBottomRow;
@@ -363,11 +363,18 @@ export class SceneProxy {
       );
     }
     // create colGroup
-    const lastColumnGroup = (
-      this.table.scenegraph.bodyGroup.lastChild instanceof Group
+    let lastColumnGroup =
+      this.table.scenegraph.bodyGroup.lastChild &&
+      ((this.table.scenegraph.bodyGroup.lastChild instanceof Group
         ? this.table.scenegraph.bodyGroup.lastChild
-        : this.table.scenegraph.bodyGroup.lastChild._prev
-    ) as Group;
+        : this.table.scenegraph.bodyGroup.lastChild._prev) as Group);
+    if (!lastColumnGroup) {
+      lastColumnGroup =
+        this.table.scenegraph.colHeaderGroup.lastChild &&
+        ((this.table.scenegraph.colHeaderGroup.lastChild instanceof Group
+          ? this.table.scenegraph.colHeaderGroup.lastChild
+          : this.table.scenegraph.colHeaderGroup.lastChild._prev) as Group);
+    }
     const xOrigin = lastColumnGroup.attribute.x + lastColumnGroup.attribute.width;
     const yOrigin = lastColumnGroup.attribute.y;
     // create bodyGroup

diff --git a/packages/vtable/src/scenegraph/group-creater/progress/update-position/dynamic-set-x.ts b/packages/vtable/src/scenegraph/group-creater/progress/update-position/dynamic-set-x.ts
@@ -80,7 +80,8 @@ async function moveColumn(
       direction
     );
 
-    const colGroup = proxy.table.scenegraph.getColGroup(screenLeftCol);
+    const colGroup =
+      proxy.table.scenegraph.getColGroup(screenLeftCol) || proxy.table.scenegraph.getColGroup(screenLeftCol, true);
     const deltaX =
       screenLeftX - (colGroup.attribute.x + proxy.table.getFrozenColsWidth() + proxy.table.scenegraph.proxy.deltaX);
     proxy.table.scenegraph.proxy.deltaX += deltaX;