@visactor/vseed 0.1.45 → 0.1.47

package/dist/umd/index.js

@@ -5,44 +5,7 @@
     else root["VSeed"] = factory();
 })(globalThis, ()=>(()=>{
         "use strict";
-        var __webpack_modules__ = {};
-        var __webpack_module_cache__ = {};
-        function __webpack_require__(moduleId) {
-            var cachedModule = __webpack_module_cache__[moduleId];
-            if (void 0 !== cachedModule) return cachedModule.exports;
-            var module1 = __webpack_module_cache__[moduleId] = {
-                exports: {}
-            };
-            __webpack_modules__[moduleId](module1, module1.exports, __webpack_require__);
-            return module1.exports;
-        }
-        (()=>{
-            var getProto = Object.getPrototypeOf ? (obj)=>Object.getPrototypeOf(obj) : (obj)=>obj.__proto__;
-            var leafPrototypes;
-            __webpack_require__.t = function(value, mode) {
-                if (1 & mode) value = this(value);
-                if (8 & mode) return value;
-                if ('object' == typeof value && value) {
-                    if (4 & mode && value.__esModule) return value;
-                    if (16 & mode && 'function' == typeof value.then) return value;
-                }
-                var ns = Object.create(null);
-                __webpack_require__.r(ns);
-                var def = {};
-                leafPrototypes = leafPrototypes || [
-                    null,
-                    getProto({}),
-                    getProto([]),
-                    getProto(getProto)
-                ];
-                for(var current = 2 & mode && value; 'object' == typeof current && !~leafPrototypes.indexOf(current); current = getProto(current))Object.getOwnPropertyNames(current).forEach((key)=>{
-                    def[key] = ()=>value[key];
-                });
-                def['default'] = ()=>value;
-                __webpack_require__.d(ns, def);
-                return ns;
-            };
-        })();
+        var __webpack_require__ = {};
         (()=>{
             __webpack_require__.d = (exports1, definition)=>{
                 for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
@@ -151,11 +114,9 @@
             zDualChartType: ()=>zDualChartType,
             darkTheme: ()=>darkTheme,
             isVTable: ()=>isVTable,
-            MaxMeasureId: ()=>MaxMeasureId,
             ORIGINAL_DATA: ()=>ORIGINAL_DATA,
-            MinMeasureId: ()=>MinMeasureId,
-            columnParallelSpecPipeline: ()=>columnParallelSpecPipeline,
             zAnnotationHorizontalLineConfig: ()=>zAnnotationHorizontalLineConfig,
+            columnParallelSpecPipeline: ()=>columnParallelSpecPipeline,
             zAnnotationPoint: ()=>zAnnotationPoint,
             DATUM_HIDE_KEY: ()=>DATUM_HIDE_KEY,
             isMeasure: ()=>isMeasure,
@@ -171,20 +132,21 @@
             findMeasureById: ()=>findMeasureById,
             AngleEncoding: ()=>AngleEncoding,
             areaPercentAdvancedPipeline: ()=>areaPercentAdvancedPipeline,
-            zBackgroundColor: ()=>zBackgroundColor,
+            findTreeNodesBy: ()=>findTreeNodesBy,
             zAreaPercentConfig: ()=>zAreaPercentConfig,
-            zLowessRegressionLine: ()=>zLowessRegressionLine,
+            zBackgroundColor: ()=>zBackgroundColor,
             MeasureId: ()=>MeasureId,
             registerRadar: ()=>registerRadar,
             zLocale: ()=>zLocale,
             isDimension: ()=>isDimension,
+            zLowessRegressionLine: ()=>zLowessRegressionLine,
             zMeasure: ()=>zMeasure,
             registerScatter: ()=>registerScatter,
             boxplotSpecPipeline: ()=>boxplotSpecPipeline,
             autoNumFormatter: ()=>autoNumFormatter,
             tableSpecPipeline: ()=>tableSpecPipeline,
-            isCombination: ()=>isCombination,
             zConfig: ()=>zConfig,
+            isCombination: ()=>isCombination,
             zBarStyle: ()=>zBarStyle,
             deleteDimensionTreeByCallback: ()=>deleteDimensionTreeByCallback,
             zRoseParallelConfig: ()=>zRoseParallelConfig,
@@ -198,6 +160,7 @@
             registerPie: ()=>registerPie,
             zEcdfRegressionLine: ()=>zEcdfRegressionLine,
             zBarParallelConfig: ()=>zBarParallelConfig,
+            LowerWhisker: ()=>LowerWhisker,
             lineAdvancedPipeline: ()=>lineAdvancedPipeline,
             AXIS_LABEL_SPACE: ()=>8,
             FoldMeasureValue: ()=>FoldMeasureValue,
@@ -235,6 +198,7 @@
             Separator: ()=>"-",
             findAllMeasures: ()=>findAllMeasures,
             zColorLegend: ()=>zColorLegend,
+            UpperWhisker: ()=>UpperWhisker,
             EncodingEnum: ()=>EncodingEnum,
             preorderTraverse: ()=>preorderTraverse,
             roseParallelSpecPipeline: ()=>roseParallelSpecPipeline,
@@ -300,7 +264,7 @@
             BinEndMeasureId: ()=>BinEndMeasureId,
             zAnnotationArea: ()=>zAnnotationArea,
             DetailEncoding: ()=>DetailEncoding,
-            isPivot: ()=>isPivot,
+            isPivot: ()=>chatType_isPivot,
             zPointStyle: ()=>zPointStyle,
             zDimension: ()=>zDimension,
             lightTheme: ()=>lightTheme,
@@ -351,11 +315,47 @@
         function chunk_JK3VNB42_n(e) {
             return null == e;
         }
-        var i18nData_namespaceObject = JSON.parse('{"指标名称":{"en-US":"MeasureName","zh-CN":"指标名称"},"指标Id":{"en-US":"MeasureId","zh-CN":"指标Id"},"指标值":{"en-US":"MeasureValue","zh-CN":"指标值"}}');
-        var i18n_i18nData_namespaceObject = /*#__PURE__*/ __webpack_require__.t(i18nData_namespaceObject, 2);
+        const translateMap = {
+            指标名称: {
+                'en-US': 'MeasureName',
+                'zh-CN': "\u6307\u6807\u540D\u79F0"
+            },
+            指标Id: {
+                'en-US': 'MeasureId',
+                'zh-CN': "\u6307\u6807Id"
+            },
+            指标值: {
+                'en-US': 'MeasureValue',
+                'zh-CN': "\u6307\u6807\u503C"
+            },
+            异常点: {
+                'en-US': 'Outlier',
+                'zh-CN': "\u5F02\u5E38\u70B9"
+            },
+            上边界: {
+                'en-US': 'Upper Whisker',
+                'zh-CN': "\u4E0A\u8FB9\u754C"
+            },
+            上四分位数: {
+                'en-US': 'Q3',
+                'zh-CN': "75\u5206\u4F4D\u6570"
+            },
+            中位数: {
+                'en-US': 'Q2',
+                'zh-CN': "\u4E2D\u4F4D\u6570"
+            },
+            下四分位数: {
+                'en-US': 'Q1',
+                'zh-CN': "25\u5206\u4F4D\u6570"
+            },
+            下边界: {
+                'en-US': 'Lower Whisker',
+                'zh-CN': "\u4E0B\u8FB9\u754C"
+            }
+        };
         class i18n_Intl {
             static instance;
-            translateMap = i18n_i18nData_namespaceObject;
+            translateMap = translateMap;
             locale = 'zh-CN';
             canTranslate = (value)=>!!this.translateMap[value];
             i18n = (segments, ...values)=>{
@@ -525,6 +525,17 @@
                 }
             }
         };
+        const findTreeNodesBy = (nodes = [], callback, childrenKey = 'children')=>{
+            if (!nodes) return [];
+            const result = [];
+            preorderTraverse(nodes, (node)=>{
+                if (!(childrenKey in node)) {
+                    if (callback(node)) result.push(node);
+                }
+                return false;
+            });
+            return result;
+        };
         const measureDepth = (measures = [])=>{
             if (!measures) return 0;
             let depth = 1;
@@ -613,10 +624,10 @@
         const isVChart = (vseed)=>!isVTable(vseed);
         const isPivotChart = (vseed)=>{
             if (isVTable(vseed)) return false;
-            if (isPivot(vseed)) return true;
+            if (chatType_isPivot(vseed)) return true;
             return isCombination(vseed);
         };
-        const isPivot = (vseed)=>{
+        const chatType_isPivot = (vseed)=>{
             const { dimensions = [] } = vseed;
             return dimensions && dimensions.some((dimension)=>'row' === dimension.encoding || 'column' === dimension.encoding);
         };
@@ -1571,8 +1582,8 @@
         const DetailEncoding = '__Dim_Detail__';
         const ColorEncoding = '__Dim_Color__';
         const ColorIdEncoding = '__Dim_ColorId__';
-        const MinMeasureId = '__Min__';
-        const MaxMeasureId = '__Max__';
+        const LowerWhisker = '__Lower_Whisker__';
+        const UpperWhisker = '__Upper_Whisker__';
         const OutliersMeasureId = '__Outliers__';
         const MedianMeasureId = '__Meadian__';
         const BinStartMeasureId = '__BinStart__';
@@ -2271,7 +2282,7 @@
             ];
         };
         const deleteMeasureTreeByCallback = (measureTree, callback)=>{
-            if (!measureTree) return measureTree;
+            if (!measureTree) return;
             const stack = [
                 ...measureTree
             ].reverse();
@@ -2295,23 +2306,28 @@
                     nodesToProcess.push(node);
                 }
             }
+            const deleted = [];
             for (const node of nodesToProcess){
                 const parentList = parents.get(node);
                 if (parentList) {
                     const index = parentList.indexOf(node);
                     if (isMeasure(node)) {
-                        if (callback?.(node, index, parentList)) parentList.splice(index, 1);
+                        if (callback?.(node, index, parentList)) {
+                            parentList.splice(index, 1);
+                            deleted.push(node);
+                        }
                     }
                 }
             }
-            return measureTree;
+            return deleted;
         };
-        const deleteEncodingForMeasure = (encodingKeys)=>(advancedVSeed)=>{
+        const pickMeasuresForReshape = (encodingKeys)=>(advancedVSeed)=>{
+                const clonedMeasures = chunk_BCBB46UE_d(advancedVSeed.measures);
                 const deleteBy = (measure)=>encodingKeys.includes(measure.encoding);
-                const measureTree = deleteMeasureTreeByCallback(advancedVSeed.measures, deleteBy);
+                deleteMeasureTreeByCallback(clonedMeasures, deleteBy);
                 return {
                     ...advancedVSeed,
-                    measures: measureTree
+                    reshapeMeasures: clonedMeasures
                 };
             };
         const deleteDimensionTreeByCallback = (dimensionTree, callback)=>{
@@ -2350,12 +2366,13 @@
             }
             return dimensionTree;
         };
-        const deleteTooltipAndLabelDimension = (advancedVSeed)=>{
+        const pickDimensionsForReshape = (advancedVSeed)=>{
             const deleteBy = (dimension)=>'tooltip' === dimension.encoding || 'label' === dimension.encoding;
-            const dimensionTree = deleteDimensionTreeByCallback(advancedVSeed.dimensions, deleteBy);
+            const reshapeDimensions = chunk_BCBB46UE_d(advancedVSeed.dimensions);
+            deleteDimensionTreeByCallback(reshapeDimensions, deleteBy);
             return {
                 ...advancedVSeed,
-                dimensions: dimensionTree
+                reshapeDimensions
             };
         };
         const pivotAdapter = (pipeline, pivotPipeline)=>(advancedVSeed, context)=>{
@@ -2478,9 +2495,9 @@
             };
             const { vseed } = context;
             const { dataset, chartType } = vseed;
-            const { dimensions = [], measures = [], encoding } = advancedVSeed;
+            const { encoding } = advancedVSeed;
             const colorMeasureId = getColorMeasureId(advancedVSeed, vseed);
-            const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(findAllMeasures(measures), (item)=>item.id), encoding, {
+            const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [], (item)=>item.id), T(advancedVSeed.reshapeMeasures ?? findAllMeasures(advancedVSeed.measures), (item)=>item.id), encoding, {
                 colorItemAsId: false,
                 colorMeasureId
             });
@@ -2494,9 +2511,7 @@
                         foldInfo,
                         unfoldInfo
                     }
-                ],
-                dimensions,
-                measures
+                ]
             };
         };
         const pivotReshapeWithEncoding = (advancedVSeed, context)=>{
@@ -2505,7 +2520,9 @@
             };
             const { vseed } = context;
             const { dataset } = vseed;
