diff --git a/common/config/rush/pnpm-config.json b/common/config/rush/pnpm-config.json index ba4a7549d..f95a5a623 100644 --- 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 index a1321555c..20f874ea9 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -1,7 +1,7 @@ lockfileVersion: 5.4 overrides: - '@visactor/vrender': 0.9.2-fill-stroke.10 + '@visactor/vrender': 0.10.0-alpha.1 importers: @@ -24,8 +24,8 @@ importers: '@types/react': 16.9.49 '@types/react-dom': 16.9.8 '@visactor/vchart': 0.0.1-alpha.0 - '@visactor/vrender': 0.9.2-fill-stroke.10 - '@visactor/vrender-components': 0.9.2-fill-stroke.10 + '@visactor/vrender': 0.10.0-alpha.1 + '@visactor/vrender-components': 0.10.0-alpha.1 '@visactor/vscale': 0.9.0-alpha.2 '@visactor/vutils': 0.9.0-alpha.2 '@vitejs/plugin-react': 3.1.0 @@ -57,8 +57,8 @@ importers: vite: 3.2.6 vite-plugin-markdown: ^2.1.0 dependencies: - '@visactor/vrender': 0.9.2-fill-stroke.10 - '@visactor/vrender-components': 0.9.2-fill-stroke.10 + '@visactor/vrender': 0.10.0-alpha.1 + '@visactor/vrender-components': 0.10.0-alpha.1 '@visactor/vscale': 0.9.0-alpha.2 '@visactor/vutils': 0.9.0-alpha.2 cssfontparser: 1.2.1 @@ -2713,8 +2713,8 @@ packages: '@visactor/vgrammar-util': 0.0.10-alpha.0 '@visactor/vgrammar-wordcloud': 0.0.10-alpha.0 '@visactor/vgrammar-wordcloud-shape': 0.0.10-alpha.0 - '@visactor/vrender': 0.9.2-fill-stroke.10 - '@visactor/vrender-components': 0.9.0-alpha.1_2gifkalfev5lihmqdgdi4q5elu + '@visactor/vrender': 0.10.0-alpha.1 + '@visactor/vrender-components': 0.9.0-alpha.1_dfza6q7eupifptctzznig4fmhu '@visactor/vscale': 0.9.0-alpha.2 '@visactor/vutils': 0.9.0-alpha.2 dev: true @@ -2753,7 +2753,7 @@ packages: dependencies: '@visactor/vgrammar': 0.0.10-alpha.0 '@visactor/vgrammar-util': 0.0.10-alpha.0 - '@visactor/vrender': 0.9.2-fill-stroke.10 + '@visactor/vrender': 0.10.0-alpha.1 '@visactor/vutils': 0.9.0-alpha.2 dev: true @@ -2771,7 +2771,7 @@ packages: dependencies: '@visactor/vgrammar': 0.0.10-alpha.0 '@visactor/vgrammar-util': 0.0.10-alpha.0 - '@visactor/vrender': 0.9.2-fill-stroke.10 + '@visactor/vrender': 0.10.0-alpha.1 '@visactor/vutils': 0.9.0-alpha.2 dev: true @@ -2786,7 +2786,7 @@ packages: dependencies: '@visactor/vgrammar': 0.0.10-alpha.0 '@visactor/vgrammar-util': 0.0.10-alpha.0 - '@visactor/vrender': 0.9.2-fill-stroke.10 + '@visactor/vrender': 0.10.0-alpha.1 '@visactor/vscale': 0.9.0-alpha.2 '@visactor/vutils': 0.9.0-alpha.2 dev: true @@ -2796,7 +2796,7 @@ packages: dependencies: '@visactor/vgrammar': 0.0.10-alpha.0 '@visactor/vgrammar-util': 0.0.10-alpha.0 - '@visactor/vrender': 0.9.2-fill-stroke.10 + '@visactor/vrender': 0.10.0-alpha.1 '@visactor/vutils': 0.9.0-alpha.2 dev: true @@ -2805,35 +2805,35 @@ packages: dependencies: '@visactor/vgrammar-coordinate': 0.0.10-alpha.0 '@visactor/vgrammar-util': 0.0.10-alpha.0 - '@visactor/vrender': 0.9.2-fill-stroke.10 - '@visactor/vrender-components': 0.9.0-alpha.1_2gifkalfev5lihmqdgdi4q5elu + '@visactor/vrender': 0.10.0-alpha.1 + '@visactor/vrender-components': 0.9.0-alpha.1_dfza6q7eupifptctzznig4fmhu '@visactor/vscale': 0.9.0-alpha.2 '@visactor/vutils': 0.9.0-alpha.2 dev: true - /@visactor/vrender-components/0.9.0-alpha.1_2gifkalfev5lihmqdgdi4q5elu: - resolution: {integrity: sha512-Z/D2fk61awTAGhZY9Cmq1CXFH4sgrx2EUCCKbVr1Mw/9Orq5nITQ2xHbPWwrProg+VZS9dRoMDP5vvJsAO2RUA==} - peerDependencies: - '@visactor/vrender': 0.9.0-alpha.1 - '@visactor/vscale': 0.9.0-alpha.2 + /@visactor/vrender-components/0.10.0-alpha.1: + resolution: {integrity: sha512-EJ91rtnz0ZHv0OwXB26XQ031sCwLpUPy3fz/zqarfmkcseq+Bo/MQJDVJTxfg8Y0fRFIFIe71ghLq1aEzxc/Nw==} dependencies: - '@visactor/vrender': 0.9.2-fill-stroke.10 + '@visactor/vrender': 0.10.0-alpha.1 '@visactor/vscale': 0.9.0-alpha.2 '@visactor/vutils': 0.9.0-alpha.2 gl-matrix: 3.4.3 - dev: true + dev: false - /@visactor/vrender-components/0.9.2-fill-stroke.10: - resolution: {integrity: sha512-e7jcHRFhx1+ENPxDx+52kF0riozOTBcmR3+MvrArStn9xQWVsV4YrY02XSz9r9SEiqo1aHhPYTPOF9WMobOIEQ==} + /@visactor/vrender-components/0.9.0-alpha.1_dfza6q7eupifptctzznig4fmhu: + resolution: {integrity: sha512-Z/D2fk61awTAGhZY9Cmq1CXFH4sgrx2EUCCKbVr1Mw/9Orq5nITQ2xHbPWwrProg+VZS9dRoMDP5vvJsAO2RUA==} + peerDependencies: + '@visactor/vrender': 0.9.0-alpha.1 + '@visactor/vscale': 0.9.0-alpha.2 dependencies: - '@visactor/vrender': 0.9.2-fill-stroke.10 + '@visactor/vrender': 0.10.0-alpha.1 '@visactor/vscale': 0.9.0-alpha.2 '@visactor/vutils': 0.9.0-alpha.2 gl-matrix: 3.4.3 dev: true - /@visactor/vrender/0.9.2-fill-stroke.10: - resolution: {integrity: sha512-5v9176v7OMv3YbBS/nfjqm5aX9zLM64ATUrlzVdFjee2BfZ/EY/P8TuqJNWw8a4san1d0SyHtmHpd4HX7HWjAw==} + /@visactor/vrender/0.10.0-alpha.1: + resolution: {integrity: sha512-hVFIF4ixgUX2JDc5ZxA+XOemRN7jGiLcW6z4+J7aSTOXnQJNnv1QAxxo6qLVwwwTtfZPnIpy9oFovio9Q6+Y/A==} dependencies: '@visactor/vutils': 0.9.0-alpha.2 color-convert: 2.0.1 diff --git a/packages/vtable/package.json b/packages/vtable/package.json index 1b1499c10..49c82bc40 100644 --- 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 index a19e5d61f..d6877776d 100644 --- 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'