fix(ava/insight): correct sign of regression line & format the mean i…

…n lowVarianceMark
antvis · Nov 17, 2023 · b1eeeb6 · b1eeeb6
1 parent 8257cb3
commit b1eeeb6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/ava/src/insight/chart/strategy/augmentedMarks/lowVariance.ts b/packages/ava/src/insight/chart/strategy/augmentedMarks/lowVariance.ts
@@ -1,17 +1,18 @@
-import { Mark } from '@antv/g2';
+import { LineMark, Mark } from '@antv/g2';
 
 import { LowVarianceInfo, InsightInfo } from '../../../types';
 import { lineMarkStrategy } from '../commonMarks';
 import { insight2ChartStrategy } from '../chart';
 import { LowVarianceMark } from '../../types';
 import { augmentedMarks2Marks } from '../../utils';
+import { dataFormat } from '../../../../utils';
 
 export const lowVarianceAugmentedMarkStrategy = (insight: InsightInfo<LowVarianceInfo>): LowVarianceMark[] => {
   const { patterns } = insight;
   const marks: LowVarianceMark[] = [];
   patterns.forEach((pattern) => {
     const { mean } = pattern;
-    const meanLineMark = lineMarkStrategy({ y: mean }, { label: `mean: ${mean}` });
+    const meanLineMark = lineMarkStrategy({ y: mean }, { label: `mean: ${dataFormat(mean)}` }) as LineMark;
     marks.push({
       meanLine: [meanLineMark],
     });

diff --git a/packages/ava/src/insight/chart/strategy/augmentedMarks/trend.ts b/packages/ava/src/insight/chart/strategy/augmentedMarks/trend.ts
@@ -4,6 +4,7 @@ import { lineMarkStrategy } from '../commonMarks';
 import { insight2ChartStrategy } from '../chart';
 import { InsightInfo, TrendInfo } from '../../../types';
 import { TrendMark } from '../../types';
+import { dataFormat } from '../../../../utils';
 
 export const trendAugmentedMarksStrategy = (insight: InsightInfo<TrendInfo>): TrendMark[] => {
   const {
@@ -28,7 +29,10 @@ export const trendAugmentedMarksStrategy = (insight: InsightInfo<TrendInfo>): Tr
 
   const lineData = points.map((point) => ({ x: point[0], y: point[1] }));
 
-  const regressionLineMark = lineMarkStrategy({ points: lineData }, { label: `y=${m.toFixed(2)}x+${c.toFixed(2)}` });
+  const regressionLineMark = lineMarkStrategy(
+    { points: lineData },
+    { label: `y=${dataFormat(m)}x${c < 0 ? '' : '+'}${dataFormat(c)}` }
+  );
 
   return [
     {