-            const { dimensions = [], measures = [], encoding } = advancedVSeed;
+            const { encoding } = advancedVSeed;
+            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
             const allMeasures = findAllMeasures(measures);
             const measureGroups = [];
             if (measures) measures.forEach((measure)=>{
@@ -2667,12 +2684,12 @@
             ], [
                 encodingForLine,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -2966,12 +2983,22 @@
             const { measures, dimensions, encoding } = advancedVSeed;
             const config = advancedVSeed.config?.[chartType]?.yAxis;
             if (!result.axes) result.axes = [];
+            const isPivot = isPivotChart(vseed);
             const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10, autoFormat, numFormat = {} } = config;
             const formatter = createNumFormatter(numFormat);
             const percentFormatter = createNumFormatter({
                 type: 'percent'
             });
             const linearAxis = {
+                ...isPivot ? {
+                    range: {
+                        min,
+                        max
+                    }
+                } : {
+                    min,
+                    max
+                },
                 visible,
                 type: log ? 'log' : 'linear',
                 base: logBase,
@@ -2979,8 +3006,6 @@
                 nice,
                 zero: log ? false : zero,
                 inverse,
-                max,
-                min,
                 label: {
                     space: 8,
                     visible: label?.visible,
@@ -3218,7 +3243,7 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { datasetReshapeInfo, chartType } = advancedVSeed;
+            const { datasetReshapeInfo, chartType, measures = [] } = advancedVSeed;
             const { unfoldInfo } = datasetReshapeInfo[0];
             const baseConfig = advancedVSeed.config[chartType];
             if (!baseConfig || !baseConfig.legend) return result;
@@ -3279,8 +3304,7 @@
                     }
                 }
             };
