@visactor/vseed 0.1.14 → 0.1.16

package/dist/esm/pipeline/spec/chart/pipes/label/label.js

@@ -1,36 +1,62 @@
-import { autoFormatter, createFormatter, findMeasureById } from "../../../../utils/index.js";
+import { createFormatter, createFormatterByMeasure, findMeasureById } from "../../../../utils/index.js";
 import { isEmpty, merge, uniqueBy } from "remeda";
-import { intl } from "../../../../../i18n/index.js";
 const label_label = (spec, context)=>{
     const result = {
         ...spec
     };
     const { advancedVSeed, vseed } = context;
-    const { measures, datasetReshapeInfo } = advancedVSeed;
+    const { datasetReshapeInfo } = advancedVSeed;
     const { chartType, encoding } = advancedVSeed;
     const baseConfig = advancedVSeed.config[chartType];
+    const foldInfo = datasetReshapeInfo[0].foldInfo;
     if (!baseConfig || isEmpty(baseConfig.label)) return result;
-    const { measureId, measureValue, statistics } = datasetReshapeInfo[0].foldInfo;
     const { label } = baseConfig;
-    const { enable, wrap, showValue, showValuePercent, labelOverlap, labelColorSmartInvert, labelColor, labelFontSize, labelFontWeight, labelBackgroundColor, labelPosition, autoFormat = true, numFormat = {} } = label;
-    const labelDims = uniqueBy((vseed.dimensions || []).filter((item)=>encoding.label?.includes(item.id)), (item)=>item.id);
-    const labelMeas = uniqueBy((vseed.measures || []).filter((item)=>encoding.label?.includes(item.id)), (item)=>item.id);
+    result.label = buildLabel(label, vseed.measures, vseed.dimensions, advancedVSeed.measures, encoding, [
+        foldInfo
+    ]);
+    return result;
+};
+const generateMeasureValue = (value, measure, labelAutoFormat, numFormat = {})=>{
+    if (!measure) return value;
+    const format = merge(numFormat, measure.numFormat || measure.format);
+    const mergedMeasure = {
+        ...measure,
+        numFormat: format,
+        autoFormat: labelAutoFormat || measure.autoFormat
+    };
+    const formatter = createFormatterByMeasure(mergedMeasure);
+    return formatter(value);
+};
+const generateMeasurePercent = (value, sum, formatter)=>{
+    if (null == value) return String(value);
+    const num = Number(value);
+    if (Number.isNaN(num)) return String(value);
+    const percentValue = num / sum;
+    return formatter(percentValue);
+};
+const buildLabel = (label, vseedMeasures = [], vseedDimensions = [], advancedVSeedMeasures, encoding, foldInfoList)=>{
+    const { enable, wrap, showValue, showValuePercent, labelOverlap, labelColorSmartInvert, labelColor, labelFontSize, labelFontWeight, labelBackgroundColor, labelPosition, autoFormat, numFormat = {} } = label;
+    const labelDims = uniqueBy((vseedDimensions || []).filter((item)=>encoding.label?.includes(item.id)), (item)=>item.id);
+    const labelMeas = uniqueBy((vseedMeasures || []).filter((item)=>encoding.label?.includes(item.id)), (item)=>item.id);
     const percentFormat = merge(numFormat, {
         type: 'percent'
     });
     const percentFormatter = createFormatter(percentFormat);
-    result.label = {
+    const result = {
         visible: enable,
         formatMethod: (_, datum)=>{
             const result = [];
             const dimLabels = labelDims.map((item)=>item.alias || item.id);
             const meaLabels = labelMeas.map((item)=>generateMeasureValue(datum[item.id], item, autoFormat, numFormat));
-            const measure = findMeasureById(measures, datum[measureId]);
-            const measureValueLabel = generateMeasureValue(datum[measureValue], measure, autoFormat, numFormat);
-            const measurePercentLabel = generateMeasurePercent(datum[measureValue], statistics.sum, percentFormatter);
             result.push(...dimLabels);
-            if (showValue) result.push(measureValueLabel);
-            if (showValuePercent) result.push(measurePercentLabel);
+            foldInfoList.forEach((foldInfo)=>{
+                const { measureId, measureValue, statistics } = foldInfo;
+                const measure = findMeasureById(advancedVSeedMeasures, datum[measureId]);
+                const measureValueLabel = generateMeasureValue(datum[measureValue], measure, autoFormat, numFormat);
+                const measurePercentLabel = generateMeasurePercent(datum[measureValue], statistics.sum, percentFormatter);
+                if (showValue) result.push(measureValueLabel);
+                if (showValuePercent) result.push(measurePercentLabel);
+            });
             result.push(...meaLabels);
             if (wrap) return result;
             return result.join(' ');
@@ -44,30 +70,12 @@ const label_label = (spec, context)=>{
         },
         smartInvert: labelColorSmartInvert
     };
-    if (labelOverlap) result.label.overlap = {
+    if (labelOverlap) result.overlap = {
         hideOnHit: true,
         clampForce: true
     };
     return result;
 };
-const generateMeasureValue = (value, measure, labelAutoFormat = true, numFormat = {})=>{
-    if (!measure) return value;
-    const format = merge(numFormat, measure.format);
-    const autoFormat = labelAutoFormat || measure.autoFormat;
-    if (!isEmpty(format)) {
-        const formatter = createFormatter(format);
-        return formatter(value);
-    }
-    if (autoFormat) return autoFormatter(value, intl.getLocale());
-    return String(value);
-};
-const generateMeasurePercent = (value, sum, formatter)=>{
-    if (null == value) return String(value);
-    const num = Number(value);
-    if (Number.isNaN(num)) return String(value);
-    const percentValue = num / sum;
-    return formatter(percentValue);
-};
-export { label_label as label };
+export { buildLabel, generateMeasurePercent, generateMeasureValue, label_label as label };
 
 //# sourceMappingURL=label.js.map

package/dist/esm/pipeline/spec/chart/pipes/label/label.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/label/label.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/label/label.ts"],"sourcesContent":["import type { ILineChartSpec } from '@visactor/vchart'\nimport type { ILineLikeLabelSpec } from '@visactor/vchart/esm/series/mixin/interface'\nimport { autoFormatter, createFormatter, findMeasureById } from '../../../../utils'\nimport type { Datum, Formatter, Label, Measure, NumFormat, SpecPipe } from 'src/types'\nimport { isEmpty, merge, uniqueBy } from 'remeda'\nimport { intl } from 'src/i18n'\n\nexport const label: SpecPipe = (spec, context) => {\n  const result = { ...spec } as ILineChartSpec\n  const { advancedVSeed, vseed } = context\n  const { measures, datasetReshapeInfo } = advancedVSeed\n  const { chartType, encoding } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { label: Label }\n\n  if (!baseConfig || isEmpty(baseConfig.label)) {\n    return result\n  }\n\n  const { measureId, measureValue, statistics } = datasetReshapeInfo[0].foldInfo\n  const { label } = baseConfig\n  const {\n    enable,\n    wrap,\n    showValue,\n    showValuePercent,\n    labelOverlap,\n    labelColorSmartInvert,\n    labelColor,\n    labelFontSize,\n    labelFontWeight,\n    labelBackgroundColor,\n    labelPosition,\n    autoFormat = true,\n    numFormat = {},\n  } = label\n\n  const labelDims = uniqueBy(\n    (vseed.dimensions || []).filter((item) => encoding.label?.includes(item.id)),\n    (item) => item.id,\n  )\n  const labelMeas = uniqueBy(\n    (vseed.measures || []).filter((item) => encoding.label?.includes(item.id)),\n    (item) => item.id,\n  )\n\n  const percentFormat: NumFormat = merge(numFormat, {\n    type: 'percent',\n  } as NumFormat)\n\n  const percentFormatter = createFormatter(percentFormat)\n\n  result.label = {\n    visible: enable,\n    formatMethod: (_, datum: Datum) => {\n      const result = []\n\n      const dimLabels = labelDims.map((item) => item.alias || item.id)\n      const meaLabels = labelMeas.map((item) =>\n        generateMeasureValue(datum[item.id] as number | string, item, autoFormat, numFormat),\n      )\n\n      const measure = findMeasureById(measures, datum[measureId] as string)\n      const measureValueLabel = generateMeasureValue(\n        datum[measureValue] as number | string,\n        measure,\n        autoFormat,\n        numFormat,\n      )\n      const measurePercentLabel = generateMeasurePercent(\n        datum[measureValue] as number | string,\n        statistics.sum,\n        percentFormatter,\n      )\n\n      result.push(...dimLabels)\n\n      if (showValue) {\n        result.push(measureValueLabel)\n      }\n      if (showValuePercent) {\n        result.push(measurePercentLabel)\n      }\n\n      result.push(...meaLabels)\n\n      if (wrap) {\n        return result\n      }\n      return result.join(' ')\n    },\n    position: labelPosition,\n    style: {\n      fill: labelColor,\n      fontSize: labelFontSize,\n      fontWeight: labelFontWeight,\n      background: labelBackgroundColor,\n    },\n    smartInvert: labelColorSmartInvert,\n  } as ILineLikeLabelSpec\n\n  if (labelOverlap) {\n    result.label.overlap = {\n      hideOnHit: true,\n      clampForce: true,\n    }\n  }\n\n  return result\n}\n\nconst generateMeasureValue = (\n  value: number | string,\n  measure?: Measure,\n  labelAutoFormat: boolean = true,\n  numFormat: NumFormat = {},\n) => {\n  if (!measure) {\n    return value\n  }\n  const format = merge(numFormat, measure.format)\n  const autoFormat = labelAutoFormat || measure.autoFormat\n\n  if (!isEmpty(format)) {\n    const formatter = createFormatter(format)\n    return formatter(value)\n  }\n  if (autoFormat) {\n    return autoFormatter(value, intl.getLocale())\n  }\n  return String(value)\n}\n\nconst generateMeasurePercent = (value: number | string, sum: number, formatter: Formatter) => {\n  if (value === undefined || value === null) return String(value)\n  const num = Number(value)\n  if (Number.isNaN(num)) return String(value)\n\n  const percentValue = num / sum\n  return formatter(percentValue)\n}\n"],"names":["label","spec","context","result","advancedVSeed","vseed","measures","datasetReshapeInfo","chartType","encoding","baseConfig","isEmpty","measureId","measureValue","statistics","enable","wrap","showValue","showValuePercent","labelOverlap","labelColorSmartInvert","labelColor","labelFontSize","labelFontWeight","labelBackgroundColor","labelPosition","autoFormat","numFormat","labelDims","uniqueBy","item","labelMeas","percentFormat","merge","percentFormatter","createFormatter","_","datum","dimLabels","meaLabels","generateMeasureValue","measure","findMeasureById","measureValueLabel","measurePercentLabel","generateMeasurePercent","value","labelAutoFormat","format","formatter","autoFormatter","intl","String","sum","num","Number","percentValue"],"mappings":"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"}
+{"version":3,"file":"pipeline/spec/chart/pipes/label/label.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/label/label.ts"],"sourcesContent":["import type { ILineChartSpec } from '@visactor/vchart'\nimport type { ILineLikeLabelSpec } from '@visactor/vchart/esm/series/mixin/interface'\nimport { createFormatter, createFormatterByMeasure, findMeasureById } from '../../../../utils'\nimport type {\n  Datum,\n  Dimensions,\n  Encoding,\n  FoldInfo,\n  Formatter,\n  Label,\n  Measure,\n  Measures,\n  NumFormat,\n  SpecPipe,\n} from 'src/types'\nimport { isEmpty, merge, uniqueBy } from 'remeda'\n\nexport const label: SpecPipe = (spec, context) => {\n  const result = { ...spec } as ILineChartSpec\n  const { advancedVSeed, vseed } = context\n  const { datasetReshapeInfo } = advancedVSeed\n  const { chartType, encoding } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { label: Label }\n  const foldInfo = datasetReshapeInfo[0].foldInfo as FoldInfo\n  if (!baseConfig || isEmpty(baseConfig.label)) {\n    return result\n  }\n\n  const { label } = baseConfig\n\n  result.label = buildLabel(label, vseed.measures, vseed.dimensions, advancedVSeed.measures, encoding as Encoding, [\n    foldInfo,\n  ])\n\n  return result\n}\n\nexport const generateMeasureValue = (\n  value: number | string,\n  measure?: Measure,\n  labelAutoFormat?: boolean,\n  numFormat: NumFormat = {},\n) => {\n  if (!measure) {\n    return value\n  }\n\n  const format = merge(numFormat, measure.numFormat || measure.format)\n  const mergedMeasure = { ...measure, numFormat: format, autoFormat: labelAutoFormat || measure.autoFormat }\n\n  const formatter = createFormatterByMeasure(mergedMeasure)\n  return formatter(value)\n}\n\nexport const generateMeasurePercent = (value: number | string, sum: number, formatter: Formatter) => {\n  if (value === undefined || value === null) return String(value)\n  const num = Number(value)\n  if (Number.isNaN(num)) return String(value)\n\n  const percentValue = num / sum\n  return formatter(percentValue)\n}\n\nexport const buildLabel = (\n  label: Label,\n  vseedMeasures: Measures = [],\n  vseedDimensions: Dimensions = [],\n  advancedVSeedMeasures: Measures,\n  encoding: Encoding,\n  foldInfoList: FoldInfo[],\n) => {\n  const {\n    enable,\n    wrap,\n    showValue,\n    showValuePercent,\n    labelOverlap,\n    labelColorSmartInvert,\n    labelColor,\n    labelFontSize,\n    labelFontWeight,\n    labelBackgroundColor,\n    labelPosition,\n    autoFormat,\n    numFormat = {},\n  } = label\n\n  const labelDims = uniqueBy(\n    (vseedDimensions || []).filter((item) => encoding.label?.includes(item.id)),\n    (item) => item.id,\n  )\n  const labelMeas = uniqueBy(\n    (vseedMeasures || []).filter((item) => encoding.label?.includes(item.id)),\n    (item) => item.id,\n  )\n\n  const percentFormat: NumFormat = merge(numFormat, {\n    type: 'percent',\n  } as NumFormat)\n\n  const percentFormatter = createFormatter(percentFormat)\n\n  const result = {\n    visible: enable,\n    formatMethod: (_, datum: Datum) => {\n      const result = []\n\n      const dimLabels = labelDims.map((item) => item.alias || item.id)\n      const meaLabels = labelMeas.map((item) =>\n        generateMeasureValue(datum[item.id] as number | string, item, autoFormat, numFormat),\n      )\n\n      result.push(...dimLabels)\n\n      foldInfoList.forEach((foldInfo) => {\n        const { measureId, measureValue, statistics } = foldInfo\n        const measure = findMeasureById(advancedVSeedMeasures, datum[measureId] as string)\n        const measureValueLabel = generateMeasureValue(\n          datum[measureValue] as number | string,\n          measure,\n          autoFormat,\n          numFormat,\n        )\n        const measurePercentLabel = generateMeasurePercent(\n          datum[measureValue] as number | string,\n          statistics.sum,\n          percentFormatter,\n        )\n        if (showValue) {\n          result.push(measureValueLabel)\n        }\n        if (showValuePercent) {\n          result.push(measurePercentLabel)\n        }\n      })\n\n      result.push(...meaLabels)\n\n      if (wrap) {\n        return result\n      }\n      return result.join(' ')\n    },\n    position: labelPosition,\n    style: {\n      fill: labelColor,\n      fontSize: labelFontSize,\n      fontWeight: labelFontWeight,\n      background: labelBackgroundColor,\n    },\n    smartInvert: labelColorSmartInvert,\n  } as ILineLikeLabelSpec\n\n  if (labelOverlap) {\n    result.overlap = {\n      hideOnHit: true,\n      clampForce: true,\n    }\n  }\n\n  return result\n}\n"],"names":["label","spec","context","result","advancedVSeed","vseed","datasetReshapeInfo","chartType","encoding","baseConfig","foldInfo","isEmpty","buildLabel","generateMeasureValue","value","measure","labelAutoFormat","numFormat","format","merge","mergedMeasure","formatter","createFormatterByMeasure","generateMeasurePercent","sum","String","num","Number","percentValue","vseedMeasures","vseedDimensions","advancedVSeedMeasures","foldInfoList","enable","wrap","showValue","showValuePercent","labelOverlap","labelColorSmartInvert","labelColor","labelFontSize","labelFontWeight","labelBackgroundColor","labelPosition","autoFormat","labelDims","uniqueBy","item","labelMeas","percentFormat","percentFormatter","createFormatter","_","datum","dimLabels","meaLabels","measureId","measureValue","statistics","findMeasureById","measureValueLabel","measurePercentLabel"],"mappings":"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"}

package/dist/esm/pipeline/spec/chart/pipes/label/labelDualAxis.js

@@ -1,74 +1,37 @@
-import { autoFormatter, createFormatter, findMeasureById } from "../../../../utils/index.js";
-import { isEmpty, isNullish } from "remeda";
+import { isNullish } from "remeda";
+import { buildLabel } from "./label.js";
+import { DUAL_AXIS_LABEL_Z_INDEX } from "../../../../utils/constant.js";
 const labelPrimary = (spec, context)=>{
     const result = {
         ...spec
     };
-    const { advancedVSeed } = context;
-    const { measures, datasetReshapeInfo, locale } = advancedVSeed;
+    const { advancedVSeed, vseed } = context;
+    const { datasetReshapeInfo, encoding } = advancedVSeed;
     const { chartType } = advancedVSeed;
     const baseConfig = advancedVSeed.config[chartType];
     if (!baseConfig || !baseConfig.label) return result;
     const foldInfoList = datasetReshapeInfo[0].foldInfoList;
-    const { measureId, measureValue } = foldInfoList[0];
-    const { label } = baseConfig;
-    const { enable } = label;
-    result.label = {
-        visible: enable,
-        formatMethod: (value, datum)=>{
-            const result = [];
-            const formatValue = (value)=>{
-                const id = datum[measureId];
-                const measure = findMeasureById(measures, id);
-                if (!measure) return value;
-                const { format = {}, autoFormat = true } = measure;
-                if (!isEmpty(format)) {
-                    const formatter = createFormatter(format);
-                    return formatter(value);
-                }
-                if (autoFormat) return autoFormatter(value, locale);
-                return String(value);
-            };
-            result.push(formatValue(datum[measureValue]));
-            return result.join(' ');
-        }
-    };
+    result.label = buildLabel(baseConfig.label, vseed.measures, vseed.dimensions, advancedVSeed.measures, encoding, [
+        foldInfoList[0]
+    ]);
+    result.label.zIndex = DUAL_AXIS_LABEL_Z_INDEX;
     return result;
 };
 const labelSecondary = (spec, context)=>{
     const result = {
         ...spec
     };
-    const { advancedVSeed } = context;
-    const { measures, datasetReshapeInfo, locale } = advancedVSeed;
+    const { advancedVSeed, vseed } = context;
+    const { datasetReshapeInfo, encoding } = advancedVSeed;
     const { chartType } = advancedVSeed;
     const baseConfig = advancedVSeed.config[chartType];
     if (!baseConfig || !baseConfig.label) return result;
     if (isNullish(datasetReshapeInfo[0].foldInfoList?.[1])) return result;
     const foldInfoList = datasetReshapeInfo[0].foldInfoList;
-    const { measureId, measureValue } = foldInfoList[1];
-    const { label } = baseConfig;
-    const { enable } = label;
-    result.label = {
-        visible: enable,
-        formatMethod: (value, datum)=>{
-            const result = [];
-            const formatValue = (value)=>{
-                const id = datum[measureId];
-                const measure = findMeasureById(measures, id);
-                if (!measure) return value;
-                const { format = {}, autoFormat = true } = measure;
-                if (!isEmpty(format)) {
-                    const formatter = createFormatter(format);
-                    return formatter(value);
-                }
-                if (autoFormat) return autoFormatter(value, locale);
-                return String(value);
-            };
-            result.push(formatValue(datum[measureValue]));
-            return result.join(' ');
-        }
-    };
+    result.label = buildLabel(baseConfig.label, vseed.measures, vseed.dimensions, advancedVSeed.measures, encoding, [
+        foldInfoList[1]
+    ]);
+    result.label.zIndex = DUAL_AXIS_LABEL_Z_INDEX;
     return result;
 };
 export { labelPrimary, labelSecondary };

package/dist/esm/pipeline/spec/chart/pipes/label/labelDualAxis.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/label/labelDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/label/labelDualAxis.ts"],"sourcesContent":["import type { ILineChartSpec } from '@visactor/vchart'\nimport type { ILineLikeLabelSpec } from '@visactor/vchart/esm/series/mixin/interface'\nimport { autoFormatter, createFormatter, findMeasureById } from '../../../../utils'\nimport type { Datum, FoldInfo, Label, SpecPipe } from 'src/types'\nimport { isEmpty, isNullish } from 'remeda'\n\nexport const labelPrimary: SpecPipe = (spec, context) => {\n  const result = { ...spec } as ILineChartSpec\n  const { advancedVSeed } = context\n  const { measures, datasetReshapeInfo, locale } = advancedVSeed\n  const { chartType } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { label: Label }\n\n  if (!baseConfig || !baseConfig.label) {\n    return result\n  }\n\n  const foldInfoList = datasetReshapeInfo[0].foldInfoList as FoldInfo[]\n  const { measureId, measureValue } = foldInfoList[0]\n  const { label } = baseConfig\n  const { enable } = label\n\n  result.label = {\n    visible: enable,\n    formatMethod: (value: string, datum: Datum) => {\n      const result = []\n\n      const formatValue = (value: number) => {\n        const id = datum[measureId] as string\n        const measure = findMeasureById(measures, id)\n        if (!measure) {\n          return value\n        }\n\n        const { format = {}, autoFormat = true } = measure\n\n        if (!isEmpty(format)) {\n          const formatter = createFormatter(format)\n          return formatter(value)\n        }\n        if (autoFormat) {\n          return autoFormatter(value, locale)\n        }\n        return String(value)\n      }\n\n      result.push(formatValue(datum[measureValue] as number))\n\n      return result.join(' ')\n    },\n  } as ILineLikeLabelSpec\n  return result\n}\n\nexport const labelSecondary: SpecPipe = (spec, context) => {\n  const result = { ...spec } as ILineChartSpec\n  const { advancedVSeed } = context\n  const { measures, datasetReshapeInfo, locale } = advancedVSeed\n  const { chartType } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { label: Label }\n\n  if (!baseConfig || !baseConfig.label) {\n    return result\n  }\n  if (isNullish(datasetReshapeInfo[0].foldInfoList?.[1])) {\n    return result\n  }\n  const foldInfoList = datasetReshapeInfo[0].foldInfoList as FoldInfo[]\n\n  const { measureId, measureValue } = foldInfoList[1]\n  const { label } = baseConfig\n  const { enable } = label\n\n  result.label = {\n    visible: enable,\n    formatMethod: (value: string, datum: Datum) => {\n      const result = []\n\n      const formatValue = (value: number) => {\n        const id = datum[measureId] as string\n        const measure = findMeasureById(measures, id)\n        if (!measure) {\n          return value\n        }\n\n        const { format = {}, autoFormat = true } = measure\n\n        if (!isEmpty(format)) {\n          const formatter = createFormatter(format)\n          return formatter(value)\n        }\n        if (autoFormat) {\n          return autoFormatter(value, locale)\n        }\n        return String(value)\n      }\n\n      result.push(formatValue(datum[measureValue] as number))\n\n      return result.join(' ')\n    },\n  } as ILineLikeLabelSpec\n  return result\n}\n"],"names":["labelPrimary","spec","context","result","advancedVSeed","measures","datasetReshapeInfo","locale","chartType","baseConfig","foldInfoList","measureId","measureValue","label","enable","value","datum","formatValue","id","measure","findMeasureById","format","autoFormat","isEmpty","formatter","createFormatter","autoFormatter","String","labelSecondary","isNullish"],"mappings":";;AAMO,MAAMA,eAAyB,CAACC,MAAMC;IAC3C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAE,GAAGF;IAC1B,MAAM,EAAEG,QAAQ,EAAEC,kBAAkB,EAAEC,MAAM,EAAE,GAAGH;IACjD,MAAM,EAAEI,SAAS,EAAE,GAAGJ;IACtB,MAAMK,aAAaL,cAAc,MAAM,CAACI,UAAU;IAElD,IAAI,CAACC,cAAc,CAACA,WAAW,KAAK,EAClC,OAAON;IAGT,MAAMO,eAAeJ,kBAAkB,CAAC,EAAE,CAAC,YAAY;IACvD,MAAM,EAAEK,SAAS,EAAEC,YAAY,EAAE,GAAGF,YAAY,CAAC,EAAE;IACnD,MAAM,EAAEG,KAAK,EAAE,GAAGJ;IAClB,MAAM,EAAEK,MAAM,EAAE,GAAGD;IAEnBV,OAAO,KAAK,GAAG;QACb,SAASW;QACT,cAAc,CAACC,OAAeC;YAC5B,MAAMb,SAAS,EAAE;YAEjB,MAAMc,cAAc,CAACF;gBACnB,MAAMG,KAAKF,KAAK,CAACL,UAAU;gBAC3B,MAAMQ,UAAUC,gBAAgBf,UAAUa;gBAC1C,IAAI,CAACC,SACH,OAAOJ;gBAGT,MAAM,EAAEM,SAAS,CAAC,CAAC,EAAEC,aAAa,IAAI,EAAE,GAAGH;gBAE3C,IAAI,CAACI,QAAQF,SAAS;oBACpB,MAAMG,YAAYC,gBAAgBJ;oBAClC,OAAOG,UAAUT;gBACnB;gBACA,IAAIO,YACF,OAAOI,cAAcX,OAAOR;gBAE9B,OAAOoB,OAAOZ;YAChB;YAEAZ,OAAO,IAAI,CAACc,YAAYD,KAAK,CAACJ,aAAa;YAE3C,OAAOT,OAAO,IAAI,CAAC;QACrB;IACF;IACA,OAAOA;AACT;AAEO,MAAMyB,iBAA2B,CAAC3B,MAAMC;IAC7C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAE,GAAGF;IAC1B,MAAM,EAAEG,QAAQ,EAAEC,kBAAkB,EAAEC,MAAM,EAAE,GAAGH;IACjD,MAAM,EAAEI,SAAS,EAAE,GAAGJ;IACtB,MAAMK,aAAaL,cAAc,MAAM,CAACI,UAAU;IAElD,IAAI,CAACC,cAAc,CAACA,WAAW,KAAK,EAClC,OAAON;IAET,IAAI0B,UAAUvB,kBAAkB,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,GACnD,OAAOH;IAET,MAAMO,eAAeJ,kBAAkB,CAAC,EAAE,CAAC,YAAY;IAEvD,MAAM,EAAEK,SAAS,EAAEC,YAAY,EAAE,GAAGF,YAAY,CAAC,EAAE;IACnD,MAAM,EAAEG,KAAK,EAAE,GAAGJ;IAClB,MAAM,EAAEK,MAAM,EAAE,GAAGD;IAEnBV,OAAO,KAAK,GAAG;QACb,SAASW;QACT,cAAc,CAACC,OAAeC;YAC5B,MAAMb,SAAS,EAAE;YAEjB,MAAMc,cAAc,CAACF;gBACnB,MAAMG,KAAKF,KAAK,CAACL,UAAU;gBAC3B,MAAMQ,UAAUC,gBAAgBf,UAAUa;gBAC1C,IAAI,CAACC,SACH,OAAOJ;gBAGT,MAAM,EAAEM,SAAS,CAAC,CAAC,EAAEC,aAAa,IAAI,EAAE,GAAGH;gBAE3C,IAAI,CAACI,QAAQF,SAAS;oBACpB,MAAMG,YAAYC,gBAAgBJ;oBAClC,OAAOG,UAAUT;gBACnB;gBACA,IAAIO,YACF,OAAOI,cAAcX,OAAOR;gBAE9B,OAAOoB,OAAOZ;YAChB;YAEAZ,OAAO,IAAI,CAACc,YAAYD,KAAK,CAACJ,aAAa;YAE3C,OAAOT,OAAO,IAAI,CAAC;QACrB;IACF;IACA,OAAOA;AACT"}
+{"version":3,"file":"pipeline/spec/chart/pipes/label/labelDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/label/labelDualAxis.ts"],"sourcesContent":["import type { ILineChartSpec } from '@visactor/vchart'\nimport type { Encoding, FoldInfo, Label, SpecPipe } from 'src/types'\nimport { isNullish } from 'remeda'\nimport { buildLabel } from './label'\nimport { DUAL_AXIS_LABEL_Z_INDEX } from 'src/pipeline/utils/constant'\n\nexport const labelPrimary: SpecPipe = (spec, context) => {\n  const result = { ...spec } as ILineChartSpec\n  const { advancedVSeed, vseed } = context\n  const { datasetReshapeInfo, encoding } = advancedVSeed\n  const { chartType } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { label: Label }\n\n  if (!baseConfig || !baseConfig.label) {\n    return result\n  }\n\n  const foldInfoList = datasetReshapeInfo[0].foldInfoList as FoldInfo[]\n  result.label = buildLabel(\n    baseConfig.label,\n    vseed.measures,\n    vseed.dimensions,\n    advancedVSeed.measures,\n    encoding as Encoding,\n    [foldInfoList[0]],\n  )\n  result.label.zIndex = DUAL_AXIS_LABEL_Z_INDEX\n  return result\n}\n\nexport const labelSecondary: SpecPipe = (spec, context) => {\n  const result = { ...spec } as ILineChartSpec\n  const { advancedVSeed, vseed } = context\n  const { datasetReshapeInfo, encoding } = advancedVSeed\n  const { chartType } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { label: Label }\n\n  if (!baseConfig || !baseConfig.label) {\n    return result\n  }\n  if (isNullish(datasetReshapeInfo[0].foldInfoList?.[1])) {\n    return result\n  }\n  const foldInfoList = datasetReshapeInfo[0].foldInfoList as FoldInfo[]\n\n  result.label = buildLabel(\n    baseConfig.label,\n    vseed.measures,\n    vseed.dimensions,\n    advancedVSeed.measures,\n    encoding as Encoding,\n    [foldInfoList[1]],\n  )\n  result.label.zIndex = DUAL_AXIS_LABEL_Z_INDEX\n  return result\n}\n"],"names":["labelPrimary","spec","context","result","advancedVSeed","vseed","datasetReshapeInfo","encoding","chartType","baseConfig","foldInfoList","buildLabel","DUAL_AXIS_LABEL_Z_INDEX","labelSecondary","isNullish"],"mappings":";;;AAMO,MAAMA,eAAyB,CAACC,MAAMC;IAC3C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,kBAAkB,EAAEC,QAAQ,EAAE,GAAGH;IACzC,MAAM,EAAEI,SAAS,EAAE,GAAGJ;IACtB,MAAMK,aAAaL,cAAc,MAAM,CAACI,UAAU;IAElD,IAAI,CAACC,cAAc,CAACA,WAAW,KAAK,EAClC,OAAON;IAGT,MAAMO,eAAeJ,kBAAkB,CAAC,EAAE,CAAC,YAAY;IACvDH,OAAO,KAAK,GAAGQ,WACbF,WAAW,KAAK,EAChBJ,MAAM,QAAQ,EACdA,MAAM,UAAU,EAChBD,cAAc,QAAQ,EACtBG,UACA;QAACG,YAAY,CAAC,EAAE;KAAC;IAEnBP,OAAO,KAAK,CAAC,MAAM,GAAGS;IACtB,OAAOT;AACT;AAEO,MAAMU,iBAA2B,CAACZ,MAAMC;IAC7C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,kBAAkB,EAAEC,QAAQ,EAAE,GAAGH;IACzC,MAAM,EAAEI,SAAS,EAAE,GAAGJ;IACtB,MAAMK,aAAaL,cAAc,MAAM,CAACI,UAAU;IAElD,IAAI,CAACC,cAAc,CAACA,WAAW,KAAK,EAClC,OAAON;IAET,IAAIW,UAAUR,kBAAkB,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,GACnD,OAAOH;IAET,MAAMO,eAAeJ,kBAAkB,CAAC,EAAE,CAAC,YAAY;IAEvDH,OAAO,KAAK,GAAGQ,WACbF,WAAW,KAAK,EAChBJ,MAAM,QAAQ,EACdA,MAAM,UAAU,EAChBD,cAAc,QAAQ,EACtBG,UACA;QAACG,YAAY,CAAC,EAAE;KAAC;IAEnBP,OAAO,KAAK,CAAC,MAAM,GAAGS;IACtB,OAAOT;AACT"}

package/dist/esm/pipeline/spec/chart/pipes/label/{labelColorInversion.d.ts → labelScatter.d.ts}

@@ -1,2 +1,2 @@
 import type { SpecPipe } from '../../../../../types';
-export declare const labelColorInversion: SpecPipe;
+export declare const labelScatter: SpecPipe;

package/dist/esm/pipeline/spec/chart/pipes/label/labelScatter.js

@@ -0,0 +1,19 @@
+import { isEmpty } from "remeda";
+import { buildLabel } from "./label.js";
+const labelScatter = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed, vseed } = context;
+    const { datasetReshapeInfo } = advancedVSeed;
+    const { chartType, encoding } = advancedVSeed;
+    const baseConfig = advancedVSeed.config[chartType];
+    if (!baseConfig || isEmpty(baseConfig.label)) return result;
+    const foldInfoList = datasetReshapeInfo[0].foldInfoList;
+    const { label } = baseConfig;
+    result.label = buildLabel(label, vseed.measures, vseed.dimensions, advancedVSeed.measures, encoding, foldInfoList);
+    return result;
+};
+export { labelScatter };
+
+//# sourceMappingURL=labelScatter.js.map

