@visactor/vseed 0.0.12 → 0.0.13

package/dist/builder/builder/builder.d.ts

@@ -1396,6 +1396,7 @@ export declare class Builder implements VSeedBuilder {
                 outerPadding?: number | undefined;
             }[] | undefined;
         };
+        locale: "zh-CN" | "en-US";
         dimensions?: {
             id: string;
             location: "dimension" | "rowDimension" | "columnDimension";
@@ -6931,6 +6932,7 @@ export declare class Builder implements VSeedBuilder {
                 outerPadding?: number | undefined;
             }[] | undefined;
         };
+        locale: "zh-CN" | "en-US";
         dimensions?: {
             id: string;
             location: "dimension" | "rowDimension" | "columnDimension";
@@ -9730,6 +9732,7 @@ export declare class Builder implements VSeedBuilder {
                 outerPadding?: number | undefined;
             }[] | undefined;
         };
+        locale: "zh-CN" | "en-US";
         dimensions?: {
             id: string;
             location: "dimension" | "rowDimension" | "columnDimension";

package/dist/i18n/i18n.d.ts

@@ -0,0 +1,17 @@
+import type { Locale } from '../types';
+declare class Intl {
+    private static instance;
+    private translateMap;
+    private locale;
+    canTranslate: (value: string) => boolean;
+    /**
+     * @example i18n`指标名称`
+     */
+    i18n: (segments: TemplateStringsArray, ...values: Array<number | string>) => string;
+    setLocale: (locale: Locale) => void;
+    getLocale: () => Locale;
+    static getInstance(): Intl;
+}
+declare const intl: Intl;
+declare const i18n: (segments: TemplateStringsArray, ...values: Array<number | string>) => string;
+export { intl, i18n };

package/dist/i18n/index.d.ts

@@ -0,0 +1 @@
+export * from './i18n.ts';

package/dist/index.cjs

@@ -26,6 +26,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     registerBar: ()=>registerBar,
     isVChart: ()=>isVChart,
+    autoFormatter: ()=>autoFormatter,
     zBaseConfig: ()=>zBaseConfig,
     zTooltip: ()=>zTooltip,
     pieAdvancedPipeline: ()=>pieAdvancedPipeline,
@@ -39,6 +40,7 @@ __webpack_require__.d(__webpack_exports__, {
     zMeasures: ()=>zMeasures,
     zCrosshairRect: ()=>zCrosshairRect,
     FoldMeasureName: ()=>FoldMeasureName,
+    intl: ()=>intl,
     darkTheme: ()=>darkTheme,
     createNumFormatter: ()=>createNumFormatter,
     columnPercentAdvancedPipeline: ()=>columnPercentAdvancedPipeline,
@@ -60,6 +62,7 @@ __webpack_require__.d(__webpack_exports__, {
     columnAdvancedPipeline: ()=>columnAdvancedPipeline,
     columnParallelSpecPipeline: ()=>columnParallelSpecPipeline,
     zLabel: ()=>zLabel,
+    i18n: ()=>i18n,
     registerColumn: ()=>registerColumn,
     zAnnotationPoint: ()=>zAnnotationPoint,
     lightTheme: ()=>lightTheme,
@@ -86,6 +89,7 @@ __webpack_require__.d(__webpack_exports__, {
     zTheme: ()=>zTheme,
     zEncoding: ()=>zEncoding,
     registerAreaPercent: ()=>registerAreaPercent,
+    autoNumFormatter: ()=>autoNumFormatter,
     zXLinearAxis: ()=>zXLinearAxis,
     zConfig: ()=>zConfig,
     zDatum: ()=>zDatum,
@@ -112,11 +116,11 @@ __webpack_require__.d(__webpack_exports__, {
     zChartType: ()=>zChartType,
     createFormatter: ()=>createFormatter,
     unfoldDimensions: ()=>unfoldDimensions,
+    columnPercentSpecPipeline: ()=>columnPercentSpecPipeline,
     areaAdvancedPipeline: ()=>areaAdvancedPipeline,
-    areaPercentSpecPipeline: ()=>areaPercentSpecPipeline,
     Builder: ()=>Builder,
     barParallelSpecPipeline: ()=>barParallelSpecPipeline,
-    columnPercentSpecPipeline: ()=>columnPercentSpecPipeline,
+    areaPercentSpecPipeline: ()=>areaPercentSpecPipeline,
     registerAll: ()=>all_registerAll
 });
 const initAdvancedVSeed = (advancedVSeed, context)=>{
@@ -127,6 +131,10 @@ const initAdvancedVSeed = (advancedVSeed, context)=>{
         chartType
     };
 };
+const execPipeline = (pipeline, context, initialValue = {})=>{
+    const result = pipeline.reduce((prev, cur)=>cur(prev, context), initialValue);
+    return result;
+};
 const isVTable = (chartType)=>[
         'table',
         'pivotTable'
@@ -138,6 +146,146 @@ const isPivotChart = (vseed)=>{
     const hasMeasureGroup = measures && measures.find((measure)=>measure && measure.children);
     return hasRowOrColumnDimension || hasMeasureGroup;
 };
+const external_remeda_namespaceObject = require("remeda");
+var i18n_namespaceObject = JSON.parse('{"指标名称":{"en-US":"MeasureName","zh-CN":"指标名称"},"指标Id":{"en-US":"MeasureId","zh-CN":"指标Id"},"指标值":{"en-US":"MeasureValue","zh-CN":"指标值"}}');
+class Intl {
+    static instance;
+    translateMap = i18n_namespaceObject;
+    locale = 'zh-CN';
+    canTranslate = (value)=>!!this.translateMap[value];
+    i18n = (segments, ...values)=>{
+        const text = segments.map((segment, index)=>segment + (values[index] || '')).join('');
+        const translatedText = this.translateMap?.[text]?.[this.locale];
+        if ((0, external_remeda_namespaceObject.isNullish)(translatedText)) {
+            console.warn(`i18n ${this.locale} no translate: ${text}`);
+            return text;
+        }
+        return translatedText;
+    };
+    setLocale = (locale)=>{
+        this.locale = locale;
+    };
+    getLocale = ()=>this.locale;
+    static getInstance() {
+        if (!Intl.instance) Intl.instance = new Intl();
+        return Intl.instance;
+    }
+}
+const intl = Intl.getInstance();
+const i18n = intl.i18n;
+const createNumFormatter = (format)=>{
+    const { type = 'number', ratio = 1, symbol = '', thousandSeparator = true, decimalPlaces = 2, round = 'round', prefix = '', suffix = '' } = format || {};
+    return (value)=>{
+        let num = Number(value);
+        let typeSymbol = '';
+        if (Number.isNaN(num)) return num.toString();
+        if ('percent' === type) {
+            num *= 100;
+            typeSymbol = '%';
+        } else if ('permille' === type) {
+            num *= 1000;
+            typeSymbol = "\u2030";
+        } else if ('number' === type) num /= ratio || 1;
+        const multiplier = 10 ** decimalPlaces;
+        num = Math[round](num * multiplier) / multiplier;
+        let numStr = num.toFixed(decimalPlaces);
+        if (thousandSeparator) {
+            const parts = numStr.split('.');
+            parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+            numStr = parts.join('.');
+        }
+        return `${prefix}${numStr}${typeSymbol}${symbol}${suffix}`;
+    };
+};
+const autoNumFormatter = (value, locale = intl.getLocale())=>{
+    if (null == value) return String(value);
+    const num = Number(value);
+    if (Number.isNaN(num)) return String(value);
+    const countDecimalPlaces = (num)=>{
+        if (Number.isInteger(num)) return 0;
+        const str = num.toString();
+        if (str.indexOf('e-') > -1) return parseInt(str.split('e-')[1]);
+        const decimalPart = str.split('.')[1];
+        if (!decimalPart) return 0;
+        const decimalPlaces = decimalPart.replace(/0+$/, '').length;
+        return Math.max(2, decimalPlaces);
+    };
+    const numFormat = {
+        type: 'number',
+        decimalPlaces: countDecimalPlaces(num),
+        round: 'round',
+        thousandSeparator: true
+    };
+    const rules = NUMBER_FORMAT_RULES[locale] || NUMBER_FORMAT_RULES['default'];
+    for (const rule of rules)if (num >= rule.threshold) {
+        numFormat.ratio = rule.ratio;
+        numFormat.symbol = rule.symbol;
+        break;
+    }
+    return createNumFormatter(numFormat)(value);
+};
+const NUMBER_FORMAT_RULES = {
+    'zh-CN': [
+        {
+            threshold: 100000000,
+            ratio: 100000000,
+            symbol: "\u4EBF"
+        },
+        {
+            threshold: 10000,
+            ratio: 10000,
+            symbol: "\u4E07"
+        }
+    ],
+    'en-US': [
+        {
+            threshold: 1000000000,
+            ratio: 1000000000,
+            symbol: 'B'
+        },
+        {
+            threshold: 1000000,
+            ratio: 1000000,
+            symbol: 'M'
+        },
+        {
+            threshold: 1000,
+            ratio: 1000,
+            symbol: 'K'
+        }
+    ],
+    default: [
+        {
+            threshold: 1000000000,
+            ratio: 1000000000,
+            symbol: 'B'
+        },
+        {
+            threshold: 1000000,
+            ratio: 1000000,
+            symbol: 'M'
+        },
+        {
+            threshold: 1000,
+            ratio: 1000,
+            symbol: 'K'
+        }
+    ]
+};
+const createFormatter = (format)=>createNumFormatter(format);
+const autoFormatter = (value, locale)=>autoNumFormatter(value, locale);
+function findMeasureById(measures, id) {
+    if (!measures) return;
+    const stack = [
+        ...measures
+    ];
+    while(stack.length > 0){
+        const current = stack.pop();
+        if (!current) continue;
+        if (current.id === id && !('children' in current)) return current;
+        if ('children' in current && current.children) stack.push(...current.children);
+    }
+}
 const autoMeasures = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
@@ -244,7 +392,6 @@ const FoldMeasureId = '__MeaId__';
 const UnfoldDimensionGroup = '__DimGroup__';
 const Separator = '-';
 const ORIGINAL_DATA = '__OriginalData__';
-const external_remeda_namespaceObject = require("remeda");
 const unfoldDimensions = (dataset, dimensions, measures, unfoldStartIndex = 0, foldGroupName = UnfoldDimensionGroup, dimensionsSeparator = Separator)=>{
     if (unfoldStartIndex < 0 || unfoldStartIndex >= dimensions.length) throw new Error('unfoldStartIndex is out of range');
     const dimensionsToBeUnfolded = dimensions.slice(unfoldStartIndex);
@@ -323,18 +470,18 @@ const dataReshapeFor2D1M = (dataset, dimensions, measures, options)=>{
         const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, [
             {
                 id: foldMeasureId,
-                alias: "\u6307\u6807Id",
+                alias: i18n`指标Id`,
                 location: 'dimension'
             },
             {
                 id: foldMeasureName,
-                alias: "\u6307\u6807\u540D\u79F0",
+                alias: i18n`指标名称`,
                 location: 'dimension'
             }
         ], [
             {
                 id: foldMeasureValue,
-                alias: "\u6307\u6807\u503C"
+                alias: i18n`指标值`
             }
         ], 1, unfoldDimensionGroup);
         return {
@@ -348,13 +495,13 @@ const dataReshapeFor2D1M = (dataset, dimensions, measures, options)=>{
             ...dimensions,
             {
                 id: foldMeasureName,
-                alias: "\u6307\u6807\u540D\u79F0",
+                alias: i18n`指标名称`,
                 location: 'dimension'
             }
         ], [
             {
                 id: foldMeasureValue,
-                alias: "\u6307\u6807\u503C"
+                alias: i18n`指标值`
             }
         ], 1, unfoldDimensionGroup);
         return {
@@ -385,13 +532,13 @@ const dataReshapeFor1D1M = (dataset, dimensions, measures, options)=>{
         const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, [
             {
                 id: foldMeasureName,
-                alias: "\u6307\u6807\u540D\u79F0",
+                alias: i18n`指标名称`,
                 location: 'dimension'
             }
         ], [
             {
                 id: foldMeasureValue,
-                alias: "\u6307\u6807\u503C"
+                alias: i18n`指标值`
             }
         ], 0, unfoldDimensionGroup);
         return {
@@ -405,13 +552,13 @@ const dataReshapeFor1D1M = (dataset, dimensions, measures, options)=>{
             ...dimensions,
             {
                 id: foldMeasureName,
-                alias: "\u6307\u6807\u540D\u79F0",
+                alias: i18n`指标名称`,
                 location: 'dimension'
             }
         ], [
             {
                 id: foldMeasureValue,
-                alias: "\u6307\u6807\u503C"
+                alias: i18n`指标值`
             }
         ], 0, unfoldDimensionGroup);
         return {
@@ -759,10 +906,6 @@ const vchartTheme = (advancedVSeed, context)=>{
     }
     return result;
 };
-const execPipeline = (pipeline, context, initialValue = {})=>{
-    const result = pipeline.reduce((prev, cur)=>cur(prev, context), initialValue);
-    return result;
-};
 const pivotAdapter = (pipeline, pivotPipeline)=>(advancedVSeed, context)=>{
         const { vseed } = context;
         const usePivotChart = isPivotChart(vseed);
@@ -795,8 +938,17 @@ const annotation_annotation = (advancedVSeed, context)=>{
         annotation
     };
 };
+const locale_locale = (advancedVSeed, context)=>{
+    const { vseed } = context;
+    const { locale } = vseed;
+    return {
+        ...advancedVSeed,
+        locale: locale || 'zh-CN'
+    };
+};
 const lineAdvancedPipeline = [
     initAdvancedVSeed,
+    locale_locale,
     autoMeasures,
     autoDimensions,
     pivotAdapter([
@@ -813,6 +965,7 @@ const lineAdvancedPipeline = [
 ];
 const barAdvancedPipeline = [
     initAdvancedVSeed,
+    locale_locale,
     autoMeasures,
     autoDimensions,
     pivotAdapter([
@@ -829,6 +982,7 @@ const barAdvancedPipeline = [
 ];
 const barParallelAdvancedPipeline = [
     initAdvancedVSeed,
+    locale_locale,
     autoMeasures,
     autoDimensions,
     pivotAdapter([
@@ -845,6 +999,7 @@ const barParallelAdvancedPipeline = [
 ];
 const barPercentAdvancedPipeline = [
     initAdvancedVSeed,
+    locale_locale,
     autoMeasures,
     autoDimensions,
     pivotAdapter([
@@ -861,6 +1016,7 @@ const barPercentAdvancedPipeline = [
 ];
 const columnAdvancedPipeline = [
     initAdvancedVSeed,
+    locale_locale,
     autoMeasures,
     autoDimensions,
     pivotAdapter([
@@ -877,6 +1033,7 @@ const columnAdvancedPipeline = [
 ];
 const columnParallelAdvancedPipeline = [
     initAdvancedVSeed,
+    locale_locale,
     autoMeasures,
     autoDimensions,
     pivotAdapter([
@@ -893,6 +1050,7 @@ const columnParallelAdvancedPipeline = [
 ];
 const columnPercentAdvancedPipeline = [
     initAdvancedVSeed,
+    locale_locale,
     autoMeasures,
     autoDimensions,
     pivotAdapter([
@@ -909,6 +1067,7 @@ const columnPercentAdvancedPipeline = [
 ];
 const areaAdvancedPipeline = [
     initAdvancedVSeed,
+    locale_locale,
     autoMeasures,
     autoDimensions,
     pivotAdapter([
@@ -925,6 +1084,7 @@ const areaAdvancedPipeline = [
 ];
 const areaPercentAdvancedPipeline = [
     initAdvancedVSeed,
+    locale_locale,
     autoMeasures,
     autoDimensions,
     pivotAdapter([
@@ -941,6 +1101,7 @@ const areaPercentAdvancedPipeline = [
 ];
 const pieAdvancedPipeline = [
     initAdvancedVSeed,
+    locale_locale,
     autoMeasures,
     autoDimensions,
     pivotAdapter([
@@ -1244,13 +1405,14 @@ const xBand = (spec, context)=>{
     return result;
 };
 const ANNOTATION_Z_INDEX = 1000;
-const LINEAR_AXIS_INNER_OFFSET_TOP = 5;
+const LINEAR_AXIS_INNER_OFFSET_TOP = 7;
 const xLinear = (spec, context)=>{
     const result = {
         ...spec
     };
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
+    const { locale } = advancedVSeed;
     const config = advancedVSeed.config?.[chartType]?.xAxis;
     if (!result.axes) result.axes = [];
     if (!config) {
@@ -1276,6 +1438,7 @@ const xLinear = (spec, context)=>{
         min,
         label: {
             visible: label?.visible,
+            formatMethod: (value)=>autoFormatter(value, locale),
             style: {
                 fill: label?.labelColor,
                 angle: label?.labelAngle,
@@ -1425,6 +1588,7 @@ const yLinear = (spec, context)=>{
     };
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
+    const { locale } = advancedVSeed;
     const config = advancedVSeed.config?.[chartType]?.yAxis;
     if (!result.axes) result.axes = [];
     if (!config) {
@@ -1450,6 +1614,7 @@ const yLinear = (spec, context)=>{
         min,
         label: {
             visible: label?.visible,
+            formatMethod: (value)=>autoFormatter(value, locale),
             style: {
                 fill: label?.labelColor,
                 angle: label?.labelAngle,
@@ -1534,43 +1699,6 @@ const background_backgroundColor = (spec, context)=>{
         background: backgroundColor
     };
 };
-function findMeasureById(measures, id) {
-    if (!measures) return;
-    const stack = [
-        ...measures
-    ];
-    while(stack.length > 0){
-        const current = stack.pop();
-        if (!current) continue;
-        if (current.id === id && !('children' in current)) return current;
-        if ('children' in current && current.children) stack.push(...current.children);
-    }
-}
-const createNumFormatter = (format)=>{
-    const { type = 'number', ratio = 1, symbol = '', thousandSeparator = true, decimalPlaces = 2, round = 'round', prefix = '', suffix = '' } = format || {};
-    return (value)=>{
-        let num = Number(value);
-        let typeSymbol = '';
-        if (Number.isNaN(num)) return num.toString();
-        if ('percent' === type) {
-            num *= 100;
-            typeSymbol = '%';
-        } else if ('permille' === type) {
-            num *= 1000;
-            typeSymbol = "\u2030";
-        } else if ('number' === type) num /= ratio || 1;
-        const multiplier = 10 ** decimalPlaces;
-        num = Math[round](num * multiplier) / multiplier;
-        let numStr = num.toFixed(decimalPlaces);
-        if (thousandSeparator) {
-            const parts = numStr.split('.');
-            parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-            numStr = parts.join('.');
-        }
-        return `${prefix}${numStr}${typeSymbol}${symbol}${suffix}`;
-    };
-};
-const createFormatter = (format)=>createNumFormatter(format);
 const defaultTooltip = {
     enable: true
 };
@@ -1598,10 +1726,11 @@ const tooltip_tooltip = (spec, context)=>{
                         const measure = findMeasureById(measures, id);
                         if (!measure) return String(value);
                         const { format = {}, autoFormat = true } = measure;
-                        if (format || autoFormat) {
+                        if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
                             const formatter = createFormatter(format);
                             return formatter(value);
                         }
+                        if (autoFormat) return autoFormatter(value);
                         return String(value);
                     }
                 }
@@ -1619,10 +1748,11 @@ const tooltip_tooltip = (spec, context)=>{
                         const measure = findMeasureById(measures, id);
                         if (!measure) return String(value);
                         const { format = {}, autoFormat = true } = measure;
-                        if (format || autoFormat) {
+                        if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
                             const formatter = createFormatter(format);
                             return formatter(value);
                         }
+                        if (autoFormat) return autoFormatter(value);
                         return String(value);
                     }
                 }
@@ -1636,7 +1766,7 @@ const label_label = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { measures, datasetReshapeInfo } = advancedVSeed;
+    const { measures, datasetReshapeInfo, locale } = advancedVSeed;
     const baseConfig = advancedVSeed.baseConfig.vchart;
     if (!baseConfig || !baseConfig.label) return result;
     const { measureId } = datasetReshapeInfo[0].foldInfo;
@@ -1649,10 +1779,12 @@ const label_label = (spec, context)=>{
             const measure = findMeasureById(measures, id);
             if (!measure) return value;
             const { format = {}, autoFormat = true } = measure;
-            if (format || autoFormat) {
+            if (!(0, external_remeda_namespaceObject.isEmpty)(format)) {
                 const formatter = createFormatter(format);
                 return formatter(value);
             }
+            if (autoFormat) return autoFormatter(value, locale);
+            return String(value);
         }
     };
     return result;
@@ -3552,6 +3684,7 @@ class Builder {
     _spec = null;
     constructor(vseed){
         this._vseed = vseed;
+        this._vseed.locale = vseed.locale || intl.getLocale();
     }
     build = ()=>build(this);
     buildSpec = (advanced)=>buildSpec(this, advanced);
@@ -4161,7 +4294,7 @@ const zMeasure = external_zod_namespaceObject.z.object({
     alias: external_zod_namespaceObject.z.string().optional(),
     visible: external_zod_namespaceObject.z.boolean().default(true).optional(),
     autoFormat: external_zod_namespaceObject.z.boolean().default(true).optional(),
-    format: zNumFormat.optional()
+    format: zNumFormat["default"]({}).optional()
 });
 const zMeasureGroup = external_zod_namespaceObject.z.object({
     id: external_zod_namespaceObject.z.string(),
@@ -4807,6 +4940,8 @@ exports.areaAdvancedPipeline = __webpack_exports__.areaAdvancedPipeline;
 exports.areaPercentAdvancedPipeline = __webpack_exports__.areaPercentAdvancedPipeline;
 exports.areaPercentSpecPipeline = __webpack_exports__.areaPercentSpecPipeline;
 exports.areaSpecPipeline = __webpack_exports__.areaSpecPipeline;
+exports.autoFormatter = __webpack_exports__.autoFormatter;
+exports.autoNumFormatter = __webpack_exports__.autoNumFormatter;
 exports.barAdvancedPipeline = __webpack_exports__.barAdvancedPipeline;
 exports.barParallelAdvancedPipeline = __webpack_exports__.barParallelAdvancedPipeline;
 exports.barParallelSpecPipeline = __webpack_exports__.barParallelSpecPipeline;
@@ -4827,6 +4962,8 @@ exports.dataReshapeFor2D1M = __webpack_exports__.dataReshapeFor2D1M;
 exports.execPipeline = __webpack_exports__.execPipeline;
 exports.findMeasureById = __webpack_exports__.findMeasureById;
 exports.foldMeasures = __webpack_exports__.foldMeasures;
+exports.i18n = __webpack_exports__.i18n;
+exports.intl = __webpack_exports__.intl;
 exports.isPivotChart = __webpack_exports__.isPivotChart;
 exports.isVChart = __webpack_exports__.isVChart;
 exports.isVTable = __webpack_exports__.isVTable;
@@ -4902,6 +5039,8 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "areaPercentAdvancedPipeline",
     "areaPercentSpecPipeline",
     "areaSpecPipeline",
+    "autoFormatter",
+    "autoNumFormatter",
     "barAdvancedPipeline",
     "barParallelAdvancedPipeline",
     "barParallelSpecPipeline",
@@ -4922,6 +5061,8 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "execPipeline",
     "findMeasureById",
     "foldMeasures",
+    "i18n",
+    "intl",
     "isPivotChart",
     "isVChart",
     "isVTable",