-            const measures = findAllMeasures(advancedVSeed.measures);
-            const colorMeasure = measures.find((m)=>'color' === m.encoding);
+            const colorMeasure = findTreeNodesBy(measures, (m)=>'color' === m.encoding)?.[0];
             if (colorMeasure) {
                 const formatter = createFormatterByMeasure(colorMeasure);
                 result.legends.handlerText.formatter = formatter;
@@ -3642,7 +3666,11 @@
                         const datum = v;
                         const key = datum && datum[encodingColor] || '';
                         return unfoldInfo.colorIdMap[key].alias ?? key;
-                    } : Object.values(foldMap)[0],
+                    } : (v)=>{
+                        const datum = v;
+                        const key = datum && datum[measureId] || '';
+                        return foldMap[key] ?? key;
+                    },
                     value: (v)=>{
                         const datum = v;
                         if (!datum) return '';
@@ -4783,7 +4811,7 @@
             const { vseed, advancedVSeed } = context;
             const { config, chartType } = advancedVSeed;
             const themConfig = config?.[chartType]?.pivotGrid ?? {};
-            const onlyCombination = !isPivot(vseed) && isCombination(vseed);
+            const onlyCombination = !chatType_isPivot(vseed) && isCombination(vseed);
             const result = {
                 ...spec
             };
@@ -5568,12 +5596,12 @@
             ], [
                 encodingForColumn,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -6439,12 +6467,12 @@
             ], [
                 encodingForColumn,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -6604,12 +6632,12 @@
             ], [
                 encodingForColumn,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -6786,12 +6814,12 @@
             ], [
                 encodingForBar,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -6879,12 +6907,22 @@
             const { chartType } = vseed;
             const config = advancedVSeed.config?.[chartType]?.xAxis;
             if (!result.axes) result.axes = [];
+            const isPivot = isPivotChart(vseed);
             const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10, autoFormat, numFormat = {} } = config;
             const formatter = createNumFormatter(numFormat);
             const percentFormatter = createNumFormatter({
                 type: 'percent'
             });
             const linearAxis = {
+                ...isPivot ? {
+                    range: {
+                        min,
+                        max
+                    }
+                } : {
+                    min,
+                    max
+                },
                 visible,
                 type: log ? 'log' : 'linear',
                 base: logBase,
@@ -6892,8 +6930,6 @@
                 nice,
                 zero: log ? false : zero,
                 inverse,
-                max,
-                min,
                 label: {
                     space: 8,
                     visible: label?.visible,
@@ -7143,12 +7179,12 @@
             ], [
                 encodingForBar,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -7257,12 +7293,12 @@
             ], [
                 encodingForBar,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -7344,12 +7380,12 @@
             ], [
                 encodingForLine,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -7541,12 +7577,12 @@
             ], [
                 encodingForLine,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -7820,7 +7856,9 @@
             };
             const { vseed } = context;
             const { dataset } = vseed;
-            const { dimensions = [], measures = [], encoding, chartType } = advancedVSeed;
+            const { encoding, chartType } = advancedVSeed;
+            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
             if (measures.length > 2) throw new Error('measures can not be more than 2 groups in scatter');
             const foldInfoList = [];
             const unfoldInfoList = [];
@@ -7877,7 +7915,9 @@
             };
             const { vseed } = context;
             const { dataset } = vseed;