package/dist/esm/pipeline/spec/chart/pipes/label/labelScatter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pipeline/spec/chart/pipes/label/labelScatter.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/label/labelScatter.ts"],"sourcesContent":["import type { IScatterChartSpec } from '@visactor/vchart'\nimport type { Encoding, FoldInfo, Label, SpecPipe } from 'src/types'\nimport { isEmpty } from 'remeda'\nimport { buildLabel } from './label'\n\nexport const labelScatter: SpecPipe = (spec, context) => {\n  const result = { ...spec } as IScatterChartSpec\n  const { advancedVSeed, vseed } = context\n  const { datasetReshapeInfo } = advancedVSeed\n  const { chartType, encoding } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { label: Label }\n\n  if (!baseConfig || isEmpty(baseConfig.label)) {\n    return result\n  }\n\n  const foldInfoList = datasetReshapeInfo[0].foldInfoList as FoldInfo[]\n\n  const { label } = baseConfig\n\n  result.label = buildLabel(\n    label,\n    vseed.measures,\n    vseed.dimensions,\n    advancedVSeed.measures,\n    encoding as Encoding,\n    foldInfoList,\n  )\n\n  return result\n}\n"],"names":["labelScatter","spec","context","result","advancedVSeed","vseed","datasetReshapeInfo","chartType","encoding","baseConfig","isEmpty","foldInfoList","label","buildLabel"],"mappings":";;AAKO,MAAMA,eAAyB,CAACC,MAAMC;IAC3C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,kBAAkB,EAAE,GAAGF;IAC/B,MAAM,EAAEG,SAAS,EAAEC,QAAQ,EAAE,GAAGJ;IAChC,MAAMK,aAAaL,cAAc,MAAM,CAACG,UAAU;IAElD,IAAI,CAACE,cAAcC,QAAQD,WAAW,KAAK,GACzC,OAAON;IAGT,MAAMQ,eAAeL,kBAAkB,CAAC,EAAE,CAAC,YAAY;IAEvD,MAAM,EAAEM,KAAK,EAAE,GAAGH;IAElBN,OAAO,KAAK,GAAGU,WACbD,OACAP,MAAM,QAAQ,EACdA,MAAM,UAAU,EAChBD,cAAc,QAAQ,EACtBI,UACAG;IAGF,OAAOR;AACT"}

