Merge pull request #222 from VisActor/fix/phase2

Fix/phase2

Author: xile611

apps/website/package.json

@@ -13,8 +13,8 @@
     "rspress": "1.45.3",
     "@visactor/vseed": "workspace:*",
     "@visactor/vquery": "workspace:*",
-    "@visactor/vchart": "2.0.9",
-    "@visactor/vtable": "1.22.5-alpha.2",
+    "@visactor/vchart": "2.0.10",
+    "@visactor/vtable": "1.22.5",
     "zustand": "5.0.6"
   },
   "devDependencies": {

packages/vseed/package.json

@@ -44,8 +44,8 @@
     "@rstest/coverage-istanbul": "0.0.3",
     "@types/node": "22.16.5",
     "@typescript-eslint/eslint-plugin": "8.38.0",
-    "@visactor/vchart": "2.0.9",
-    "@visactor/vtable": "1.22.5-alpha.2",
+    "@visactor/vchart": "2.0.10",
+    "@visactor/vtable": "1.22.5",
     "@vitest/coverage-istanbul": "3.2.4",
     "@vitest/coverage-v8": "3.2.4",
     "eslint": "9.30.0",

packages/vseed/src/pipeline/spec/chart/pipes/pivotChart/dimensionLinkage.ts

@@ -1,25 +1,6 @@
 import type { ICartesianCrosshairSpec, ILineChartSpec } from '@visactor/vchart'
-import { isNullish } from 'remeda'
 import type { DimensionLinkage, PivotChartSpecPipe } from 'src/types'
 
-const defaultScatterFormatter = (val: number | string) => {
-  if (isNullish(val)) {
-    return ''
-  }
-  if (typeof val === 'string') {
-    return val
-  }
-
-  if (val === 0) {
-    return '0'
-  }
-  if (Math.abs(val) < 1) {
-    return val.toFixed(2)
-  }
-
-  return val === Math.floor(val) ? `${val}` : val.toFixed(1)
-}
-
 export const dimensionLinkage: PivotChartSpecPipe = (spec, context) => {
   const { advancedVSeed, vseed } = context
   const { chartType } = vseed
@@ -40,15 +21,15 @@ export const dimensionLinkage: PivotChartSpecPipe = (spec, context) => {
       visible: config.showLabel ?? crosshair.xField.label?.visible ?? true,
       background: crosshair.xField.label?.labelBackground,
       textStyle: crosshair.xField.label?.style,
-      formatMethod: chartType === 'scatter' ? defaultScatterFormatter : undefined,
+      formatMethod: crosshair.xField.label?.formatMethod || undefined,
     }
   }
   if (crosshair?.yField) {
     ;(labelHoverOnAxis as any).left = {
       visible: config.showLabel ?? crosshair.yField.label?.visible ?? true,
       background: crosshair.yField.label?.labelBackground,
       textStyle: crosshair.yField.label?.style,
-      formatMethod: chartType === 'scatter' ? defaultScatterFormatter : undefined,
+      formatMethod: crosshair.yField.label?.formatMethod || undefined,
     }
   }
 

packages/vseed/src/pipeline/spec/chart/pipes/regressionLine/kdeRegressionLine.ts

@@ -12,6 +12,7 @@ export const kdeRegressionLine: VChartSpecPipe = (spec, context) => {
   const { chartType, encoding = {} as Encoding, dimensions, regressionLine } = advancedVSeed
   const { dataset } = vseed
   const lineTheme = advancedVSeed.config[chartType as 'histogram']?.regressionLine as RegressionLineConfig
+  const binValueType = advancedVSeed.config[chartType as 'histogram']?.binValueType
 
   if (!regressionLine || !regressionLine.kdeRegressionLine) {
     return result
@@ -74,8 +75,18 @@ export const kdeRegressionLine: VChartSpecPipe = (spec, context) => {
             } as KDEOptions)
             const N = Math.max(3, Math.floor(simpleData.length / 4))
             const lineData = res.evaluateGrid(N)
+
+            // 根据 binValueType 决定如何转换 KDE 密度值
+            // - 频次模式 (count): 频次 = 密度 × 样本数 × 带宽
+            // - 百分比模式 (percentage): 百分比 = 密度 × 带宽
             const scaleR = (k: number) => {
-              return scaleY.scale(k * simpleData.length * res.bandwidth)
+              if (binValueType === 'percentage') {
+                // 百分比模式：y轴是0-1的百分比，KDE密度值乘以带宽即可
+                return scaleY.scale(k * res.bandwidth)
+              } else {
+                // 频次模式：y轴是实际计数，需要乘以样本数量
+                return scaleY.scale(k * simpleData.length * res.bandwidth)
+              }
             }
 
             const linePoints = lineData.map((ld: Datum) => {

packages/vseed/tests/pipeline/chartType/histogram/__snapshots__/pivotHistogram.test.ts.snap

@@ -1143,7 +1143,7 @@ exports[`pivotHistogram 2`] = `
           },
           "visible": true,
         },
-        "formatMethod": undefined,
+        "formatMethod": [Function],
         "textStyle": {
           "fill": "#ffffff",
         },