-            const { dimensions = [], measures = [], encoding, chartType } = advancedVSeed;
+            const { encoding, chartType } = advancedVSeed;
+            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
             const allMeasures = findAllMeasures(measures);
             const measureGroups = [];
             const depth = measureDepth(measures);
@@ -7954,12 +7994,12 @@
             ], [
                 encodingForScatter,
                 buildMeasuresForScatter,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'size'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithScatterEncoding
@@ -8397,7 +8437,7 @@
                 }
             };
         }
-        const generateRegressionLinePipe = (type, regressionFunction, getOptions)=>(spec, context)=>{
+        const generateRegressionLinePipe = (type, regressionFunction, getOptions = getDefaultRegressionOptions)=>(spec, context)=>{
                 const result = {
                     ...spec
                 };
@@ -8545,9 +8585,13 @@
                 });
                 return result;
             };
+        const getDefaultRegressionOptions = (lineConfig)=>({
+                alpha: lineConfig?.confidenceLevel ?? 0.95
+            });
         const linearRegressionLine = generateRegressionLinePipe('linearRegressionLine', regressionLinear);
         const lowessRegressionLine = generateRegressionLinePipe('lowessRegressionLine', regressionLowess);
         const polynomialRegressionLine = generateRegressionLinePipe('polynomialRegressionLine', regressionPolynomial, (lineConfig)=>({
+                ...getDefaultRegressionOptions(lineConfig),
                 degree: lineConfig.degree ?? 2
             }));
         const logisticRegressionLine = generateRegressionLinePipe('logisticRegressionLine', regressionLogistic);
@@ -8786,7 +8830,9 @@
             };
             const { vseed } = context;
             const { dataset } = vseed;
-            const { dimensions = [], measures = [], encoding, chartType } = advancedVSeed;
+            const { encoding, chartType } = advancedVSeed;
+            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
             if (measures.length > 2) throw new Error('measures can not be more than 2 groups in dualAxis');
             const foldInfoList = [];
             const unfoldInfoList = [];
@@ -8841,7 +8887,9 @@
             };
             const { vseed } = context;
             const { dataset } = vseed;
-            const { dimensions = [], measures = [], encoding, chartType } = advancedVSeed;
+            const { encoding, chartType } = advancedVSeed;
+            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
             const allMeasures = findAllMeasures(measures);
             const datasetList = [];
             const datasetReshapeInfo = [];
