@visactor/vseed 0.2.1 → 0.2.2

package/dist/esm/builder/register/all.js

@@ -1,4 +1,4 @@
-import { registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerBoxplot, registerColumn, registerColumnParallel, registerColumnPercent, registerDonut, registerDualAxis, registerFunnel, registerHeatmap, registerHistogram, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable } from "./chartType/index.js";
+import { registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerBoxPlot, registerColumn, registerColumnParallel, registerColumnPercent, registerDonut, registerDualAxis, registerFunnel, registerHeatmap, registerHistogram, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable } from "./chartType/index.js";
 import { registerDarkTheme, registerLightTheme } from "./theme/index.js";
 const registerAll = ()=>{
     registerTable();
@@ -21,7 +21,7 @@ const registerAll = ()=>{
     registerRadar();
     registerFunnel();
     registerHeatmap();
-    registerBoxplot();
+    registerBoxPlot();
     registerHistogram();
     registerLightTheme();
     registerDarkTheme();

package/dist/esm/builder/register/all.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder/register/all.js","sources":["../../../../src/builder/register/all.ts"],"sourcesContent":["import {\n  registerArea,\n  registerAreaPercent,\n  registerBar,\n  registerBarParallel,\n  registerBarPercent,\n  registerColumn,\n  registerColumnParallel,\n  registerColumnPercent,\n  registerLine,\n  registerPie,\n  registerDonut,\n  registerRose,\n  registerRoseParallel,\n  registerFunnel,\n  registerScatter,\n  registerTable,\n  registerPivotTable,\n  registerHeatmap,\n  registerRadar,\n  registerDualAxis,\n  registerBoxplot,\n  registerHistogram,\n} from './chartType'\nimport { registerDarkTheme, registerLightTheme } from './theme'\n\nexport const registerAll = () => {\n  // table\n  registerTable()\n  registerPivotTable()\n  // cartesian\n  registerLine()\n  registerColumn()\n  registerColumnParallel()\n  registerColumnPercent()\n  registerBar()\n  registerBarParallel()\n  registerBarPercent()\n  registerArea()\n  registerAreaPercent()\n  registerScatter()\n  registerDualAxis()\n  // polar\n  registerPie()\n  registerDonut()\n  registerRose()\n  registerRoseParallel()\n  registerRadar()\n  // other\n  registerFunnel()\n  registerHeatmap()\n  registerBoxplot()\n  registerHistogram()\n  // theme\n  registerLightTheme()\n  registerDarkTheme()\n}\n"],"names":["registerAll","registerTable","registerPivotTable","registerLine","registerColumn","registerColumnParallel","registerColumnPercent","registerBar","registerBarParallel","registerBarPercent","registerArea","registerAreaPercent","registerScatter","registerDualAxis","registerPie","registerDonut","registerRose","registerRoseParallel","registerRadar","registerFunnel","registerHeatmap","registerBoxplot","registerHistogram","registerLightTheme","registerDarkTheme"],"mappings":";;AA0BO,MAAMA,cAAc;IAEzBC;IACAC;IAEAC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAC;IAEAC;IACAC;IACAC;IACAC;IACAC;IAEAC;IACAC;IACAC;IACAC;IAEAC;IACAC;AACF"}
+{"version":3,"file":"builder/register/all.js","sources":["../../../../src/builder/register/all.ts"],"sourcesContent":["import {\n  registerArea,\n  registerAreaPercent,\n  registerBar,\n  registerBarParallel,\n  registerBarPercent,\n  registerColumn,\n  registerColumnParallel,\n  registerColumnPercent,\n  registerLine,\n  registerPie,\n  registerDonut,\n  registerRose,\n  registerRoseParallel,\n  registerFunnel,\n  registerScatter,\n  registerTable,\n  registerPivotTable,\n  registerHeatmap,\n  registerRadar,\n  registerDualAxis,\n  registerBoxPlot,\n  registerHistogram,\n} from './chartType'\nimport { registerDarkTheme, registerLightTheme } from './theme'\n\nexport const registerAll = () => {\n  // table\n  registerTable()\n  registerPivotTable()\n  // cartesian\n  registerLine()\n  registerColumn()\n  registerColumnParallel()\n  registerColumnPercent()\n  registerBar()\n  registerBarParallel()\n  registerBarPercent()\n  registerArea()\n  registerAreaPercent()\n  registerScatter()\n  registerDualAxis()\n  // polar\n  registerPie()\n  registerDonut()\n  registerRose()\n  registerRoseParallel()\n  registerRadar()\n  // other\n  registerFunnel()\n  registerHeatmap()\n  registerBoxPlot()\n  registerHistogram()\n  // theme\n  registerLightTheme()\n  registerDarkTheme()\n}\n"],"names":["registerAll","registerTable","registerPivotTable","registerLine","registerColumn","registerColumnParallel","registerColumnPercent","registerBar","registerBarParallel","registerBarPercent","registerArea","registerAreaPercent","registerScatter","registerDualAxis","registerPie","registerDonut","registerRose","registerRoseParallel","registerRadar","registerFunnel","registerHeatmap","registerBoxPlot","registerHistogram","registerLightTheme","registerDarkTheme"],"mappings":";;AA0BO,MAAMA,cAAc;IAEzBC;IACAC;IAEAC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAC;IAEAC;IACAC;IACAC;IACAC;IACAC;IAEAC;IACAC;IACAC;IACAC;IAEAC;IACAC;AACF"}

package/dist/esm/builder/register/chartType/boxplot.d.ts

@@ -1 +1 @@
-export declare const registerBoxplot: () => void;
+export declare const registerBoxPlot: () => void;

package/dist/esm/builder/register/chartType/boxplot.js

@@ -1,9 +1,9 @@
 import { boxplotAdvancedPipeline, boxplotSpecPipeline } from "../../../pipeline/index.js";
 import { Builder } from "../../builder/index.js";
-const registerBoxplot = ()=>{
+const registerBoxPlot = ()=>{
     Builder._advancedPipelineMap.boxPlot = boxplotAdvancedPipeline;
     Builder._specPipelineMap.boxPlot = boxplotSpecPipeline;
 };
-export { registerBoxplot };
+export { registerBoxPlot };
 
 //# sourceMappingURL=boxplot.js.map

package/dist/esm/builder/register/chartType/boxplot.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder/register/chartType/boxplot.js","sources":["../../../../../src/builder/register/chartType/boxplot.ts"],"sourcesContent":["import { boxplotAdvancedPipeline, boxplotSpecPipeline } from '../../../pipeline'\nimport { Builder } from '../../builder'\n\nexport const registerBoxplot = () => {\n  Builder._advancedPipelineMap['boxPlot'] = boxplotAdvancedPipeline\n  Builder._specPipelineMap['boxPlot'] = boxplotSpecPipeline\n}\n"],"names":["registerBoxplot","Builder","boxplotAdvancedPipeline","boxplotSpecPipeline"],"mappings":";;AAGO,MAAMA,kBAAkB;IAC7BC,QAAQ,oBAAoB,CAA5BA,OAAuC,GAAGC;IAC1CD,QAAQ,gBAAgB,CAAxBA,OAAmC,GAAGE;AACxC"}
+{"version":3,"file":"builder/register/chartType/boxplot.js","sources":["../../../../../src/builder/register/chartType/boxplot.ts"],"sourcesContent":["import { boxplotAdvancedPipeline, boxplotSpecPipeline } from '../../../pipeline'\nimport { Builder } from '../../builder'\n\nexport const registerBoxPlot = () => {\n  Builder._advancedPipelineMap['boxPlot'] = boxplotAdvancedPipeline\n  Builder._specPipelineMap['boxPlot'] = boxplotSpecPipeline\n}\n"],"names":["registerBoxPlot","Builder","boxplotAdvancedPipeline","boxplotSpecPipeline"],"mappings":";;AAGO,MAAMA,kBAAkB;IAC7BC,QAAQ,oBAAoB,CAA5BA,OAAuC,GAAGC;IAC1CD,QAAQ,gBAAgB,CAAxBA,OAAmC,GAAGE;AACxC"}

package/dist/esm/builder/register/chartType/index.d.ts

@@ -18,5 +18,5 @@ export { registerRoseParallel } from './roseParallel';
 export { registerRadar } from './radar';
 export { registerHeatmap } from './heatmap';
 export { registerFunnel } from './funnel';
-export { registerBoxplot } from './boxplot';
+export { registerBoxPlot } from './boxplot';
 export { registerHistogram } from './histogram';

package/dist/esm/builder/register/chartType/index.js

@@ -18,6 +18,6 @@ import { registerRoseParallel } from "./roseParallel.js";
 import { registerRadar } from "./radar.js";
 import { registerHeatmap } from "./heatmap.js";
 import { registerFunnel } from "./funnel.js";
-import { registerBoxplot } from "./boxplot.js";
+import { registerBoxPlot } from "./boxplot.js";
 import { registerHistogram } from "./histogram.js";
-export { registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerBoxplot, registerColumn, registerColumnParallel, registerColumnPercent, registerDonut, registerDualAxis, registerFunnel, registerHeatmap, registerHistogram, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable };
+export { registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerBoxPlot, registerColumn, registerColumnParallel, registerColumnPercent, registerDonut, registerDualAxis, registerFunnel, registerHeatmap, registerHistogram, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable };

package/dist/esm/index.d.ts

@@ -2,7 +2,7 @@ export { Builder } from './builder';
 export { registerAll } from './builder/register/all';
 export { updateAdvanced, updateSpec } from './builder/register/custom';
 export { registerDarkTheme, registerLightTheme, registerCustomTheme } from './builder/register/theme';
-export { registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerLine, registerPie, registerDonut, registerRose, registerRoseParallel, registerFunnel, registerScatter, registerTable, registerPivotTable, registerHeatmap, registerRadar, registerBoxplot, registerHistogram, registerDualAxis, } from './builder/register/chartType';
+export { registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerLine, registerPie, registerDonut, registerRose, registerRoseParallel, registerFunnel, registerScatter, registerTable, registerPivotTable, registerHeatmap, registerRadar, registerBoxPlot, registerHistogram, registerDualAxis, } from './builder/register/chartType';
 export * from './pipeline';
 export * from './types';
 export * from './dataReshape';

package/dist/esm/index.js

@@ -2,11 +2,11 @@ import { Builder } from "./builder/index.js";
 import { registerAll } from "./builder/register/all.js";
 import { updateAdvanced, updateSpec } from "./builder/register/custom.js";
 import { registerCustomTheme, registerDarkTheme, registerLightTheme } from "./builder/register/theme/index.js";
-import { registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerBoxplot, registerColumn, registerColumnParallel, registerColumnPercent, registerDonut, registerDualAxis, registerFunnel, registerHeatmap, registerHistogram, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable } from "./builder/register/chartType/index.js";
+import { registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerBoxPlot, registerColumn, registerColumnParallel, registerColumnPercent, registerDonut, registerDualAxis, registerFunnel, registerHeatmap, registerHistogram, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable } from "./builder/register/chartType/index.js";
 export * from "./pipeline/index.js";
 export * from "./types/index.js";
 export * from "./dataReshape/index.js";
 export * from "./dataSelector/index.js";
 export * from "./theme/index.js";
 export * from "./i18n/index.js";
-export { Builder, registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerBoxplot, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerDonut, registerDualAxis, registerFunnel, registerHeatmap, registerHistogram, registerLightTheme, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable, updateAdvanced, updateSpec };
+export { Builder, registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerBoxPlot, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerDonut, registerDualAxis, registerFunnel, registerHeatmap, registerHistogram, registerLightTheme, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable, updateAdvanced, updateSpec };

package/dist/esm/pipeline/advanced/chart/pipes/config/histogram.js

@@ -1,3 +1,4 @@
+import { merge } from "@visactor/vutils";
 import { pick } from "remeda";
 import { BinEndMeasureId, BinStartMeasureId } from "../../../../../dataReshape/index.js";
 import { replaceNullToUndefined } from "../../../../utils/index.js";
@@ -23,6 +24,22 @@ const histogramConfig = (advancedVSeed, context)=>{
         'dimensionLinkage'
     ]);
     let config = replaceNullToUndefined(pickedConfig);
+    if (pickedConfig?.binValueType === 'percentage') config = merge({}, {
+        yAxis: {
+            autoFomat: false,
+            numFormat: {
+                type: 'percent',
+                fractionDigits: 1
+            }
+        },
+        label: {
+            autoFormat: false,
+            numFormat: {
+                type: 'percent',
+                fractionDigits: 1
+            }
+        }
+    }, config);
     if (!hasColorEncoding && !config?.legend?.enable) config = {
         ...config,
         legend: {

package/dist/esm/pipeline/advanced/chart/pipes/config/histogram.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/advanced/chart/pipes/config/histogram.js","sources":["../../../../../../../src/pipeline/advanced/chart/pipes/config/histogram.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment */\nimport { pick } from 'remeda'\nimport { BinEndMeasureId, BinStartMeasureId } from 'src/dataReshape'\nimport { replaceNullToUndefined } from 'src/pipeline/utils'\nimport type { AdvancedPipe, AdvancedVSeed, Config, Dimension } from 'src/types'\n\nexport const histogramConfig: AdvancedPipe = (advancedVSeed, context) => {\n  const { vseed } = context\n  const { chartType } = vseed\n  const result = {\n    ...advancedVSeed,\n  }\n  const hasColorEncoding = (advancedVSeed?.dimensions || []).find((field: Dimension) => field?.encoding === 'color')\n\n  const pickedConfig = pick(vseed, [\n    'backgroundColor',\n    'color',\n    'label',\n    'legend',\n    'tooltip',\n    'xAxis',\n    'yAxis',\n    'crosshairRect',\n    'binCount',\n    'binStep',\n    'binValueType',\n\n    'dimensionLinkage',\n  ]) as Config['histogram']\n\n  let config = replaceNullToUndefined(pickedConfig)\n\n  if (!hasColorEncoding && !config?.legend?.enable) {\n    config = {\n      ...config,\n      legend: {\n        ...config?.legend,\n        enable: false,\n      },\n    }\n  }\n  result.config = {\n    ...(result.config || {}),\n    [chartType]: {\n      ...config,\n    },\n  }\n\n  return result as AdvancedVSeed\n}\n\nexport const histogramXAxisConfig: AdvancedPipe = (advancedVSeed, context) => {\n  const { vseed } = context\n  const { chartType } = vseed\n  const result = {\n    ...advancedVSeed,\n  }\n  const { dataset = [] } = advancedVSeed\n  const flattenDatasert = dataset.flat()\n  const minValue = Math.min(...flattenDatasert.map((v) => +v[BinStartMeasureId]))\n  const maxValue = Math.max(...flattenDatasert.map((v) => +v[BinEndMeasureId]))\n\n  const chartConfig = result.config?.[chartType] as any\n  result.config = {\n    ...(result.config || {}),\n    [chartType]: {\n      ...chartConfig,\n      xAxis: {\n        min: Number.isNaN(minValue) ? undefined : minValue,\n        max: Number.isNaN(maxValue) ? undefined : maxValue,\n        ...(chartConfig?.xAxis || {}),\n      },\n    },\n  }\n\n  return result as AdvancedVSeed\n}\n"],"names":["histogramConfig","advancedVSeed","context","vseed","chartType","result","hasColorEncoding","field","pickedConfig","pick","config","replaceNullToUndefined","histogramXAxisConfig","dataset","flattenDatasert","minValue","Math","v","BinStartMeasureId","maxValue","BinEndMeasureId","chartConfig","Number","undefined"],"mappings":";;;AAMO,MAAMA,kBAAgC,CAACC,eAAeC;IAC3D,MAAM,EAAEC,KAAK,EAAE,GAAGD;IAClB,MAAM,EAAEE,SAAS,EAAE,GAAGD;IACtB,MAAME,SAAS;QACb,GAAGJ,aAAa;IAClB;IACA,MAAMK,mBAAoBL,AAAAA,CAAAA,eAAe,cAAc,EAAC,EAAG,IAAI,CAAC,CAACM,QAAqBA,OAAO,aAAa;IAE1G,MAAMC,eAAeC,KAAKN,OAAO;QAC/B;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QAEA;KACD;IAED,IAAIO,SAASC,uBAAuBH;IAEpC,IAAI,CAACF,oBAAoB,CAACI,QAAQ,QAAQ,QACxCA,SAAS;QACP,GAAGA,MAAM;QACT,QAAQ;YACN,GAAGA,QAAQ,MAAM;YACjB,QAAQ;QACV;IACF;IAEFL,OAAO,MAAM,GAAG;QACd,GAAIA,OAAO,MAAM,IAAI,CAAC,CAAC;QACvB,CAACD,UAAU,EAAE;YACX,GAAGM,MAAM;QACX;IACF;IAEA,OAAOL;AACT;AAEO,MAAMO,uBAAqC,CAACX,eAAeC;IAChE,MAAM,EAAEC,KAAK,EAAE,GAAGD;IAClB,MAAM,EAAEE,SAAS,EAAE,GAAGD;IACtB,MAAME,SAAS;QACb,GAAGJ,aAAa;IAClB;IACA,MAAM,EAAEY,UAAU,EAAE,EAAE,GAAGZ;IACzB,MAAMa,kBAAkBD,QAAQ,IAAI;IACpC,MAAME,WAAWC,KAAK,GAAG,IAAIF,gBAAgB,GAAG,CAAC,CAACG,IAAM,CAACA,CAAC,CAACC,kBAAkB;IAC7E,MAAMC,WAAWH,KAAK,GAAG,IAAIF,gBAAgB,GAAG,CAAC,CAACG,IAAM,CAACA,CAAC,CAACG,gBAAgB;IAE3E,MAAMC,cAAchB,OAAO,MAAM,EAAE,CAACD,UAAU;IAC9CC,OAAO,MAAM,GAAG;QACd,GAAIA,OAAO,MAAM,IAAI,CAAC,CAAC;QACvB,CAACD,UAAU,EAAE;YACX,GAAGiB,WAAW;YACd,OAAO;gBACL,KAAKC,OAAO,KAAK,CAACP,YAAYQ,SAAYR;gBAC1C,KAAKO,OAAO,KAAK,CAACH,YAAYI,SAAYJ;gBAC1C,GAAIE,aAAa,SAAS,CAAC,CAAC;YAC9B;QACF;IACF;IAEA,OAAOhB;AACT"}
+{"version":3,"file":"pipeline/advanced/chart/pipes/config/histogram.js","sources":["../../../../../../../src/pipeline/advanced/chart/pipes/config/histogram.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment */\nimport { merge } from '@visactor/vutils'\nimport { pick } from 'remeda'\nimport { BinEndMeasureId, BinStartMeasureId } from 'src/dataReshape'\nimport { replaceNullToUndefined } from 'src/pipeline/utils'\nimport type { AdvancedPipe, AdvancedVSeed, Config, Dimension } from 'src/types'\n\nexport const histogramConfig: AdvancedPipe = (advancedVSeed, context) => {\n  const { vseed } = context\n  const { chartType } = vseed\n  const result = {\n    ...advancedVSeed,\n  }\n  const hasColorEncoding = (advancedVSeed?.dimensions || []).find((field: Dimension) => field?.encoding === 'color')\n\n  const pickedConfig = pick(vseed, [\n    'backgroundColor',\n    'color',\n    'label',\n    'legend',\n    'tooltip',\n    'xAxis',\n    'yAxis',\n    'crosshairRect',\n    'binCount',\n    'binStep',\n    'binValueType',\n\n    'dimensionLinkage',\n  ]) as Config['histogram']\n\n  let config = replaceNullToUndefined(pickedConfig)\n\n  if (pickedConfig?.binValueType === 'percentage') {\n    config = merge(\n      {},\n      {\n        yAxis: {\n          autoFomat: false,\n          numFormat: {\n            type: 'percent',\n            fractionDigits: 1,\n          },\n        },\n        label: {\n          autoFormat: false,\n          numFormat: {\n            type: 'percent',\n            fractionDigits: 1,\n          },\n        },\n      },\n      config,\n    )\n  }\n  if (!hasColorEncoding && !config?.legend?.enable) {\n    config = {\n      ...config,\n      legend: {\n        ...config?.legend,\n        enable: false,\n      },\n    }\n  }\n  result.config = {\n    ...(result.config || {}),\n    [chartType]: {\n      ...config,\n    },\n  }\n\n  return result as AdvancedVSeed\n}\n\nexport const histogramXAxisConfig: AdvancedPipe = (advancedVSeed, context) => {\n  const { vseed } = context\n  const { chartType } = vseed\n  const result = {\n    ...advancedVSeed,\n  }\n  const { dataset = [] } = advancedVSeed\n  const flattenDatasert = dataset.flat()\n  const minValue = Math.min(...flattenDatasert.map((v) => +v[BinStartMeasureId]))\n  const maxValue = Math.max(...flattenDatasert.map((v) => +v[BinEndMeasureId]))\n\n  const chartConfig = result.config?.[chartType] as any\n  result.config = {\n    ...(result.config || {}),\n    [chartType]: {\n      ...chartConfig,\n      xAxis: {\n        min: Number.isNaN(minValue) ? undefined : minValue,\n        max: Number.isNaN(maxValue) ? undefined : maxValue,\n        ...(chartConfig?.xAxis || {}),\n      },\n    },\n  }\n\n  return result as AdvancedVSeed\n}\n"],"names":["histogramConfig","advancedVSeed","context","vseed","chartType","result","hasColorEncoding","field","pickedConfig","pick","config","replaceNullToUndefined","merge","histogramXAxisConfig","dataset","flattenDatasert","minValue","Math","v","BinStartMeasureId","maxValue","BinEndMeasureId","chartConfig","Number","undefined"],"mappings":";;;;AAOO,MAAMA,kBAAgC,CAACC,eAAeC;IAC3D,MAAM,EAAEC,KAAK,EAAE,GAAGD;IAClB,MAAM,EAAEE,SAAS,EAAE,GAAGD;IACtB,MAAME,SAAS;QACb,GAAGJ,aAAa;IAClB;IACA,MAAMK,mBAAoBL,AAAAA,CAAAA,eAAe,cAAc,EAAC,EAAG,IAAI,CAAC,CAACM,QAAqBA,OAAO,aAAa;IAE1G,MAAMC,eAAeC,KAAKN,OAAO;QAC/B;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QAEA;KACD;IAED,IAAIO,SAASC,uBAAuBH;IAEpC,IAAIA,cAAc,iBAAiB,cACjCE,SAASE,MACP,CAAC,GACD;QACE,OAAO;YACL,WAAW;YACX,WAAW;gBACT,MAAM;gBACN,gBAAgB;YAClB;QACF;QACA,OAAO;YACL,YAAY;YACZ,WAAW;gBACT,MAAM;gBACN,gBAAgB;YAClB;QACF;IACF,GACAF;IAGJ,IAAI,CAACJ,oBAAoB,CAACI,QAAQ,QAAQ,QACxCA,SAAS;QACP,GAAGA,MAAM;QACT,QAAQ;YACN,GAAGA,QAAQ,MAAM;YACjB,QAAQ;QACV;IACF;IAEFL,OAAO,MAAM,GAAG;QACd,GAAIA,OAAO,MAAM,IAAI,CAAC,CAAC;QACvB,CAACD,UAAU,EAAE;YACX,GAAGM,MAAM;QACX;IACF;IAEA,OAAOL;AACT;AAEO,MAAMQ,uBAAqC,CAACZ,eAAeC;IAChE,MAAM,EAAEC,KAAK,EAAE,GAAGD;IAClB,MAAM,EAAEE,SAAS,EAAE,GAAGD;IACtB,MAAME,SAAS;QACb,GAAGJ,aAAa;IAClB;IACA,MAAM,EAAEa,UAAU,EAAE,EAAE,GAAGb;IACzB,MAAMc,kBAAkBD,QAAQ,IAAI;IACpC,MAAME,WAAWC,KAAK,GAAG,IAAIF,gBAAgB,GAAG,CAAC,CAACG,IAAM,CAACA,CAAC,CAACC,kBAAkB;IAC7E,MAAMC,WAAWH,KAAK,GAAG,IAAIF,gBAAgB,GAAG,CAAC,CAACG,IAAM,CAACA,CAAC,CAACG,gBAAgB;IAE3E,MAAMC,cAAcjB,OAAO,MAAM,EAAE,CAACD,UAAU;IAC9CC,OAAO,MAAM,GAAG;QACd,GAAIA,OAAO,MAAM,IAAI,CAAC,CAAC;QACvB,CAACD,UAAU,EAAE;YACX,GAAGkB,WAAW;YACd,OAAO;gBACL,KAAKC,OAAO,KAAK,CAACP,YAAYQ,SAAYR;gBAC1C,KAAKO,OAAO,KAAK,CAACH,YAAYI,SAAYJ;gBAC1C,GAAIE,aAAa,SAAS,CAAC,CAAC;YAC9B;QACF;IACF;IAEA,OAAOjB;AACT"}

package/dist/esm/pipeline/spec/chart/pipeline/histogram.js

@@ -1,4 +1,4 @@
-import { annotationAreaBand, annotationHorizontalLine, annotationPoint, annotationVerticalLine, backgroundColor, barStyle, color, colorAdapter, colorBarStyleFill, colorLegend, datasetHistogram, datasetPivot, dimensionLinkage, discreteLegend, ecdfRegressionLine, histogramVerticalCrosshairRect, initHistogram, initPivot, kdeRegressionLine, label, linearColor, pivotAdapter, pivotAxisStyle, pivotColorLegend, pivotColumnDimensions, pivotDiscreteLegend, pivotGridStyle, pivotIndicators, pivotRowDimensions, pivotTitle, progressive, tooltipHistogram, xLinear, yLinear } from "../pipes/index.js";
+import { annotationAreaBand, annotationHorizontalLine, annotationPointOfHistogram, annotationVerticalLine, backgroundColor, barStyle, color, colorAdapter, colorBarStyleFill, colorLegend, datasetHistogram, datasetPivot, dimensionLinkage, discreteLegend, ecdfRegressionLine, histogramVerticalCrosshairRect, initHistogram, initPivot, kdeRegressionLine, label, linearColor, pivotAdapter, pivotAxisStyle, pivotColorLegend, pivotColumnDimensions, pivotDiscreteLegend, pivotGridStyle, pivotIndicators, pivotRowDimensions, pivotTitle, progressive, tooltipHistogram, xLinear, yLinear } from "../pipes/index.js";
 const histogram = [
     initHistogram,
     colorAdapter(color, linearColor),
@@ -12,7 +12,7 @@ const histogram = [
     colorAdapter(discreteLegend, colorLegend),
     histogramVerticalCrosshairRect,
     colorBarStyleFill(barStyle),
-    annotationPoint,
+    annotationPointOfHistogram,
     annotationVerticalLine,
     annotationHorizontalLine,
     annotationAreaBand,
@@ -35,7 +35,7 @@ const pivotHistogram = [
         tooltipHistogram,
         colorBarStyleFill(barStyle),
         histogramVerticalCrosshairRect,
-        annotationPoint,
+        annotationPointOfHistogram,
         annotationVerticalLine,
         annotationHorizontalLine,
         annotationAreaBand,

package/dist/esm/pipeline/spec/chart/pipeline/histogram.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipeline/histogram.js","sources":["../../../../../../src/pipeline/spec/chart/pipeline/histogram.ts"],"sourcesContent":["import type { PivotChartSpecPipeline, VChartSpecPipeline } from 'src/types'\nimport {\n  label,\n  xLinear,\n  backgroundColor,\n  discreteLegend,\n  color,\n  pivotAdapter,\n  initPivot,\n  datasetPivot,\n  pivotIndicators,\n  pivotDiscreteLegend,\n  pivotGridStyle,\n  pivotColumnDimensions,\n  pivotRowDimensions,\n  barStyle,\n  annotationPoint,\n  annotationVerticalLine,\n  annotationHorizontalLine,\n  annotationAreaBand,\n  datasetHistogram,\n  progressive,\n  colorAdapter,\n  linearColor,\n  colorLegend,\n  colorBarStyleFill,\n  pivotColorLegend,\n  initHistogram,\n  yLinear,\n  histogramVerticalCrosshairRect,\n  tooltipHistogram,\n  kdeRegressionLine,\n  ecdfRegressionLine,\n  pivotTitle,\n  pivotAxisStyle,\n  dimensionLinkage,\n} from '../pipes'\n\nconst histogram: VChartSpecPipeline = [\n  initHistogram,\n  colorAdapter(color, linearColor),\n  backgroundColor,\n  datasetHistogram,\n  progressive,\n  xLinear,\n  yLinear,\n  label,\n  tooltipHistogram,\n  colorAdapter(discreteLegend, colorLegend),\n  histogramVerticalCrosshairRect,\n  colorBarStyleFill(barStyle),\n  annotationPoint,\n  annotationVerticalLine,\n  annotationHorizontalLine,\n  annotationAreaBand,\n  kdeRegressionLine,\n  ecdfRegressionLine,\n]\n\nconst pivotHistogram: PivotChartSpecPipeline = [\n  initPivot,\n  pivotGridStyle,\n  datasetPivot,\n  pivotIndicators([\n    initHistogram,\n    colorAdapter(color, linearColor),\n    backgroundColor,\n    datasetHistogram,\n    progressive,\n    xLinear,\n    pivotAxisStyle(yLinear),\n    label,\n    tooltipHistogram,\n    colorBarStyleFill(barStyle),\n    histogramVerticalCrosshairRect,\n    annotationPoint,\n    annotationVerticalLine,\n    annotationHorizontalLine,\n    annotationAreaBand,\n    kdeRegressionLine,\n    ecdfRegressionLine,\n  ]),\n  pivotRowDimensions,\n  pivotColumnDimensions,\n  pivotTitle,\n  colorAdapter(pivotDiscreteLegend, pivotColorLegend),\n  dimensionLinkage,\n]\n\nexport const histogramSpecPipeline = [pivotAdapter(histogram, pivotHistogram)]\n"],"names":["histogram","initHistogram","colorAdapter","color","linearColor","backgroundColor","datasetHistogram","progressive","xLinear","yLinear","label","tooltipHistogram","discreteLegend","colorLegend","histogramVerticalCrosshairRect","colorBarStyleFill","barStyle","annotationPoint","annotationVerticalLine","annotationHorizontalLine","annotationAreaBand","kdeRegressionLine","ecdfRegressionLine","pivotHistogram","initPivot","pivotGridStyle","datasetPivot","pivotIndicators","pivotAxisStyle","pivotRowDimensions","pivotColumnDimensions","pivotTitle","pivotDiscreteLegend","pivotColorLegend","dimensionLinkage","histogramSpecPipeline","pivotAdapter"],"mappings":";AAsCA,MAAMA,YAAgC;IACpCC;IACAC,aAAaC,OAAOC;IACpBC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAT,aAAaU,gBAAgBC;IAC7BC;IACAC,kBAAkBC;IAClBC;IACAC;IACAC;IACAC;IACAC;IACAC;CACD;AAED,MAAMC,iBAAyC;IAC7CC;IACAC;IACAC;IACAC,gBAAgB;QACd1B;QACAC,aAAaC,OAAOC;QACpBC;QACAC;QACAC;QACAC;QACAoB,eAAenB;QACfC;QACAC;QACAI,kBAAkBC;QAClBF;QACAG;QACAC;QACAC;QACAC;QACAC;QACAC;KACD;IACDO;IACAC;IACAC;IACA7B,aAAa8B,qBAAqBC;IAClCC;CACD;AAEM,MAAMC,wBAAwB;IAACC,aAAapC,WAAWuB;CAAgB"}
+{"version":3,"file":"pipeline/spec/chart/pipeline/histogram.js","sources":["../../../../../../src/pipeline/spec/chart/pipeline/histogram.ts"],"sourcesContent":["import type { PivotChartSpecPipeline, VChartSpecPipeline } from 'src/types'\nimport {\n  label,\n  xLinear,\n  backgroundColor,\n  discreteLegend,\n  color,\n  pivotAdapter,\n  initPivot,\n  datasetPivot,\n  pivotIndicators,\n  pivotDiscreteLegend,\n  pivotGridStyle,\n  pivotColumnDimensions,\n  pivotRowDimensions,\n  barStyle,\n  annotationPointOfHistogram,\n  annotationVerticalLine,\n  annotationHorizontalLine,\n  annotationAreaBand,\n  datasetHistogram,\n  progressive,\n  colorAdapter,\n  linearColor,\n  colorLegend,\n  colorBarStyleFill,\n  pivotColorLegend,\n  initHistogram,\n  yLinear,\n  histogramVerticalCrosshairRect,\n  tooltipHistogram,\n  kdeRegressionLine,\n  ecdfRegressionLine,\n  pivotTitle,\n  pivotAxisStyle,\n  dimensionLinkage,\n} from '../pipes'\n\nconst histogram: VChartSpecPipeline = [\n  initHistogram,\n  colorAdapter(color, linearColor),\n  backgroundColor,\n  datasetHistogram,\n  progressive,\n  xLinear,\n  yLinear,\n  label,\n  tooltipHistogram,\n  colorAdapter(discreteLegend, colorLegend),\n  histogramVerticalCrosshairRect,\n  colorBarStyleFill(barStyle),\n  annotationPointOfHistogram,\n  annotationVerticalLine,\n  annotationHorizontalLine,\n  annotationAreaBand,\n  kdeRegressionLine,\n  ecdfRegressionLine,\n]\n\nconst pivotHistogram: PivotChartSpecPipeline = [\n  initPivot,\n  pivotGridStyle,\n  datasetPivot,\n  pivotIndicators([\n    initHistogram,\n    colorAdapter(color, linearColor),\n    backgroundColor,\n    datasetHistogram,\n    progressive,\n    xLinear,\n    pivotAxisStyle(yLinear),\n    label,\n    tooltipHistogram,\n    colorBarStyleFill(barStyle),\n    histogramVerticalCrosshairRect,\n    annotationPointOfHistogram,\n    annotationVerticalLine,\n    annotationHorizontalLine,\n    annotationAreaBand,\n    kdeRegressionLine,\n    ecdfRegressionLine,\n  ]),\n  pivotRowDimensions,\n  pivotColumnDimensions,\n  pivotTitle,\n  colorAdapter(pivotDiscreteLegend, pivotColorLegend),\n  dimensionLinkage,\n]\n\nexport const histogramSpecPipeline = [pivotAdapter(histogram, pivotHistogram)]\n"],"names":["histogram","initHistogram","colorAdapter","color","linearColor","backgroundColor","datasetHistogram","progressive","xLinear","yLinear","label","tooltipHistogram","discreteLegend","colorLegend","histogramVerticalCrosshairRect","colorBarStyleFill","barStyle","annotationPointOfHistogram","annotationVerticalLine","annotationHorizontalLine","annotationAreaBand","kdeRegressionLine","ecdfRegressionLine","pivotHistogram","initPivot","pivotGridStyle","datasetPivot","pivotIndicators","pivotAxisStyle","pivotRowDimensions","pivotColumnDimensions","pivotTitle","pivotDiscreteLegend","pivotColorLegend","dimensionLinkage","histogramSpecPipeline","pivotAdapter"],"mappings":";AAsCA,MAAMA,YAAgC;IACpCC;IACAC,aAAaC,OAAOC;IACpBC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAC;IACAT,aAAaU,gBAAgBC;IAC7BC;IACAC,kBAAkBC;IAClBC;IACAC;IACAC;IACAC;IACAC;IACAC;CACD;AAED,MAAMC,iBAAyC;IAC7CC;IACAC;IACAC;IACAC,gBAAgB;QACd1B;QACAC,aAAaC,OAAOC;QACpBC;QACAC;QACAC;QACAC;QACAoB,eAAenB;QACfC;QACAC;QACAI,kBAAkBC;QAClBF;QACAG;QACAC;QACAC;QACAC;QACAC;QACAC;KACD;IACDO;IACAC;IACAC;IACA7B,aAAa8B,qBAAqBC;IAClCC;CACD;AAEM,MAAMC,wBAAwB;IAACC,aAAapC,WAAWuB;CAAgB"}

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationPoint.js

@@ -1,78 +1,5 @@
-import { selector } from "../../../../../dataSelector/index.js";
-import { isSubset } from "./utils.js";
-import { ANNOTATION_Z_INDEX } from "../../../../utils/constant.js";
-import { isBarLikeChart } from "../../../../utils/chatType.js";
-const annotationPoint_annotationPoint = (spec, context)=>{
-    const { advancedVSeed, vseed } = context;
-    const { annotation, config } = advancedVSeed;
-    if (!annotation || !annotation.annotationPoint) return spec;
-    const theme = config?.[vseed.chartType]?.annotation?.annotationPoint;
-    const { annotationPoint } = annotation;
-    const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [
-        annotationPoint
-    ];
-    const isHorizontalBar = isBarLikeChart(advancedVSeed);
-    const defaultStyle = isHorizontalBar ? {
-        textAlign: 'right',
-        textBaseline: 'middle'
-    } : {
-        textAlign: 'center',
-        textBaseline: 'top'
-    };
-    const markPoint = annotationPointList.flatMap((annotationPoint)=>{
-        const { selector: selectorPoint, text = '', textColor = theme?.textColor ?? '#ffffff', textFontSize = theme?.textFontSize ?? 12, textFontWeight = theme?.textFontWeight ?? 400, textAlign = defaultStyle.textAlign, textBaseline = defaultStyle.textBaseline, textBackgroundBorderColor = theme?.textBackgroundBorderColor, textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4, textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1, textBackgroundColor = theme?.textBackgroundColor ?? '#212121', textBackgroundPadding = theme?.textBackgroundPadding ?? 2, textBackgroundVisible = theme?.textBackgroundVisible ?? true, offsetX = theme?.offsetX ?? 0, offsetY = theme?.offsetY ?? 0 } = annotationPoint;
-        const dataset = advancedVSeed.dataset.flat();
-        const selectedData = selectorPoint ? dataset.filter((datum)=>selector(datum, selectorPoint)) : [];
-        const dx = -10 - (isHorizontalBar ? textFontSize : 0);
-        const dy = isHorizontalBar ? 0 : textFontSize;
-        return selectedData.map((datum)=>({
-                zIndex: ANNOTATION_Z_INDEX,
-                regionRelative: true,
-                coordinate: (data)=>data.find((item)=>isSubset(datum, item)),
-                itemLine: {
-                    visible: false
-                },
-                itemContent: {
-                    offsetY,
-                    offsetX,
-                    confine: true,
-                    text: {
-                        text: text,
-                        style: {
-                            opacity: 0.95,
-                            visible: true,
-                            textAlign: textAlign,
-                            textBaseline: textBaseline,
-                            fill: textColor,
-                            stroke: textBackgroundColor,
-                            lineWidth: 1,
-                            fontSize: textFontSize,
-                            fontWeight: textFontWeight,
-                            dx,
-                            dy
-                        },
-                        labelBackground: {
-                            visible: textBackgroundVisible,
-                            padding: textBackgroundPadding,
-                            style: {
-                                opacity: 0.95,
-                                cornerRadius: textBackgroundBorderRadius ?? 4,
-                                fill: textBackgroundColor,
-                                stroke: textBackgroundBorderColor,
-                                lineWidth: textBackgroundBorderWidth,
-                                dx,
-                                dy
-                            }
-                        }
-                    }
-                }
-            }));
-    });
-    return {
-        ...spec,
-        markPoint
-    };
-};
-export { annotationPoint_annotationPoint as annotationPoint };
+import { generateAnnotationPointPipe } from "./annotationPointCommon.js";
+const annotationPoint = generateAnnotationPointPipe({});
+export { annotationPoint };
 
 //# sourceMappingURL=annotationPoint.js.map

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationPoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/annotation/annotationPoint.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/annotationPoint.ts"],"sourcesContent":["import type { ILineChartSpec } from '@visactor/vchart'\nimport { selector } from '../../../../../dataSelector'\nimport type { Datum, VChartSpecPipe, VSeed } from 'src/types'\nimport { isSubset } from './utils'\nimport { ANNOTATION_Z_INDEX } from '../../../../utils/constant'\nimport { isBarLikeChart } from 'src/pipeline/utils/chatType'\n\nexport const annotationPoint: VChartSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const { annotation, config } = advancedVSeed\n\n  if (!annotation || !annotation.annotationPoint) {\n    return spec\n  }\n\n  const theme = config?.[vseed.chartType as 'column']?.annotation?.annotationPoint\n  const { annotationPoint } = annotation\n  const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [annotationPoint]\n  const isHorizontalBar = isBarLikeChart(advancedVSeed as VSeed)\n  const defaultStyle = isHorizontalBar\n    ? {\n        textAlign: 'right',\n        textBaseline: 'middle',\n      }\n    : {\n        textAlign: 'center',\n        textBaseline: 'top',\n      }\n\n  const markPoint = annotationPointList.flatMap((annotationPoint) => {\n    const {\n      selector: selectorPoint,\n      text = '',\n      textColor = theme?.textColor ?? '#ffffff',\n      textFontSize = theme?.textFontSize ?? 12,\n      textFontWeight = theme?.textFontWeight ?? 400,\n      textAlign = defaultStyle.textAlign,\n      textBaseline = defaultStyle.textBaseline,\n      textBackgroundBorderColor = theme?.textBackgroundBorderColor,\n      textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4,\n      textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1,\n      textBackgroundColor = theme?.textBackgroundColor ?? '#212121',\n      textBackgroundPadding = theme?.textBackgroundPadding ?? 2,\n      textBackgroundVisible = theme?.textBackgroundVisible ?? true,\n      offsetX = theme?.offsetX ?? 0,\n      offsetY = theme?.offsetY ?? 0,\n    } = annotationPoint\n\n    const dataset = advancedVSeed.dataset.flat()\n    const selectedData = selectorPoint ? dataset.filter((datum) => selector(datum, selectorPoint)) : []\n    const dx = -10 - (isHorizontalBar ? (textFontSize as number) : 0) // 由于vchart tag实现问题，需要设置这个强制偏移量\n    const dy = isHorizontalBar ? 0 : (textFontSize as number)\n\n    return selectedData.map((datum) => {\n      return {\n        zIndex: ANNOTATION_Z_INDEX,\n        regionRelative: true,\n        coordinate: (data: Datum[]) => {\n          return data.find((item) => isSubset(datum, item))\n        },\n\n        itemLine: {\n          visible: false,\n        },\n        itemContent: {\n          offsetY,\n          offsetX,\n          confine: true,\n          text: {\n            text: text,\n            style: {\n              opacity: 0.95,\n              visible: true,\n              textAlign: textAlign,\n              textBaseline: textBaseline,\n              fill: textColor,\n              stroke: textBackgroundColor,\n              lineWidth: 1,\n              fontSize: textFontSize,\n              fontWeight: textFontWeight,\n              dx,\n              dy,\n            },\n            labelBackground: {\n              visible: textBackgroundVisible,\n              padding: textBackgroundPadding,\n              style: {\n                opacity: 0.95,\n                cornerRadius: textBackgroundBorderRadius ?? 4,\n                fill: textBackgroundColor,\n                stroke: textBackgroundBorderColor,\n                lineWidth: textBackgroundBorderWidth,\n                dx,\n                dy,\n              },\n            },\n          },\n        },\n      }\n    })\n  }) as ILineChartSpec['markPoint']\n\n  return {\n    ...spec,\n    markPoint,\n  }\n}\n"],"names":["annotationPoint","spec","context","advancedVSeed","vseed","annotation","config","theme","annotationPointList","Array","isHorizontalBar","isBarLikeChart","defaultStyle","markPoint","selectorPoint","text","textColor","textFontSize","textFontWeight","textAlign","textBaseline","textBackgroundBorderColor","textBackgroundBorderRadius","textBackgroundBorderWidth","textBackgroundColor","textBackgroundPadding","textBackgroundVisible","offsetX","offsetY","dataset","selectedData","datum","selector","dx","dy","ANNOTATION_Z_INDEX","data","item","isSubset"],"mappings":";;;;AAOO,MAAMA,kCAAkC,CAACC,MAAMC;IACpD,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;IACjC,MAAM,EAAEG,UAAU,EAAEC,MAAM,EAAE,GAAGH;IAE/B,IAAI,CAACE,cAAc,CAACA,WAAW,eAAe,EAC5C,OAAOJ;IAGT,MAAMM,QAAQD,QAAQ,CAACF,MAAM,SAAS,CAAa,EAAE,YAAY;IACjE,MAAM,EAAEJ,eAAe,EAAE,GAAGK;IAC5B,MAAMG,sBAAsBC,MAAM,OAAO,CAACT,mBAAmBA,kBAAkB;QAACA;KAAgB;IAChG,MAAMU,kBAAkBC,eAAeR;IACvC,MAAMS,eAAeF,kBACjB;QACE,WAAW;QACX,cAAc;IAChB,IACA;QACE,WAAW;QACX,cAAc;IAChB;IAEJ,MAAMG,YAAYL,oBAAoB,OAAO,CAAC,CAACR;QAC7C,MAAM,EACJ,UAAUc,aAAa,EACvBC,OAAO,EAAE,EACTC,YAAYT,OAAO,aAAa,SAAS,EACzCU,eAAeV,OAAO,gBAAgB,EAAE,EACxCW,iBAAiBX,OAAO,kBAAkB,GAAG,EAC7CY,YAAYP,aAAa,SAAS,EAClCQ,eAAeR,aAAa,YAAY,EACxCS,4BAA4Bd,OAAO,yBAAyB,EAC5De,6BAA6Bf,OAAO,8BAA8B,CAAC,EACnEgB,4BAA4BhB,OAAO,6BAA6B,CAAC,EACjEiB,sBAAsBjB,OAAO,uBAAuB,SAAS,EAC7DkB,wBAAwBlB,OAAO,yBAAyB,CAAC,EACzDmB,wBAAwBnB,OAAO,yBAAyB,IAAI,EAC5DoB,UAAUpB,OAAO,WAAW,CAAC,EAC7BqB,UAAUrB,OAAO,WAAW,CAAC,EAC9B,GAAGP;QAEJ,MAAM6B,UAAU1B,cAAc,OAAO,CAAC,IAAI;QAC1C,MAAM2B,eAAehB,gBAAgBe,QAAQ,MAAM,CAAC,CAACE,QAAUC,SAASD,OAAOjB,kBAAkB,EAAE;QACnG,MAAMmB,KAAK,MAAOvB,CAAAA,kBAAmBO,eAA0B;QAC/D,MAAMiB,KAAKxB,kBAAkB,IAAKO;QAElC,OAAOa,aAAa,GAAG,CAAC,CAACC,QAChB;gBACL,QAAQI;gBACR,gBAAgB;gBAChB,YAAY,CAACC,OACJA,KAAK,IAAI,CAAC,CAACC,OAASC,SAASP,OAAOM;gBAG7C,UAAU;oBACR,SAAS;gBACX;gBACA,aAAa;oBACXT;oBACAD;oBACA,SAAS;oBACT,MAAM;wBACJ,MAAMZ;wBACN,OAAO;4BACL,SAAS;4BACT,SAAS;4BACT,WAAWI;4BACX,cAAcC;4BACd,MAAMJ;4BACN,QAAQQ;4BACR,WAAW;4BACX,UAAUP;4BACV,YAAYC;4BACZe;4BACAC;wBACF;wBACA,iBAAiB;4BACf,SAASR;4BACT,SAASD;4BACT,OAAO;gCACL,SAAS;gCACT,cAAcH,8BAA8B;gCAC5C,MAAME;gCACN,QAAQH;gCACR,WAAWE;gCACXU;gCACAC;4BACF;wBACF;oBACF;gBACF;YACF;IAEJ;IAEA,OAAO;QACL,GAAGjC,IAAI;QACPY;IACF;AACF"}
+{"version":3,"file":"pipeline/spec/chart/pipes/annotation/annotationPoint.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/annotationPoint.ts"],"sourcesContent":["import type { VChartSpecPipe } from 'src/types'\nimport { generateAnnotationPointPipe } from './annotationPointCommon'\n\nexport const annotationPoint: VChartSpecPipe = generateAnnotationPointPipe({})\n"],"names":["annotationPoint","generateAnnotationPointPipe"],"mappings":";AAGO,MAAMA,kBAAkCC,4BAA4B,CAAC"}

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationPointCommon.d.ts

@@ -0,0 +1,6 @@
+import type { ISpec, IMarkPointSpec } from '@visactor/vchart';
+import type { Datum, Selector, Selectors, SpecPipelineContext, VChartSpecPipe } from '../../../../../types';
+export declare const generateAnnotationPointPipe: (options: {
+    findSelectedDatas?: (dataset: Datum[], selector: Selector | Selectors | undefined | null, spec: ISpec, context: SpecPipelineContext) => Datum[];
+    generateMarkPoint?: (datum: Datum, spec: ISpec, context: SpecPipelineContext) => IMarkPointSpec[] | undefined;
+}) => VChartSpecPipe;

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationPointCommon.js

@@ -0,0 +1,95 @@
+import { selector } from "../../../../../dataSelector/index.js";
+import { isSubset } from "./utils.js";
+import { ANNOTATION_Z_INDEX } from "../../../../utils/constant.js";
+import { isBarLikeChart } from "../../../../utils/chatType.js";
+const generateAnnotationPointPipe = (options)=>{
+    const findSelectedDatas = options.findSelectedDatas ?? ((dataset, s)=>dataset.filter((datum)=>selector(datum, s)));
+    const generateMarkPoint = options.generateMarkPoint ?? ((datum)=>[
+            {
+                coordinate: (data)=>data.find((item)=>isSubset(datum, item))
+            }
+        ]);
+    return (spec, context)=>{
+        const { advancedVSeed, vseed } = context;
+        const { annotation, config } = advancedVSeed;
+        if (!annotation || !annotation.annotationPoint) return spec;
+        const theme = config?.[vseed.chartType]?.annotation?.annotationPoint;
+        const { annotationPoint } = annotation;
+        const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [
+            annotationPoint
+        ];
+        const isHorizontalBar = isBarLikeChart(advancedVSeed);
+        const defaultStyle = isHorizontalBar ? {
+            textAlign: 'right',
+            textBaseline: 'middle'
+        } : {
+            textAlign: 'center',
+            textBaseline: 'top'
+        };
+        const markPoint = annotationPointList.flatMap((annotationPoint)=>{
+            const { selector: selectorPoint, text = '', textColor = theme?.textColor ?? '#ffffff', textFontSize = theme?.textFontSize ?? 12, textFontWeight = theme?.textFontWeight ?? 400, textAlign = defaultStyle.textAlign, textBaseline = defaultStyle.textBaseline, textBackgroundBorderColor = theme?.textBackgroundBorderColor, textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4, textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1, textBackgroundColor = theme?.textBackgroundColor ?? '#212121', textBackgroundPadding = theme?.textBackgroundPadding ?? 2, textBackgroundVisible = theme?.textBackgroundVisible ?? true, offsetX = theme?.offsetX ?? 0, offsetY = theme?.offsetY ?? 0 } = annotationPoint;
+            const dataset = advancedVSeed.dataset.flat();
+            const selectedData = selectorPoint ? findSelectedDatas(dataset, selectorPoint, spec, context) : [];
+            const dx = -10 - (isHorizontalBar ? textFontSize : 0);
+            const dy = isHorizontalBar ? 0 : textFontSize;
+            const markPointStyle = {
+                zIndex: ANNOTATION_Z_INDEX,
+                regionRelative: true,
+                itemLine: {
+                    visible: false
+                },
+                itemContent: {
+                    offsetY,
+                    offsetX,
+                    confine: true,
+                    text: {
+                        text: text,
+                        style: {
+                            opacity: 0.95,
+                            visible: true,
+                            textAlign: textAlign,
+                            textBaseline: textBaseline,
+                            fill: textColor,
+                            stroke: textBackgroundColor,
+                            lineWidth: 1,
+                            fontSize: textFontSize,
+                            fontWeight: textFontWeight,
+                            dx,
+                            dy
+                        },
+                        labelBackground: {
+                            visible: textBackgroundVisible,
+                            padding: textBackgroundPadding,
+                            style: {
+                                opacity: 0.95,
+                                cornerRadius: textBackgroundBorderRadius ?? 4,
+                                fill: textBackgroundColor,
+                                stroke: textBackgroundBorderColor,
+                                lineWidth: textBackgroundBorderWidth,
+                                dx,
+                                dy
+                            }
+                        }
+                    }
+                }
+            };
+            return selectedData.reduce((res, datum)=>{
+                const marks = generateMarkPoint(datum, spec, context);
+                if (marks && marks.length) marks.forEach((mark)=>{
+                    res.push({
+                        ...markPointStyle,
+                        ...mark
+                    });
+                });
+                return res;
+            }, []);
+        });
+        return {
+            ...spec,
+            markPoint
+        };
+    };
+};
+export { generateAnnotationPointPipe };
+
+//# sourceMappingURL=annotationPointCommon.js.map

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationPointCommon.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pipeline/spec/chart/pipes/annotation/annotationPointCommon.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/annotationPointCommon.ts"],"sourcesContent":["import type { ISpec, IMarkPointSpec } from '@visactor/vchart'\nimport { selector } from '../../../../../dataSelector'\nimport type { Datum, Selector, Selectors, SpecPipelineContext, VChartSpecPipe, VSeed } from 'src/types'\nimport { isSubset } from './utils'\nimport { ANNOTATION_Z_INDEX } from '../../../../utils/constant'\nimport { isBarLikeChart } from 'src/pipeline/utils/chatType'\n\nexport const generateAnnotationPointPipe = (options: {\n  findSelectedDatas?: (\n    dataset: Datum[],\n    selector: Selector | Selectors | undefined | null,\n    spec: ISpec,\n    context: SpecPipelineContext,\n  ) => Datum[]\n  generateMarkPoint?: (datum: Datum, spec: ISpec, context: SpecPipelineContext) => IMarkPointSpec[] | undefined\n}) => {\n  const findSelectedDatas = options.findSelectedDatas ?? ((dataset, s) => dataset.filter((datum) => selector(datum, s)))\n  const generateMarkPoint =\n    options.generateMarkPoint ??\n    ((datum: Datum) => {\n      return [\n        {\n          coordinate: (data: Datum[]) => {\n            return data.find((item) => isSubset(datum, item))\n          },\n        },\n      ]\n    })\n\n  return ((spec: ISpec, context: SpecPipelineContext) => {\n    const { advancedVSeed, vseed } = context\n    const { annotation, config } = advancedVSeed\n\n    if (!annotation || !annotation.annotationPoint) {\n      return spec\n    }\n\n    const theme = config?.[vseed.chartType as 'column']?.annotation?.annotationPoint\n    const { annotationPoint } = annotation\n    const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [annotationPoint]\n    const isHorizontalBar = isBarLikeChart(advancedVSeed as VSeed)\n    const defaultStyle = isHorizontalBar\n      ? {\n          textAlign: 'right',\n          textBaseline: 'middle',\n        }\n      : {\n          textAlign: 'center',\n          textBaseline: 'top',\n        }\n\n    const markPoint = annotationPointList.flatMap((annotationPoint) => {\n      const {\n        selector: selectorPoint,\n        text = '',\n        textColor = theme?.textColor ?? '#ffffff',\n        textFontSize = theme?.textFontSize ?? 12,\n        textFontWeight = theme?.textFontWeight ?? 400,\n        textAlign = defaultStyle.textAlign,\n        textBaseline = defaultStyle.textBaseline,\n        textBackgroundBorderColor = theme?.textBackgroundBorderColor,\n        textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4,\n        textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1,\n        textBackgroundColor = theme?.textBackgroundColor ?? '#212121',\n        textBackgroundPadding = theme?.textBackgroundPadding ?? 2,\n        textBackgroundVisible = theme?.textBackgroundVisible ?? true,\n        offsetX = theme?.offsetX ?? 0,\n        offsetY = theme?.offsetY ?? 0,\n      } = annotationPoint\n\n      const dataset = advancedVSeed.dataset.flat()\n      const selectedData = selectorPoint ? findSelectedDatas(dataset, selectorPoint, spec, context) : []\n      const dx = -10 - (isHorizontalBar ? (textFontSize as number) : 0) // 由于vchart tag实现问题，需要设置这个强制偏移量\n      const dy = isHorizontalBar ? 0 : (textFontSize as number)\n      const markPointStyle = {\n        zIndex: ANNOTATION_Z_INDEX,\n        regionRelative: true,\n        itemLine: {\n          visible: false,\n        },\n        itemContent: {\n          offsetY,\n          offsetX,\n          confine: true,\n          text: {\n            text: text,\n            style: {\n              opacity: 0.95,\n              visible: true,\n              textAlign: textAlign,\n              textBaseline: textBaseline,\n              fill: textColor,\n              stroke: textBackgroundColor,\n              lineWidth: 1,\n              fontSize: textFontSize,\n              fontWeight: textFontWeight,\n              dx,\n              dy,\n            },\n            labelBackground: {\n              visible: textBackgroundVisible,\n              padding: textBackgroundPadding,\n              style: {\n                opacity: 0.95,\n                cornerRadius: textBackgroundBorderRadius ?? 4,\n                fill: textBackgroundColor,\n                stroke: textBackgroundBorderColor,\n                lineWidth: textBackgroundBorderWidth,\n                dx,\n                dy,\n              },\n            },\n          },\n        },\n      } as Partial<IMarkPointSpec>\n\n      return selectedData.reduce((res: IMarkPointSpec[], datum) => {\n        const marks = generateMarkPoint(datum, spec, context)\n\n        if (marks && marks.length) {\n          marks.forEach((mark) => {\n            res.push({\n              ...markPointStyle,\n              ...mark,\n            } as IMarkPointSpec)\n          })\n        }\n\n        return res\n      }, [])\n    }) as unknown as IMarkPointSpec[]\n\n    return {\n      ...spec,\n      markPoint,\n    } as ISpec\n  }) as VChartSpecPipe\n}\n"],"names":["generateAnnotationPointPipe","options","findSelectedDatas","dataset","s","datum","selector","generateMarkPoint","data","item","isSubset","spec","context","advancedVSeed","vseed","annotation","config","theme","annotationPoint","annotationPointList","Array","isHorizontalBar","isBarLikeChart","defaultStyle","markPoint","selectorPoint","text","textColor","textFontSize","textFontWeight","textAlign","textBaseline","textBackgroundBorderColor","textBackgroundBorderRadius","textBackgroundBorderWidth","textBackgroundColor","textBackgroundPadding","textBackgroundVisible","offsetX","offsetY","selectedData","dx","dy","markPointStyle","ANNOTATION_Z_INDEX","res","marks","mark"],"mappings":"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"}

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationPointOfDualAxis.js

@@ -1,94 +1,26 @@
 import { selector } from "../../../../../dataSelector/index.js";
 import { isSubset } from "./utils.js";
-import { ANNOTATION_Z_INDEX } from "../../../../utils/constant.js";
-import { isBarLikeChart } from "../../../../utils/chatType.js";
 import { findAllMeasures } from "../../../../utils/index.js";
 import { MeasureId } from "../../../../../dataReshape/constant.js";
 import { pickWithout } from "@visactor/vutils";
-const annotationPointOfDualAxis = (spec, context)=>{
-    const { advancedVSeed, vseed } = context;
-    const { annotation, config } = advancedVSeed;
-    if (!annotation || !annotation.annotationPoint) return spec;
-    const theme = config?.[vseed.chartType]?.annotation?.annotationPoint;
-    const { annotationPoint } = annotation;
-    const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [
-        annotationPoint
-    ];
-    const isHorizontalBar = isBarLikeChart(advancedVSeed);
-    const defaultStyle = isHorizontalBar ? {
-        textAlign: 'right',
-        textBaseline: 'middle'
-    } : {
-        textAlign: 'center',
-        textBaseline: 'top'
-    };
-    const allMeasureIds = findAllMeasures(advancedVSeed.reshapeMeasures ?? advancedVSeed.measures).map((m)=>m.id);
-    const markPoint = annotationPointList.flatMap((annotationPoint)=>{
-        const { selector: selectorPoint, text = '', textColor = theme?.textColor ?? '#ffffff', textFontSize = theme?.textFontSize ?? 12, textFontWeight = theme?.textFontWeight ?? 400, textAlign = defaultStyle.textAlign, textBaseline = defaultStyle.textBaseline, textBackgroundBorderColor = theme?.textBackgroundBorderColor, textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4, textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1, textBackgroundColor = theme?.textBackgroundColor ?? '#212121', textBackgroundPadding = theme?.textBackgroundPadding ?? 2, textBackgroundVisible = theme?.textBackgroundVisible ?? true, offsetX = theme?.offsetX ?? 0, offsetY = theme?.offsetY ?? 0 } = annotationPoint;
-        const dataset = advancedVSeed.dataset.flat();
-        const selectedData = selectorPoint ? dataset.reduce((res, d)=>{
+import { generateAnnotationPointPipe } from "./annotationPointCommon.js";
+const annotationPointOfDualAxis = generateAnnotationPointPipe({
+    findSelectedDatas: (dataset, s, spec, context)=>dataset.reduce((res, d)=>{
+            const { advancedVSeed } = context;
+            const allMeasureIds = findAllMeasures(advancedVSeed.reshapeMeasures ?? advancedVSeed.measures).map((m)=>m.id);
             const pickedDatum = pickWithout(d, allMeasureIds.filter((id)=>id !== d[MeasureId]));
-            if (selector(pickedDatum, selectorPoint)) res.push(pickedDatum);
+            if (selector(pickedDatum, s)) res.push(pickedDatum);
             return res;
-        }, []) : [];
-        const dx = -10 - (isHorizontalBar ? textFontSize : 0);
-        const dy = isHorizontalBar ? 0 : textFontSize;
-        const baseConfig = {
-            zIndex: ANNOTATION_Z_INDEX,
-            itemLine: {
-                visible: false
-            },
-            itemContent: {
-                offsetY,
-                offsetX,
-                confine: true,
-                text: {
-                    text: text,
-                    style: {
-                        opacity: 0.95,
-                        visible: true,
-                        textAlign: textAlign,
-                        textBaseline: textBaseline,
-                        fill: textColor,
-                        stroke: textBackgroundColor,
-                        lineWidth: 1,
-                        fontSize: textFontSize,
-                        fontWeight: textFontWeight,
-                        dx,
-                        dy
-                    },
-                    labelBackground: {
-                        visible: textBackgroundVisible,
-                        padding: textBackgroundPadding,
-                        style: {
-                            opacity: 0.95,
-                            cornerRadius: textBackgroundBorderRadius ?? 4,
-                            fill: textBackgroundColor,
-                            stroke: textBackgroundBorderColor,
-                            lineWidth: textBackgroundBorderWidth,
-                            dx,
-                            dy
-                        }
-                    }
-                }
-            }
-        };
-        return spec.series?.reduce((res, s, index)=>{
-            selectedData.forEach((datum)=>{
-                res.push({
-                    ...baseConfig,
-                    relativeSeriesIndex: index,
-                    coordinate: (data)=>data.find((item)=>isSubset(datum, item, allMeasureIds.filter((id)=>id !== item[MeasureId])))
-                });
-            });
-            return res;
-        }, []);
-    });
-    return {
-        ...spec,
-        markPoint
-    };
-};
+        }, []),
+    generateMarkPoint: (datum, spec, context)=>{
+        const { advancedVSeed } = context;
+        const allMeasureIds = findAllMeasures(advancedVSeed.reshapeMeasures ?? advancedVSeed.measures).map((m)=>m.id);
+        return spec.series?.map((s, index)=>({
+                relativeSeriesIndex: index,
+                coordinate: (data)=>data.find((item)=>isSubset(datum, item, allMeasureIds.filter((id)=>id !== item[MeasureId])))
+            }));
+    }
+});
 export { annotationPointOfDualAxis };
 
 //# sourceMappingURL=annotationPointOfDualAxis.js.map

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationPointOfDualAxis.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/annotation/annotationPointOfDualAxis.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/annotationPointOfDualAxis.ts"],"sourcesContent":["import type { ILineChartSpec } from '@visactor/vchart'\nimport { selector } from '../../../../../dataSelector'\nimport type { Datum, VChartSpecPipe, VSeed } from 'src/types'\nimport { isSubset } from './utils'\nimport { ANNOTATION_Z_INDEX } from '../../../../utils/constant'\nimport { isBarLikeChart } from 'src/pipeline/utils/chatType'\nimport { findAllMeasures } from 'src/pipeline/utils'\nimport { MeasureId } from 'src/dataReshape/constant'\nimport { pickWithout } from '@visactor/vutils'\n\nexport const annotationPointOfDualAxis: VChartSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const { annotation, config } = advancedVSeed\n\n  if (!annotation || !annotation.annotationPoint) {\n    return spec\n  }\n\n  const theme = config?.[vseed.chartType as 'column']?.annotation?.annotationPoint\n  const { annotationPoint } = annotation\n  const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [annotationPoint]\n  const isHorizontalBar = isBarLikeChart(advancedVSeed as VSeed)\n  const defaultStyle = isHorizontalBar\n    ? {\n        textAlign: 'right',\n        textBaseline: 'middle',\n      }\n    : {\n        textAlign: 'center',\n        textBaseline: 'top',\n      }\n  const allMeasureIds = findAllMeasures(advancedVSeed.reshapeMeasures ?? advancedVSeed.measures).map((m) => m.id)\n\n  const markPoint = annotationPointList.flatMap((annotationPoint) => {\n    const {\n      selector: selectorPoint,\n      text = '',\n      textColor = theme?.textColor ?? '#ffffff',\n      textFontSize = theme?.textFontSize ?? 12,\n      textFontWeight = theme?.textFontWeight ?? 400,\n      textAlign = defaultStyle.textAlign,\n      textBaseline = defaultStyle.textBaseline,\n      textBackgroundBorderColor = theme?.textBackgroundBorderColor,\n      textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4,\n      textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1,\n      textBackgroundColor = theme?.textBackgroundColor ?? '#212121',\n      textBackgroundPadding = theme?.textBackgroundPadding ?? 2,\n      textBackgroundVisible = theme?.textBackgroundVisible ?? true,\n      offsetX = theme?.offsetX ?? 0,\n      offsetY = theme?.offsetY ?? 0,\n    } = annotationPoint\n\n    const dataset = advancedVSeed.dataset.flat()\n    const selectedData = selectorPoint\n      ? dataset.reduce((res: Datum[], d: Datum) => {\n          const pickedDatum = pickWithout(\n            d,\n            allMeasureIds.filter((id) => id !== d[MeasureId]),\n          )\n\n          if (selector(pickedDatum, selectorPoint)) {\n            res.push(pickedDatum)\n          }\n\n          return res\n        }, [])\n      : []\n\n    const dx = -10 - (isHorizontalBar ? (textFontSize as number) : 0) // 由于vchart tag实现问题，需要设置这个强制偏移量\n    const dy = isHorizontalBar ? 0 : (textFontSize as number)\n    const baseConfig = {\n      zIndex: ANNOTATION_Z_INDEX,\n      itemLine: {\n        visible: false,\n      },\n      itemContent: {\n        offsetY,\n        offsetX,\n        confine: true,\n        text: {\n          text: text,\n          style: {\n            opacity: 0.95,\n            visible: true,\n            textAlign: textAlign,\n            textBaseline: textBaseline,\n            fill: textColor,\n            stroke: textBackgroundColor,\n            lineWidth: 1,\n            fontSize: textFontSize,\n            fontWeight: textFontWeight,\n            dx,\n            dy,\n          },\n          labelBackground: {\n            visible: textBackgroundVisible,\n            padding: textBackgroundPadding,\n            style: {\n              opacity: 0.95,\n              cornerRadius: textBackgroundBorderRadius ?? 4,\n              fill: textBackgroundColor,\n              stroke: textBackgroundBorderColor,\n              lineWidth: textBackgroundBorderWidth,\n              dx,\n              dy,\n            },\n          },\n        },\n      },\n    }\n\n    return spec.series?.reduce((res: any[], s: any, index: number) => {\n      selectedData.forEach((datum: Datum) => {\n        res.push({\n          ...baseConfig,\n          relativeSeriesIndex: index,\n          coordinate: (data: Datum[]) => {\n            return data.find((item) => {\n              return isSubset(\n                datum,\n                item,\n                allMeasureIds.filter((id) => id !== item[MeasureId]),\n              )\n            })\n          },\n        })\n      })\n\n      return res\n    }, [] as any[])\n  }) as ILineChartSpec['markPoint']\n\n  return {\n    ...spec,\n    markPoint,\n  }\n}\n"],"names":["annotationPointOfDualAxis","spec","context","advancedVSeed","vseed","annotation","config","theme","annotationPoint","annotationPointList","Array","isHorizontalBar","isBarLikeChart","defaultStyle","allMeasureIds","findAllMeasures","m","markPoint","selectorPoint","text","textColor","textFontSize","textFontWeight","textAlign","textBaseline","textBackgroundBorderColor","textBackgroundBorderRadius","textBackgroundBorderWidth","textBackgroundColor","textBackgroundPadding","textBackgroundVisible","offsetX","offsetY","dataset","selectedData","res","d","pickedDatum","pickWithout","id","MeasureId","selector","dx","dy","baseConfig","ANNOTATION_Z_INDEX","s","index","datum","data","item","isSubset"],"mappings":";;;;;;;AAUO,MAAMA,4BAA4C,CAACC,MAAMC;IAC9D,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;IACjC,MAAM,EAAEG,UAAU,EAAEC,MAAM,EAAE,GAAGH;IAE/B,IAAI,CAACE,cAAc,CAACA,WAAW,eAAe,EAC5C,OAAOJ;IAGT,MAAMM,QAAQD,QAAQ,CAACF,MAAM,SAAS,CAAa,EAAE,YAAY;IACjE,MAAM,EAAEI,eAAe,EAAE,GAAGH;IAC5B,MAAMI,sBAAsBC,MAAM,OAAO,CAACF,mBAAmBA,kBAAkB;QAACA;KAAgB;IAChG,MAAMG,kBAAkBC,eAAeT;IACvC,MAAMU,eAAeF,kBACjB;QACE,WAAW;QACX,cAAc;IAChB,IACA;QACE,WAAW;QACX,cAAc;IAChB;IACJ,MAAMG,gBAAgBC,gBAAgBZ,cAAc,eAAe,IAAIA,cAAc,QAAQ,EAAE,GAAG,CAAC,CAACa,IAAMA,EAAE,EAAE;IAE9G,MAAMC,YAAYR,oBAAoB,OAAO,CAAC,CAACD;QAC7C,MAAM,EACJ,UAAUU,aAAa,EACvBC,OAAO,EAAE,EACTC,YAAYb,OAAO,aAAa,SAAS,EACzCc,eAAed,OAAO,gBAAgB,EAAE,EACxCe,iBAAiBf,OAAO,kBAAkB,GAAG,EAC7CgB,YAAYV,aAAa,SAAS,EAClCW,eAAeX,aAAa,YAAY,EACxCY,4BAA4BlB,OAAO,yBAAyB,EAC5DmB,6BAA6BnB,OAAO,8BAA8B,CAAC,EACnEoB,4BAA4BpB,OAAO,6BAA6B,CAAC,EACjEqB,sBAAsBrB,OAAO,uBAAuB,SAAS,EAC7DsB,wBAAwBtB,OAAO,yBAAyB,CAAC,EACzDuB,wBAAwBvB,OAAO,yBAAyB,IAAI,EAC5DwB,UAAUxB,OAAO,WAAW,CAAC,EAC7ByB,UAAUzB,OAAO,WAAW,CAAC,EAC9B,GAAGC;QAEJ,MAAMyB,UAAU9B,cAAc,OAAO,CAAC,IAAI;QAC1C,MAAM+B,eAAehB,gBACjBe,QAAQ,MAAM,CAAC,CAACE,KAAcC;YAC5B,MAAMC,cAAcC,YAClBF,GACAtB,cAAc,MAAM,CAAC,CAACyB,KAAOA,OAAOH,CAAC,CAACI,UAAU;YAGlD,IAAIC,SAASJ,aAAanB,gBACxBiB,IAAI,IAAI,CAACE;YAGX,OAAOF;QACT,GAAG,EAAE,IACL,EAAE;QAEN,MAAMO,KAAK,MAAO/B,CAAAA,kBAAmBU,eAA0B;QAC/D,MAAMsB,KAAKhC,kBAAkB,IAAKU;QAClC,MAAMuB,aAAa;YACjB,QAAQC;YACR,UAAU;gBACR,SAAS;YACX;YACA,aAAa;gBACXb;gBACAD;gBACA,SAAS;gBACT,MAAM;oBACJ,MAAMZ;oBACN,OAAO;wBACL,SAAS;wBACT,SAAS;wBACT,WAAWI;wBACX,cAAcC;wBACd,MAAMJ;wBACN,QAAQQ;wBACR,WAAW;wBACX,UAAUP;wBACV,YAAYC;wBACZoB;wBACAC;oBACF;oBACA,iBAAiB;wBACf,SAASb;wBACT,SAASD;wBACT,OAAO;4BACL,SAAS;4BACT,cAAcH,8BAA8B;4BAC5C,MAAME;4BACN,QAAQH;4BACR,WAAWE;4BACXe;4BACAC;wBACF;oBACF;gBACF;YACF;QACF;QAEA,OAAO1C,KAAK,MAAM,EAAE,OAAO,CAACkC,KAAYW,GAAQC;YAC9Cb,aAAa,OAAO,CAAC,CAACc;gBACpBb,IAAI,IAAI,CAAC;oBACP,GAAGS,UAAU;oBACb,qBAAqBG;oBACrB,YAAY,CAACE,OACJA,KAAK,IAAI,CAAC,CAACC,OACTC,SACLH,OACAE,MACApC,cAAc,MAAM,CAAC,CAACyB,KAAOA,OAAOW,IAAI,CAACV,UAAU;gBAI3D;YACF;YAEA,OAAOL;QACT,GAAG,EAAE;IACP;IAEA,OAAO;QACL,GAAGlC,IAAI;QACPgB;IACF;AACF"}
+{"version":3,"file":"pipeline/spec/chart/pipes/annotation/annotationPointOfDualAxis.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/annotationPointOfDualAxis.ts"],"sourcesContent":["import type { IMarkPointSpec, ISpec } from '@visactor/vchart'\nimport { selector } from '../../../../../dataSelector'\nimport type { Datum, SpecPipelineContext, VChartSpecPipe } from 'src/types'\nimport { isSubset } from './utils'\nimport { findAllMeasures } from 'src/pipeline/utils'\nimport { MeasureId } from 'src/dataReshape/constant'\nimport { pickWithout } from '@visactor/vutils'\nimport { generateAnnotationPointPipe } from './annotationPointCommon'\n\nexport const annotationPointOfDualAxis: VChartSpecPipe = generateAnnotationPointPipe({\n  findSelectedDatas: (dataset, s, spec: ISpec, context: SpecPipelineContext) => {\n    return dataset.reduce((res: Datum[], d: Datum) => {\n      const { advancedVSeed } = context\n      const allMeasureIds = findAllMeasures(advancedVSeed.reshapeMeasures ?? advancedVSeed.measures).map((m) => m.id)\n      const pickedDatum = pickWithout(\n        d,\n        allMeasureIds.filter((id) => id !== d[MeasureId]),\n      )\n\n      if (selector(pickedDatum, s)) {\n        res.push(pickedDatum)\n      }\n\n      return res\n    }, [])\n  },\n  generateMarkPoint: (datum: Datum, spec: ISpec, context: SpecPipelineContext) => {\n    const { advancedVSeed } = context\n    const allMeasureIds = findAllMeasures(advancedVSeed.reshapeMeasures ?? advancedVSeed.measures).map((m) => m.id)\n    return spec.series?.map((s: any, index: number) => {\n      return {\n        relativeSeriesIndex: index,\n        coordinate: (data: Datum[]) => {\n          return data.find((item) => {\n            return isSubset(\n              datum,\n              item,\n              allMeasureIds.filter((id) => id !== item[MeasureId]),\n            )\n          })\n        },\n      } as IMarkPointSpec\n    })\n  },\n})\n"],"names":["annotationPointOfDualAxis","generateAnnotationPointPipe","dataset","s","spec","context","res","d","advancedVSeed","allMeasureIds","findAllMeasures","m","pickedDatum","pickWithout","id","MeasureId","selector","datum","index","data","item","isSubset"],"mappings":";;;;;;AASO,MAAMA,4BAA4CC,4BAA4B;IACnF,mBAAmB,CAACC,SAASC,GAAGC,MAAaC,UACpCH,QAAQ,MAAM,CAAC,CAACI,KAAcC;YACnC,MAAM,EAAEC,aAAa,EAAE,GAAGH;YAC1B,MAAMI,gBAAgBC,gBAAgBF,cAAc,eAAe,IAAIA,cAAc,QAAQ,EAAE,GAAG,CAAC,CAACG,IAAMA,EAAE,EAAE;YAC9G,MAAMC,cAAcC,YAClBN,GACAE,cAAc,MAAM,CAAC,CAACK,KAAOA,OAAOP,CAAC,CAACQ,UAAU;YAGlD,IAAIC,SAASJ,aAAaT,IACxBG,IAAI,IAAI,CAACM;YAGX,OAAON;QACT,GAAG,EAAE;IAEP,mBAAmB,CAACW,OAAcb,MAAaC;QAC7C,MAAM,EAAEG,aAAa,EAAE,GAAGH;QAC1B,MAAMI,gBAAgBC,gBAAgBF,cAAc,eAAe,IAAIA,cAAc,QAAQ,EAAE,GAAG,CAAC,CAACG,IAAMA,EAAE,EAAE;QAC9G,OAAOP,KAAK,MAAM,EAAE,IAAI,CAACD,GAAQe,QACxB;gBACL,qBAAqBA;gBACrB,YAAY,CAACC,OACJA,KAAK,IAAI,CAAC,CAACC,OACTC,SACLJ,OACAG,MACAX,cAAc,MAAM,CAAC,CAACK,KAAOA,OAAOM,IAAI,CAACL,UAAU;YAI3D;IAEJ;AACF"}

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationPointOfHistogram.d.ts

@@ -0,0 +1,2 @@
+import type { VChartSpecPipe } from '../../../../../types';
+export declare const annotationPointOfHistogram: VChartSpecPipe;

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationPointOfHistogram.js

@@ -0,0 +1,23 @@
+import { isSubset } from "./utils.js";
+import { generateAnnotationPointPipe } from "./annotationPointCommon.js";
+const annotationPointOfHistogram = generateAnnotationPointPipe({
+    generateMarkPoint: (datum, spec)=>{
+        const histogramSpec = spec;
+        const xField = histogramSpec.xField;
+        const x2Field = histogramSpec.x2Field;
+        return [
+            {
+                coordinate: (data)=>{
+                    const d = data.find((item)=>isSubset(datum, item));
+                    return d ? {
+                        ...d,
+                        [xField]: (d[xField] + d[x2Field]) / 2
+                    } : void 0;
+                }
+            }
+        ];
+    }
+});
+export { annotationPointOfHistogram };
+
+//# sourceMappingURL=annotationPointOfHistogram.js.map

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationPointOfHistogram.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pipeline/spec/chart/pipes/annotation/annotationPointOfHistogram.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/annotationPointOfHistogram.ts"],"sourcesContent":["import type { IHistogramChartSpec, IMarkPointSpec } from '@visactor/vchart'\nimport type { Datum, VChartSpecPipe } from 'src/types'\nimport { isSubset } from './utils'\nimport { generateAnnotationPointPipe } from './annotationPointCommon'\n\nexport const annotationPointOfHistogram: VChartSpecPipe = generateAnnotationPointPipe({\n  generateMarkPoint: (datum: Datum, spec) => {\n    const histogramSpec = spec as IHistogramChartSpec\n    const xField = histogramSpec.xField as string\n    const x2Field = histogramSpec.x2Field as string\n\n    return [\n      {\n        coordinate: (data: Datum[]) => {\n          const d = data.find((item) => isSubset(datum, item))\n\n          return d\n            ? {\n                ...d,\n                [xField]: (d[xField] + d[x2Field]) / 2,\n              }\n            : undefined\n        },\n      } as IMarkPointSpec,\n    ]\n  },\n})\n"],"names":["annotationPointOfHistogram","generateAnnotationPointPipe","datum","spec","histogramSpec","xField","x2Field","data","d","item","isSubset","undefined"],"mappings":";;AAKO,MAAMA,6BAA6CC,4BAA4B;IACpF,mBAAmB,CAACC,OAAcC;QAChC,MAAMC,gBAAgBD;QACtB,MAAME,SAASD,cAAc,MAAM;QACnC,MAAME,UAAUF,cAAc,OAAO;QAErC,OAAO;YACL;gBACE,YAAY,CAACG;oBACX,MAAMC,IAAID,KAAK,IAAI,CAAC,CAACE,OAASC,SAASR,OAAOO;oBAE9C,OAAOD,IACH;wBACE,GAAGA,CAAC;wBACJ,CAACH,OAAO,EAAGG,AAAAA,CAAAA,CAAC,CAACH,OAAO,GAAGG,CAAC,CAACF,QAAO,IAAK;oBACvC,IACAK;gBACN;YACF;SACD;IACH;AACF"}