Merge pull request #38 from VisActor/27-bug-sparkline-render

27 bug sparkline render
VisActor · Jun 16, 2023 · ec77e89 · ec77e89
2 parents 57b117a + 9c0b03d
commit ec77e89
Show file tree

Hide file tree

Showing 20 changed files with 91 additions and 101 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -28,5 +28,9 @@
   "editor.tabSize": 2,
   "editor.detectIndentation": false,
   // Typescript
-  "typescript.preferences.importModuleSpecifier": "project-relative"
+  "typescript.preferences.importModuleSpecifier": "project-relative",
+  "[python]": {
+    "editor.defaultFormatter": "ms-python.black-formatter"
+  },
+  "python.formatting.provider": "none"
 }
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/examples/pivot/pivot-chart.ts b/packages/vtable/examples/pivot/pivot-chart.ts
@@ -319,7 +319,6 @@ export function createTable() {
             }
           },
           point: {
-            visible: true,
             hover: {
               stroke: 'blue',
               strokeWidth: 1,

diff --git a/packages/vtable/examples/type/spark-line.ts b/packages/vtable/examples/type/spark-line.ts
@@ -99,32 +99,26 @@ export function createTable() {
     type: 'line',
     xField: {
       field: 'x',
-      domain: [0, 1, 2, 3, 4, 5, 6, 7, 8],
-      type: 'point'
+      domain: [0, 1, 2, 3, 4, 5, 6, 7, 8]
     },
     yField: {
       field: 'y',
-      domain: [0, 80],
-      type: 'linear'
+      domain: [0, 80]
     },
     pointShowRule: 'all',
     line: {
-      visible: true,
       style: {
         stroke: '#2E62F1',
         strokeWidth: 2
       }
     },
     point: {
-      visible: true,
-      state: {
-        hover: {
-          stroke: 'blue',
-          strokeWidth: 1,
-          fill: 'red',
-          shape: 'circle',
-          size: 4
-        }
+      hover: {
+        stroke: 'blue',
+        strokeWidth: 1,
+        fill: 'red',
+        shape: 'circle',
+        size: 4
       },
       style: {
         stroke: 'red',
@@ -147,22 +141,18 @@ export function createTable() {
     yField: 'y',
     pointShowRule: 'all',
     line: {
-      visible: true,
       style: {
         stroke: 'green',
         strokeWidth: 4
       }
     },
     point: {
-      visible: true,
-      state: {
-        hover: {
-          stroke: 'blue',
-          strokeWidth: 1,
-          fill: 'red',
-          shape: 'circle',
-          size: 4
-        }
+      hover: {
+        stroke: 'blue',
+        strokeWidth: 1,
+        fill: 'red',
+        shape: 'circle',
+        size: 4
       },
       style: {
         stroke: 'red',
@@ -192,7 +182,6 @@ export function createTable() {
       }
     },
     point: {
-      visible: true,
       hover: {
         stroke: 'blue',
         strokeWidth: 1,
@@ -243,6 +232,7 @@ export function createTable() {
         width: 250,
         columnType: 'sparkline',
         sparklineSpec: Object.assign({}, baseSpec, {
+          smooth: true,
           point: {
             visible: false,
             state: {
@@ -282,8 +272,7 @@ export function createTable() {
           yField: 'y',
           crosshair: {
             style: {
-              stroke: 'red',
-              interpolate: 'monotone'
+              stroke: 'red'
             }
           }
         }

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/site-demo/business/trend.md b/packages/vtable/site-demo/business/trend.md
@@ -284,23 +284,19 @@ const option = {
           pointShowRule: 'none',
           smooth: true,
           line: {
-            visible: true,
             style: {
               stroke: '#2E62F1',
               strokeWidth: 2,
               // interpolate: 'monotone',
             },
           },
-          symbol: {
-            visible: true,
-            state: {
+          point: {
               hover: {
                 stroke: 'blue',
                 strokeWidth: 1,
                 fill: 'red',
                 shape: 'circle',
                 size: 4,
-              },
             },
             style: {
               stroke: 'red',

diff --git a/packages/vtable/site-demo/cell-type/multi-type.md b/packages/vtable/site-demo/cell-type/multi-type.md
@@ -159,8 +159,7 @@ const columns = [
             strokeWidth: 2,
           },
         },
-        symbol: {
-          visible: true,
+        point: {
           hover: {
               stroke: 'blue',
               strokeWidth: 1,

diff --git a/packages/vtable/src/index.ts b/packages/vtable/src/index.ts
@@ -21,8 +21,7 @@ import type {
   ListTableConstructorOptions,
   PivotTableConstructorOptions,
   IHeaderTreeDefine,
-  IDimension,
-  IIndicatorCustom
+  IDimension
 } from './ts-types';
 import { ListTable } from './ListTable';
 import { PivotTable } from './PivotTable';
@@ -45,7 +44,6 @@ export {
   PivotTableConstructorOptions,
   IHeaderTreeDefine,
   IDimension,
-  IIndicatorCustom,
   ColumnsDefine,
   ColumnDefine,
   LinkColumnDefine,

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'

diff --git a/packages/vtable/src/scenegraph/group-creater/cell-type/spark-line-cell.ts b/packages/vtable/src/scenegraph/group-creater/cell-type/spark-line-cell.ts
@@ -203,8 +203,8 @@ function createSparkLine(
   // 更新symbol节点属性
   const symbolGroup = chartGroup.getChildByName('sparkline-symbol-group') as ILine;
   if (symbolGroup) {
-    const isShowIsolatedPoint = sparklineSpec.point?.visible && sparklineSpec.pointShowRule === 'isolatedPoint';
-    if (sparklineSpec.point?.visible && sparklineSpec.pointShowRule === 'all') {
+    const isShowIsolatedPoint = sparklineSpec.pointShowRule === 'isolatedPoint';
+    if (sparklineSpec.pointShowRule === 'all') {
       for (let i = 0; i < items.length; i++) {
         const { x, y, defined } = items[i];
         if (defined) {
@@ -257,7 +257,7 @@ function createChartGroup(
     const line = createLine({
       x: 0,
       y: 0,
-      curveType: specObj.smooth ?? specObj.line?.style?.interpolate === 'linear' ? 'linear' : 'monotoneX',
+      curveType: specObj.smooth ? 'monotoneX' : 'linear',
       stroke: specObj.line?.style?.stroke ?? 'blue',
       lineWidth: specObj.line?.style?.strokeWidth ?? 2
     });

diff --git a/packages/vtable/src/ts-types/pivot-table/corner.ts b/packages/vtable/src/ts-types/pivot-table/corner.ts
@@ -2,24 +2,24 @@ import type { IImageStyleOption, ITextStyleOption, IStyleOption } from '../colum
 import type { ShowColumnRowType } from '../table-engine';
 
 interface IBasicCornerDefine {
-  titleOnDimension: ShowColumnRowType; //角头标题是否显示列维度名称  否则显示行维度名称
+  titleOnDimension?: ShowColumnRowType; //角头标题是否显示列维度名称  否则显示行维度名称
   // headerStyle?: HeaderStyleOption | null; //角头标题的样式
   // headerType?: HeaderTypeOption | null; //角头标题的类型
 }
 
 interface ITextCornerDefine extends IBasicCornerDefine {
-  headerType: 'text';
-  headerStyle: ITextStyleOption;
+  headerType?: 'text';
+  headerStyle?: ITextStyleOption;
 }
 
 interface IImageCornerDefine extends IBasicCornerDefine {
   headerType: 'image';
-  headerStyle: IImageStyleOption;
+  headerStyle?: IImageStyleOption;
 }
 
 interface ILinkCornerDefine extends IBasicCornerDefine {
   headerType: 'link';
-  headerStyle: ITextStyleOption;
+  headerStyle?: ITextStyleOption;
 }
 
-export type ICornerDefine = Partial<ITextCornerDefine | IImageCornerDefine | ILinkCornerDefine>;
+export type ICornerDefine = IImageCornerDefine | ILinkCornerDefine | ITextCornerDefine;
diff --git a/packages/vtable/src/ts-types/pivot-table/dimension/index.ts b/packages/vtable/src/ts-types/pivot-table/dimension/index.ts
@@ -2,4 +2,4 @@ import type { IImageDimension } from './image-dimension';
 import type { ILinkDimension } from './link-dimension';
 import type { ITextDimension } from './multilinetext-dimension';
 
-export type IDimension = Partial<ITextDimension | ILinkDimension | IImageDimension>;
+export type IDimension = ILinkDimension | IImageDimension | ITextDimension;