package/dist/esm/pipeline/spec/chart/pipes/series/series.js

@@ -18,6 +18,7 @@ const seriesDualAxis = (...args)=>{
     const result = {
         type: 'common',
         padding: 0,
+        labelLayout: 'region',
         region: [
             {
                 clip: true

package/dist/esm/pipeline/spec/chart/pipes/series/series.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/series/series.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/series/series.ts"],"sourcesContent":["import type { Spec, SpecPipe, SpecPipeline, SpecPipelineContext } from 'src/types'\nimport { execPipeline } from '../../../../utils'\nimport type { ICommonChartSpec, ILineSeriesSpec } from '@visactor/vchart'\n\nexport const series = (...args: SpecPipeline[]): SpecPipe => {\n  const result = {\n    type: 'common',\n    padding: 0,\n    region: [\n      {\n        clip: true,\n      },\n    ],\n  } as ICommonChartSpec\n\n  return (_, context) => {\n    result.series = args.map((pipeline) => {\n      return execPipeline<Spec, SpecPipelineContext>(pipeline, context, {})\n    }) as ILineSeriesSpec[]\n\n    return result\n  }\n}\n\n/**\n * @description 双轴图的透视场景, 不能使用此pipe, 请使用series\n * 因为VTable.PivotVChart会自行解析数据, 而非VChart解析.\n */\nexport const seriesDualAxis = (...args: SpecPipeline[]): SpecPipe => {\n  const result = {\n    type: 'common',\n    padding: 0,\n    region: [\n      {\n        clip: true,\n      },\n    ],\n  } as ICommonChartSpec\n\n  const createDualContext = <T extends SpecPipelineContext>(context: T, index: number): T => {\n    const { advancedVSeed } = context\n    const dataset = advancedVSeed.dataset[index]\n    return {\n      ...context,\n      advancedVSeed: {\n        ...advancedVSeed,\n        dataset: dataset,\n      },\n    }\n  }\n\n  return (_, context) => {\n    result.series = args.map((pipeline, index) => {\n      const seriesContext = createDualContext(context, index)\n      return execPipeline<Spec, SpecPipelineContext>(pipeline, seriesContext, {})\n    }) as ILineSeriesSpec[]\n\n    return result\n  }\n}\n"],"names":["series","args","result","_","context","pipeline","execPipeline","seriesDualAxis","createDualContext","index","advancedVSeed","dataset","seriesContext"],"mappings":";AAIO,MAAMA,SAAS,CAAC,GAAGC;IACxB,MAAMC,SAAS;QACb,MAAM;QACN,SAAS;QACT,QAAQ;YACN;gBACE,MAAM;YACR;SACD;IACH;IAEA,OAAO,CAACC,GAAGC;QACTF,OAAO,MAAM,GAAGD,KAAK,GAAG,CAAC,CAACI,WACjBC,aAAwCD,UAAUD,SAAS,CAAC;QAGrE,OAAOF;IACT;AACF;AAMO,MAAMK,iBAAiB,CAAC,GAAGN;IAChC,MAAMC,SAAS;QACb,MAAM;QACN,SAAS;QACT,QAAQ;YACN;gBACE,MAAM;YACR;SACD;IACH;IAEA,MAAMM,oBAAoB,CAAgCJ,SAAYK;QACpE,MAAM,EAAEC,aAAa,EAAE,GAAGN;QAC1B,MAAMO,UAAUD,cAAc,OAAO,CAACD,MAAM;QAC5C,OAAO;YACL,GAAGL,OAAO;YACV,eAAe;gBACb,GAAGM,aAAa;gBAChB,SAASC;YACX;QACF;IACF;IAEA,OAAO,CAACR,GAAGC;QACTF,OAAO,MAAM,GAAGD,KAAK,GAAG,CAAC,CAACI,UAAUI;YAClC,MAAMG,gBAAgBJ,kBAAkBJ,SAASK;YACjD,OAAOH,aAAwCD,UAAUO,eAAe,CAAC;QAC3E;QAEA,OAAOV;IACT;AACF"}
+{"version":3,"file":"pipeline/spec/chart/pipes/series/series.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/series/series.ts"],"sourcesContent":["import type { Spec, SpecPipe, SpecPipeline, SpecPipelineContext } from 'src/types'\nimport { execPipeline } from '../../../../utils'\nimport type { ICommonChartSpec, ILineSeriesSpec } from '@visactor/vchart'\n\nexport const series = (...args: SpecPipeline[]): SpecPipe => {\n  const result = {\n    type: 'common',\n    padding: 0,\n    region: [\n      {\n        clip: true,\n      },\n    ],\n  } as ICommonChartSpec\n\n  return (_, context) => {\n    result.series = args.map((pipeline) => {\n      return execPipeline<Spec, SpecPipelineContext>(pipeline, context, {})\n    }) as ILineSeriesSpec[]\n\n    return result\n  }\n}\n\n/**\n * @description 双轴图的透视场景, 不能使用此pipe, 请使用series\n * 因为VTable.PivotVChart会自行解析数据, 而非VChart解析.\n */\nexport const seriesDualAxis = (...args: SpecPipeline[]): SpecPipe => {\n  const result = {\n    type: 'common',\n    padding: 0,\n    labelLayout: 'region',\n    region: [\n      {\n        clip: true,\n      },\n    ],\n  } as ICommonChartSpec\n\n  const createDualContext = <T extends SpecPipelineContext>(context: T, index: number): T => {\n    const { advancedVSeed } = context\n    const dataset = advancedVSeed.dataset[index]\n    return {\n      ...context,\n      advancedVSeed: {\n        ...advancedVSeed,\n        dataset: dataset,\n      },\n    }\n  }\n\n  return (_, context) => {\n    result.series = args.map((pipeline, index) => {\n      const seriesContext = createDualContext(context, index)\n      return execPipeline<Spec, SpecPipelineContext>(pipeline, seriesContext, {})\n    }) as ILineSeriesSpec[]\n\n    return result\n  }\n}\n"],"names":["series","args","result","_","context","pipeline","execPipeline","seriesDualAxis","createDualContext","index","advancedVSeed","dataset","seriesContext"],"mappings":";AAIO,MAAMA,SAAS,CAAC,GAAGC;IACxB,MAAMC,SAAS;QACb,MAAM;QACN,SAAS;QACT,QAAQ;YACN;gBACE,MAAM;YACR;SACD;IACH;IAEA,OAAO,CAACC,GAAGC;QACTF,OAAO,MAAM,GAAGD,KAAK,GAAG,CAAC,CAACI,WACjBC,aAAwCD,UAAUD,SAAS,CAAC;QAGrE,OAAOF;IACT;AACF;AAMO,MAAMK,iBAAiB,CAAC,GAAGN;IAChC,MAAMC,SAAS;QACb,MAAM;QACN,SAAS;QACT,aAAa;QACb,QAAQ;YACN;gBACE,MAAM;YACR;SACD;IACH;IAEA,MAAMM,oBAAoB,CAAgCJ,SAAYK;QACpE,MAAM,EAAEC,aAAa,EAAE,GAAGN;QAC1B,MAAMO,UAAUD,cAAc,OAAO,CAACD,MAAM;QAC5C,OAAO;YACL,GAAGL,OAAO;YACV,eAAe;gBACb,GAAGM,aAAa;gBAChB,SAASC;YACX;QACF;IACF;IAEA,OAAO,CAACR,GAAGC;QACTF,OAAO,MAAM,GAAGD,KAAK,GAAG,CAAC,CAACI,UAAUI;YAClC,MAAMG,gBAAgBJ,kBAAkBJ,SAASK;YACjD,OAAOH,aAAwCD,UAAUO,eAAe,CAAC;QAC3E;QAEA,OAAOV;IACT;AACF"}

package/dist/esm/pipeline/spec/chart/pipes/tooltip/tooltip.d.ts

@@ -1,13 +1,13 @@
-import type { Dimensions, FoldInfo, Locale, Measures, SpecPipe, UnfoldInfo } from '../../../../../types';
+import type { Dimensions, FoldInfo, Measures, SpecPipe, UnfoldInfo } from '../../../../../types';
 export declare const tooltip: SpecPipe;
-export declare const createDimensionContent: (measures: Measures, foldInfo: FoldInfo, unfoldInfo: UnfoldInfo, locale: Locale) => {
+export declare const createDimensionContent: (measures: Measures, foldInfo: FoldInfo, unfoldInfo: UnfoldInfo) => {
     visible: boolean;
     shapeType: string;
     hasShape: boolean;
     key: (v: unknown) => string;
     value: (v: unknown) => string;
 }[];
-export declare const createMarkContent: (tooltip: string[], dimensions: Dimensions, measures: Measures, locale: Locale, foldInfo: FoldInfo, unfoldInfo: UnfoldInfo) => ({
+export declare const createMarkContent: (tooltip: string[], dimensions: Dimensions, measures: Measures, foldInfo: FoldInfo, unfoldInfo: UnfoldInfo) => ({
     visible: boolean;
     hasShape: boolean;
     shapeType: string;

package/dist/esm/pipeline/spec/chart/pipes/tooltip/tooltip.js

@@ -1,12 +1,12 @@
-import { isEmpty, pipe, uniqueBy } from "remeda";
-import { autoFormatter, createFormatter, findAllMeasures, findMeasureById } from "../../../../utils/index.js";
+import { pipe, uniqueBy } from "remeda";
+import { createFormatterByMeasure, findAllMeasures, findMeasureById } from "../../../../utils/index.js";
 import { ORIGINAL_DATA } from "../../../../../dataReshape/index.js";
 const tooltip_tooltip = (spec, context)=>{
     const result = {
         ...spec
     };
     const { advancedVSeed, vseed } = context;
-    const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
+    const { measures, datasetReshapeInfo, chartType, dimensions, encoding } = advancedVSeed;
     const baseConfig = advancedVSeed.config[chartType];
     const { tooltip = {
         enable: true
@@ -19,18 +19,18 @@ const tooltip_tooltip = (spec, context)=>{
             title: {
                 visible: false
             },
-            content: createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), locale, foldInfo, unfoldInfo)
+            content: createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), foldInfo, unfoldInfo)
         },
         dimension: {
             title: {
                 visible: true
             },
-            content: createDimensionContent(measures, foldInfo, unfoldInfo, locale)
+            content: createDimensionContent(measures, foldInfo, unfoldInfo)
         }
     };
     return result;
 };
-const createDimensionContent = (measures, foldInfo, unfoldInfo, locale)=>{
+const createDimensionContent = (measures, foldInfo, unfoldInfo)=>{
     const { measureId, measureValue } = foldInfo;
     const { encodingColor } = unfoldInfo;
     return [
@@ -48,19 +48,13 @@ const createDimensionContent = (measures, foldInfo, unfoldInfo, locale)=>{
                 const value = datum[measureValue];
                 const id = datum[measureId];
                 const measure = findMeasureById(measures, id);
-                if (!measure) return String(value);
-                const { format = {}, autoFormat = true } = measure;
-                if (!isEmpty(format)) {
-                    const formatter = createFormatter(format);
-                    return formatter(value);
-                }
-                if (autoFormat) return autoFormatter(value, locale);
-                return String(value);
+                const formatter = createFormatterByMeasure(measure);
+                return formatter(value);
             }
         }
     ];
 };
-const createMarkContent = (tooltip, dimensions, measures, locale, foldInfo, unfoldInfo)=>{
+const createMarkContent = (tooltip, dimensions, measures, foldInfo, unfoldInfo)=>{
     const dims = pipe(dimensions.filter((item)=>tooltip.includes(item.id)), uniqueBy((item)=>item.id), uniqueBy((item)=>item.alias));
     const meas = pipe(measures.filter((item)=>tooltip.includes(item.id)), uniqueBy((item)=>item.id), uniqueBy((item)=>item.alias));
     const dimContent = dims.map((item)=>({
@@ -90,14 +84,8 @@ const createMarkContent = (tooltip, dimensions, measures, locale, foldInfo, unfo
                 const originalData = datum[ORIGINAL_DATA];
                 const value = originalData[id];
                 const measure = findMeasureById(measures, id);
-                if (!measure) return String(value);
-                const { format = {}, autoFormat = true } = measure;
-                if (!isEmpty(format)) {
-                    const formatter = createFormatter(format);
-                    return formatter(value);
-                }
-                if (autoFormat) return autoFormatter(value, locale);
-                return String(value);
+                const formatter = createFormatterByMeasure(measure);
+                return formatter(value);
             }
         }));
     const defaultContent = {
@@ -118,13 +106,8 @@ const createMarkContent = (tooltip, dimensions, measures, locale, foldInfo, unfo
             const id = datum[measureId];
             const measure = findMeasureById(measures, id);
             if (!measure) return String(value);
-            const { format = {}, autoFormat = true } = measure;
-            if (!isEmpty(format)) {
-                const formatter = createFormatter(format);
-                return formatter(value);
-            }
-            if (autoFormat) return autoFormatter(value, locale);
-            return String(value);
+            const formatter = createFormatterByMeasure(measure);
+            return formatter(value);
         }
     };
     return [

package/dist/esm/pipeline/spec/chart/pipes/tooltip/tooltip.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/tooltip/tooltip.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/tooltip/tooltip.ts"],"sourcesContent":["import { isEmpty, pipe, uniqueBy } from 'remeda'\nimport { autoFormatter, createFormatter, findAllMeasures, findMeasureById } from '../../../../utils'\nimport type { Datum, Dimensions, FoldInfo, Locale, Measures, SpecPipe, Tooltip, UnfoldInfo } from 'src/types'\nimport { ORIGINAL_DATA } from 'src/dataReshape'\n\nexport const tooltip: SpecPipe = (spec, context) => {\n  const result = { ...spec }\n  const { advancedVSeed, vseed } = context\n  const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { tooltip: Tooltip }\n  const { tooltip = { enable: true } } = baseConfig\n  const { enable } = tooltip\n  const { foldInfo, unfoldInfo } = datasetReshapeInfo[0] as unknown as {\n    foldInfo: FoldInfo\n    unfoldInfo: UnfoldInfo\n  }\n\n  result.tooltip = {\n    visible: enable,\n    mark: {\n      title: {\n        visible: false,\n      },\n      content: createMarkContent(\n        encoding.tooltip || [],\n        dimensions,\n        findAllMeasures(vseed.measures),\n        locale,\n        foldInfo,\n        unfoldInfo,\n      ),\n    },\n    dimension: {\n      title: {\n        visible: true,\n      },\n      content: createDimensionContent(measures, foldInfo, unfoldInfo, locale),\n    },\n  }\n  return result\n}\n\nexport const createDimensionContent = (\n  measures: Measures,\n  foldInfo: FoldInfo,\n  unfoldInfo: UnfoldInfo,\n  locale: Locale,\n) => {\n  const { measureId, measureValue } = foldInfo\n  const { encodingColor } = unfoldInfo\n\n  return [\n    {\n      visible: true,\n      shapeType: 'rectRound',\n      hasShape: true,\n      key: (v: unknown) => {\n        const datum = v as Datum\n        return (datum && (datum[encodingColor] as string)) || ''\n      },\n      value: (v: unknown) => {\n        const datum = v as Datum\n        if (!datum) {\n          return ''\n        }\n        const value = datum[measureValue] as string | number\n        const id = datum[measureId] as string\n        const measure = findMeasureById(measures, id)\n        if (!measure) {\n          return String(value)\n        }\n        const { format = {}, autoFormat = true } = measure\n        if (!isEmpty(format)) {\n          const formatter = createFormatter(format)\n          return formatter(value)\n        }\n        if (autoFormat) {\n          return autoFormatter(value, locale)\n        }\n        return String(value)\n      },\n    },\n  ]\n}\n\nexport const createMarkContent = (\n  tooltip: string[],\n  dimensions: Dimensions,\n  measures: Measures,\n  locale: Locale,\n  foldInfo: FoldInfo,\n  unfoldInfo: UnfoldInfo,\n) => {\n  const dims = pipe(\n    dimensions.filter((item) => tooltip.includes(item.id)),\n    uniqueBy((item) => item.id),\n    uniqueBy((item) => item.alias),\n  )\n  const meas = pipe(\n    measures.filter((item) => tooltip.includes(item.id)),\n    uniqueBy((item) => item.id),\n    uniqueBy((item) => item.alias),\n  )\n\n  const dimContent = dims.map((item) => ({\n    visible: true,\n    hasShape: true,\n    shapeType: 'rectRound',\n    key: (v: unknown) => {\n      const datum = v as Datum\n      if (item.alias || item.id) {\n        return item.alias || item.id\n      }\n      return datum && (datum[item.id] as string)\n    },\n    value: (v: unknown) => {\n      const datum = v as Datum\n      return datum && (datum[item.id] as string)\n    },\n  }))\n\n  const meaContent = meas.map((item) => ({\n    visible: true,\n    hasShape: true,\n    shapeType: 'rectRound',\n    key: item.alias || item.id,\n    value: (v: unknown) => {\n      const datum = v as Datum\n      if (!datum) {\n        return ''\n      }\n      const id = item.id\n      if (!datum || !datum[ORIGINAL_DATA] || !datum[ORIGINAL_DATA]) {\n        return ''\n      }\n      const originalData = datum[ORIGINAL_DATA] as Datum\n      const value = originalData[id] as string | number\n      const measure = findMeasureById(measures, id)\n      if (!measure) {\n        return String(value)\n      }\n      const { format = {}, autoFormat = true } = measure\n      if (!isEmpty(format)) {\n        const formatter = createFormatter(format)\n        return formatter(value)\n      }\n      if (autoFormat) {\n        return autoFormatter(value, locale)\n      }\n      return String(value)\n    },\n  }))\n\n  const defaultContent = {\n    visible: true,\n    hasShape: true,\n    shapeType: 'rectRound',\n    key: (v: unknown) => {\n      const { measureName } = foldInfo\n      const { encodingColor: colorName } = unfoldInfo\n\n      const datum = v as Datum\n      return (datum && (datum[measureName || colorName] as string)) || ''\n    },\n    value: (v: unknown) => {\n      const { measureId, measureValue } = foldInfo\n\n      const datum = v as Datum\n      if (!datum) {\n        return ''\n      }\n      const value = datum[measureValue] as string | number\n      const id = datum[measureId] as string\n      const measure = findMeasureById(measures, id)\n      if (!measure) {\n        return String(value)\n      }\n\n      const { format = {}, autoFormat = true } = measure\n\n      if (!isEmpty(format)) {\n        const formatter = createFormatter(format)\n        return formatter(value)\n      }\n      if (autoFormat) {\n        return autoFormatter(value, locale)\n      }\n      return String(value)\n    },\n  }\n\n  return [...dimContent, defaultContent, ...meaContent]\n}\n"],"names":["tooltip","spec","context","result","advancedVSeed","vseed","measures","datasetReshapeInfo","chartType","locale","dimensions","encoding","baseConfig","enable","foldInfo","unfoldInfo","createMarkContent","findAllMeasures","createDimensionContent","measureId","measureValue","encodingColor","v","datum","value","id","measure","findMeasureById","String","format","autoFormat","isEmpty","formatter","createFormatter","autoFormatter","dims","pipe","item","uniqueBy","meas","dimContent","meaContent","ORIGINAL_DATA","originalData","defaultContent","measureName","colorName"],"mappings":"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"}
+{"version":3,"file":"pipeline/spec/chart/pipes/tooltip/tooltip.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/tooltip/tooltip.ts"],"sourcesContent":["import { pipe, uniqueBy } from 'remeda'\nimport { createFormatterByMeasure, findAllMeasures, findMeasureById } from '../../../../utils'\nimport type { Datum, Dimensions, FoldInfo, Measures, SpecPipe, Tooltip, UnfoldInfo } from 'src/types'\nimport { ORIGINAL_DATA } from 'src/dataReshape'\n\nexport const tooltip: SpecPipe = (spec, context) => {\n  const result = { ...spec }\n  const { advancedVSeed, vseed } = context\n  const { measures, datasetReshapeInfo, chartType, dimensions, encoding } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { tooltip: Tooltip }\n  const { tooltip = { enable: true } } = baseConfig\n  const { enable } = tooltip\n  const { foldInfo, unfoldInfo } = datasetReshapeInfo[0] as unknown as {\n    foldInfo: FoldInfo\n    unfoldInfo: UnfoldInfo\n  }\n\n  result.tooltip = {\n    visible: enable,\n    mark: {\n      title: {\n        visible: false,\n      },\n      content: createMarkContent(\n        encoding.tooltip || [],\n        dimensions,\n        findAllMeasures(vseed.measures),\n        foldInfo,\n        unfoldInfo,\n      ),\n    },\n    dimension: {\n      title: {\n        visible: true,\n      },\n      content: createDimensionContent(measures, foldInfo, unfoldInfo),\n    },\n  }\n  return result\n}\n\nexport const createDimensionContent = (measures: Measures, foldInfo: FoldInfo, unfoldInfo: UnfoldInfo) => {\n  const { measureId, measureValue } = foldInfo\n  const { encodingColor } = unfoldInfo\n\n  return [\n    {\n      visible: true,\n      shapeType: 'rectRound',\n      hasShape: true,\n      key: (v: unknown) => {\n        const datum = v as Datum\n        return (datum && (datum[encodingColor] as string)) || ''\n      },\n      value: (v: unknown) => {\n        const datum = v as Datum\n        if (!datum) {\n          return ''\n        }\n        const value = datum[measureValue] as string | number\n        const id = datum[measureId] as string\n        const measure = findMeasureById(measures, id)\n        const formatter = createFormatterByMeasure(measure)\n        return formatter(value)\n      },\n    },\n  ]\n}\n\nexport const createMarkContent = (\n  tooltip: string[],\n  dimensions: Dimensions,\n  measures: Measures,\n  foldInfo: FoldInfo,\n  unfoldInfo: UnfoldInfo,\n) => {\n  const dims = pipe(\n    dimensions.filter((item) => tooltip.includes(item.id)),\n    uniqueBy((item) => item.id),\n    uniqueBy((item) => item.alias),\n  )\n  const meas = pipe(\n    measures.filter((item) => tooltip.includes(item.id)),\n    uniqueBy((item) => item.id),\n    uniqueBy((item) => item.alias),\n  )\n\n  const dimContent = dims.map((item) => ({\n    visible: true,\n    hasShape: true,\n    shapeType: 'rectRound',\n    key: (v: unknown) => {\n      const datum = v as Datum\n      if (item.alias || item.id) {\n        return item.alias || item.id\n      }\n      return datum && (datum[item.id] as string)\n    },\n    value: (v: unknown) => {\n      const datum = v as Datum\n      return datum && (datum[item.id] as string)\n    },\n  }))\n\n  const meaContent = meas.map((item) => ({\n    visible: true,\n    hasShape: true,\n    shapeType: 'rectRound',\n    key: item.alias || item.id,\n    value: (v: unknown) => {\n      const datum = v as Datum\n      if (!datum) {\n        return ''\n      }\n      const id = item.id\n      if (!datum || !datum[ORIGINAL_DATA] || !datum[ORIGINAL_DATA]) {\n        return ''\n      }\n      const originalData = datum[ORIGINAL_DATA] as Datum\n      const value = originalData[id] as string | number\n      const measure = findMeasureById(measures, id)\n      const formatter = createFormatterByMeasure(measure)\n      return formatter(value)\n    },\n  }))\n\n  const defaultContent = {\n    visible: true,\n    hasShape: true,\n    shapeType: 'rectRound',\n    key: (v: unknown) => {\n      const { measureName } = foldInfo\n      const { encodingColor: colorName } = unfoldInfo\n\n      const datum = v as Datum\n      return (datum && (datum[measureName || colorName] as string)) || ''\n    },\n    value: (v: unknown) => {\n      const { measureId, measureValue } = foldInfo\n\n      const datum = v as Datum\n      if (!datum) {\n        return ''\n      }\n      const value = datum[measureValue] as string | number\n      const id = datum[measureId] as string\n      const measure = findMeasureById(measures, id)\n      if (!measure) {\n        return String(value)\n      }\n\n      const formatter = createFormatterByMeasure(measure)\n      return formatter(value)\n    },\n  }\n\n  return [...dimContent, defaultContent, ...meaContent]\n}\n"],"names":["tooltip","spec","context","result","advancedVSeed","vseed","measures","datasetReshapeInfo","chartType","dimensions","encoding","baseConfig","enable","foldInfo","unfoldInfo","createMarkContent","findAllMeasures","createDimensionContent","measureId","measureValue","encodingColor","v","datum","value","id","measure","findMeasureById","formatter","createFormatterByMeasure","dims","pipe","item","uniqueBy","meas","dimContent","meaContent","ORIGINAL_DATA","originalData","defaultContent","measureName","colorName","String"],"mappings":"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"}

package/dist/esm/pipeline/spec/chart/pipes/tooltip/tooltipDualAxis.js

@@ -6,7 +6,7 @@ const tooltipPrimary = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed, vseed } = context;
-    const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
+    const { measures, datasetReshapeInfo, chartType, dimensions, encoding } = advancedVSeed;
     const baseConfig = advancedVSeed.config[chartType];
     const { tooltip = {
         enable: true
@@ -20,13 +20,13 @@ const tooltipPrimary = (spec, context)=>{
             title: {
                 visible: false
             },
-            content: createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), locale, foldInfoList[0], unfoldInfo)
+            content: createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), foldInfoList[0], unfoldInfo)
         },
         dimension: {
             title: {
                 visible: true
             },
-            content: createDimensionContent(measures, foldInfoList[0], unfoldInfo, locale)
+            content: createDimensionContent(measures, foldInfoList[0], unfoldInfo)
         }
     };
     return result;
@@ -36,7 +36,7 @@ const tooltipSecondary = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed, vseed } = context;
-    const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
+    const { measures, datasetReshapeInfo, chartType, dimensions, encoding } = advancedVSeed;
     const baseConfig = advancedVSeed.config[chartType];
     const { tooltip = {
         enable: true
@@ -51,13 +51,13 @@ const tooltipSecondary = (spec, context)=>{
             title: {
                 visible: false
             },
-            content: createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), locale, foldInfoList[1], unfoldInfo)
+            content: createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), foldInfoList[1], unfoldInfo)
         },
         dimension: {
             title: {
                 visible: true
             },
-            content: createDimensionContent(measures, foldInfoList[1], unfoldInfo, locale)
+            content: createDimensionContent(measures, foldInfoList[1], unfoldInfo)
         }
     };
     return result;

