Merge branch 'fix/sparkline-smooth' into 27-bug-sparkline-render

VisActor · Jun 15, 2023 · ea0c873 · ea0c873
2 parents a89014e + 802fae1
commit ea0c873
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 32 deletions.
diff --git a/common/config/rush/pnpm-config.json b/common/config/rush/pnpm-config.json
@@ -83,7 +83,7 @@
    * PNPM documentation: https://pnpm.io/package_json#pnpmoverrides
    */
   "globalOverrides": {
-    "@visactor/vrender": "0.9.2-fill-stroke.10"
+    "@visactor/vrender": "0.10.0-alpha.1"
   },
   /**
    * The `globalPeerDependencyRules` setting provides various settings for suppressing validation errors

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/vtable/package.json b/packages/vtable/package.json
@@ -49,9 +49,9 @@
     "ci": "node github-ci.js"
   },
   "dependencies": {
-    "@visactor/vrender": "0.9.2-fill-stroke.10",
+    "@visactor/vrender": "0.10.0-alpha.1",
     "@visactor/vutils": "0.9.0-alpha.2",
-    "@visactor/vrender-components": "0.9.2-fill-stroke.10",
+    "@visactor/vrender-components": "0.10.0-alpha.1",
     "cssfontparser": "^1.2.1",
     "@visactor/vscale": "0.9.0-alpha.2"
   },

diff --git a/packages/vtable/src/scenegraph/component/table-component.ts b/packages/vtable/src/scenegraph/component/table-component.ts
@@ -240,8 +240,8 @@ export class TableComponent {
       const y = Math.min(tableHeight, totalHeight);
       const rangeEnd = Math.max(0.05, (tableWidth - frozenColsWidth) / (totalWidth - frozenColsWidth));
       this.hScrollBar.setAttributes({
-        x: frozenColsWidth,
-        y: y - (this.table.theme.scrollStyle.hoverOn ? width : 0),
+        x: frozenColsWidth + (!this.table.theme.scrollStyle.hoverOn ? this.table.scenegraph.tableGroup.attribute.x : 0),
+        y: y - (this.table.theme.scrollStyle.hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y),
         width: tableWidth - frozenColsWidth,
         range: [0, rangeEnd],
         visible: visible === 'always'
@@ -260,8 +260,9 @@ export class TableComponent {
       const x = Math.min(tableWidth, totalWidth);
       const rangeEnd = Math.max(0.05, (tableHeight - frozenRowsHeight) / (totalHeight - frozenRowsHeight));
       this.vScrollBar.setAttributes({
-        x: x - (this.table.theme.scrollStyle.hoverOn ? width : 0),
-        y: frozenRowsHeight,
+        x: x - (this.table.theme.scrollStyle.hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.x),
+        y:
+          frozenRowsHeight + (!this.table.theme.scrollStyle.hoverOn ? this.table.scenegraph.tableGroup.attribute.y : 0),
         height: tableHeight - frozenRowsHeight,
         range: [0, rangeEnd],
         visible: visible === 'always'