@@ -8947,12 +8995,12 @@
             ], [
                 encodingForDualAxis,
                 buildMeasuresForDualAxis,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithDualEncoding
@@ -9722,12 +9770,12 @@
             ], [
                 encodingForPie,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -9883,12 +9931,12 @@
             ], [
                 encodingForPie,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -10048,12 +10096,12 @@
             ], [
                 encodingForRose,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -10201,12 +10249,12 @@
             ], [
                 encodingForRose,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -10396,12 +10444,12 @@
             ], [
                 encodingForRadar,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -10611,12 +10659,12 @@
             ], [
                 encodingForFunnel,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -10838,11 +10886,11 @@
             ], [
                 encodingForHeatmap,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -11244,36 +11292,42 @@
             };
             const { vseed } = context;
             const { dataset, chartType } = vseed;
-            const { dimensions = [], measures = [], encoding = {}, config } = advancedVSeed;
+            const { encoding = {}, config } = advancedVSeed;
+            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
             const uniqDims = T(dimensions, (item)=>item.id);
             const whiskers = config?.[chartType]?.whiskers;
             let newDatasets = [];
             let foldInfo = {};
             let unfoldInfo = {};
             const allMeasures = findAllMeasures(measures);
-            if (encoding.value?.length) encoding.value.forEach((f)=>{
-                const m = allMeasures.find((m)=>m.id === f);
-                const boxPlotData = boxplot_boxplot(dataset, {
-                    field: f,
-                    groupField: [
-                        ...encoding.x ?? [],
-                        ...encoding.color ?? []
-                    ],
-                    whiskers,
-                    outputNames: {
-                        q1: "__Q1__",
-                        q3: "__Q3__",
-                        min: MinMeasureId,
-                        max: MaxMeasureId,
-                        median: MedianMeasureId,
-                        outliers: OutliersMeasureId
-                    }
-                });
-                boxPlotData.forEach((datum)=>{
-                    datum[FoldMeasureId] = f;
-                    datum[FoldMeasureName] = m?.alias ?? f;
+            if (encoding.value?.length) {
+                const boxPlotDataList = [];
+                encoding.value.forEach((f)=>{
+                    const m = allMeasures.find((m)=>m.id === f);
+                    const boxPlotData = boxplot_boxplot(dataset, {
+                        field: f,
+                        groupField: [
+                            ...encoding.x ?? [],
+                            ...encoding.color ?? []
+                        ],
+                        whiskers,
+                        outputNames: {
+                            q1: "__Q1__",
+                            q3: "__Q3__",
+                            lowerWhisker: LowerWhisker,
+                            upperWhisker: UpperWhisker,
+                            median: MedianMeasureId,
+                            outliers: OutliersMeasureId
+                        }
+                    });
+                    boxPlotData.forEach((datum)=>{
+                        datum[FoldMeasureId] = f;
+                        datum[FoldMeasureName] = m?.alias ?? f;
+                    });
+                    boxPlotDataList.push(...boxPlotData);
                 });
-                const res = unfoldDimensions(boxPlotData, uniqDims, encoding, {
+                const res = unfoldDimensions(boxPlotDataList, uniqDims, encoding, {
                     foldMeasureId: FoldMeasureId,
                     separator: "-",
                     colorItemAsId: false
@@ -11282,16 +11336,15 @@
                     newDatasets.push(d);
                 });
                 unfoldInfo = res.unfoldInfo;
-            });
-            else if (encoding.q1?.length && encoding.q3?.length && encoding.min?.length && encoding.max?.length && encoding.median?.length) {
+            } else if (encoding.q1?.length && encoding.q3?.length && encoding.min?.length && encoding.max?.length && encoding.median?.length) {
                 const res = unfoldDimensions(dataset, uniqDims, encoding, {
                     foldMeasureId: FoldMeasureId,
                     separator: "-",
                     colorItemAsId: false
                 });
                 res.dataset.forEach((datum)=>{
-                    datum[MaxMeasureId] = datum[encoding.max[0]];
-                    datum[MinMeasureId] = datum[encoding.min[0]];
+                    datum[UpperWhisker] = datum[encoding.max[0]];
+                    datum[LowerWhisker] = datum[encoding.min[0]];
                     datum["__Q1__"] = datum[encoding.q1[0]];
                     datum["__Q3__"] = datum[encoding.q3[0]];
                     datum[MedianMeasureId] = datum[encoding.median[0]];
@@ -11321,7 +11374,9 @@
             };
             const { vseed } = context;
             const { dataset, chartType } = vseed;
-            const { dimensions = [], measures = [], encoding = {}, config } = advancedVSeed;
+            const { encoding = {}, config } = advancedVSeed;
+            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
             const uniqDims = T(dimensions, (item)=>item.id);
             const chartConfig = config?.[chartType];
             const whiskers = chartConfig?.whiskers;
@@ -11339,30 +11394,35 @@
                 let newDatasets = [];
                 let foldInfo = {};
                 let unfoldInfo = {};
-                if (encoding.value?.length) encoding.value.forEach((f)=>{
-                    const m = subMeasures.find((m)=>m.id === f);
-                    const boxPlotData = boxplot_boxplot(dataset, {
-                        field: f,
-                        groupField: [
-                            ...encoding.x ?? [],
-                            ...encoding.color ?? [],
-                            ...rowColumnFields.map((item)=>item.id)
-                        ],
-                        whiskers,
-                        outputNames: {
-                            q1: "__Q1__",
-                            q3: "__Q3__",
-                            min: MinMeasureId,
-                            max: MaxMeasureId,
-                            median: MedianMeasureId,
-                            outliers: OutliersMeasureId
-                        }
-                    });
-                    boxPlotData.forEach((datum)=>{
-                        datum[FoldMeasureId] = f;
-                        datum[FoldMeasureName] = m?.alias ?? f;
+                const validEncodingIds = (encoding.value || []).filter((id)=>subMeasures.find((field)=>field.id === id));
+                if (validEncodingIds.length) {
+                    const boxPlotDataList = [];
+                    validEncodingIds.forEach((f)=>{
+                        const m = subMeasures.find((m)=>m.id === f);
+                        const boxPlotData = boxplot_boxplot(dataset, {
+                            field: f,
+                            groupField: [
+                                ...encoding.x ?? [],
+                                ...encoding.color ?? [],
+                                ...rowColumnFields.map((item)=>item.id)
+                            ],
+                            whiskers,
+                            outputNames: {
+                                q1: "__Q1__",
+                                q3: "__Q3__",
+                                lowerWhisker: LowerWhisker,
+                                upperWhisker: UpperWhisker,
+                                median: MedianMeasureId,
+                                outliers: OutliersMeasureId
+                            }
+                        });
+                        boxPlotData.forEach((datum)=>{
+                            datum[FoldMeasureId] = f;
+                            datum[FoldMeasureName] = m?.alias ?? f;
+                        });
+                        boxPlotDataList.push(...boxPlotData);
                     });
-                    const res = unfoldDimensions(boxPlotData, uniqDims, encoding, {
+                    const res = unfoldDimensions(boxPlotDataList, uniqDims, encoding, {
                         foldMeasureId: FoldMeasureId,
                         separator: "-",
                         colorItemAsId: false
@@ -11371,16 +11431,15 @@
                         newDatasets.push(d);
                     });
                     unfoldInfo = res.unfoldInfo;
-                });
-                else if (encoding.q1?.length && encoding.q3?.length && encoding.min?.length && encoding.max?.length && encoding.median?.length) {
+                } else if (encoding.q1?.length && encoding.q3?.length && encoding.min?.length && encoding.max?.length && encoding.median?.length) {
                     const res = unfoldDimensions(dataset, uniqDims, encoding, {
                         foldMeasureId: FoldMeasureId,
                         separator: "-",
                         colorItemAsId: false
                     });
                     res.dataset.forEach((datum)=>{
-                        datum[MaxMeasureId] = datum[encoding.max[0]];
-                        datum[MinMeasureId] = datum[encoding.min[0]];
+                        datum[UpperWhisker] = datum[encoding.max[0]];
+                        datum[LowerWhisker] = datum[encoding.min[0]];
                         datum["__Q1__"] = datum[encoding.q1[0]];
                         datum["__Q3__"] = datum[encoding.q3[0]];
                         datum[MedianMeasureId] = datum[encoding.median[0]];
@@ -11416,12 +11475,12 @@
             ], [
                 encodingForBoxplot,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithBoxplotEncoding
@@ -11441,10 +11500,10 @@
             const { datasetReshapeInfo, encoding } = advancedVSeed;
             const { unfoldInfo } = datasetReshapeInfo[0];
             result.type = 'boxPlot';
-            result.minField = MinMeasureId;
+            result.minField = LowerWhisker;
+            result.maxField = UpperWhisker;
             result.q1Field = "__Q1__";
             result.medianField = MedianMeasureId;
-            result.maxField = MaxMeasureId;
             result.q3Field = "__Q3__";
             result.outliersField = OutliersMeasureId;
             result.xField = [
@@ -11480,12 +11539,20 @@
             };
         };
         const boxPlotMeasureKeys = [
-            MaxMeasureId,
+            UpperWhisker,
             "__Q3__",
             MedianMeasureId,
             "__Q1__",
-            MinMeasureId
+            LowerWhisker
         ];
+        const measureAliasMapping = {
+            [OutliersMeasureId]: intl.i18n`异常点`,
+            [UpperWhisker]: intl.i18n`上边界`,
+            ["__Q3__"]: intl.i18n`上四分位数`,
+            [MedianMeasureId]: intl.i18n`中位数`,
+            ["__Q1__"]: intl.i18n`下四分位数`,
+            [LowerWhisker]: intl.i18n`下边界`
+        };
         const VCHART_OUTLIER_KEY = '__VCHART_BOX_PLOT_OUTLIER_VALUE';
         const tooltipBoxplot = (spec, context)=>{
             const result = {
@@ -11517,7 +11584,7 @@
                             const formatter = outerlierMeasure ? createFormatterByMeasure(outerlierMeasure) : defaultFormatter;
                             tooltipItems.push({
                                 ...tooltipItems[0],
-                                key: outerlierMeasure?.alias ?? OutliersMeasureId,
+                                key: outerlierMeasure?.alias ?? measureAliasMapping[OutliersMeasureId],
                                 value: formatter(datum?.[VCHART_OUTLIER_KEY])
                             });
                             return tooltipItems;
@@ -11529,7 +11596,7 @@
                                 return {
                                     ...entry,
                                     value: formatter(datum?.[entry.key]),
-                                    key: mea?.alias ?? entry.key
+                                    key: mea?.alias ?? measureAliasMapping[entry?.key] ?? entry.key
                                 };
                             }
                             return entry;
@@ -11572,6 +11639,17 @@
                 defaultContent
             ];
         };
+        const boxLegend = (spec, context)=>{
+            const normalLegend = discreteLegend(spec, context);
+            normalLegend.legends = {
+                ...normalLegend.legends,
+                data: (data)=>data.map((obj)=>{
+                        obj.shape.fill = obj.shape.stroke;
+                        return obj;
+                    })
+            };
+            return normalLegend;
+        };
         const pipeline_boxplot_boxplot = [
             initBoxplot,
             stackCornerRadius_stackCornerRadius,
@@ -11583,7 +11661,7 @@
             yLinear,
             label_label,
             tooltipBoxplot,
-            colorAdapter(discreteLegend, colorLegend),
+            colorAdapter(boxLegend, colorLegend),
             verticalCrosshairRect,
             colorBarStyleFill(barStyle_barStyle),
             annotationPoint_annotationPoint,
@@ -11893,7 +11971,9 @@
             };
             const { vseed } = context;
             const { dataset, chartType } = vseed;
-            const { dimensions = [], measures = [], encoding = {}, config } = advancedVSeed;
+            const { encoding = {}, config } = advancedVSeed;
+            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
             const uniqDims = T(dimensions, (item)=>item.id);
             const chartConfig = config?.[chartType];
             const binCount = chartConfig?.binCount;
@@ -11990,7 +12070,9 @@
             };
             const { vseed } = context;
             const { dataset, chartType } = vseed;
-            const { dimensions = [], measures = [], encoding = {}, config } = advancedVSeed;
+            const { encoding = {}, config } = advancedVSeed;
+            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
             const colorMeasureId = getColorMeasureId(advancedVSeed, vseed);
             const uniqDims = T(dimensions, (item)=>item.id);
             const chartConfig = config?.[chartType];
@@ -12031,9 +12113,9 @@
                         field: valueField,
                         groupField: [
                             ...encoding.x ?? [],
-                            ...encoding.color ?? [],
-                            ...rowColumnFields.map((item)=>item.id)
+                            ...encoding.color ?? []
                         ],
+                        facetField: rowColumnFields.map((item)=>item.id),
                         bins: binCount,
                         step: binStep,
                         outputNames: {
@@ -12105,12 +12187,12 @@
             ], [
                 encodingForHistogram,
                 buildMeasures,
-                deleteEncodingForMeasure([
+                pickMeasuresForReshape([
                     'tooltip',
                     'label',
                     'color'
                 ]),
-                deleteTooltipAndLabelDimension
+                pickDimensionsForReshape
             ]),
             pivotAdapter([
                 reshapeWithHistogramEncoding
@@ -12159,6 +12241,13 @@
                 }
             };
         };
+        const getDefaultXFormatterOfHistogram = (advancedVSeed)=>{
+            const { chartType, config } = advancedVSeed;
+            const xConfig = config?.[chartType]?.xAxis;
+            const { autoFormat = true, numFormat = {} } = xConfig;
+            const formatter = createNumFormatter(numFormat);
+            return (value)=>createLinearFormat(value, autoFormat, numFormat, formatter);
+        };
         const tooltipHistogram_VCHART_OUTLIER_KEY = '__VCHART_BOX_PLOT_OUTLIER_VALUE';
         const tooltipHistogram = (spec, context)=>{
             const result = {
@@ -12171,6 +12260,7 @@
                 enable: true
             } } = baseConfig;
             const { enable } = tooltip;
+            const defaultXFormatter = getDefaultXFormatterOfHistogram(advancedVSeed);
             result.tooltip = {
                 style: getTooltipStyle(tooltip),
                 visible: enable,
@@ -12178,18 +12268,18 @@
                     title: {
                         visible: false
                     },
-                    content: tooltipHistogram_createMarkContent(encoding.tooltip || [], dimensions, encoding)
+                    content: tooltipHistogram_createMarkContent(encoding.tooltip || [], dimensions, encoding, defaultXFormatter)
                 },
                 dimension: {
                     title: {
                         visible: false
                     },
-                    content: tooltipHistogram_createMarkContent(encoding.tooltip || [], dimensions, encoding)
+                    content: tooltipHistogram_createMarkContent(encoding.tooltip || [], dimensions, encoding, defaultXFormatter)
                 }
             };
             return result;
         };
-        const tooltipHistogram_createMarkContent = (tooltip, dimensions, encoding)=>{
+        const tooltipHistogram_createMarkContent = (tooltip, dimensions, encoding, dimFormatter)=>{
             const dims = C(dimensions.filter((item)=>tooltip.includes(item.id)), T((item)=>item.id), T((item)=>item.alias));
             const dimContent = dims.map((item)=>({
                     visible: true,
@@ -12211,7 +12301,7 @@
                     shapeType: 'rectRound',
                     key: (datum)=>{
                         if (!datum) return '';
-                        return `${datum[BinStartMeasureId]} ~ ${datum[BinEndMeasureId]}`;
+                        return `[${dimFormatter(+datum[BinStartMeasureId])}, ${dimFormatter(+datum[BinEndMeasureId])})`;
                     },
                     value: (datum)=>{
                         if (!datum) return '';
@@ -12224,6 +12314,27 @@
                 defaultContent
             ];
         };
+        const histogramVerticalCrosshairRect = (spec, context)=>{
+            const result = verticalCrosshairRect(spec, context);
+            if (!result.crosshair) return result;
+            const crosshair = result.crosshair;
+            if (!crosshair.xField) return result;
+            const defaultXFormatter = getDefaultXFormatterOfHistogram(context.advancedVSeed);
+            crosshair.xField = {
+                ...crosshair.xField || {},
+                label: {
+                    ...crosshair.xField?.label || {},
+                    formatMethod: (text)=>{
+                        if (common_isArray(text)) return text;
+                        const binRange = `${text}`.split('~');
+                        const binStart = defaultXFormatter(+binRange[0]);
+                        const binEnd = defaultXFormatter(+binRange[1]);
+                        return 1 === binRange.length ? binStart : `[${binStart}, ${binEnd})`;
+                    }
+                }
+            };
+            return result;
+        };
         const gaussian = (u)=>1 / Math.sqrt(2 * Math.PI) * Math.exp(-0.5 * u * u);
         function scott(n, std, dim = 1) {
             return n <= 0 || 0 === std ? 0 : std * Math.pow(n, -1 / (dim + 4));
@@ -12556,6 +12667,36 @@
                     }
                 });
             });
+            const leftAxis = result.axes?.find((v)=>'left' === v.orient);
+            if (leftAxis && lineList.length) result.axes?.push({
+                visible: true,
+                orient: 'right',
+                type: 'linear',
+                base: 10,
+                min: 0,
+                max: 1,
+                domainLine: {
+                    ...leftAxis.domainLine
+                },
+                grid: {
+                    visible: false
+                },
+                tick: {
+                    ...leftAxis.tick
+                },
+                title: {
+                    ...leftAxis.title,
+                    visible: false
+                },
+                label: {
+                    ...leftAxis.label,
+                    visible: true,
+                    formatMethod: (v)=>{
+                        const text = common_isArray(v) ? v[0] : v;
+                        return `${(100 * text).toFixed(1)}%`;
+                    }
+                }
+            });
             return result;
         };
         const histogram = [
@@ -12569,7 +12710,7 @@
             label_label,
             tooltipHistogram,
             colorAdapter(discreteLegend, colorLegend),
-            verticalCrosshairRect,
+            histogramVerticalCrosshairRect,
             colorBarStyleFill(barStyle_barStyle),
             annotationPoint_annotationPoint,
             annotationVerticalLine_annotationVerticalLine,
@@ -12593,7 +12734,7 @@
                 label_label,
                 tooltipHistogram,
                 colorBarStyleFill(barStyle_barStyle),
-                verticalCrosshairRect,
+                histogramVerticalCrosshairRect,
                 annotationPoint_annotationPoint,
                 annotationVerticalLine_annotationVerticalLine,
                 annotationHorizontalLine_annotationHorizontalLine,
@@ -17103,9 +17244,9 @@
         const zMeasure = schemas_object({
             id: schemas_string(),
             alias: schemas_string().optional(),
-            autoFormat: schemas_boolean().default(true),
-            numFormat: zNumFormat["default"]({}),
-            format: zNumFormat["default"]({}),
+            autoFormat: schemas_boolean().optional(),
+            numFormat: zNumFormat.optional(),
+            format: zNumFormat.optional(),
             encoding: schemas_enum([
                 'primaryYAxis',
                 'secondaryYAxis',
@@ -17118,7 +17259,16 @@
                 'label',
                 'tooltip',
                 'detail',
-                'column'
+                'column',
+                'value',
+                'q1',
+                'q3',
+                'min',
+                'max',
+                'median',
+                'outliers',
+                'x0',
+                'x1'
             ]).optional(),
             parentId: schemas_string().optional()
         });
@@ -18676,6 +18826,8 @@
             datasetReshapeInfo: zDatasetReshapeInfo,
             dimensions: zDimensionTree,
             measures: zMeasureTree,
+            reshapeMeasures: zMeasureTree.optional(),
+            reshapeDimensions: zDimensionTree.optional(),
             encoding: zEncoding,
             config: zConfig,
             analysis: zAnalysis,