package/dist/esm/pipeline/spec/chart/pipes/tooltip/tooltipDualAxis.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/tooltip/tooltipDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/tooltip/tooltipDualAxis.ts"],"sourcesContent":["import { isNullish } from 'remeda'\nimport { createDimensionContent, createMarkContent } from './tooltip'\nimport type { FoldInfo, SpecPipe, Tooltip, UnfoldInfo } from 'src/types'\nimport { findAllMeasures } from 'src/pipeline/utils'\n\nexport const tooltipPrimary: SpecPipe = (spec, context) => {\n  const result = { ...spec }\n  const { advancedVSeed, vseed } = context\n  const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { tooltip: Tooltip }\n  const { tooltip = { enable: true } } = baseConfig\n  const { enable } = tooltip\n\n  const foldInfoList = datasetReshapeInfo[0].foldInfoList as FoldInfo[]\n  const unfoldInfo = datasetReshapeInfo[0].unfoldInfo\n\n  result.tooltip = {\n    visible: enable,\n    mark: {\n      title: {\n        visible: false,\n      },\n      content: createMarkContent(\n        encoding.tooltip || [],\n        dimensions,\n        findAllMeasures(vseed.measures),\n        locale,\n        foldInfoList[0],\n        unfoldInfo,\n      ),\n    },\n    dimension: {\n      title: {\n        visible: true,\n      },\n      content: createDimensionContent(measures, foldInfoList[0], unfoldInfo, locale),\n    },\n  }\n  return result\n}\n\nexport const tooltipSecondary: SpecPipe = (spec, context) => {\n  const result = { ...spec }\n  const { advancedVSeed, vseed } = context\n  const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { tooltip: Tooltip }\n  const { tooltip = { enable: true } } = baseConfig\n  const { enable } = tooltip\n\n  if (isNullish(datasetReshapeInfo[0].foldInfoList?.[1])) {\n    return result\n  }\n\n  const foldInfoList = datasetReshapeInfo[0].foldInfoList as FoldInfo[]\n  const unfoldInfo = datasetReshapeInfo[0].unfoldInfo as UnfoldInfo\n  result.tooltip = {\n    visible: enable,\n    mark: {\n      title: {\n        visible: false,\n      },\n      content: createMarkContent(\n        encoding.tooltip || [],\n        dimensions,\n        findAllMeasures(vseed.measures),\n        locale,\n        foldInfoList[1],\n        unfoldInfo,\n      ),\n    },\n    dimension: {\n      title: {\n        visible: true,\n      },\n      content: createDimensionContent(measures, foldInfoList[1], unfoldInfo, locale),\n    },\n  }\n  return result\n}\n"],"names":["tooltipPrimary","spec","context","result","advancedVSeed","vseed","measures","datasetReshapeInfo","chartType","locale","dimensions","encoding","baseConfig","tooltip","enable","foldInfoList","unfoldInfo","createMarkContent","findAllMeasures","createDimensionContent","tooltipSecondary","isNullish"],"mappings":";;;AAKO,MAAMA,iBAA2B,CAACC,MAAMC;IAC7C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,QAAQ,EAAEC,kBAAkB,EAAEC,SAAS,EAAEC,MAAM,EAAEC,UAAU,EAAEC,QAAQ,EAAE,GAAGP;IAClF,MAAMQ,aAAaR,cAAc,MAAM,CAACI,UAAU;IAClD,MAAM,EAAEK,UAAU;QAAE,QAAQ;IAAK,CAAC,EAAE,GAAGD;IACvC,MAAM,EAAEE,MAAM,EAAE,GAAGD;IAEnB,MAAME,eAAeR,kBAAkB,CAAC,EAAE,CAAC,YAAY;IACvD,MAAMS,aAAaT,kBAAkB,CAAC,EAAE,CAAC,UAAU;IAEnDJ,OAAO,OAAO,GAAG;QACf,SAASW;QACT,MAAM;YACJ,OAAO;gBACL,SAAS;YACX;YACA,SAASG,kBACPN,SAAS,OAAO,IAAI,EAAE,EACtBD,YACAQ,gBAAgBb,MAAM,QAAQ,GAC9BI,QACAM,YAAY,CAAC,EAAE,EACfC;QAEJ;QACA,WAAW;YACT,OAAO;gBACL,SAAS;YACX;YACA,SAASG,uBAAuBb,UAAUS,YAAY,CAAC,EAAE,EAAEC,YAAYP;QACzE;IACF;IACA,OAAON;AACT;AAEO,MAAMiB,mBAA6B,CAACnB,MAAMC;IAC/C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,QAAQ,EAAEC,kBAAkB,EAAEC,SAAS,EAAEC,MAAM,EAAEC,UAAU,EAAEC,QAAQ,EAAE,GAAGP;IAClF,MAAMQ,aAAaR,cAAc,MAAM,CAACI,UAAU;IAClD,MAAM,EAAEK,UAAU;QAAE,QAAQ;IAAK,CAAC,EAAE,GAAGD;IACvC,MAAM,EAAEE,MAAM,EAAE,GAAGD;IAEnB,IAAIQ,UAAUd,kBAAkB,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,GACnD,OAAOJ;IAGT,MAAMY,eAAeR,kBAAkB,CAAC,EAAE,CAAC,YAAY;IACvD,MAAMS,aAAaT,kBAAkB,CAAC,EAAE,CAAC,UAAU;IACnDJ,OAAO,OAAO,GAAG;QACf,SAASW;QACT,MAAM;YACJ,OAAO;gBACL,SAAS;YACX;YACA,SAASG,kBACPN,SAAS,OAAO,IAAI,EAAE,EACtBD,YACAQ,gBAAgBb,MAAM,QAAQ,GAC9BI,QACAM,YAAY,CAAC,EAAE,EACfC;QAEJ;QACA,WAAW;YACT,OAAO;gBACL,SAAS;YACX;YACA,SAASG,uBAAuBb,UAAUS,YAAY,CAAC,EAAE,EAAEC,YAAYP;QACzE;IACF;IACA,OAAON;AACT"}
+{"version":3,"file":"pipeline/spec/chart/pipes/tooltip/tooltipDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/tooltip/tooltipDualAxis.ts"],"sourcesContent":["import { isNullish } from 'remeda'\nimport { createDimensionContent, createMarkContent } from './tooltip'\nimport type { FoldInfo, SpecPipe, Tooltip, UnfoldInfo } from 'src/types'\nimport { findAllMeasures } from 'src/pipeline/utils'\n\nexport const tooltipPrimary: SpecPipe = (spec, context) => {\n  const result = { ...spec }\n  const { advancedVSeed, vseed } = context\n  const { measures, datasetReshapeInfo, chartType, dimensions, encoding } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { tooltip: Tooltip }\n  const { tooltip = { enable: true } } = baseConfig\n  const { enable } = tooltip\n\n  const foldInfoList = datasetReshapeInfo[0].foldInfoList as FoldInfo[]\n  const unfoldInfo = datasetReshapeInfo[0].unfoldInfo\n\n  result.tooltip = {\n    visible: enable,\n    mark: {\n      title: {\n        visible: false,\n      },\n      content: createMarkContent(\n        encoding.tooltip || [],\n        dimensions,\n        findAllMeasures(vseed.measures),\n        foldInfoList[0],\n        unfoldInfo,\n      ),\n    },\n    dimension: {\n      title: {\n        visible: true,\n      },\n      content: createDimensionContent(measures, foldInfoList[0], unfoldInfo),\n    },\n  }\n  return result\n}\n\nexport const tooltipSecondary: SpecPipe = (spec, context) => {\n  const result = { ...spec }\n  const { advancedVSeed, vseed } = context\n  const { measures, datasetReshapeInfo, chartType, dimensions, encoding } = advancedVSeed\n  const baseConfig = advancedVSeed.config[chartType] as { tooltip: Tooltip }\n  const { tooltip = { enable: true } } = baseConfig\n  const { enable } = tooltip\n\n  if (isNullish(datasetReshapeInfo[0].foldInfoList?.[1])) {\n    return result\n  }\n\n  const foldInfoList = datasetReshapeInfo[0].foldInfoList as FoldInfo[]\n  const unfoldInfo = datasetReshapeInfo[0].unfoldInfo as UnfoldInfo\n  result.tooltip = {\n    visible: enable,\n    mark: {\n      title: {\n        visible: false,\n      },\n      content: createMarkContent(\n        encoding.tooltip || [],\n        dimensions,\n        findAllMeasures(vseed.measures),\n        foldInfoList[1],\n        unfoldInfo,\n      ),\n    },\n    dimension: {\n      title: {\n        visible: true,\n      },\n      content: createDimensionContent(measures, foldInfoList[1], unfoldInfo),\n    },\n  }\n  return result\n}\n"],"names":["tooltipPrimary","spec","context","result","advancedVSeed","vseed","measures","datasetReshapeInfo","chartType","dimensions","encoding","baseConfig","tooltip","enable","foldInfoList","unfoldInfo","createMarkContent","findAllMeasures","createDimensionContent","tooltipSecondary","isNullish"],"mappings":";;;AAKO,MAAMA,iBAA2B,CAACC,MAAMC;IAC7C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,QAAQ,EAAEC,kBAAkB,EAAEC,SAAS,EAAEC,UAAU,EAAEC,QAAQ,EAAE,GAAGN;IAC1E,MAAMO,aAAaP,cAAc,MAAM,CAACI,UAAU;IAClD,MAAM,EAAEI,UAAU;QAAE,QAAQ;IAAK,CAAC,EAAE,GAAGD;IACvC,MAAM,EAAEE,MAAM,EAAE,GAAGD;IAEnB,MAAME,eAAeP,kBAAkB,CAAC,EAAE,CAAC,YAAY;IACvD,MAAMQ,aAAaR,kBAAkB,CAAC,EAAE,CAAC,UAAU;IAEnDJ,OAAO,OAAO,GAAG;QACf,SAASU;QACT,MAAM;YACJ,OAAO;gBACL,SAAS;YACX;YACA,SAASG,kBACPN,SAAS,OAAO,IAAI,EAAE,EACtBD,YACAQ,gBAAgBZ,MAAM,QAAQ,GAC9BS,YAAY,CAAC,EAAE,EACfC;QAEJ;QACA,WAAW;YACT,OAAO;gBACL,SAAS;YACX;YACA,SAASG,uBAAuBZ,UAAUQ,YAAY,CAAC,EAAE,EAAEC;QAC7D;IACF;IACA,OAAOZ;AACT;AAEO,MAAMgB,mBAA6B,CAAClB,MAAMC;IAC/C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,QAAQ,EAAEC,kBAAkB,EAAEC,SAAS,EAAEC,UAAU,EAAEC,QAAQ,EAAE,GAAGN;IAC1E,MAAMO,aAAaP,cAAc,MAAM,CAACI,UAAU;IAClD,MAAM,EAAEI,UAAU;QAAE,QAAQ;IAAK,CAAC,EAAE,GAAGD;IACvC,MAAM,EAAEE,MAAM,EAAE,GAAGD;IAEnB,IAAIQ,UAAUb,kBAAkB,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,GACnD,OAAOJ;IAGT,MAAMW,eAAeP,kBAAkB,CAAC,EAAE,CAAC,YAAY;IACvD,MAAMQ,aAAaR,kBAAkB,CAAC,EAAE,CAAC,UAAU;IACnDJ,OAAO,OAAO,GAAG;QACf,SAASU;QACT,MAAM;YACJ,OAAO;gBACL,SAAS;YACX;YACA,SAASG,kBACPN,SAAS,OAAO,IAAI,EAAE,EACtBD,YACAQ,gBAAgBZ,MAAM,QAAQ,GAC9BS,YAAY,CAAC,EAAE,EACfC;QAEJ;QACA,WAAW;YACT,OAAO;gBACL,SAAS;YACX;YACA,SAASG,uBAAuBZ,UAAUQ,YAAY,CAAC,EAAE,EAAEC;QAC7D;IACF;IACA,OAAOZ;AACT"}

package/dist/esm/pipeline/spec/chart/pipes/tooltip/tooltipHeatmap.js

@@ -1,5 +1,5 @@
-import { isEmpty, uniqueBy } from "remeda";
-import { autoFormatter, createFormatter, findAllMeasures, findMeasureById } from "../../../../utils/index.js";
+import { uniqueBy } from "remeda";
+import { createFormatterByMeasure, findAllMeasures, findMeasureById } from "../../../../utils/index.js";
 import { ORIGINAL_DATA } from "../../../../../dataReshape/index.js";
 const tooltipHeatmap = (spec, context)=>{
     const result = {
@@ -57,14 +57,8 @@ const createMarkContent = (tooltip, dimensions, measures, locale, foldInfo)=>{
                 const originalData = datum[ORIGINAL_DATA];
                 const value = originalData[id];
                 const measure = findMeasureById(measures, id);
-                if (!measure) return String(value);
-                const { format = {}, autoFormat = true } = measure;
-                if (!isEmpty(format)) {
-                    const formatter = createFormatter(format);
-                    return formatter(value);
-                }
-                if (autoFormat) return autoFormatter(value, locale);
-                return String(value);
+                const formatter = createFormatterByMeasure(measure);
+                return formatter(value);
             }
         }));
     const foldMeaContent = [
@@ -86,14 +80,8 @@ const createMarkContent = (tooltip, dimensions, measures, locale, foldInfo)=>{
                 const value = datum[measureValue];
                 const id = datum[measureId];
                 const measure = findMeasureById(measures, id);
-                if (!measure) return String(value);
-                const { format = {}, autoFormat = true } = measure;
-                if (!isEmpty(format)) {
-                    const formatter = createFormatter(format);
-                    return formatter(value);
-                }
-                if (autoFormat) return autoFormatter(value, locale);
-                return String(value);
+                const formatter = createFormatterByMeasure(measure);
+                return formatter(value);
             }
         }));
     return [