@visactor/vseed 0.0.39 → 0.1.0

package/dist/umd/index.js

@@ -40,14 +40,16 @@
             isTable: ()=>isTable,
             zDonut: ()=>zDonut,
             zDualMeasures: ()=>zDualMeasures,
-            zPie: ()=>zPie,
+            XEncoding: ()=>XEncoding,
             findFirstMeasure: ()=>findFirstMeasure,
             scatterAdvancedPipeline: ()=>scatterAdvancedPipeline,
+            zPie: ()=>zPie,
             zRoseConfig: ()=>zRoseConfig,
             updateSpec: ()=>updateSpec,
             zCrosshairRect: ()=>zCrosshairRect,
             scatterSpecPipeline: ()=>scatterSpecPipeline,
             intl: ()=>intl,
+            zScatterMeasures: ()=>zScatterMeasures,
             columnPercentAdvancedPipeline: ()=>columnPercentAdvancedPipeline,
             zColumnConfig: ()=>zColumnConfig,
             zAnnotation: ()=>zAnnotation,
@@ -57,12 +59,11 @@
             pivotTableAdvancedPipeline: ()=>pivotTableAdvancedPipeline,
             isMeasures: ()=>isMeasures,
             zYBandAxis: ()=>zYBandAxis,
-            dataReshapeFor1D2M: ()=>dataReshapeFor1D2M,
             zAnnotationHorizontalLine: ()=>zAnnotationHorizontalLine,
+            zYLinearAxis: ()=>zYLinearAxis,
             zMarkStyle: ()=>zMarkStyle,
             registerFunnel: ()=>registerFunnel,
             Separator: ()=>Separator,
-            zYLinearAxis: ()=>zYLinearAxis,
             columnAdvancedPipeline: ()=>columnAdvancedPipeline,
             zLabel: ()=>zLabel,
             registerColumn: ()=>registerColumn,
@@ -75,16 +76,16 @@
             zDimensionTree: ()=>zDimensionTree,
             roseParallelSpecPipeline: ()=>roseParallelSpecPipeline,
             zLineStyle: ()=>zLineStyle,
-            dataReshapeFor1D1M: ()=>dataReshapeFor1D1M,
             registerArea: ()=>registerArea,
             zRoseParallel: ()=>zRoseParallel,
+            MeasureName: ()=>MeasureName,
             zDataset: ()=>zDataset,
             UnfoldDimensionGroupId: ()=>UnfoldDimensionGroupId,
             zNumFormat: ()=>zNumFormat,
             barPercentAdvancedPipeline: ()=>barPercentAdvancedPipeline,
             findAllDimensions: ()=>findAllDimensions,
+            FoldYMeasureValue: ()=>FoldYMeasureValue,
             findDimensionById: ()=>findDimensionById,
-            zAreaRangeConfig: ()=>zAreaRangeConfig,
             zPivotTableConfig: ()=>zPivotTableConfig,
             zArea: ()=>zArea,
             zColumnParallel: ()=>zColumnParallel,
@@ -96,25 +97,26 @@
             registerAreaPercent: ()=>registerAreaPercent,
             zHeatmap: ()=>zHeatmap,
             zBarPercent: ()=>zBarPercent,
+            zScatterMeasure: ()=>zScatterMeasure,
             zTheme: ()=>zTheme,
             zDatum: ()=>zDatum,
             barAdvancedPipeline: ()=>barAdvancedPipeline,
             zCustomThemeConfig: ()=>zCustomThemeConfig,
             registerColumnPercent: ()=>registerColumnPercent,
             registerHeatmap: ()=>registerHeatmap,
-            registerAreaRange: ()=>registerAreaRange,
-            roseSpecPipeline: ()=>roseSpecPipeline,
-            dataReshapeFor2D1M0Name: ()=>dataReshapeFor2D1M0Name,
             registerBarPercent: ()=>registerBarPercent,
+            roseSpecPipeline: ()=>roseSpecPipeline,
+            ColorIdEncoding: ()=>ColorIdEncoding,
+            zCrosshairLine: ()=>zCrosshairLine,
             registerLightTheme: ()=>registerLightTheme,
             roseAdvancedPipeline: ()=>roseAdvancedPipeline,
             zBarParallel: ()=>zBarParallel,
             registerDarkTheme: ()=>registerDarkTheme,
             registerPivotTable: ()=>registerPivotTable,
             isPartialDatumSelector: ()=>isPartialDatumSelector,
+            pieSpecPipeline: ()=>pieSpecPipeline,
             isDimensionGroup: ()=>isDimensionGroup,
             dualAxisSpecPipeline: ()=>dualAxisSpecPipeline,
-            pieSpecPipeline: ()=>pieSpecPipeline,
             tableAdvancedPipeline: ()=>tableAdvancedPipeline,
             barSpecPipeline: ()=>barSpecPipeline,
             zAnnotationVerticalLine: ()=>zAnnotationVerticalLine,
@@ -123,15 +125,15 @@
             unfoldDimensions: ()=>unfoldDimensions,
             roseParallelAdvancedPipeline: ()=>roseParallelAdvancedPipeline,
             registerTable: ()=>registerTable,
-            autoFormatter: ()=>autoFormatter,
+            Builder: ()=>Builder,
             isMeasureGroup: ()=>isMeasureGroup,
-            findFirstDimension: ()=>findFirstDimension,
+            YEncoding: ()=>YEncoding,
             registerAll: ()=>registerAll,
             registerBar: ()=>registerBar,
             isVChart: ()=>isVChart,
             radarSpecPipeline: ()=>radarSpecPipeline,
-            Builder: ()=>Builder,
-            zCrosshairLine: ()=>zCrosshairLine,
+            findFirstDimension: ()=>findFirstDimension,
+            autoFormatter: ()=>autoFormatter,
             zMeasureTree: ()=>zMeasureTree,
             zPieConfig: ()=>zPieConfig,
             registerLine: ()=>registerLine,
@@ -165,8 +167,9 @@
             zRadarConfig: ()=>zRadarConfig,
             zAnnotationArea: ()=>zAnnotationArea,
             zStackCornerRadius: ()=>zStackCornerRadius,
-            zUnfoldInfo: ()=>zUnfoldInfo,
+            DetailEncoding: ()=>DetailEncoding,
             zRose: ()=>zRose,
+            zUnfoldInfo: ()=>zUnfoldInfo,
             columnParallelSpecPipeline: ()=>columnParallelSpecPipeline,
             i18n: ()=>i18n,
             zPointStyle: ()=>zPointStyle,
@@ -188,30 +191,30 @@
             FoldPrimaryMeasureValue: ()=>FoldPrimaryMeasureValue,
             zTableConfig: ()=>zTableConfig,
             zXBandAxis: ()=>zXBandAxis,
-            dataReshapeFor1D: ()=>dataReshapeFor1D,
             zColumnPercentConfig: ()=>zColumnPercentConfig,
             findMeasureById: ()=>findMeasureById,
             zVSeed: ()=>zVSeed,
+            AngleEncoding: ()=>AngleEncoding,
             areaPercentAdvancedPipeline: ()=>areaPercentAdvancedPipeline,
             radarAdvancedPipeline: ()=>radarAdvancedPipeline,
-            zBackgroundColor: ()=>zBackgroundColor,
             zAreaPercentConfig: ()=>zAreaPercentConfig,
+            zBackgroundColor: ()=>zBackgroundColor,
             registerBarParallel: ()=>registerBarParallel,
             registerRadar: ()=>registerRadar,
-            zLocale: ()=>zLocale,
+            zEncodings: ()=>zEncodings,
             isDimension: ()=>isDimension,
             pivotTableSpecPipeline: ()=>pivotTableSpecPipeline,
-            areaRangeSpecPipeline: ()=>areaRangeSpecPipeline,
-            areaRangeAdvancedPipeline: ()=>areaRangeAdvancedPipeline,
+            zLocale: ()=>zLocale,
+            FoldXMeasureValue: ()=>FoldXMeasureValue,
             dualAxisAdvancedPipeline: ()=>dualAxisAdvancedPipeline,
             registerScatter: ()=>registerScatter,
-            zAreaRange: ()=>zAreaRange,
-            measureDepth: ()=>measureDepth,
+            zEncoding: ()=>zEncoding,
+            ColorEncoding: ()=>ColorEncoding,
             autoNumFormatter: ()=>autoNumFormatter,
-            zAdvancedVSeed: ()=>zAdvancedVSeed,
+            measureDepth: ()=>measureDepth,
             tableSpecPipeline: ()=>tableSpecPipeline,
+            zAdvancedVSeed: ()=>zAdvancedVSeed,
             zConfig: ()=>zConfig,
-            zEncoding: ()=>zEncoding,
             zBarStyle: ()=>zBarStyle,
             zMeasure: ()=>zMeasure,
             zRoseParallelConfig: ()=>zRoseParallelConfig,
@@ -222,20 +225,20 @@
             donutAdvancedPipeline: ()=>donutAdvancedPipeline,
             zColumnPercent: ()=>zColumnPercent,
             registerPie: ()=>registerPie,
-            dataReshapeFor2D1M: ()=>dataReshapeFor2D1M,
             foldMeasures: ()=>foldMeasures,
             isPivotTable: ()=>isPivotTable,
             zFunnel: ()=>zFunnel,
             zScatter: ()=>zScatter,
+            zScatterConfig: ()=>zScatterConfig,
             zBarParallelConfig: ()=>zBarParallelConfig,
             barParallelAdvancedPipeline: ()=>barParallelAdvancedPipeline,
             FoldMeasureValue: ()=>FoldMeasureValue,
             barPercentSpecPipeline: ()=>barPercentSpecPipeline,
             lineAdvancedPipeline: ()=>lineAdvancedPipeline,
-            zBarPercentConfig: ()=>zBarPercentConfig,
+            dataReshapeByEncoding: ()=>dataReshapeByEncoding,
             lineSpecPipeline: ()=>lineSpecPipeline,
             isDimensions: ()=>isDimensions,
-            zScatterConfig: ()=>zScatterConfig,
+            zBarPercentConfig: ()=>zBarPercentConfig,
             createFormatter: ()=>createFormatter,
             zDimensionGroup: ()=>zDimensionGroup,
             isMeasureSelector: ()=>isMeasureSelector,
@@ -1494,13 +1497,26 @@
         const isVChart = (vseed)=>!isVTable(vseed);
         const isPivotChart = (vseed)=>{
             if (isVTable(vseed)) return false;
-            if ('dualAxis' === vseed.chartType) {
-                if (vseed.measures) {
-                    const depth = measureDepth(vseed.measures);
-                    if (3 === depth) return true;
-                    return false;
+            if ('dualAxis' === vseed.chartType || 'scatter' === vseed.chartType) {
+                const { dimensions = [] } = vseed;
+                const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'rowDimension' === dimension.location || 'columnDimension' === dimension.location);
+                if (hasRowOrColumnDimension) return true;
+                if ('scatter' === vseed.chartType) {
+                    if (vseed.measures) {
+                        const depth = measureDepth(vseed.measures);
+                        if (3 === depth) return true;
+                        return false;
+                    }
+                    if (vseed.scatterMeasures && vseed.scatterMeasures.length > 1) return true;
+                }
+                if ('dualAxis' === vseed.chartType) {
+                    if (vseed.measures) {
+                        const depth = measureDepth(vseed.measures);
+                        if (3 === depth) return true;
+                        return false;
+                    }
+                    if (vseed.dualMeasures && vseed.dualMeasures.length > 1) return true;
                 }
-                if (vseed.dualMeasures && vseed.dualMeasures.length > 1) return true;
                 return false;
             }
             const { measures = [], dimensions = [] } = vseed;
@@ -1579,6 +1595,24 @@
                 alias: '',
                 children: []
             });
+        const ORIGINAL_DATA = '__OriginalData__';
+        const Separator = '-';
+        const FoldMeasureName = '__MeaName__';
+        const FoldMeasureId = '__MeaId__';
+        const FoldMeasureValue = '__MeaValue__';
+        const MeasureName = FoldMeasureName;
+        const FoldPrimaryMeasureValue = '__MeaPrimaryValue__';
+        const FoldSecondaryMeasureValue = '__MeaSecondaryValue__';
+        const FoldXMeasureValue = '__MeaXValue__';
+        const FoldYMeasureValue = '__MeaYValue__';
+        const XEncoding = '__Dim_X__';
+        const YEncoding = '__Dim_Y__';
+        const AngleEncoding = '__Dim_Angle__';
+        const DetailEncoding = '__Dim_Detail__';
+        const ColorEncoding = '__Dim_Color__';
+        const ColorIdEncoding = '__Dim_ColorId__';
+        const UnfoldDimensionGroup = '__DimGroup__';
+        const UnfoldDimensionGroupId = '__DimGroupID__';
         const autoDimensions_autoDimensions = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
@@ -1586,6 +1620,10 @@
             const { vseed } = context;
             const { dimensions, dataset } = vseed;
             const measures = findAllMeasures(advancedVSeed.measures);
+            const MeaName = {
+                id: MeasureName,
+                alias: intl.i18n`指标名称`
+            };
             if (!dataset) throw new Error('dataset is required');
             if (0 === dataset.length) return result;
             if (dimensions) {
@@ -1593,6 +1631,8 @@
                         location: 'dimension',
                         ...dim
                     }));
+                if (result.dimensions.some((dim)=>dim.id === MeasureName)) return result;
+                result.dimensions.push(MeaName);
                 return result;
             }
             const top100dataset = dataset.slice(0, 100);
@@ -1609,23 +1649,51 @@
                     alias: dim,
                     location: 'dimension'
                 }));
+            result.dimensions.push(MeaName);
             return result;
         };
+        const encodingForColumn = (advancedVSeed, context)=>{
+            const { vseed } = context;
+            const { dimensions } = advancedVSeed;
+            if (!dimensions) return advancedVSeed;
+            const encoding = vseed.encoding;
+            if (encoding) {
+                const x = encoding.x || [];
+                const detail = encoding.detail || [];
+                const color = encoding.color || [];
+                const mergedDetail = [
+                    ...color.filter((d)=>!x.includes(d)),
+                    ...detail
+                ];
+                return {
+                    ...advancedVSeed,
+                    encoding: {
+                        ...encoding,
+                        detail: mergedDetail
+                    }
+                };
+            }
+            const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
+            const mergedEncoding = {
+                x: dimensions.slice(0, 1).map((item)=>item.id),
+                color: dimensions.slice(1).map((item)=>item.id),
+                detail: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
+                tooltip: dimensions.map((item)=>item.id),
+                label: [],
+                row: [],
+                column: []
+            };
+            return {
+                ...advancedVSeed,
+                encoding: mergedEncoding
+            };
+        };
         const pivotAdapter = (pipeline, pivotPipeline)=>(advancedVSeed, context)=>{
                 const { vseed } = context;
                 const usePivotChart = isPivotChart(vseed);
                 if (usePivotChart) return execPipeline(pivotPipeline, context, advancedVSeed);
                 return execPipeline(pipeline, context, advancedVSeed);
             };
-        const FoldMeasureName = '__MeaName__';
-        const FoldMeasureId = '__MeaId__';
-        const FoldMeasureValue = '__MeaValue__';
-        const FoldPrimaryMeasureValue = '__MeaPrimaryValue__';
-        const FoldSecondaryMeasureValue = '__MeaSecondaryValue__';
-        const UnfoldDimensionGroup = '__DimGroup__';
-        const UnfoldDimensionGroupId = '__DimGroupID__';
-        const Separator = '-';
-        const ORIGINAL_DATA = '__OriginalData__';
         function chunk_AIG3BDKO_i(...e) {
             return chunk_WIMGWYZL_u(chunk_AIG3BDKO_n, e);
         }
@@ -1676,79 +1744,53 @@
                 foldInfo
             };
         };
-        const unfoldDimensions = (dataset, dimensions, measures, unfoldStartIndex = 0, unfoldGroupName = UnfoldDimensionGroup, unfoldGroupId = UnfoldDimensionGroupId, foldMeasureId = FoldMeasureId, dimensionsSeparator = Separator)=>{
-            if (unfoldStartIndex < 0 || unfoldStartIndex >= dimensions.length) throw new Error('unfoldStartIndex is out of range');
-            const dimensionsToBeUnfolded = dimensions.slice(unfoldStartIndex);
+        const unfoldDimensions = (dataset, dimensions, encoding, options)=>{
+            const { foldMeasureId, separator, colorItemAsId } = options;
             const unfoldInfo = {
-                groupName: unfoldGroupName,
-                groupId: unfoldGroupId,
+                encodingAngle: AngleEncoding,
+                encodingX: XEncoding,
+                encodingY: YEncoding,
+                encodingDetail: DetailEncoding,
+                encodingColor: ColorEncoding,
+                encodingColorId: ColorIdEncoding,
                 colorItems: [],
                 colorIdMap: {}
             };
-            if (0 === dimensions.length || 0 === measures.length) return {
-                dataset,
-                unfoldInfo: {
-                    groupName: unfoldGroupName,
-                    groupId: unfoldGroupId,
-                    colorItems: [],
-                    colorIdMap: {}
-                }
-            };
-            const colorItems = [];
-            const colorMap = {};
+            const { color, x, y, detail, angle } = encoding;
+            const angleDimensions = angle ? dimensions.filter((dim)=>angle.includes(dim.id)) : [];
+            const xDimensions = x ? dimensions.filter((dim)=>x.includes(dim.id)) : [];
+            const yDimensions = y ? dimensions.filter((dim)=>y.includes(dim.id)) : [];
+            const colorDimensions = color ? dimensions.filter((dim)=>color.includes(dim.id)) : [];
+            const detailDimensions = detail ? dimensions.filter((dim)=>detail.includes(dim.id)) : [];
+            const colorItems = new Set();
+            const colorIdMap = {};
             for(let i = 0; i < dataset.length; i++){
                 const datum = dataset[i];
-                const colorName = generateDimGroupName(dimensionsToBeUnfolded, datum, dimensionsSeparator);
-                const colorId = datum[foldMeasureId] ? [
-                    colorName,
-                    datum[foldMeasureId]
-                ].join(dimensionsSeparator) : colorName;
-                datum[unfoldGroupName] = colorName;
-                datum[unfoldGroupId] = colorId;
-                colorItems.push(colorId);
-                colorMap[colorId] = colorName;
+                applyEncoding(AngleEncoding, angleDimensions, datum, separator);
+                applyEncoding(XEncoding, xDimensions, datum, separator);
+                applyEncoding(YEncoding, yDimensions, datum, separator);
+                applyEncoding(ColorEncoding, colorDimensions, datum, separator);
+                applyEncoding(DetailEncoding, detailDimensions, datum, separator);
+                if (!datum[ColorEncoding]) continue;
+                const measureId = String(datum[foldMeasureId]);
+                const colorItem = String(datum[ColorEncoding]);
+                const colorId = colorItemAsId ? colorItem : measureId ? [
+                    colorItem,
+                    measureId
+                ].join(separator) : colorItem;
+                datum[ColorIdEncoding] = colorId;
+                colorIdMap[colorId] = colorItem;
+                colorItems.add(colorId);
             }
-            unfoldInfo.colorItems = chunk_QJLMYOTX_i(colorItems);
-            unfoldInfo.colorIdMap = colorMap;
+            unfoldInfo.colorItems = Array.from(colorItems);
+            unfoldInfo.colorIdMap = colorIdMap;
             return {
                 dataset,
                 unfoldInfo
             };
         };
-        const generateDimGroupName = (dimensionsToBeGrouped, datum, dimensionsSeparator)=>dimensionsToBeGrouped.map((dim)=>String(datum[dim.id])).join(dimensionsSeparator);
-        const unfoldZeroDimensions = (dataset, measures, measureName, unfoldGroupName = UnfoldDimensionGroup, unfoldGroupId = UnfoldDimensionGroupId)=>{
-            const unfoldInfo = {
-                groupName: unfoldGroupName,
-                groupId: unfoldGroupId,
-                colorItems: [],
-                colorIdMap: {}
-            };
-            if (0 === measures.length) return {
-                dataset,
-                unfoldInfo: {
-                    groupName: unfoldGroupName,
-                    groupId: unfoldGroupId,
-                    colorItems: [],
-                    colorIdMap: {}
-                }
-            };
-            const colorItems = [];
-            const colorMap = {};
-            for(let i = 0; i < dataset.length; i++){
-                const datum = dataset[i];
-                const colorName = measureName;
-                const colorId = measureName;
-                datum[unfoldGroupName] = colorName;
-                datum[unfoldGroupId] = colorId;
-                colorItems.push(colorId);
-                colorMap[colorId] = colorName;
-            }
-            unfoldInfo.colorItems = chunk_QJLMYOTX_i(colorItems);
-            unfoldInfo.colorIdMap = colorMap;
-            return {
-                dataset,
-                unfoldInfo
-            };
+        const applyEncoding = (encoding, dimensions, datum, separator)=>{
+            if (encoding && dimensions.length) datum[encoding] = dimensions.map((dim)=>String(datum[dim.id])).join(separator);
         };
         const emptyReshapeResult = {
             dataset: [],
@@ -1759,69 +1801,47 @@
                 measureValue: ''
             },
             unfoldInfo: {
-                groupName: '',
-                groupId: '',
+                encodingAngle: AngleEncoding,
+                encodingX: XEncoding,
+                encodingY: YEncoding,
+                encodingDetail: DetailEncoding,
+                encodingColor: ColorEncoding,
+                encodingColorId: ColorIdEncoding,
                 colorItems: [],
                 colorIdMap: {}
             }
         };
-        const dataReshapeFor2D1M0Name = (dataset, dimensions, measures, options)=>{
-            const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, unfoldDimensionGroup = UnfoldDimensionGroup, unfoldDimensionGroupId = UnfoldDimensionGroupId } = options || {};
+        const dataReshapeByEncoding = (dataset, dimensions, measures, encoding, options)=>{
+            const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, colorItemAsId = false } = options || {};
             if (0 === dimensions.length && 0 === measures.length) return emptyReshapeResult;
             const { dataset: foldedDataset, foldInfo } = foldMeasures(dataset, measures, foldMeasureId, foldMeasureName, foldMeasureValue);
-            if (0 === dimensions.length) {
-                const { dataset: finalDataset, unfoldInfo } = unfoldZeroDimensions(foldedDataset, [
-                    {
-                        id: foldMeasureValue,
-                        alias: i18n`指标值`
-                    }
-                ], i18n`指标名称`, unfoldDimensionGroup, unfoldDimensionGroupId);
-                return {
-                    dataset: finalDataset,
-                    foldInfo,
-                    unfoldInfo
-                };
-            }
-            {
-                const onlyOneMeasure = 1 === measures.length;
-                const onlyOneDimension = 1 === dimensions.length;
-                const dims = [
-                    ...dimensions
-                ];
-                if (!onlyOneMeasure || onlyOneDimension) dims.push({
-                    id: foldMeasureName,
-                    alias: i18n`指标名称`,
-                    location: 'dimension'
-                });
-                const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, dims, [
-                    {
-                        id: foldMeasureValue,
-                        alias: i18n`指标值`
-                    }
-                ], 1, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
-                return {
-                    dataset: finalDataset,
-                    foldInfo,
-                    unfoldInfo
-                };
-            }
+            const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, dimensions, encoding, {
+                foldMeasureId,
+                separator: Separator,
+                colorItemAsId
+            });
+            return {
+                dataset: finalDataset,
+                foldInfo,
+                unfoldInfo
+            };
         };
-        const reshapeTo2D1M0Name = (advancedVSeed, context)=>{
+        const reshapeWithEncoding = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
             };
             const { vseed } = context;
-            const { dataset } = vseed;
-            const { dimensions, measures } = advancedVSeed;
-            if (!measures || !dimensions || !dataset) return result;
+            const { dataset, chartType } = vseed;
+            const { dimensions, measures, encoding } = advancedVSeed;
+            if (!measures || !dimensions || !dataset || !encoding) return result;
             if (0 === measures.length) throw new Error('measures can not be empty');
-            const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeFor2D1M0Name(dataset, dimensions, measures);
+            const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, measures, encoding);
             return {
                 ...result,
                 dataset: newDatasets,
                 datasetReshapeInfo: [
                     {
-                        id: '2D1M',
+                        id: String(chartType),
                         index: 0,
                         foldInfo,
                         unfoldInfo
@@ -1831,31 +1851,27 @@
                 measures
             };
         };
-        const pivotReshapeTo2D1M0Name = (advancedVSeed, context)=>{
+        const pivotReshapeWithEncoding = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
             };
             const { vseed } = context;
             const { dataset } = vseed;
-            const { measures } = advancedVSeed;
-            const dimensions = advancedVSeed.dimensions;
-            if (!measures || !dimensions) return result;
+            const { dimensions, measures, encoding } = advancedVSeed;
+            if (!measures || !dimensions || !dataset || !encoding) return result;
+            if (0 === measures.length) throw new Error('measures can not be empty');
             const measureGroups = [];
             if (measures) measures.forEach((measure)=>{
                 if (measure.children && measure.children.length > 0) measureGroups.push(measure);
             });
-            const commonDimensions = dimensions.filter((dim)=>'dimension' === dim.location);
-            const newDatasets = [];
+            const datasets = [];
             const datasetReshapeInfo = [];
             measureGroups.forEach((measureGroup, index)=>{
                 const measures = measureGroup.children;
                 if (!measures) return;
                 const groupId = measureGroup.id;
-                const { dataset: newSubDataset, foldInfo, unfoldInfo } = dataReshapeFor2D1M0Name(dataset, commonDimensions, measures, {
-                    foldMeasureId: FoldMeasureId,
-                    foldMeasureName: FoldMeasureName,
-                    foldMeasureValue: FoldMeasureValue + groupId,
-                    unfoldDimensionGroup: UnfoldDimensionGroup
+                const { dataset: newSubDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, measures, encoding, {
+                    foldMeasureValue: `${FoldMeasureValue}${groupId}`
                 });
                 const reshapeInfo = {
                     id: groupId,
@@ -1863,52 +1879,15 @@
                     foldInfo,
                     unfoldInfo
                 };
-                newDatasets.push(newSubDataset);
+                datasets.push(newSubDataset);
                 datasetReshapeInfo.push(reshapeInfo);
             });
             return {
                 ...result,
-                dataset: newDatasets,
+                dataset: datasets,
                 datasetReshapeInfo: datasetReshapeInfo
             };
         };
-        const encodingXY = (advancedVSeed)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { datasetReshapeInfo, dimensions } = advancedVSeed;
-            if (!datasetReshapeInfo || !dimensions) return result;
-            const xDimension = dimensions.find((item)=>'rowDimension' !== item.location && 'columnDimension' !== item.location) || dimensions[0];
-            const isZeroDimension = 0 === dimensions.length;
-            const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
-                const { foldInfo, unfoldInfo } = cur;
-                const x = [
-                    isZeroDimension ? foldInfo.measureName : xDimension?.id
-                ];
-                const y = [
-                    foldInfo.measureValue
-                ];
-                const group = [
-                    unfoldInfo.groupId
-                ];
-                const color = [
-                    foldInfo.measureName
-                ];
-                return [
-                    ...prev,
-                    {
-                        x,
-                        y,
-                        group,
-                        color
-                    }
-                ];
-            }, []);
-            return {
-                ...result,
-                encoding
-            };
-        };
         function chunk_NFFV4IQT_m(...r) {
             return chunk_WIMGWYZL_u(chunk_NFFV4IQT_o, r);
         }
@@ -1923,42 +1902,46 @@
                 ...advancedVSeed
             };
             const { vseed } = context;
-            const { sort: sortAxis, dataset } = vseed;
-            const { encoding } = advancedVSeed;
-            const xField = encoding?.[0]?.x?.[0];
+            const { sort: sortAxis } = vseed;
+            const { datasetReshapeInfo, dataset } = advancedVSeed;
+            const { unfoldInfo } = datasetReshapeInfo[0];
+            const xField = unfoldInfo.encodingX;
             if (!sortAxis || !xField) return advancedVSeed;
             if (!result.analysis) result.analysis = {};
             if (!result.analysis.orderMapping) result.analysis.orderMapping = {};
-            const axisOrderResult = calcOrder(sortAxis, xField, dataset);
+            const axisOrderResult = calcOrder(sortAxis, xField, dataset.flat(2));
             result.analysis.orderMapping[xField] = axisOrderResult;
             return result;
         };
-        const sortYBandAxis = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { vseed } = context;
-            const { sort: sortAxis, dataset } = vseed;
-            const { encoding } = advancedVSeed;
-            const yField = encoding?.[0]?.y?.[0];
-            if (!sortAxis || !yField) return advancedVSeed;
-            if (!result.analysis) result.analysis = {};
-            if (!result.analysis.orderMapping) result.analysis.orderMapping = {};
-            const axisOrderResult = calcOrder(sortAxis, yField, dataset);
-            result.analysis.orderMapping[yField] = axisOrderResult;
-            return result;
+        const calcOrder = (sortConfig, id, dataset)=>{
+            if (sortConfig.customOrder) return sortConfig.customOrder;
+            const order = sortConfig.order || 'asc';
+            const orderBy = sortConfig.orderBy;
+            const res = chunk_NFFV4IQT_m(dataset, (a, b)=>{
+                const aValue = a[orderBy || id];
+                const bValue = b[orderBy || id];
+                if ('asc' === order) {
+                    if (aValue < bValue) return -1;
+                    if (aValue > bValue) return 1;
+                    return 0;
+                }
+                if (aValue > bValue) return -1;
+                if (aValue < bValue) return 1;
+                return 0;
+            });
+            return chunk_QJLMYOTX_i(res.map((item)=>item[id]));
         };
-        const sort_sortLegend = (advancedVSeed, context)=>{
+        const sortLegend_sortLegend = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
             };
             const { vseed } = context;
             const { sortLegend } = vseed;
-            const { datasetReshapeInfo } = advancedVSeed;
-            const groupField = datasetReshapeInfo?.[0]?.unfoldInfo?.groupId;
+            const { datasetReshapeInfo, dataset } = advancedVSeed;
+            const colorId = datasetReshapeInfo?.[0]?.unfoldInfo?.encodingColorId;
             const colorIdMap = datasetReshapeInfo?.[0]?.unfoldInfo?.colorIdMap;
             const colorItems = datasetReshapeInfo?.[0]?.unfoldInfo?.colorItems;
-            if (!sortLegend || !groupField || !colorIdMap || !colorItems) return advancedVSeed;
+            if (!sortLegend || !colorId || !colorIdMap || !colorItems) return advancedVSeed;
             if (!result.analysis) result.analysis = {};
             if (!result.analysis.orderMapping) result.analysis.orderMapping = {};
             if (sortLegend.customOrder) {
@@ -1967,15 +1950,14 @@
                     return pre;
                 }, {});
                 const orderRes = sortLegend.customOrder.map((itemNameOrId)=>nameMap[itemNameOrId] ? nameMap[itemNameOrId] : itemNameOrId);
-                result.analysis.orderMapping[groupField] = orderRes;
+                result.analysis.orderMapping[colorId] = orderRes;
                 return result;
             }
-            const dataset = advancedVSeed.dataset?.flat(2);
-            const orderRes = calcOrder(sortLegend, groupField, dataset || []);
-            result.analysis.orderMapping[groupField] = orderRes;
+            const orderRes = sortLegend_calcOrder(sortLegend, colorId, dataset?.flat(2) || []);
+            result.analysis.orderMapping[colorId] = orderRes;
             return result;
         };
-        const calcOrder = (sortConfig, id, dataset)=>{
+        const sortLegend_calcOrder = (sortConfig, id, dataset)=>{
             if (sortConfig.customOrder) return sortConfig.customOrder;
             const order = sortConfig.order || 'asc';
             const orderBy = sortConfig.orderBy;
@@ -2107,14 +2089,14 @@
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForColumn,
             pivotAdapter([
-                reshapeTo2D1M0Name
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo2D1M0Name
+                pivotReshapeWithEncoding
             ]),
-            encodingXY,
             sortXBandAxis,
-            sort_sortLegend,
+            sortLegend_sortLegend,
             lineConfig,
             theme_theme,
             markStyle_markStyle,
@@ -2125,13 +2107,13 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding } = advancedVSeed;
-            if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const { foldInfo, unfoldInfo } = datasetReshapeInfo[0];
             result.type = 'line';
             result.direction = 'vertical';
-            result.xField = encoding[0].x[0];
-            result.yField = encoding[0].y[0];
-            result.seriesField = encoding[0].group[0];
+            result.xField = unfoldInfo.encodingX;
+            result.yField = foldInfo.measureValue;
+            result.seriesField = unfoldInfo.encodingColorId;
             result.padding = 0;
             result.region = [
                 {
@@ -2207,11 +2189,12 @@
         };
         const datasetXY = (spec, context)=>{
             const { advancedVSeed, vseed } = context;
-            const { encoding, analysis, datasetReshapeInfo } = advancedVSeed;
+            const { analysis, datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo } = datasetReshapeInfo[0];
             const orderMapping = analysis?.orderMapping || {};
-            const angle = encoding[0]?.angle?.[0];
-            const x = encoding[0]?.x?.[0];
-            const group = encoding[0]?.group?.[0];
+            const angle = unfoldInfo.encodingAngle;
+            const x = unfoldInfo.encodingX;
+            const colorId = unfoldInfo.encodingColorId;
             const id = datasetReshapeInfo[0].id;
             const fields = {};
             if (angle) fields[angle] = {
@@ -2228,14 +2211,14 @@
                     sortIndex: 0
                 };
             }
-            if (group) {
-                const order = orderMapping[group];
-                if (order) fields[group] = {
+            if (colorId) {
+                const order = orderMapping[colorId];
+                if (order) fields[colorId] = {
                     sortIndex: 0,
                     domain: order,
                     lockStatisticsByDomain: true
                 };
-                else fields[group] = {
+                else fields[colorId] = {
                     sortIndex: 0
                 };
             }
@@ -2488,7 +2471,7 @@
             } } = baseConfig;
             const { enable } = tooltip;
             const { measureId, measureValue, measureName } = datasetReshapeInfo[0].foldInfo;
-            const { groupName } = datasetReshapeInfo[0].unfoldInfo;
+            const { encodingColor: colorName } = datasetReshapeInfo[0].unfoldInfo;
             result.tooltip = {
                 visible: enable,
                 mark: {
@@ -2509,7 +2492,7 @@
                         {
                             visible: true,
                             hasShape: true,
-                            key: (datum)=>datum && datum[measureName || groupName] || '',
+                            key: (datum)=>datum && datum[measureName || colorName] || '',
                             value: (datum)=>{
                                 if (!datum) return '';
                                 const value = datum[measureValue];
@@ -2531,7 +2514,7 @@
                     content: [
                         {
                             visible: true,
-                            key: (datum)=>datum && datum[groupName] || '',
+                            key: (datum)=>datum && datum[colorName] || '',
                             value: (datum)=>{
                                 if (!datum) return '';
                                 const value = datum[measureValue];
@@ -2869,7 +2852,8 @@
         const pointStateHover = (spec, context)=>{
             const point = spec.point || {};
             const { advancedVSeed } = context;
-            const { encoding } = advancedVSeed;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo } = datasetReshapeInfo[0];
             const result = {
                 ...spec,
                 point: {
@@ -2880,7 +2864,7 @@
                             scaleX: 1.4,
                             scaleY: 1.4,
                             stroke: (datum, context)=>{
-                                const field = encoding[0]?.group?.[0];
+                                const field = unfoldInfo.encodingColorId;
                                 const color = context.seriesColor(datum[field]);
                                 return color;
                             },
@@ -2910,7 +2894,8 @@
         };
         const lineStyle_lineStyle = (spec, context)=>{
             const { advancedVSeed } = context;
-            const { markStyle, encoding, dataset } = advancedVSeed;
+            const { markStyle, datasetReshapeInfo, dataset } = advancedVSeed;
+            const { unfoldInfo } = datasetReshapeInfo[0];
             const { lineStyle } = markStyle;
             if (!lineStyle) return spec;
             const result = {
@@ -2919,8 +2904,8 @@
             const lineStyles = Array.isArray(lineStyle) ? lineStyle : [
                 lineStyle
             ];
-            const group = encoding[0]?.group?.[0];
-            const lineGroups = chunk_HVPVHFDT_i(dataset, (d)=>d[group ?? '']);
+            const colorId = unfoldInfo.encodingColorId;
+            const lineGroups = chunk_HVPVHFDT_i(dataset, (d)=>d[colorId ?? '']);
             const customMap = lineStyles.reduce((result, style, index)=>{
                 const { lineColor, lineColorOpacity, lineSmooth, lineStyle, lineWidth = 2, lineVisible = true } = style;
                 const dashSegment = 2 * lineWidth;
@@ -2941,7 +2926,7 @@
                     [`custom${index + 1}`]: {
                         level: index + 1,
                         filter: (datum)=>{
-                            const lineData = lineGroups[datum[group ?? '']];
+                            const lineData = lineGroups[datum[colorId ?? '']];
                             for (const d of lineData)if (selector_selector(d, style.selector)) return true;
                             return false;
                         },
@@ -3039,7 +3024,8 @@
         }
         const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
             const { advancedVSeed } = context;
-            const { annotation, encoding } = advancedVSeed;
+            const { annotation, datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo } = datasetReshapeInfo[0];
             if (!annotation || !annotation.annotationVerticalLine) return spec;
             const { annotationVerticalLine } = annotation;
             const annotationVerticalLineList = Array.isArray(annotationVerticalLine) ? annotationVerticalLine : [
@@ -3119,7 +3105,7 @@
                 }
                 const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
                 return selectedData.map((datum)=>{
-                    const x = encoding[0]?.x?.[0];
+                    const x = unfoldInfo.encodingX;
                     if (!x) return {};
                     return generateOneMarkLine(datum[x]);
                 });
@@ -3136,7 +3122,8 @@
         };
         const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
             const { advancedVSeed } = context;
-            const { annotation, encoding } = advancedVSeed;
+            const { annotation, datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo } = datasetReshapeInfo[0];
             if (!annotation || !annotation.annotationHorizontalLine) return spec;
             const { annotationHorizontalLine } = annotation;
             const annotationVerticalLineList = Array.isArray(annotationHorizontalLine) ? annotationHorizontalLine : [
@@ -3216,7 +3203,7 @@
                 }
                 const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
                 return selectedData.map((datum)=>{
-                    const y = encoding[0]?.y?.[0];
+                    const y = unfoldInfo.encodingY;
                     if (!y) return {};
                     return generateOneMarkLine(datum[y]);
                 });
@@ -3497,13 +3484,10 @@
                     ...spec
                 };
                 const { advancedVSeed } = context;
-                const { measures, datasetReshapeInfo, encoding, dataset } = advancedVSeed;
+                const { measures, datasetReshapeInfo, dataset } = advancedVSeed;
                 const colorItems = chunk_QJLMYOTX_i(datasetReshapeInfo.flatMap((d)=>d.unfoldInfo.colorItems));
                 const indicators = datasetReshapeInfo.map((reshapeInfo, index)=>{
                     const measure = measures?.find((d)=>d.id === reshapeInfo.id);
-                    const newEncoding = [
-                        encoding[index]
-                    ];
                     const newDataset = dataset[index];
                     const newDatasetReshapeInfo = [
                         {
@@ -3519,8 +3503,7 @@
                         advancedVSeed: {
                             ...advancedVSeed,
                             datasetReshapeInfo: newDatasetReshapeInfo,
-                            dataset: newDataset,
-                            encoding: newEncoding
+                            dataset: newDataset
                         }
                     };
                     const chartSpec = execPipeline(chartPipeline, newContext, {});
@@ -3706,7 +3689,7 @@
                         }
                     },
                     label: {
-                        formatMethod: (value)=>colorIdMap[String(value)] ?? value,
+                        formatMethod: (value)=>colorIdMap[value] ?? value,
                         style: {
                             fontSize: labelFontSize,
                             fill: labelFontColor,
@@ -3789,151 +3772,18 @@
             Builder._advancedPipelineMap.line = lineAdvancedPipeline;
             Builder._specPipelineMap.line = lineSpecPipeline;
         };
-        const dataReshapeFor2D1M_emptyReshapeResult = {
-            dataset: [],
-            foldInfo: {
-                foldMap: {},
-                measureId: '',
-                measureName: '',
-                measureValue: ''
-            },
-            unfoldInfo: {
-                groupName: '',
-                groupId: '',
-                colorItems: [],
-                colorIdMap: {}
-            }
-        };
-        const dataReshapeFor2D1M = (dataset, dimensions, measures, options)=>{
-            const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, unfoldDimensionGroup = UnfoldDimensionGroup, unfoldDimensionGroupId = UnfoldDimensionGroupId } = options || {};
-            if (0 === dimensions.length && 0 === measures.length) return dataReshapeFor2D1M_emptyReshapeResult;
-            const { dataset: foldedDataset, foldInfo } = foldMeasures(dataset, measures, foldMeasureId, foldMeasureName, foldMeasureValue);
-            if (0 === dimensions.length) {
-                const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, [
-                    {
-                        id: foldMeasureId,
-                        alias: i18n`指标Id`,
-                        location: 'dimension'
-                    },
-                    {
-                        id: foldMeasureName,
-                        alias: i18n`指标名称`,
-                        location: 'dimension'
-                    }
-                ], [
-                    {
-                        id: foldMeasureValue,
-                        alias: i18n`指标值`
-                    }
-                ], 1, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
-                return {
-                    dataset: finalDataset,
-                    foldInfo,
-                    unfoldInfo
-                };
-            }
-            {
-                const onlyOneMeasure = 1 === measures.length;
-                const onlyOneDimension = 1 === dimensions.length;
-                const dims = [
-                    ...dimensions
-                ];
-                if (!onlyOneMeasure || onlyOneDimension) dims.push({
-                    id: foldMeasureName,
-                    alias: i18n`指标名称`,
-                    location: 'dimension'
-                });
-                const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, dims, [
-                    {
-                        id: foldMeasureValue,
-                        alias: i18n`指标值`
-                    }
-                ], 1, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
-                return {
-                    dataset: finalDataset,
-                    foldInfo,
-                    unfoldInfo
-                };
-            }
-        };
-        const reshapeTo2D1M = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { vseed } = context;
-            const { dataset } = vseed;
-            const { dimensions, measures } = advancedVSeed;
-            if (!measures || !dimensions || !dataset) return result;
-            if (0 === measures.length) throw new Error('measures can not be empty');
-            const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeFor2D1M(dataset, dimensions, measures);
-            return {
-                ...result,
-                dataset: newDatasets,
-                datasetReshapeInfo: [
-                    {
-                        id: '2D1M',
-                        index: 0,
-                        foldInfo,
-                        unfoldInfo
-                    }
-                ],
-                dimensions,
-                measures
-            };
-        };
-        const pivotReshapeTo2D1M = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { vseed } = context;
-            const { dataset } = vseed;
-            const { measures } = advancedVSeed;
-            const dimensions = advancedVSeed.dimensions;
-            if (!measures || !dimensions) return result;
-            const measureGroups = [];
-            if (measures) measures.forEach((measure)=>{
-                if (measure.children && measure.children.length > 0) measureGroups.push(measure);
-            });
-            const commonDimensions = dimensions.filter((dim)=>'dimension' === dim.location);
-            const newDatasets = [];
-            const datasetReshapeInfo = [];
-            measureGroups.forEach((measureGroup, index)=>{
-                const measures = measureGroup.children;
-                if (!measures) return;
-                const groupId = measureGroup.id;
-                const { dataset: newSubDataset, foldInfo, unfoldInfo } = dataReshapeFor2D1M(dataset, commonDimensions, measures, {
-                    foldMeasureId: FoldMeasureId,
-                    foldMeasureName: FoldMeasureName,
-                    foldMeasureValue: FoldMeasureValue + groupId,
-                    unfoldDimensionGroup: UnfoldDimensionGroup
-                });
-                const reshapeInfo = {
-                    id: groupId,
-                    index,
-                    foldInfo,
-                    unfoldInfo
-                };
-                newDatasets.push(newSubDataset);
-                datasetReshapeInfo.push(reshapeInfo);
-            });
-            return {
-                ...result,
-                dataset: newDatasets,
-                datasetReshapeInfo: datasetReshapeInfo
-            };
-        };
         const columnAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForColumn,
             pivotAdapter([
-                reshapeTo2D1M
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo2D1M
+                pivotReshapeWithEncoding
             ]),
-            encodingXY,
             sortXBandAxis,
-            sort_sortLegend,
+            sortLegend_sortLegend,
             columnConfig,
             theme_theme,
             markStyle_markStyle,
@@ -3944,13 +3794,13 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding } = advancedVSeed;
-            if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
             result.type = 'bar';
             result.direction = 'vertical';
-            result.xField = encoding[0].x[0];
-            result.yField = encoding[0].y[0];
-            result.seriesField = encoding[0].group[0];
+            result.xField = unfoldInfo.encodingX;
+            result.yField = foldInfo.measureValue;
+            result.seriesField = unfoldInfo.encodingColorId;
             result.padding = 0;
             result.region = [
                 {
@@ -4270,14 +4120,14 @@
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForColumn,
             pivotAdapter([
-                reshapeTo2D1M
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo2D1M
+                pivotReshapeWithEncoding
             ]),
-            encodingXY,
             sortXBandAxis,
-            sort_sortLegend,
+            sortLegend_sortLegend,
             columnParallelConfig,
             theme_theme,
             markStyle_markStyle,
@@ -4288,17 +4138,19 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding, datasetReshapeInfo } = advancedVSeed;
-            const { unfoldInfo } = datasetReshapeInfo[0];
-            if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
+            const { datasetReshapeInfo, dimensions } = advancedVSeed;
+            const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
+            const sameDimensionsMode = dimensions.length > 1 && dimensions.every((dim)=>dim.id === dimensions[0].id);
             result.type = 'bar';
             result.direction = 'vertical';
-            result.xField = [
-                encoding[0].x[0],
-                unfoldInfo.groupId
+            result.xField = sameDimensionsMode ? [
+                unfoldInfo.encodingX
+            ] : [
+                unfoldInfo.encodingX,
+                unfoldInfo.encodingDetail
             ];
-            result.yField = encoding[0].y[0];
-            result.seriesField = encoding[0].group[0];
+            result.yField = foldInfo.measureValue;
+            result.seriesField = unfoldInfo.encodingColorId;
             result.padding = 0;
             result.region = [
                 {
@@ -4365,14 +4217,14 @@
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForColumn,
             pivotAdapter([
-                reshapeTo2D1M
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo2D1M
+                pivotReshapeWithEncoding
             ]),
-            encodingXY,
             sortXBandAxis,
-            sort_sortLegend,
+            sortLegend_sortLegend,
             columnPercentConfig,
             theme_theme,
             markStyle_markStyle,
@@ -4442,55 +4294,70 @@
             Builder._advancedPipelineMap.columnPercent = columnPercentAdvancedPipeline;
             Builder._specPipelineMap.columnPercent = columnPercentSpecPipeline;
         };
-        const encodingYX = (advancedVSeed)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { datasetReshapeInfo, dimensions } = advancedVSeed;
-            if (!datasetReshapeInfo || !dimensions) return result;
-            const yDimension = dimensions.find((item)=>'rowDimension' !== item.location && 'columnDimension' !== item.location) || dimensions[0];
-            const isZeroDimension = 0 === dimensions.length;
-            const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
-                const { foldInfo, unfoldInfo } = cur;
-                const y = [
-                    isZeroDimension ? foldInfo.measureName : yDimension?.id
-                ];
-                const x = [
-                    foldInfo.measureValue
-                ];
-                const group = [
-                    unfoldInfo.groupId
-                ];
-                const color = [
-                    foldInfo.measureName
+        const encodingForBar = (advancedVSeed, context)=>{
+            const { vseed } = context;
+            const { dimensions } = advancedVSeed;
+            if (!dimensions) return advancedVSeed;
+            const encoding = vseed.encoding;
+            if (encoding) {
+                const y = encoding.y || [];
+                const detail = encoding.detail || [];
+                const color = encoding.color || [];
+                const mergedDetail = [
+                    ...color.filter((d)=>!y.includes(d)),
+                    ...detail
                 ];
-                return [
-                    ...prev,
-                    {
-                        x,
-                        y,
-                        group,
-                        color
+                return {
+                    ...advancedVSeed,
+                    encoding: {
+                        ...encoding,
+                        detail: mergedDetail
                     }
-                ];
-            }, []);
+                };
+            }
+            const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
+            const mergedEncoding = {
+                y: dimensions.slice(0, 1).map((item)=>item.id),
+                color: dimensions.slice(1).map((item)=>item.id),
+                detail: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
+                tooltip: dimensions.map((item)=>item.id),
+                label: [],
+                row: [],
+                column: []
+            };
             return {
-                ...result,
-                encoding
+                ...advancedVSeed,
+                encoding: mergedEncoding
+            };
+        };
+        const sortYBandAxis = (advancedVSeed, context)=>{
+            const result = {
+                ...advancedVSeed
             };
+            const { vseed } = context;
+            const { sort: sortAxis } = vseed;
+            const { datasetReshapeInfo, dataset } = advancedVSeed;
+            const { unfoldInfo } = datasetReshapeInfo[0];
+            const yField = unfoldInfo?.encodingY;
+            if (!sortAxis || !yField) return advancedVSeed;
+            if (!result.analysis) result.analysis = {};
+            if (!result.analysis.orderMapping) result.analysis.orderMapping = {};
+            const axisOrderResult = calcOrder(sortAxis, yField, dataset.flat(2));
+            result.analysis.orderMapping[yField] = axisOrderResult;
+            return result;
         };
         const barAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForBar,
             pivotAdapter([
-                reshapeTo2D1M
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo2D1M
+                pivotReshapeWithEncoding
             ]),
-            encodingYX,
             sortYBandAxis,
-            sort_sortLegend,
+            sortLegend_sortLegend,
             barConfig,
             theme_theme,
             markStyle_markStyle,
@@ -4501,13 +4368,13 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding } = advancedVSeed;
-            if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
             result.type = 'bar';
             result.direction = 'horizontal';
-            result.yField = encoding[0].y?.[0];
-            result.xField = encoding[0].x?.[0];
-            result.seriesField = encoding[0].group?.[0];
+            result.yField = unfoldInfo.encodingY;
+            result.xField = foldInfo.measureValue;
+            result.seriesField = unfoldInfo.encodingColorId;
             result.padding = 0;
             result.region = [
                 {
@@ -4519,11 +4386,12 @@
         };
         const datasetYX = (spec, context)=>{
             const { advancedVSeed, vseed } = context;
-            const { encoding, analysis, datasetReshapeInfo } = advancedVSeed;
+            const { analysis, datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo } = datasetReshapeInfo[0];
             const orderMapping = analysis?.orderMapping || {};
-            const angle = encoding[0]?.angle?.[0];
-            const y = encoding[0]?.y?.[0];
-            const group = encoding[0]?.group?.[0];
+            const angle = unfoldInfo.encodingAngle;
+            const y = unfoldInfo.encodingY;
+            const colorId = unfoldInfo.encodingColorId;
             const id = datasetReshapeInfo[0].id;
             const fields = {};
             if (angle) fields[angle] = {
@@ -4540,14 +4408,14 @@
                     sortIndex: 0
                 };
             }
-            if (group) {
-                const order = orderMapping[group];
-                if (order) fields[group] = {
+            if (colorId) {
+                const order = orderMapping[colorId];
+                if (order) fields[colorId] = {
                     sortIndex: 0,
                     domain: order,
                     lockStatisticsByDomain: true
                 };
-                else fields[group] = {
+                else fields[colorId] = {
                     sortIndex: 0
                 };
             }
@@ -4835,14 +4703,14 @@
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForBar,
             pivotAdapter([
-                reshapeTo2D1M
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo2D1M
+                pivotReshapeWithEncoding
             ]),
-            encodingYX,
             sortYBandAxis,
-            sort_sortLegend,
+            sortLegend_sortLegend,
             barParallelConfig,
             theme_theme,
             markStyle_markStyle,
@@ -4853,17 +4721,19 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding, datasetReshapeInfo } = advancedVSeed;
-            const { unfoldInfo } = datasetReshapeInfo[0];
-            if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
+            const { datasetReshapeInfo, dimensions } = advancedVSeed;
+            const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
+            const sameDimensionsMode = dimensions.length > 1 && dimensions.every((dim)=>dim.id === dimensions[0].id);
             result.type = 'bar';
             result.direction = 'horizontal';
-            result.yField = [
-                encoding[0].y[0],
-                unfoldInfo.groupId
+            result.yField = sameDimensionsMode ? [
+                unfoldInfo.encodingY
+            ] : [
+                unfoldInfo.encodingY,
+                unfoldInfo.encodingDetail
             ];
-            result.xField = encoding[0].x[0];
-            result.seriesField = encoding[0].group[0];
+            result.xField = foldInfo.measureValue;
+            result.seriesField = unfoldInfo.encodingColorId;
             result.padding = 0;
             result.region = [
                 {
@@ -4929,14 +4799,14 @@
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForBar,
             pivotAdapter([
-                reshapeTo2D1M
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo2D1M
+                pivotReshapeWithEncoding
             ]),
-            encodingYX,
             sortYBandAxis,
-            sort_sortLegend,
+            sortLegend_sortLegend,
             barPercentConfig,
             theme_theme,
             markStyle_markStyle,
@@ -5000,14 +4870,14 @@
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForColumn,
             pivotAdapter([
-                reshapeTo2D1M0Name
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo2D1M0Name
+                pivotReshapeWithEncoding
             ]),
-            encodingXY,
             sortXBandAxis,
-            sort_sortLegend,
+            sortLegend_sortLegend,
             areaConfig,
             theme_theme,
             markStyle_markStyle,
@@ -5018,13 +4888,13 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding } = advancedVSeed;
-            if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
             result.type = 'area';
             result.direction = 'vertical';
-            result.xField = encoding[0].x[0];
-            result.yField = encoding[0].y[0];
-            result.seriesField = encoding[0].group[0];
+            result.yField = foldInfo.measureValue;
+            result.xField = unfoldInfo.encodingX;
+            result.seriesField = unfoldInfo.encodingColorId;
             result.padding = 0;
             result.region = [
                 {
@@ -5036,8 +4906,9 @@
         };
         const areaStyle_areaStyle = (spec, context)=>{
             const { advancedVSeed } = context;
-            const { markStyle, encoding, dataset } = advancedVSeed;
+            const { markStyle, datasetReshapeInfo, dataset } = advancedVSeed;
             const { areaStyle } = markStyle;
+            const { unfoldInfo } = datasetReshapeInfo[0];
             if (!areaStyle) return {
                 ...spec,
                 area: {
@@ -5050,7 +4921,7 @@
             const areaStyles = Array.isArray(areaStyle) ? areaStyle : [
                 areaStyle
             ];
-            const group = encoding[0]?.group?.[0];
+            const group = unfoldInfo.encodingColorId;
             const areaGroups = chunk_HVPVHFDT_i(dataset, (d)=>d[group ?? '']);
             const customMap = areaStyles.reduce((result, style, index)=>{
                 const { areaColor, areaColorOpacity, areaVisible = true } = style;
@@ -5144,14 +5015,14 @@
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForColumn,
             pivotAdapter([
-                reshapeTo2D1M0Name
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo2D1M0Name
+                pivotReshapeWithEncoding
             ]),
-            encodingXY,
             sortXBandAxis,
-            sort_sortLegend,
+            sortLegend_sortLegend,
             areaPercentConfig,
             theme_theme,
             markStyle_markStyle,
@@ -5216,16 +5087,20 @@
             Builder._advancedPipelineMap.areaPercent = areaPercentAdvancedPipeline;
             Builder._specPipelineMap.areaPercent = areaPercentSpecPipeline;
         };
-        const autoMeasuresBy2M1Group = (advancedVSeed, context)=>{
+        const autoScatterMeasures = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
             };
             const { vseed } = context;
-            const { measures, dataset } = vseed;
+            const { dataset, scatterMeasures, measures } = vseed;
             if (!dataset) throw new Error('dataset is required');
             if (0 === dataset.length) return result;
-            if (measures) {
-                result.measures = auto2M1Group(measures);
+            if (scatterMeasures) {
+                result.measures = scatterMeasuresToMeasureTree(scatterMeasures);
+                return result;
+            }
+            if (measures && measureDepth(measures) > 1) {
+                result.measures = measures;
                 return result;
             }
             const top100dataset = dataset.slice(0, 100);
@@ -5233,7 +5108,7 @@
                     ...prev,
                     ...cur
                 }), {});
-            const newMeasures = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
+            const newMeasures = measures || Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
                     '',
                     null,
                     void 0
@@ -5241,693 +5116,277 @@
                     id: measure,
                     alias: measure
                 }));
-            result.measures = auto2M1Group(newMeasures);
+            if (0 === newMeasures.length) result.measures = [];
+            else if (1 === newMeasures.length) result.measures = [
+                {
+                    id: 'primary',
+                    alias: 'primary',
+                    children: newMeasures
+                }
+            ];
+            else if (newMeasures.length > 1) result.measures = [
+                {
+                    id: 'primary',
+                    alias: 'primary',
+                    children: newMeasures.slice(0, 1)
+                },
+                {
+                    id: 'secondary',
+                    alias: 'secondary',
+                    children: newMeasures.slice(1)
+                }
+            ];
             return result;
         };
-        const auto2M1Group = (measures)=>{
-            const allMeasures = findAllMeasures(measures);
-            if (allMeasures.length <= 2) return allMeasures;
-            const groups = measures.filter((measure)=>'children' in measure);
-            const singleMeasures = measures.filter((measure)=>!('children' in measure));
-            for(let i = 0; i < singleMeasures.length; i += 2){
-                const group = autoMeasuresBy2M1Group_createEmptyMeasureGroup();
-                group.children = allMeasures.slice(i, i + 2);
-                groups.push(group);
-            }
-            return groups;
-        };
-        const autoMeasuresBy2M1Group_createEmptyMeasureGroup = ()=>({
-                id: '',
-                alias: '',
-                children: []
+        const scatterMeasuresToMeasureTree = (scatterMeasures)=>{
+            const measureTree = scatterMeasures.map((item, index)=>{
+                const { xMeasures, yMeasures } = item;
+                const groupChildren = [];
+                let id = '';
+                if (xMeasures) {
+                    const arrXMeasures = Array.isArray(xMeasures) ? xMeasures : [
+                        xMeasures
+                    ];
+                    const alias = arrXMeasures.map((item)=>item.alias || item.id).toString();
+                    id += alias;
+                    groupChildren.push({
+                        id: `${index}-x`,
+                        alias: arrXMeasures.map((item)=>item.alias || item.id).toString(),
+                        children: arrXMeasures
+                    });
+                }
+                if (yMeasures) {
+                    const arrYMeasures = Array.isArray(yMeasures) ? yMeasures : [
+                        yMeasures
+                    ];
+                    const alias = arrYMeasures.map((item)=>item.alias || item.id).toString();
+                    id += alias;
+                    groupChildren.push({
+                        id: `${index}-y`,
+                        alias: arrYMeasures.map((item)=>item.alias || item.id).toString(),
+                        children: arrYMeasures
+                    });
+                }
+                return {
+                    id,
+                    alias: id,
+                    children: groupChildren
+                };
             });
-        const dataReshapeFor1D_emptyReshapeResult = {
-            dataset: [],
-            foldInfo: {
-                foldMap: {},
-                measureId: '',
-                measureName: '',
-                measureValue: ''
-            },
-            unfoldInfo: {
-                groupName: '',
-                groupId: '',
-                colorItems: [],
-                colorIdMap: {}
-            }
+            if (1 === scatterMeasures.length) return measureTree[0].children || [];
+            return measureTree;
         };
-        const dataReshapeFor1D = (dataset, dimensions, measures, options)=>{
-            const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, unfoldDimensionGroup = UnfoldDimensionGroup, unfoldDimensionGroupId = UnfoldDimensionGroupId } = options || {};
-            if (0 === dimensions.length && 0 === measures.length) return dataReshapeFor1D_emptyReshapeResult;
-            if (0 === dimensions.length) {
-                const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(dataset, [], [], 0, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
+        const encodingForScatter = (advancedVSeed, context)=>{
+            const { vseed } = context;
+            const { dimensions } = advancedVSeed;
+            if (!dimensions) return advancedVSeed;
+            const encoding = vseed.encoding;
+            if (encoding) {
+                const detail = encoding.detail || [];
+                const color = encoding.color || [];
+                const mergedDetail = chunk_QJLMYOTX_i([
+                    ...color,
+                    ...detail
+                ]);
                 return {
-                    dataset: finalDataset,
-                    foldInfo: {
-                        foldMap: {},
-                        measureId: foldMeasureId,
-                        measureName: foldMeasureName,
-                        measureValue: foldMeasureValue
-                    },
-                    unfoldInfo
-                };
-            }
-            {
-                const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(dataset, [
-                    ...dimensions
-                ], [
-                    {
-                        id: foldMeasureValue,
-                        alias: i18n`指标值`
+                    ...advancedVSeed,
+                    encoding: {
+                        ...encoding,
+                        detail: mergedDetail
                     }
-                ], 0, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
-                return {
-                    dataset: finalDataset,
-                    foldInfo: {
-                        foldMap: {},
-                        measureId: foldMeasureId,
-                        measureName: foldMeasureName,
-                        measureValue: foldMeasureValue
-                    },
-                    unfoldInfo
                 };
             }
+            const dimensionsWithoutMeasureName = dimensions.filter((item)=>item.id !== MeasureName);
+            const mergedEncoding = {
+                color: dimensions.slice(0).map((item)=>item.id),
+                detail: dimensionsWithoutMeasureName.slice(0).map((item)=>item.id),
+                tooltip: dimensionsWithoutMeasureName.map((item)=>item.id),
+                label: [],
+                row: [],
+                column: []
+            };
+            return {
+                ...advancedVSeed,
+                encoding: mergedEncoding
+            };
         };
-        const reshapeTo1D = (advancedVSeed, context)=>{
+        const reshapeWithScatterEncoding = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
             };
             const { vseed } = context;
             const { dataset } = vseed;
-            const { dimensions, measures } = advancedVSeed;
-            if (!measures || !dimensions || !dataset) return result;
+            const { dimensions, measures, encoding, chartType } = advancedVSeed;
+            if (!measures || !dimensions || !dataset || !encoding) return result;
             if (0 === measures.length) throw new Error('measures can not be empty');
-            const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeFor1D(dataset, dimensions, measures);
+            if (measures.length > 2) throw new Error('measures can not be more than 2');
+            const foldInfoList = [];
+            const unfoldInfoList = [];
+            const datasets = [];
+            const xMeasures = measures[0];
+            const yMeasures = measures[1] || xMeasures;
+            if (xMeasures && xMeasures.children) {
+                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, xMeasures.children, encoding, {
+                    foldMeasureValue: FoldXMeasureValue,
+                    colorItemAsId: true
+                });
+                datasets.push(newDataset);
+                foldInfoList.push(foldInfo);
+                unfoldInfoList.push(unfoldInfo);
+            }
+            if (yMeasures && yMeasures.children) {
+                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(datasets[0], dimensions, yMeasures.children, encoding, {
+                    foldMeasureValue: FoldYMeasureValue,
+                    colorItemAsId: true
+                });
+                datasets[0] = newDataset;
+                foldInfoList.push(foldInfo);
+                unfoldInfoList.push(unfoldInfo);
+            }
+            const unfoldInfo = {
+                ...unfoldInfoList[0],
+                colorItems: unfoldInfoList.flatMap((d)=>d.colorItems),
+                colorIdMap: unfoldInfoList.reduce((prev, cur)=>({
+                        ...prev,
+                        ...cur.colorIdMap
+                    }), {})
+            };
             return {
                 ...result,
-                dataset: newDatasets,
+                dataset: datasets[0],
                 datasetReshapeInfo: [
                     {
-                        id: '1D2M',
+                        id: String(chartType),
                         index: 0,
-                        foldInfo,
-                        unfoldInfo
+                        foldInfo: foldInfoList[0],
+                        foldInfoList: foldInfoList,
+                        unfoldInfo: unfoldInfo
                     }
                 ]
             };
         };
-        const pivotReshapeTo1D = (advancedVSeed, context)=>{
+        const pivotReshapeWithScatterEncoding = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
             };
             const { vseed } = context;
             const { dataset } = vseed;
-            const { measures } = advancedVSeed;
-            const dimensions = advancedVSeed.dimensions;
-            if (!measures || !dimensions) return result;
+            const { dimensions, measures, encoding, chartType } = advancedVSeed;
+            if (!measures || !dimensions || !dataset || !encoding) return result;
             const measureGroups = [];
-            if (measures) measures.forEach((measure)=>{
-                if (measure.children && measure.children.length > 0) measureGroups.push(measure);
+            const depth = measureDepth(measures);
+            if (3 === depth) measures.forEach((measure)=>{
+                measureGroups.push(measure.children);
             });
-            const newDatasets = [];
+            else if (2 === depth) measureGroups.push(measures);
+            const datasetList = [];
             const datasetReshapeInfo = [];
-            measureGroups.forEach((measureGroup, index)=>{
-                const measures = measureGroup.children;
-                if (!measures) return;
-                const commonDimensions = dimensions.filter((dim)=>'dimension' === dim.location);
-                const groupId = measureGroup.id;
-                const { dataset: newSubDataset, foldInfo, unfoldInfo } = dataReshapeFor1D(dataset, commonDimensions, measures, {
-                    foldMeasureId: FoldMeasureId,
-                    foldMeasureName: FoldMeasureName,
-                    foldMeasureValue: FoldMeasureValue + groupId,
-                    unfoldDimensionGroup: UnfoldDimensionGroup
-                });
+            measureGroups.forEach((measures, index)=>{
+                if (0 === measures.length) throw new Error('measures can not be empty');
+                if (measures.length > 2) throw new Error('measures can not be more than 2');
+                const foldInfoList = [];
+                const unfoldInfoList = [];
+                const datasets = [];
+                const xMeasures = measures[0];
+                const yMeasures = measures[1] || xMeasures;
+                if (xMeasures && xMeasures.children) {
+                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, xMeasures.children, encoding, {
+                        foldMeasureValue: `${FoldXMeasureValue}${index}`,
+                        colorItemAsId: true
+                    });
+                    datasets.push(newDataset);
+                    foldInfoList.push(foldInfo);
+                    unfoldInfoList.push(unfoldInfo);
+                }
+                if (yMeasures && yMeasures.children) {
+                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, yMeasures.children, encoding, {
+                        foldMeasureValue: `${FoldYMeasureValue}${index}`,
+                        colorItemAsId: true
+                    });
+                    datasets.push(newDataset);
+                    foldInfoList.push(foldInfo);
+                    unfoldInfoList.push(unfoldInfo);
+                }
+                const unfoldInfo = {
+                    ...unfoldInfoList[0],
+                    colorItems: unfoldInfoList.flatMap((d)=>d.colorItems),
+                    colorIdMap: unfoldInfoList.reduce((prev, cur)=>({
+                            ...prev,
+                            ...cur.colorIdMap
+                        }), {})
+                };
                 const reshapeInfo = {
-                    id: groupId,
+                    id: `${chartType}-${index}`,
                     index,
-                    foldInfo,
-                    unfoldInfo
+                    foldInfo: foldInfoList[0],
+                    foldInfoList: foldInfoList,
+                    unfoldInfo: unfoldInfo
                 };
-                newDatasets.push(newSubDataset);
                 datasetReshapeInfo.push(reshapeInfo);
+                datasetList.push(datasets[0].map((d, index)=>({
+                        ...d,
+                        ...datasets[1]?.[index] || {}
+                    })));
             });
             return {
                 ...result,
-                dataset: newDatasets,
+                dataset: datasetList,
                 datasetReshapeInfo: datasetReshapeInfo
             };
         };
-        const encodingAreaRange = (advancedVSeed)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { datasetReshapeInfo, measures } = advancedVSeed;
-            if (!datasetReshapeInfo || !measures) return result;
-            const encoding = datasetReshapeInfo.reduce((prev, cur, index)=>{
-                const measure = measures[index];
-                if ('children' in measure) {
-                    const m1 = measure.children?.[0];
-                    const m2 = measure.children?.[1] || m1;
-                    const { foldInfo, unfoldInfo } = cur;
-                    const x = [
-                        unfoldInfo.groupId
-                    ];
-                    const y = [
-                        m1?.id,
-                        m2?.id
-                    ];
-                    const group = [
-                        unfoldInfo.groupId
-                    ];
-                    const color = [
-                        foldInfo.measureName
-                    ];
-                    return [
-                        ...prev,
-                        {
-                            x,
-                            y,
-                            group,
-                            color
-                        }
-                    ];
-                }
-                {
-                    const m1 = measures[index];
-                    const m2 = measures[index + 1] || m1;
-                    const { foldInfo, unfoldInfo } = cur;
-                    const x = [
-                        unfoldInfo.groupId
-                    ];
-                    const y = [
-                        m1.id,
-                        m2.id
-                    ];
-                    const group = [
-                        unfoldInfo.groupId
-                    ];
-                    const color = [
-                        foldInfo.measureName
-                    ];
-                    return [
-                        ...prev,
-                        {
-                            x,
-                            y,
-                            group,
-                            color
-                        }
-                    ];
-                }
-            }, []);
-            return {
-                ...result,
-                encoding
-            };
-        };
-        const areaRangeAdvancedPipeline = [
+        const scatterAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasuresBy2M1Group,
+            autoScatterMeasures,
             autoDimensions_autoDimensions,
+            encodingForScatter,
             pivotAdapter([
-                reshapeTo1D
+                reshapeWithScatterEncoding
             ], [
-                pivotReshapeTo1D
+                pivotReshapeWithScatterEncoding
             ]),
-            encodingAreaRange,
-            sortXBandAxis,
-            areaConfig,
+            scatterConfig,
             theme_theme,
             markStyle_markStyle,
             annotation_annotation
         ];
-        const series = (...args)=>{
+        const initScatter = (spec, context)=>{
             const result = {
-                type: 'common',
-                padding: 0,
-                region: [
-                    {
-                        clip: true
-                    }
-                ]
+                ...spec
             };
-            return (_, context)=>{
-                result.series = args.map((pipeline)=>execPipeline(pipeline, context, {}));
-                return result;
+            const { advancedVSeed } = context;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo, foldInfoList } = datasetReshapeInfo[0];
+            result.type = 'scatter';
+            result.direction = 'vertical';
+            result.xField = foldInfoList?.[0].measureValue;
+            if (foldInfoList?.[1]) result.yField = foldInfoList[1].measureValue;
+            result.seriesField = unfoldInfo.encodingColorId;
+            result.padding = 0;
+            result.region = [
+                {
+                    clip: true
+                }
+            ];
+            result.animation = true;
+            return result;
+        };
+        const datasetScatter = (spec, context)=>{
+            const { advancedVSeed, vseed } = context;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const id = datasetReshapeInfo[0].id;
+            const fields = {};
+            return {
+                ...spec,
+                data: {
+                    id,
+                    values: isPivotChart(vseed) ? void 0 : advancedVSeed.dataset.flat(),
+                    fields: fields
+                }
             };
         };
-        const seriesDualAxis = (...args)=>{
+        const horizontalCrosshairLine = (spec, context)=>{
             const result = {
-                type: 'common',
-                padding: 0,
-                region: [
-                    {
-                        clip: true
-                    }
-                ]
-            };
-            const createDualContext = (context, index)=>{
-                const { advancedVSeed } = context;
-                const dataset = advancedVSeed.dataset[index];
-                return {
-                    ...context,
-                    advancedVSeed: {
-                        ...advancedVSeed,
-                        dataset: dataset
-                    }
-                };
-            };
-            return (_, context)=>{
-                result.series = args.map((pipeline, index)=>{
-                    const seriesContext = createDualContext(context, index);
-                    return execPipeline(pipeline, seriesContext, {});
-                });
-                return result;
-            };
-        };
-        const initAreaRange = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed } = context;
-            const { encoding } = advancedVSeed;
-            if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
-            const { color } = advancedVSeed.config.areaRange;
-            result.type = 'rangeArea';
-            result.direction = 'vertical';
-            result.stack = false;
-            result.xField = encoding[0].x[0];
-            result.yField = [
-                encoding[0].y[0],
-                encoding[0].y[1]
-            ];
-            result.animation = true;
-            result.area = {
-                style: {
-                    fill: color.colorScheme?.[0]
-                }
-            };
-            return result;
-        };
-        const initAreaRangeLine1 = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed } = context;
-            const { encoding } = advancedVSeed;
-            if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
-            const { color } = advancedVSeed.config.areaRange;
-            result.type = 'line';
-            result.direction = 'vertical';
-            result.stack = false;
-            result.xField = encoding[0].x[0];
-            result.yField = [
-                encoding[0].y[0]
-            ];
-            result.animation = true;
-            result.line = {
-                style: {
-                    stroke: color.colorScheme?.[0]
-                }
-            };
-            result.point = {
-                style: {
-                    visible: false,
-                    fill: color.colorScheme?.[0]
-                }
-            };
-            return result;
-        };
-        const initAreaRangeLine2 = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed } = context;
-            const { encoding } = advancedVSeed;
-            if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
-            const { color } = advancedVSeed.config.areaRange;
-            result.type = 'line';
-            result.direction = 'vertical';
-            result.stack = false;
-            result.xField = encoding[0].x[0];
-            result.yField = [
-                encoding[0].y[1]
-            ];
-            result.animation = true;
-            result.line = {
-                style: {
-                    stroke: color.colorScheme?.[0]
-                }
-            };
-            result.point = {
-                style: {
-                    visible: false,
-                    fill: color.colorScheme?.[0]
-                }
-            };
-            return result;
-        };
-        const tooltipDisable = (spec)=>{
-            const result = {
-                ...spec
-            };
-            result.tooltip = {
-                visible: false
-            };
-            return result;
-        };
-        const tooltipAreaRange = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed } = context;
-            const { measures, datasetReshapeInfo, chartType, locale, encoding } = advancedVSeed;
-            const baseConfig = advancedVSeed.config[chartType];
-            const { tooltip = {
-                enable: true
-            } } = baseConfig;
-            const { enable } = tooltip;
-            const { groupName } = datasetReshapeInfo[0].unfoldInfo;
-            const y = encoding[0]?.y || [];
-            result.tooltip = {
-                visible: enable,
-                dimension: {
-                    content: [
-                        {
-                            visible: true,
-                            key: (datum)=>datum && datum[groupName] || '',
-                            value: (datum)=>{
-                                if (!datum) return '';
-                                const text = y.map((id)=>{
-                                    const value = datum[id];
-                                    const measure = findMeasureById(measures, id);
-                                    if (!measure) return String(value);
-                                    const { format = {}, autoFormat = true } = measure;
-                                    if (!chunk_VCYTMP4D_n(format)) {
-                                        const formatter = createFormatter(format);
-                                        return formatter(value);
-                                    }
-                                    if (autoFormat) return autoFormatter(value, locale);
-                                    return String(value);
-                                });
-                                return text.join(' ~ ');
-                            },
-                            shapeType: 'rectRound'
-                        },
-                        ...y.map((id)=>{
-                            const measure = findMeasureById(measures, id);
-                            return {
-                                visible: true,
-                                key: measure?.alias || id,
-                                value: (datum)=>{
-                                    if (!datum) return '';
-                                    const value = datum[id];
-                                    const measure = findMeasureById(measures, id);
-                                    if (!measure) return String(value);
-                                    const { format = {}, autoFormat = true } = measure;
-                                    if (!chunk_VCYTMP4D_n(format)) {
-                                        const formatter = createFormatter(format);
-                                        return formatter(value);
-                                    }
-                                    if (autoFormat) return autoFormatter(value, locale);
-                                    return String(value);
-                                },
-                                shapeType: 'rectRound'
-                            };
-                        })
-                    ]
-                }
-            };
-            return result;
-        };
-        const areaRange = [
-            series([
-                initAreaRange,
-                areaStyle_areaStyle
-            ], [
-                initAreaRangeLine1,
-                lineStyle_lineStyle,
-                pointStyle_pointStyle,
-                pointStateDimensionHover,
-                tooltipDisable
-            ], [
-                initAreaRangeLine2,
-                lineStyle_lineStyle,
-                pointStyle_pointStyle,
-                pointStateDimensionHover,
-                tooltipDisable
-            ]),
-            datasetXY,
-            progressive,
-            background_backgroundColor,
-            xBand,
-            yLinear,
-            label_label,
-            tooltipAreaRange,
-            verticalCrosshairLine,
-            annotationPoint_annotationPoint,
-            annotationVerticalLine_annotationVerticalLine,
-            annotationHorizontalLine_annotationHorizontalLine,
-            annotationArea_annotationArea
-        ];
-        const pivotAreaRange = [
-            initPivot,
-            pivotGridStyle,
-            pivotIndicators_pivotIndicatorsAsRow,
-            datasetPivot,
-            pivotIndicators_pivotIndicators([
-                series([
-                    initAreaRange,
-                    areaStyle_areaStyle
-                ], [
-                    initAreaRangeLine1,
-                    lineStyle_lineStyle,
-                    pointStyle_pointStyle,
-                    pointStateDimensionHover,
-                    tooltipDisable
-                ], [
-                    initAreaRangeLine2,
-                    lineStyle_lineStyle,
-                    pointStyle_pointStyle,
-                    pointStateDimensionHover,
-                    tooltipDisable
-                ]),
-                background_backgroundColor,
-                datasetXY,
-                progressive,
-                xBand,
-                yLinear,
-                label_label,
-                tooltipAreaRange,
-                verticalCrosshairLine,
-                annotationPoint_annotationPoint,
-                annotationVerticalLine_annotationVerticalLine,
-                annotationHorizontalLine_annotationHorizontalLine,
-                annotationArea_annotationArea
-            ]),
-            pivotRowDimensions,
-            pivotColumnDimensions
-        ];
-        const areaRangeSpecPipeline = [
-            pivotAdapter_pivotAdapter(areaRange, pivotAreaRange)
-        ];
-        const registerAreaRange = ()=>{
-            Builder._advancedPipelineMap.areaRange = areaRangeAdvancedPipeline;
-            Builder._specPipelineMap.areaRange = areaRangeSpecPipeline;
-        };
-        const dataReshapeFor1D2M_emptyReshapeResult = {
-            dataset: [],
-            foldInfo: {
-                foldMap: {},
-                measureId: '',
-                measureName: '',
-                measureValue: ''
-            },
-            unfoldInfo: {
-                groupName: '',
-                groupId: '',
-                colorItems: [],
-                colorIdMap: {}
-            }
-        };
-        const dataReshapeFor1D2M = (dataset, dimensions, measures, options)=>{
-            const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, unfoldDimensionGroup = UnfoldDimensionGroup, unfoldDimensionGroupId = UnfoldDimensionGroupId } = options || {};
-            if (0 === dimensions.length && 0 === measures.length) return dataReshapeFor1D2M_emptyReshapeResult;
-            const { dataset: foldedDataset, foldInfo } = foldMeasures(dataset, measures.length > 1 ? measures.slice(1) : measures, foldMeasureId, foldMeasureName, foldMeasureValue);
-            if (0 === dimensions.length) {
-                const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, [
-                    {
-                        id: foldMeasureValue,
-                        alias: i18n`指标值`,
-                        location: 'dimension'
-                    }
-                ], [
-                    {
-                        id: foldMeasureValue,
-                        alias: i18n`指标值`
-                    }
-                ], 0, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
-                return {
-                    dataset: finalDataset,
-                    foldInfo,
-                    unfoldInfo
-                };
-            }
-            {
-                const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, [
-                    ...dimensions
-                ], [
-                    {
-                        id: foldMeasureValue,
-                        alias: i18n`指标值`
-                    }
-                ], 0, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
-                return {
-                    dataset: finalDataset,
-                    foldInfo,
-                    unfoldInfo
-                };
-            }
-        };
-        const reshapeTo1D2M = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { vseed } = context;
-            const { dataset } = vseed;
-            const { dimensions, measures } = advancedVSeed;
-            if (!measures || !dimensions || !dataset) return result;
-            if (0 === measures.length) throw new Error('measures can not be empty');
-            const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeFor1D2M(dataset, dimensions, measures);
-            return {
-                ...result,
-                dataset: newDatasets,
-                datasetReshapeInfo: [
-                    {
-                        id: '1D2M',
-                        index: 0,
-                        foldInfo,
-                        unfoldInfo
-                    }
-                ]
-            };
-        };
-        const pivotReshapeTo1D2M = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { vseed } = context;
-            const { dataset } = vseed;
-            const { measures } = advancedVSeed;
-            const dimensions = advancedVSeed.dimensions;
-            if (!measures || !dimensions) return result;
-            const measureGroups = [];
-            if (measures) measures.forEach((measure)=>{
-                if (measure.children && measure.children.length > 0) measureGroups.push(measure);
-            });
-            const newDatasets = [];
-            const datasetReshapeInfo = [];
-            measureGroups.forEach((measureGroup, index)=>{
-                const measures = measureGroup.children;
-                if (!measures) return;
-                const commonDimensions = dimensions.filter((dim)=>'dimension' === dim.location);
-                const groupId = measureGroup.id;
-                const { dataset: newSubDataset, foldInfo, unfoldInfo } = dataReshapeFor1D2M(dataset, commonDimensions, measures, {
-                    foldMeasureId: FoldMeasureId,
-                    foldMeasureName: FoldMeasureName,
-                    foldMeasureValue: FoldMeasureValue + groupId,
-                    unfoldDimensionGroup: UnfoldDimensionGroup
-                });
-                const reshapeInfo = {
-                    id: groupId,
-                    index,
-                    foldInfo,
-                    unfoldInfo
-                };
-                newDatasets.push(newSubDataset);
-                datasetReshapeInfo.push(reshapeInfo);
-            });
-            return {
-                ...result,
-                dataset: newDatasets,
-                datasetReshapeInfo: datasetReshapeInfo
-            };
-        };
-        const encodingYY = (advancedVSeed)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { datasetReshapeInfo, measures } = advancedVSeed;
-            if (!datasetReshapeInfo || !measures) return result;
-            const firstMeasure = findFirstMeasure(measures);
-            const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
-                const { foldInfo, unfoldInfo } = cur;
-                const x = [
-                    firstMeasure?.id
-                ];
-                const y = [
-                    foldInfo.measureValue
-                ];
-                const group = [
-                    unfoldInfo.groupId
-                ];
-                const color = [
-                    unfoldInfo.groupId
-                ];
-                return [
-                    ...prev,
-                    {
-                        x,
-                        y,
-                        group,
-                        color
-                    }
-                ];
-            }, []);
-            return {
-                ...result,
-                encoding
-            };
-        };
-        const scatterAdvancedPipeline = [
-            initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
-            autoDimensions_autoDimensions,
-            pivotAdapter([
-                reshapeTo1D2M
-            ], [
-                pivotReshapeTo1D2M
-            ]),
-            encodingYY,
-            scatterConfig,
-            theme_theme,
-            markStyle_markStyle,
-            annotation_annotation
-        ];
-        const initScatter = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed } = context;
-            const { encoding } = advancedVSeed;
-            if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
-            result.type = 'scatter';
-            result.direction = 'vertical';
-            result.xField = encoding[0].x[0];
-            result.yField = encoding[0].y[0];
-            result.seriesField = encoding[0].group[0];
-            result.padding = 0;
-            result.region = [
-                {
-                    clip: true
-                }
-            ];
-            result.animation = true;
-            return result;
-        };
-        const horizontalCrosshairLine = (spec, context)=>{
-            const result = {
-                ...spec
+                ...spec
             };
             const { advancedVSeed, vseed } = context;
             const { chartType } = vseed;
@@ -5973,7 +5432,7 @@
             initScatter,
             color_color,
             background_backgroundColor,
-            datasetXY,
+            datasetScatter,
             progressive,
             xLinear,
             yLinear,
@@ -5998,7 +5457,7 @@
                 initScatter,
                 color_color,
                 background_backgroundColor,
-                datasetXY,
+                datasetScatter,
                 progressive,
                 xLinear,
                 yLinear,
@@ -6024,41 +5483,163 @@
             Builder._advancedPipelineMap.scatter = scatterAdvancedPipeline;
             Builder._specPipelineMap.scatter = scatterSpecPipeline;
         };
-        const reshapeTo2D2M = (advancedVSeed, context)=>{
+        const autoDualMeasures = (advancedVSeed, context)=>{
+            const result = {
+                ...advancedVSeed
+            };
+            const { vseed } = context;
+            const { dataset, dualMeasures, measures } = vseed;
+            if (!dataset) throw new Error('dataset is required');
+            if (0 === dataset.length) return result;
+            if (dualMeasures) {
+                result.measures = dualMeasuresToMeasureTree(dualMeasures);
+                return result;
+            }
+            if (measures && measureDepth(measures) > 1) {
+                result.measures = measures;
+                return result;
+            }
+            const top100dataset = dataset.slice(0, 100);
+            const sample = top100dataset.reduce((prev, cur)=>({
+                    ...prev,
+                    ...cur
+                }), {});
+            const newMeasures = measures || Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
+                    '',
+                    null,
+                    void 0
+                ].includes(key)).map((measure)=>({
+                    id: measure,
+                    alias: measure
+                }));
+            if (0 === newMeasures.length) result.measures = [];
+            else if (1 === newMeasures.length) result.measures = [
+                {
+                    id: 'primary',
+                    alias: 'primary',
+                    children: newMeasures
+                }
+            ];
+            else if (newMeasures.length > 1) result.measures = [
+                {
+                    id: 'primary',
+                    alias: 'primary',
+                    children: newMeasures.slice(0, 1)
+                },
+                {
+                    id: 'secondary',
+                    alias: 'secondary',
+                    children: newMeasures.slice(1)
+                }
+            ];
+            return result;
+        };
+        const dualMeasuresToMeasureTree = (dualMeasures)=>{
+            const measureTree = dualMeasures.map((item, index)=>{
+                const { primaryMeasures, secondaryMeasures } = item;
+                const groupChildren = [];
+                let id = '';
+                if (primaryMeasures) {
+                    const arrPrimaryMeasures = Array.isArray(primaryMeasures) ? primaryMeasures : [
+                        primaryMeasures
+                    ];
+                    const alias = arrPrimaryMeasures.map((item)=>item.alias || item.id).toString();
+                    id += alias;
+                    groupChildren.push({
+                        id: `${index}-primary`,
+                        alias: arrPrimaryMeasures.map((item)=>item.alias || item.id).toString(),
+                        children: arrPrimaryMeasures
+                    });
+                }
+                if (secondaryMeasures) {
+                    const arrSecondaryMeasures = Array.isArray(secondaryMeasures) ? secondaryMeasures : [
+                        secondaryMeasures
+                    ];
+                    const alias = arrSecondaryMeasures.map((item)=>item.alias || item.id).toString();
+                    id += alias;
+                    groupChildren.push({
+                        id: `${index}-secondary`,
+                        alias: arrSecondaryMeasures.map((item)=>item.alias || item.id).toString(),
+                        children: arrSecondaryMeasures
+                    });
+                }
+                return {
+                    id,
+                    alias: id,
+                    children: groupChildren
+                };
+            });
+            if (1 === dualMeasures.length) return measureTree[0].children || [];
+            return measureTree;
+        };
+        const encodingForDualAxis = (advancedVSeed, context)=>{
+            const { vseed } = context;
+            const { dimensions } = advancedVSeed;
+            if (!dimensions) return advancedVSeed;
+            const encoding = vseed.encoding;
+            if (encoding) {
+                const x = encoding.x || [];
+                const detail = encoding.detail || [];
+                const color = encoding.color || [];
+                const mergedDetail = [
+                    ...color.filter((d)=>!x.includes(d)),
+                    ...detail
+                ];
+                return {
+                    ...advancedVSeed,
+                    encoding: {
+                        ...encoding,
+                        detail: mergedDetail
+                    }
+                };
+            }
+            const mergedEncoding = {
+                x: dimensions.slice(0, 1).map((item)=>item.id),
+                color: dimensions.slice(1).map((item)=>item.id),
+                detail: dimensions.slice(1).map((item)=>item.id),
+                tooltip: dimensions.map((item)=>item.id),
+                label: [],
+                row: [],
+                column: []
+            };
+            return {
+                ...advancedVSeed,
+                encoding: mergedEncoding
+            };
+        };
+        const reshapeWithDualEncoding = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
             };
             const { vseed } = context;
             const { dataset } = vseed;
-            const { dimensions, measures } = advancedVSeed;
-            if (!measures || !dimensions || !dataset) return result;
+            const { dimensions, measures, encoding, chartType } = advancedVSeed;
+            if (!measures || !dimensions || !dataset || !encoding) return result;
             if (0 === measures.length) throw new Error('measures can not be empty');
             if (measures.length > 2) throw new Error('measures can not be more than 2');
-            const commonDimensions = dimensions.filter((dim)=>'dimension' === dim.location);
-            const datasets = [];
             const foldInfoList = [];
             const unfoldInfoList = [];
+            const datasets = [];
             const primaryMeasures = measures[0];
             const secondaryMeasures = measures[1] || [];
             if (primaryMeasures && primaryMeasures.children) {
-                const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeFor2D1M(dataset, commonDimensions, primaryMeasures.children, {
+                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, primaryMeasures.children, encoding, {
                     foldMeasureValue: FoldPrimaryMeasureValue
                 });
-                datasets.push(newDatasets);
+                datasets.push(newDataset);
                 foldInfoList.push(foldInfo);
                 unfoldInfoList.push(unfoldInfo);
             }
             if (secondaryMeasures && secondaryMeasures.children) {
-                const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeFor2D1M(dataset, commonDimensions, secondaryMeasures.children, {
+                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, secondaryMeasures.children, encoding, {
                     foldMeasureValue: FoldSecondaryMeasureValue
                 });
-                datasets.push(newDatasets);
+                datasets.push(newDataset);
                 foldInfoList.push(foldInfo);
                 unfoldInfoList.push(unfoldInfo);
             }
             const unfoldInfo = {
-                groupName: unfoldInfoList[0].groupName,
-                groupId: unfoldInfoList[0].groupId,
+                ...unfoldInfoList[0],
                 colorItems: unfoldInfoList.flatMap((d)=>d.colorItems),
                 colorIdMap: unfoldInfoList.reduce((prev, cur)=>({
                         ...prev,
@@ -6070,7 +5651,7 @@
                 dataset: datasets,
                 datasetReshapeInfo: [
                     {
-                        id: '2D2M',
+                        id: String(chartType),
                         index: 0,
                         foldInfo: foldInfoList[0],
                         foldInfoList: foldInfoList,
@@ -6079,46 +5660,48 @@
                 ]
             };
         };
-        const pivotReshapeTo2D2M = (advancedVSeed, context)=>{
+        const pivotReshapeWithDualEncoding = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
             };
             const { vseed } = context;
             const { dataset } = vseed;
-            const { dimensions, measures } = advancedVSeed;
-            if (!measures || !dimensions || !dataset) return result;
-            const commonDimensions = dimensions.filter((dim)=>'dimension' === dim.location);
+            const { dimensions, measures, encoding, chartType } = advancedVSeed;
+            if (!measures || !dimensions || !dataset || !encoding) return result;
             const datasetList = [];
             const datasetReshapeInfo = [];
-            measures.forEach((measureGroup, index)=>{
-                const measures = measureGroup.children || [];
+            const measureGroups = [];
+            const depth = measureDepth(measures);
+            if (3 === depth) measures.forEach((measure)=>{
+                measureGroups.push(measure.children);
+            });
+            else if (2 === depth) measureGroups.push(measures);
+            measureGroups.forEach((measures, index)=>{
                 if (0 === measures.length) throw new Error('measures can not be empty');
                 if (measures.length > 2) throw new Error('measures can not be more than 2');
-                const datasets = [];
                 const foldInfoList = [];
                 const unfoldInfoList = [];
+                const datasets = [];
                 const primaryMeasures = measures[0];
-                const secondaryMeasures = measures[1] || measures[0];
+                const secondaryMeasures = measures[1] || [];
                 if (primaryMeasures && primaryMeasures.children) {
-                    const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeFor2D1M(dataset, commonDimensions, primaryMeasures.children, {
+                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, primaryMeasures.children, encoding, {
                         foldMeasureValue: `${FoldPrimaryMeasureValue}${index}`
                     });
-                    datasets.push(newDatasets);
+                    datasets.push(newDataset);
                     foldInfoList.push(foldInfo);
                     unfoldInfoList.push(unfoldInfo);
                 }
                 if (secondaryMeasures && secondaryMeasures.children) {
-                    const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeFor2D1M(dataset, commonDimensions, secondaryMeasures.children, {
+                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, secondaryMeasures.children, encoding, {
                         foldMeasureValue: `${FoldSecondaryMeasureValue}${index}`
                     });
-                    datasets.push(newDatasets);
+                    datasets.push(newDataset);
                     foldInfoList.push(foldInfo);
                     unfoldInfoList.push(unfoldInfo);
                 }
-                datasetList.push(datasets.flat(2));
                 const unfoldInfo = {
-                    groupName: unfoldInfoList[0].groupName,
-                    groupId: unfoldInfoList[0].groupId,
+                    ...unfoldInfoList[0],
                     colorItems: unfoldInfoList.flatMap((d)=>d.colorItems),
                     colorIdMap: unfoldInfoList.reduce((prev, cur)=>({
                             ...prev,
@@ -6126,53 +5709,19 @@
                         }), {})
                 };
                 const reshapeInfo = {
-                    id: `2D2M-${index}`,
+                    id: `${chartType}-${index}`,
                     index,
                     foldInfo: foldInfoList[0],
-                    unfoldInfo: unfoldInfo,
-                    foldInfoList: foldInfoList
+                    foldInfoList: foldInfoList,
+                    unfoldInfo: unfoldInfo
                 };
                 datasetReshapeInfo.push(reshapeInfo);
+                datasetList.push(datasets.flat(2));
             });
             return {
                 ...result,
                 dataset: datasetList,
-                datasetReshapeInfo
-            };
-        };
-        const encodingXYY = (advancedVSeed)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { datasetReshapeInfo, dimensions } = advancedVSeed;
-            if (!datasetReshapeInfo || !dimensions) return result;
-            const xDimension = dimensions.find((item)=>'rowDimension' !== item.location && 'columnDimension' !== item.location) || dimensions[0];
-            const isZeroDimension = 0 === dimensions.length;
-            const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
-                const { foldInfoList, unfoldInfo } = cur;
-                const x = [
-                    isZeroDimension ? foldInfoList[0].measureName : xDimension?.id
-                ];
-                const y = foldInfoList.map((d)=>d.measureValue);
-                const group = [
-                    unfoldInfo.groupId
-                ];
-                const color = [
-                    foldInfoList[0].measureName
-                ];
-                return [
-                    ...prev,
-                    {
-                        x,
-                        y,
-                        group,
-                        color
-                    }
-                ];
-            }, []);
-            return {
-                ...result,
-                encoding
+                datasetReshapeInfo: datasetReshapeInfo
             };
         };
         const dualAxisConfig = (advancedVSeed, context)=>{
@@ -6201,125 +5750,80 @@
             };
             return result;
         };
-        const autoDualMeasures = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { vseed } = context;
-            const { dataset, dualMeasures, measures } = vseed;
-            if (!dataset) throw new Error('dataset is required');
-            if (0 === dataset.length) return result;
-            if (dualMeasures) {
-                result.measures = dualMeasuresToMeasureTree(dualMeasures);
-                return result;
-            }
-            if (measures && measureDepth(measures) > 1) {
-                result.measures = measures;
-                return result;
-            }
-            const top100dataset = dataset.slice(0, 100);
-            const sample = top100dataset.reduce((prev, cur)=>({
-                    ...prev,
-                    ...cur
-                }), {});
-            const newMeasures = measures || Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
-                    '',
-                    null,
-                    void 0
-                ].includes(key)).map((measure)=>({
-                    id: measure,
-                    alias: measure
-                }));
-            if (0 === newMeasures.length) result.measures = [];
-            else if (1 === newMeasures.length) result.measures = [
-                {
-                    id: 'primary',
-                    alias: 'primary',
-                    children: newMeasures
-                }
-            ];
-            else if (newMeasures.length > 1) result.measures = [
-                {
-                    id: 'primary',
-                    alias: 'primary',
-                    children: newMeasures.slice(0, 1)
-                },
-                {
-                    id: 'secondary',
-                    alias: 'secondary',
-                    children: newMeasures.slice(1)
-                }
-            ];
-            return result;
-        };
-        const dualMeasuresToMeasureTree = (dualMeasures)=>{
-            const measureTree = dualMeasures.map((item, index)=>{
-                const { primaryMeasures, secondaryMeasures } = item;
-                const groupChildren = [];
-                let id = '';
-                if (primaryMeasures) {
-                    const arrPrimaryMeasures = Array.isArray(primaryMeasures) ? primaryMeasures : [
-                        primaryMeasures
-                    ];
-                    const alias = arrPrimaryMeasures.map((item)=>item.alias || item.id).toString();
-                    id += alias;
-                    groupChildren.push({
-                        id: `${index}-primary`,
-                        alias: arrPrimaryMeasures.map((item)=>item.alias || item.id).toString(),
-                        children: arrPrimaryMeasures
-                    });
-                }
-                if (secondaryMeasures) {
-                    const arrSecondaryMeasures = Array.isArray(secondaryMeasures) ? secondaryMeasures : [
-                        secondaryMeasures
-                    ];
-                    const alias = arrSecondaryMeasures.map((item)=>item.alias || item.id).toString();
-                    id += alias;
-                    groupChildren.push({
-                        id: `${index}-secondary`,
-                        alias: arrSecondaryMeasures.map((item)=>item.alias || item.id).toString(),
-                        children: arrSecondaryMeasures
-                    });
-                }
-                return {
-                    id,
-                    alias: id,
-                    children: groupChildren
-                };
-            });
-            if (1 === dualMeasures.length) return measureTree[0].children || [];
-            return measureTree;
-        };
         const dualAxisAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             autoDualMeasures,
             autoDimensions_autoDimensions,
+            encodingForDualAxis,
             pivotAdapter([
-                reshapeTo2D2M
+                reshapeWithDualEncoding
             ], [
-                pivotReshapeTo2D2M
+                pivotReshapeWithDualEncoding
             ]),
-            encodingXYY,
             sortXBandAxis,
-            sort_sortLegend,
+            sortLegend_sortLegend,
             dualAxisConfig,
             theme_theme,
             markStyle_markStyle,
             annotation_annotation
         ];
+        const series = (...args)=>{
+            const result = {
+                type: 'common',
+                padding: 0,
+                region: [
+                    {
+                        clip: true
+                    }
+                ]
+            };
+            return (_, context)=>{
+                result.series = args.map((pipeline)=>execPipeline(pipeline, context, {}));
+                return result;
+            };
+        };
+        const seriesDualAxis = (...args)=>{
+            const result = {
+                type: 'common',
+                padding: 0,
+                region: [
+                    {
+                        clip: true
+                    }
+                ]
+            };
+            const createDualContext = (context, index)=>{
+                const { advancedVSeed } = context;
+                const dataset = advancedVSeed.dataset[index];
+                return {
+                    ...context,
+                    advancedVSeed: {
+                        ...advancedVSeed,
+                        dataset: dataset
+                    }
+                };
+            };
+            return (_, context)=>{
+                result.series = args.map((pipeline, index)=>{
+                    const seriesContext = createDualContext(context, index);
+                    return execPipeline(pipeline, seriesContext, {});
+                });
+                return result;
+            };
+        };
         const initDualAxisPrimary = (spec, context)=>{
             const result = {
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding, datasetReshapeInfo } = advancedVSeed;
-            if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
-            result.id = `${datasetReshapeInfo[0].id}-primary-series`;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo, foldInfoList, id } = datasetReshapeInfo[0];
+            result.id = `${id}-primary-series`;
             result.type = 'bar';
             result.direction = 'vertical';
-            result.xField = encoding[0].x[0];
-            result.yField = encoding[0].y[0];
-            result.seriesField = encoding[0].group[0];
+            result.xField = unfoldInfo.encodingX;
+            result.seriesField = unfoldInfo.encodingColorId;
+            result.yField = foldInfoList?.[0].measureValue;
             result.animation = true;
             return result;
         };
@@ -6328,14 +5832,14 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding, datasetReshapeInfo } = advancedVSeed;
-            if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
-            result.id = `${datasetReshapeInfo[0].id}-secondary-series`;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo, foldInfoList, id } = datasetReshapeInfo[0];
+            result.id = `${id}-secondary-series`;
             result.type = 'line';
             result.direction = 'vertical';
-            result.xField = encoding[0].x[0];
-            result.yField = encoding[0].y[1];
-            result.seriesField = encoding[0].group[0];
+            result.xField = unfoldInfo.encodingX;
+            if (foldInfoList?.[1]) result.yField = foldInfoList[1].measureValue;
+            result.seriesField = unfoldInfo.encodingColorId;
             result.animation = true;
             return result;
         };
@@ -6367,10 +5871,10 @@
                 case 'columnParallel':
                     {
                         const columnSpec = result;
-                        if (Array.isArray(columnSpec.xField)) columnSpec.xField.push(datasetReshapeInfo[0].unfoldInfo.groupId);
+                        if (Array.isArray(columnSpec.xField)) columnSpec.xField.push(datasetReshapeInfo[0].unfoldInfo.encodingDetail);
                         else if (columnSpec.xField) columnSpec.xField = [
                             columnSpec.xField,
-                            datasetReshapeInfo[0].unfoldInfo.groupId
+                            datasetReshapeInfo[0].unfoldInfo.encodingDetail
                         ];
                         columnSpec.type = 'bar';
                         result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
@@ -6423,10 +5927,10 @@
                 case 'columnParallel':
                     {
                         const columnSpec = result;
-                        if (Array.isArray(columnSpec.xField)) columnSpec.xField.push(datasetReshapeInfo[0].unfoldInfo.groupId);
+                        if (Array.isArray(columnSpec.xField)) columnSpec.xField.push(datasetReshapeInfo[0].unfoldInfo.encodingDetail);
                         else if (columnSpec.xField) columnSpec.xField = [
                             columnSpec.xField,
-                            datasetReshapeInfo[0].unfoldInfo.groupId
+                            datasetReshapeInfo[0].unfoldInfo.encodingDetail
                         ];
                         columnSpec.type = 'bar';
                         result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
@@ -6453,10 +5957,11 @@
         };
         const datasetPrimary = (spec, context)=>{
             const { advancedVSeed, vseed } = context;
-            const { encoding, analysis, datasetReshapeInfo } = advancedVSeed;
+            const { analysis, datasetReshapeInfo } = advancedVSeed;
             const orderMapping = analysis?.orderMapping || {};
-            const x = encoding[0]?.x?.[0];
-            const group = encoding[0]?.group?.[0];
+            const { unfoldInfo } = datasetReshapeInfo[0];
+            const x = unfoldInfo.encodingX;
+            const colorId = unfoldInfo.encodingColorId;
             const id = datasetReshapeInfo[0].id;
             const fields = {};
             if (x) {
@@ -6470,14 +5975,14 @@
                     sortIndex: 0
                 };
             }
-            if (group) {
-                const order = orderMapping[group];
-                if (order) fields[group] = {
+            if (colorId) {
+                const order = orderMapping[colorId];
+                if (order) fields[colorId] = {
                     sortIndex: 0,
                     domain: order,
                     lockStatisticsByDomain: true
                 };
-                else fields[group] = {
+                else fields[colorId] = {
                     sortIndex: 0
                 };
             }
@@ -6492,10 +5997,11 @@
         };
         const datasetSecondary = (spec, context)=>{
             const { advancedVSeed, vseed } = context;
-            const { encoding, analysis, datasetReshapeInfo } = advancedVSeed;
+            const { analysis, datasetReshapeInfo } = advancedVSeed;
             const orderMapping = analysis?.orderMapping || {};
-            const x = encoding[0]?.x?.[0];
-            const group = encoding[0]?.group?.[0];
+            const { unfoldInfo } = datasetReshapeInfo[0];
+            const x = unfoldInfo.encodingX;
+            const colorId = unfoldInfo.encodingColorId;
             const id = datasetReshapeInfo[0].id;
             const fields = {};
             if (x) {
@@ -6509,14 +6015,14 @@
                     sortIndex: 0
                 };
             }
-            if (group) {
-                const order = orderMapping[group];
-                if (order) fields[group] = {
+            if (colorId) {
+                const order = orderMapping[colorId];
+                if (order) fields[colorId] = {
                     sortIndex: 0,
                     domain: order,
                     lockStatisticsByDomain: true
                 };
-                else fields[group] = {
+                else fields[colorId] = {
                     sortIndex: 0
                 };
             }
@@ -6614,7 +6120,7 @@
             const foldInfoList = datasetReshapeInfo[0].foldInfoList;
             const unfoldInfo = datasetReshapeInfo[0].unfoldInfo;
             const { measureId, measureValue, measureName } = foldInfoList[0];
-            const { groupName } = unfoldInfo;
+            const { encodingColor: colorName } = unfoldInfo;
             result.tooltip = {
                 visible: enable,
                 mark: {
@@ -6635,7 +6141,7 @@
                         {
                             visible: true,
                             hasShape: true,
-                            key: (datum)=>datum && datum[measureName || groupName] || '',
+                            key: (datum)=>datum && datum[measureName || colorName] || '',
                             value: (datum)=>{
                                 if (!datum) return '';
                                 const value = datum[measureValue];
@@ -6657,7 +6163,7 @@
                     content: [
                         {
                             visible: true,
-                            key: (datum)=>datum && datum[groupName] || '',
+                            key: (datum)=>datum && datum[colorName] || '',
                             value: (datum)=>{
                                 if (!datum) return '';
                                 const value = datum[measureValue];
@@ -6694,7 +6200,7 @@
             const foldInfoList = datasetReshapeInfo[0].foldInfoList;
             const unfoldInfo = datasetReshapeInfo[0].unfoldInfo;
             const { measureId, measureValue, measureName } = foldInfoList[1];
-            const { groupName } = unfoldInfo;
+            const { encodingColorId } = unfoldInfo;
             result.tooltip = {
                 visible: enable,
                 mark: {
@@ -6715,7 +6221,7 @@
                         {
                             visible: true,
                             hasShape: true,
-                            key: (datum)=>datum && datum[measureName || groupName] || '',
+                            key: (datum)=>datum && datum[measureName || encodingColorId] || '',
                             value: (datum)=>{
                                 if (!datum) return '';
                                 const value = datum[measureValue];
@@ -6737,7 +6243,7 @@
                     content: [
                         {
                             visible: true,
-                            key: (datum)=>datum && datum[groupName] || '',
+                            key: (datum)=>datum && datum[encodingColorId] || '',
                             value: (datum)=>{
                                 if (!datum) return '';
                                 const value = datum[measureValue];
@@ -6766,16 +6272,16 @@
             const { advancedVSeed, vseed } = context;
             const { chartType } = vseed;
             const { locale, datasetReshapeInfo } = advancedVSeed;
-            const index = datasetReshapeInfo[0].index;
+            const { index, id: reshapeInfoId, foldInfoList } = datasetReshapeInfo[0];
             const primaryYAxis = advancedVSeed.config?.[chartType]?.primaryYAxis;
             const yAxisConfig = Array.isArray(primaryYAxis) ? primaryYAxis[index] || primaryYAxis[0] : primaryYAxis;
             const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
             const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
-            if (datasetReshapeInfo[0].foldInfoList?.[0] && chunk_VCYTMP4D_n(datasetReshapeInfo[0].foldInfoList[0].foldMap)) return result;
-            const id = `${datasetReshapeInfo[0].id}-primary-axis`;
+            if (foldInfoList?.[0] && chunk_VCYTMP4D_n(foldInfoList[0].foldMap)) return result;
+            const id = `${reshapeInfoId}-primary-axis`;
             const seriesIds = [
-                `${datasetReshapeInfo[0].id}-primary-series`,
-                `${datasetReshapeInfo[0].id}-secondary-series`
+                `${reshapeInfoId}-primary-series`,
+                `${reshapeInfoId}-secondary-series`
             ];
             const seriesId = alignTicksConfig ? seriesIds : seriesIds[0];
             if (!result.axes) result.axes = [];
@@ -6863,20 +6369,20 @@
             const { advancedVSeed, vseed } = context;
             const { chartType } = vseed;
             const { locale, datasetReshapeInfo } = advancedVSeed;
-            const index = datasetReshapeInfo[0].index;
+            const { index, id: reshapeInfoId, foldInfoList } = datasetReshapeInfo[0];
             const secondaryYAxis = advancedVSeed.config?.[chartType]?.secondaryYAxis;
             const yAxisConfig = Array.isArray(secondaryYAxis) ? secondaryYAxis[index] || secondaryYAxis[0] : secondaryYAxis;
             const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
             const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
-            if (chunk_JK3VNB42_n(datasetReshapeInfo[0].foldInfoList?.[1])) return result;
+            if (chunk_JK3VNB42_n(foldInfoList?.[1])) return result;
             const sync = {
-                axisId: `${datasetReshapeInfo[0].id}-primary-axis`,
+                axisId: `${reshapeInfoId}-primary-axis`,
                 zeroAlign: true
             };
-            const id = `${datasetReshapeInfo[0].id}-secondary-axis`;
+            const id = `${reshapeInfoId}-secondary-axis`;
             const seriesIds = [
-                `${datasetReshapeInfo[0].id}-primary-series`,
-                `${datasetReshapeInfo[0].id}-secondary-series`
+                `${reshapeInfoId}-primary-series`,
+                `${reshapeInfoId}-secondary-series`
             ];
             const seriesId = alignTicksConfig ? seriesIds : seriesIds[1];
             if (!result.axes) result.axes = [];
@@ -7017,210 +6523,74 @@
                     areaStyle_areaStyle
                 ], [
                     initDualAxisSecondary,
-                    dualChartTypeSecondary,
-                    datasetSecondary,
-                    labelSecondary,
-                    tooltipSecondary,
-                    progressive,
-                    barStyle_barStyle,
-                    pointStyle_pointStyle,
-                    pointStateDimensionHover,
-                    lineStyle_lineStyle,
-                    areaStyle_areaStyle
-                ]),
-                xBand,
-                yLinearPrimary,
-                yLinearSecondary,
-                color_color,
-                background_backgroundColor,
-                verticalCrosshairRect,
-                annotationPoint_annotationPoint,
-                annotationVerticalLine_annotationVerticalLine,
-                annotationHorizontalLine_annotationHorizontalLine,
-                annotationArea_annotationArea
-            ]),
-            pivotRowDimensions,
-            pivotColumnDimensions,
-            pivotDiscreteLegend
-        ];
-        const dualAxisSpecPipeline = [
-            pivotAdapter_pivotAdapter(dualAxis, pivotDualAxis)
-        ];
-        const registerDualAxis = ()=>{
-            Builder._advancedPipelineMap.dualAxis = dualAxisAdvancedPipeline;
-            Builder._specPipelineMap.dualAxis = dualAxisSpecPipeline;
-        };
-        const dataReshapeFor1D1M_emptyReshapeResult = {
-            dataset: [],
-            foldInfo: {
-                foldMap: {},
-                measureId: '',
-                measureName: '',
-                measureValue: ''
-            },
-            unfoldInfo: {
-                groupName: '',
-                groupId: '',
-                colorItems: [],
-                colorIdMap: {}
-            }
-        };
-        const dataReshapeFor1D1M = (dataset, dimensions, measures, options)=>{
-            const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, unfoldDimensionGroup = UnfoldDimensionGroup, unfoldDimensionGroupId = UnfoldDimensionGroupId } = options || {};
-            if (0 === dimensions.length && 0 === measures.length) return dataReshapeFor1D1M_emptyReshapeResult;
-            const { dataset: foldedDataset, foldInfo } = foldMeasures(dataset, measures, foldMeasureId, foldMeasureName, foldMeasureValue);
-            if (0 === dimensions.length) {
-                const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, [
-                    {
-                        id: foldMeasureName,
-                        alias: i18n`指标名称`,
-                        location: 'dimension'
-                    }
-                ], [
-                    {
-                        id: foldMeasureValue,
-                        alias: i18n`指标值`
-                    }
-                ], 0, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
-                return {
-                    dataset: finalDataset,
-                    foldInfo,
-                    unfoldInfo
-                };
-            }
-            {
-                const dims = 1 === measures.length ? [
-                    ...dimensions
-                ] : [
-                    ...dimensions,
-                    {
-                        id: foldMeasureName,
-                        alias: i18n`指标名称`,
-                        location: 'dimension'
-                    }
-                ];
-                const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, dims, [
-                    {
-                        id: foldMeasureValue,
-                        alias: i18n`指标值`
-                    }
-                ], 0, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
-                return {
-                    dataset: finalDataset,
-                    foldInfo,
-                    unfoldInfo
-                };
-            }
-        };
-        const reshapeTo1D1M = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { vseed } = context;
-            const { dataset } = vseed;
-            const { dimensions, measures } = advancedVSeed;
-            if (!measures || !dimensions || !dataset) return result;
-            if (0 === measures.length) throw new Error('measures can not be empty');
-            const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeFor1D1M(dataset, dimensions, measures);
-            return {
-                ...result,
-                dataset: newDatasets,
-                datasetReshapeInfo: [
-                    {
-                        id: '1D1M',
-                        index: 0,
-                        foldInfo,
-                        unfoldInfo
-                    }
-                ]
-            };
+                    dualChartTypeSecondary,
+                    datasetSecondary,
+                    labelSecondary,
+                    tooltipSecondary,
+                    progressive,
+                    barStyle_barStyle,
+                    pointStyle_pointStyle,
+                    pointStateDimensionHover,
+                    lineStyle_lineStyle,
+                    areaStyle_areaStyle
+                ]),
+                xBand,
+                yLinearPrimary,
+                yLinearSecondary,
+                color_color,
+                background_backgroundColor,
+                verticalCrosshairRect,
+                annotationPoint_annotationPoint,
+                annotationVerticalLine_annotationVerticalLine,
+                annotationHorizontalLine_annotationHorizontalLine,
+                annotationArea_annotationArea
+            ]),
+            pivotRowDimensions,
+            pivotColumnDimensions,
+            pivotDiscreteLegend
+        ];
+        const dualAxisSpecPipeline = [
+            pivotAdapter_pivotAdapter(dualAxis, pivotDualAxis)
+        ];
+        const registerDualAxis = ()=>{
+            Builder._advancedPipelineMap.dualAxis = dualAxisAdvancedPipeline;
+            Builder._specPipelineMap.dualAxis = dualAxisSpecPipeline;
         };
-        const pivotReshapeTo1D1M = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
+        const encodingForPie = (advancedVSeed, context)=>{
             const { vseed } = context;
-            const { dataset } = vseed;
-            const { measures } = advancedVSeed;
-            const dimensions = advancedVSeed.dimensions;
-            if (!measures || !dimensions) return result;
-            const measureGroups = [];
-            if (measures) measures.forEach((measure)=>{
-                if (measure.children && measure.children.length > 0) measureGroups.push(measure);
-            });
-            const newDatasets = [];
-            const datasetReshapeInfo = [];
-            measureGroups.forEach((measureGroup, index)=>{
-                const measures = measureGroup.children;
-                if (!measures) return;
-                const commonDimensions = dimensions.filter((dim)=>'dimension' === dim.location);
-                const groupId = measureGroup.id;
-                const { dataset: newSubDataset, foldInfo, unfoldInfo } = dataReshapeFor1D1M(dataset, commonDimensions, measures, {
-                    foldMeasureId: FoldMeasureId,
-                    foldMeasureName: FoldMeasureName,
-                    foldMeasureValue: FoldMeasureValue + groupId,
-                    unfoldDimensionGroup: UnfoldDimensionGroup
-                });
-                const reshapeInfo = {
-                    id: groupId,
-                    index,
-                    foldInfo,
-                    unfoldInfo
-                };
-                newDatasets.push(newSubDataset);
-                datasetReshapeInfo.push(reshapeInfo);
-            });
-            return {
-                ...result,
-                dataset: newDatasets,
-                datasetReshapeInfo: datasetReshapeInfo
+            const { dimensions } = advancedVSeed;
+            if (!dimensions) return advancedVSeed;
+            const encoding = vseed.encoding;
+            if (encoding) return {
+                ...advancedVSeed,
+                encoding: {
+                    ...encoding
+                }
             };
-        };
-        const encodingPie = (advancedVSeed)=>{
-            const result = {
-                ...advancedVSeed
+            const mergedEncoding = {
+                angle: dimensions.slice(0, 1).map((item)=>item.id),
+                color: dimensions.slice(0).map((item)=>item.id),
+                detail: dimensions.slice(0).map((item)=>item.id),
+                tooltip: dimensions.map((item)=>item.id),
+                label: [],
+                row: [],
+                column: []
             };
-            const { datasetReshapeInfo } = advancedVSeed;
-            if (!datasetReshapeInfo) return result;
-            const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
-                const { foldInfo, unfoldInfo } = cur;
-                const radius = [
-                    foldInfo.measureValue
-                ];
-                const angle = [
-                    unfoldInfo.groupId
-                ];
-                const group = [
-                    unfoldInfo.groupId
-                ];
-                const color = [
-                    unfoldInfo.groupId
-                ];
-                return [
-                    ...prev,
-                    {
-                        angle,
-                        radius,
-                        group,
-                        color
-                    }
-                ];
-            }, []);
             return {
-                ...result,
-                encoding
+                ...advancedVSeed,
+                encoding: mergedEncoding
             };
         };
         const pieAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForPie,
             pivotAdapter([
-                reshapeTo1D1M
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo1D1M
+                pivotReshapeWithEncoding
             ]),
-            encodingPie,
             pieConfig,
             theme_theme,
             annotation_annotation
@@ -7230,15 +6600,15 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding, dataset } = advancedVSeed;
-            if (!encoding[0].angle || !encoding[0].radius || !encoding[0].group) return result;
+            const { datasetReshapeInfo, dataset } = advancedVSeed;
+            const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
             const showStroke = dataset.length <= 30;
             result.type = 'pie';
             result.outerRadius = 0.8;
             result.innerRadius = 0;
-            result.valueField = encoding[0].radius[0];
-            result.categoryField = encoding[0].angle[0];
-            result.seriesField = encoding[0].group[0];
+            result.valueField = foldInfo.measureValue;
+            result.categoryField = unfoldInfo.encodingAngle;
+            result.seriesField = unfoldInfo.encodingColorId;
             result.padding = 0;
             result.region = [
                 {
@@ -7307,12 +6677,12 @@
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForPie,
             pivotAdapter([
-                reshapeTo1D1M
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo1D1M
+                pivotReshapeWithEncoding
             ]),
-            encodingPie,
             donutConfig,
             theme_theme,
             annotation_annotation
@@ -7322,15 +6692,15 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding, dataset } = advancedVSeed;
-            if (!encoding[0].angle || !encoding[0].radius || !encoding[0].group) return result;
+            const { datasetReshapeInfo, dataset } = advancedVSeed;
+            const { foldInfo, unfoldInfo } = datasetReshapeInfo[0];
             const showStroke = dataset.length <= 30;
             result.type = 'pie';
             result.outerRadius = 0.8;
             result.innerRadius = 0.8 * result.outerRadius;
-            result.valueField = encoding[0].radius[0];
-            result.categoryField = encoding[0].angle[0];
-            result.seriesField = encoding[0].group[0];
+            result.valueField = foldInfo.measureValue;
+            result.categoryField = unfoldInfo.encodingDetail;
+            result.seriesField = unfoldInfo.encodingColorId;
             result.padding = 0;
             result.region = [
                 {
@@ -7394,54 +6764,52 @@
             Builder._advancedPipelineMap.donut = donutAdvancedPipeline;
             Builder._specPipelineMap.donut = donutSpecPipeline;
         };
-        const encodingRose = (advancedVSeed)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { datasetReshapeInfo, dimensions, measures } = advancedVSeed;
-            if (!datasetReshapeInfo || !dimensions || !measures) return result;
-            const angleDimension = dimensions.find((item)=>'rowDimension' !== item.location && 'columnDimension' !== item.location) || dimensions[0];
-            const is1D1M = 1 === dimensions.length && 1 === measures.length;
-            const isZeroDimension = 0 === dimensions.length;
-            const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
-                const { foldInfo, unfoldInfo } = cur;
-                const radius = [
-                    foldInfo.measureValue
-                ];
-                const angle = [
-                    isZeroDimension ? foldInfo.measureName : angleDimension?.id
-                ];
-                const group = [
-                    is1D1M ? angleDimension?.id : unfoldInfo.groupId
-                ];
-                const color = [
-                    is1D1M ? angleDimension?.id : unfoldInfo.groupId
+        const encodingForRose = (advancedVSeed, context)=>{
+            const { vseed } = context;
+            const { dimensions } = advancedVSeed;
+            if (!dimensions) return advancedVSeed;
+            const encoding = vseed.encoding;
+            if (encoding) {
+                const angle = encoding.angle || [];
+                const detail = encoding.detail || [];
+                const color = encoding.color || [];
+                const mergedDetail = [
+                    ...color.filter((d)=>!angle.includes(d)),
+                    ...detail
                 ];
-                return [
-                    ...prev,
-                    {
-                        angle,
-                        radius,
-                        group,
-                        color
+                return {
+                    ...advancedVSeed,
+                    encoding: {
+                        ...encoding,
+                        detail: mergedDetail
                     }
-                ];
-            }, []);
+                };
+            }
+            const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
+            const mergedEncoding = {
+                angle: dimensions.slice(0, 1).map((item)=>item.id),
+                color: dimensions.slice(1).map((item)=>item.id),
+                detail: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
+                tooltip: dimensions.map((item)=>item.id),
+                label: [],
+                row: [],
+                column: []
+            };
             return {
-                ...result,
-                encoding
+                ...advancedVSeed,
+                encoding: mergedEncoding
             };
         };
         const roseAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForRose,
             pivotAdapter([
-                reshapeTo2D1M
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo2D1M
+                pivotReshapeWithEncoding
             ]),
-            encodingRose,
             roseConfig,
             theme_theme,
             markStyle_markStyle,
@@ -7452,13 +6820,12 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding, dataset, datasetReshapeInfo } = advancedVSeed;
-            const { foldInfo } = datasetReshapeInfo[0];
-            if (!encoding[0].radius || !encoding[0].angle || !encoding[0].group) return result;
+            const { dataset, datasetReshapeInfo } = advancedVSeed;
+            const { foldInfo, unfoldInfo } = datasetReshapeInfo[0];
             result.type = 'rose';
-            result.categoryField = encoding[0].angle[0];
-            result.valueField = encoding[0].radius[0];
-            result.seriesField = encoding[0].group[0];
+            result.categoryField = unfoldInfo.encodingAngle;
+            result.seriesField = unfoldInfo.encodingColorId;
+            result.valueField = foldInfo.measureValue;
             result.padding = 0;
             result.outerRadius = 0.9;
             result.innerRadius = 0;
@@ -7606,12 +6973,12 @@
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForRose,
             pivotAdapter([
-                reshapeTo2D1M
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo2D1M
+                pivotReshapeWithEncoding
             ]),
-            encodingRose,
             roseParallelConfig,
             theme_theme,
             markStyle_markStyle,
@@ -7622,16 +6989,18 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding, datasetReshapeInfo, dataset } = advancedVSeed;
+            const { datasetReshapeInfo, dataset, dimensions } = advancedVSeed;
             const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
-            if (!encoding[0].radius || !encoding[0].angle || !encoding[0].group) return result;
+            const sameDimensionsMode = dimensions.length > 1 && dimensions.every((dim)=>dim.id === dimensions[0].id);
             result.type = 'rose';
-            result.categoryField = [
-                encoding[0].angle[0],
-                unfoldInfo.groupId
+            result.categoryField = sameDimensionsMode ? [
+                unfoldInfo.encodingAngle
+            ] : [
+                unfoldInfo.encodingAngle,
+                unfoldInfo.encodingDetail
             ];
-            result.valueField = encoding[0].radius[0];
-            result.seriesField = encoding[0].group[0];
+            result.valueField = foldInfo.measureValue;
+            result.seriesField = unfoldInfo.encodingColorId;
             result.padding = 0;
             result.outerRadius = 0.9;
             result.innerRadius = 0;
@@ -7708,54 +7077,52 @@
             Builder._advancedPipelineMap.roseParallel = roseParallelAdvancedPipeline;
             Builder._specPipelineMap.roseParallel = roseParallelSpecPipeline;
         };
-        const encodingAR = (advancedVSeed)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { datasetReshapeInfo, dimensions, measures } = advancedVSeed;
-            if (!datasetReshapeInfo || !dimensions || !measures) return result;
-            const angleDimension = dimensions.find((item)=>'rowDimension' !== item.location && 'columnDimension' !== item.location) || dimensions[0];
-            const isZeroDimension = 0 === dimensions.length;
-            const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
-                const { foldInfo, unfoldInfo } = cur;
-                const angle = [
-                    isZeroDimension ? foldInfo.measureName : angleDimension?.id
-                ];
-                const radius = [
-                    foldInfo.measureValue
-                ];
-                const group = [
-                    unfoldInfo.groupId
-                ];
-                const color = [
-                    unfoldInfo.groupId
+        const encodingForRadar = (advancedVSeed, context)=>{
+            const { vseed } = context;
+            const { dimensions } = advancedVSeed;
+            if (!dimensions) return advancedVSeed;
+            const encoding = vseed.encoding;
+            if (encoding) {
+                const angle = encoding.angle || [];
+                const detail = encoding.detail || [];
+                const color = encoding.color || [];
+                const mergedDetail = [
+                    ...color.filter((d)=>!angle.includes(d)),
+                    ...detail
                 ];
-                return [
-                    ...prev,
-                    {
-                        angle,
-                        radius,
-                        group,
-                        color
+                return {
+                    ...advancedVSeed,
+                    encoding: {
+                        ...encoding,
+                        detail: mergedDetail
                     }
-                ];
-            }, []);
+                };
+            }
+            const mergedEncoding = {
+                angle: dimensions.slice(0, 1).map((item)=>item.id),
+                color: dimensions.slice(1).map((item)=>item.id),
+                detail: dimensions.slice(1).map((item)=>item.id),
+                tooltip: dimensions.map((item)=>item.id),
+                label: [],
+                row: [],
+                column: []
+            };
             return {
-                ...result,
-                encoding
+                ...advancedVSeed,
+                encoding: mergedEncoding
             };
         };
         const radarAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForRadar,
             pivotAdapter([
-                reshapeTo2D1M0Name
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo2D1M0Name
+                pivotReshapeWithEncoding
             ]),
-            encodingAR,
-            sort_sortLegend,
+            sortLegend_sortLegend,
             radarConfig,
             theme_theme,
             markStyle_markStyle,
@@ -7766,12 +7133,12 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding } = advancedVSeed;
-            if (!encoding[0].angle || !encoding[0].radius || !encoding[0].group) return result;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
             result.type = 'radar';
-            result.angleField = encoding[0].angle[0];
-            result.radiusField = encoding[0].radius[0];
-            result.seriesField = encoding[0].group[0];
+            result.angleField = unfoldInfo.encodingAngle;
+            result.radiusField = foldInfo.measureValue;
+            result.seriesField = unfoldInfo.encodingColorId;
             result.padding = 0;
             result.region = [
                 {
@@ -7883,47 +7250,40 @@
             Builder._advancedPipelineMap.radar = radarAdvancedPipeline;
             Builder._specPipelineMap.radar = radarSpecPipeline;
         };
-        const encodingFunnel = (advancedVSeed)=>{
-            const result = {
-                ...advancedVSeed
+        const encodingForFunnel = (advancedVSeed, context)=>{
+            const { vseed } = context;
+            const { dimensions } = advancedVSeed;
+            if (!dimensions) return advancedVSeed;
+            const encoding = vseed.encoding;
+            if (encoding) return {
+                ...advancedVSeed,
+                encoding: {
+                    ...encoding
+                }
+            };
+            const mergedEncoding = {
+                color: dimensions.slice(0).map((item)=>item.id),
+                detail: dimensions.slice(0).map((item)=>item.id),
+                tooltip: dimensions.map((item)=>item.id),
+                label: [],
+                row: [],
+                column: []
             };
-            const { datasetReshapeInfo } = advancedVSeed;
-            if (!datasetReshapeInfo) return result;
-            const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
-                const { foldInfo, unfoldInfo } = cur;
-                const size = [
-                    foldInfo.measureValue
-                ];
-                const group = [
-                    unfoldInfo.groupId
-                ];
-                const color = [
-                    foldInfo.measureValue
-                ];
-                return [
-                    ...prev,
-                    {
-                        size,
-                        group,
-                        color
-                    }
-                ];
-            }, []);
             return {
-                ...result,
-                encoding
+                ...advancedVSeed,
+                encoding: mergedEncoding
             };
         };
         const funnelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForFunnel,
             pivotAdapter([
-                reshapeTo1D1M
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo1D1M
+                pivotReshapeWithEncoding
             ]),
-            encodingFunnel,
             funnelConfig,
             theme_theme,
             annotation_annotation
@@ -7933,11 +7293,12 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding } = advancedVSeed;
-            if (!encoding[0].size || !encoding[0].group || !encoding[0].color) return result;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const { foldInfo, unfoldInfo } = datasetReshapeInfo[0];
             result.type = 'funnel';
-            result.valueField = encoding[0].size[0];
-            result.categoryField = encoding[0].group[0];
+            result.valueField = foldInfo.measureValue;
+            result.categoryField = unfoldInfo.encodingDetail;
+            result.seriesField = unfoldInfo.encodingColorId;
             result.padding = 0;
             result.isTransform = true;
             result.shape = 'rect';
@@ -7952,7 +7313,7 @@
                 style: {
                     cornerRadius: 4,
                     fill: {
-                        field: encoding[0].color[0],
+                        field: unfoldInfo.encodingColorId,
                         scale: 'color'
                     }
                 },
@@ -7968,99 +7329,13 @@
             result.animation = true;
             return result;
         };
-        const linearColor = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed } = context;
-            const { datasetReshapeInfo, chartType, encoding } = advancedVSeed;
-            const baseConfig = advancedVSeed.config[chartType];
-            if (!baseConfig || !baseConfig.color) return result;
-            const { color } = baseConfig;
-            const { colorScheme } = color;
-            result.color = {
-                type: 'linear',
-                domain: [
-                    {
-                        dataId: datasetReshapeInfo[0].id,
-                        fields: encoding?.[0]?.color
-                    }
-                ],
-                range: colorScheme
-            };
-            return result;
-        };
-        const colorLegend = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed } = context;
-            const { chartType } = advancedVSeed;
-            const baseConfig = advancedVSeed.config[chartType];
-            const { encoding } = advancedVSeed;
-            if (!encoding[0].color) return result;
-            if (!baseConfig || !baseConfig.legend) return result;
-            const { legend } = baseConfig;
-            const { enable, position = 'bottom' } = legend || {};
-            const orient = [
-                'bottom',
-                'bottomLeft',
-                'bottomRight',
-                'bl',
-                'br'
-            ].includes(position) ? 'bottom' : [
-                'top',
-                'topLeft',
-                'topRight',
-                'tl',
-                'tr'
-            ].includes(position) ? 'top' : [
-                'left',
-                'leftTop',
-                'leftBottom',
-                'lt',
-                'lb'
-            ].includes(position) ? 'left' : 'right';
-            const legendPosition = [
-                'topLeft',
-                'bottomLeft',
-                'leftTop',
-                'rightTop',
-                'lt',
-                'rt',
-                'tl',
-                'bl'
-            ].includes(position) ? 'start' : [
-                'topRight',
-                'bottomRight',
-                'leftBottom',
-                'rightBottom',
-                'lb',
-                'rb',
-                'rt',
-                'br'
-            ].includes(position) ? 'end' : 'middle';
-            result.legends = {
-                type: 'color',
-                visible: enable,
-                orient,
-                position: legendPosition,
-                field: encoding[0].color[0],
-                inverse: !![
-                    'left',
-                    'right'
-                ].includes(orient)
-            };
-            return result;
-        };
         const funnel = [
             initFunnel,
-            linearColor,
             background_backgroundColor,
             datasetXY,
             label_label,
             tooltip_tooltip,
-            colorLegend,
+            discreteLegend,
             annotationPoint_annotationPoint,
             annotationVerticalLine_annotationVerticalLine,
             annotationHorizontalLine_annotationHorizontalLine,
@@ -8073,12 +7348,11 @@
             datasetPivot,
             pivotIndicators_pivotIndicators([
                 initFunnel,
-                linearColor,
                 background_backgroundColor,
                 datasetXY,
                 label_label,
                 tooltip_tooltip,
-                colorLegend,
+                discreteLegend,
                 annotationPoint_annotationPoint,
                 annotationVerticalLine_annotationVerticalLine,
                 annotationHorizontalLine_annotationHorizontalLine,
@@ -8094,49 +7368,42 @@
             Builder._advancedPipelineMap.funnel = funnelAdvancedPipeline;
             Builder._specPipelineMap.funnel = funnelSpecPipeline;
         };
-        const encodingMatrix = (advancedVSeed)=>{
-            const result = {
-                ...advancedVSeed
+        const encodingForHeatmap = (advancedVSeed, context)=>{
+            const { vseed } = context;
+            const { dimensions } = advancedVSeed;
+            if (!dimensions) return advancedVSeed;
+            const encoding = vseed.encoding;
+            if (encoding) return {
+                ...advancedVSeed,
+                encoding: {
+                    ...encoding
+                }
+            };
+            const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
+            const mergedEncoding = {
+                x: dimensions.slice(0, 1).map((item)=>item.id),
+                y: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
+                color: dimensions.slice(0).map((item)=>item.id),
+                tooltip: dimensions.map((item)=>item.id),
+                label: [],
+                row: [],
+                column: []
             };
-            const { datasetReshapeInfo, dimensions } = advancedVSeed;
-            if (!datasetReshapeInfo || !dimensions) return result;
-            const xDimension = dimensions.find((item)=>'rowDimension' !== item.location && 'columnDimension' !== item.location) || dimensions[0];
-            const isZeroDimension = 0 === dimensions.length;
-            const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
-                const { foldInfo, unfoldInfo } = cur;
-                const x = [
-                    isZeroDimension ? foldInfo.measureName : xDimension?.id
-                ];
-                const y = [
-                    unfoldInfo.groupName
-                ];
-                const color = [
-                    foldInfo.measureValue
-                ];
-                return [
-                    ...prev,
-                    {
-                        x,
-                        y,
-                        color
-                    }
-                ];
-            }, []);
             return {
-                ...result,
-                encoding
+                ...advancedVSeed,
+                encoding: mergedEncoding
             };
         };
         const heatmapAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             autoMeasures_autoMeasures,
             autoDimensions_autoDimensions,
+            encodingForHeatmap,
             pivotAdapter([
-                reshapeTo2D1M
+                reshapeWithEncoding
             ], [
-                pivotReshapeTo2D1M
+                pivotReshapeWithEncoding
             ]),
-            encodingMatrix,
             sortXBandAxis,
             heatmapConfig,
             theme_theme,
@@ -8158,23 +7425,20 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { encoding } = advancedVSeed;
-            if (!encoding[0].y || !encoding[0].x || !encoding[0].color) return result;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
             result.type = 'heatmap';
             result.direction = 'vertical';
-            result.xField = encoding[0].x[0];
-            result.yField = encoding[0].y[0];
-            result.valueField = encoding[0].color[0];
+            result.xField = unfoldInfo.encodingX;
+            result.yField = unfoldInfo.encodingY;
+            result.seriesField = unfoldInfo.encodingColorId;
+            result.valueField = foldInfo.measureValue;
             result.padding = 0;
             result.cell = {
                 style: {
                     shape: 'rect',
                     stroke: '#ffffff',
-                    lineWidth: 1,
-                    fill: {
-                        field: encoding[0].color[0],
-                        scale: 'color'
-                    }
+                    lineWidth: 1
                 }
             };
             result.axes = [
@@ -8199,12 +7463,11 @@
         };
         const heatmap = [
             initHeatmap,
-            linearColor,
             background_backgroundColor,
             datasetXY,
             label_label,
             labelColorInversion,
-            colorLegend,
+            discreteLegend,
             tooltip_tooltip,
             pointStyle_pointStyle,
             pointStateDimensionHover,
@@ -8221,12 +7484,11 @@
             datasetPivot,
             pivotIndicators_pivotIndicators([
                 initHeatmap,
-                linearColor,
                 background_backgroundColor,
                 datasetXY,
                 label_label,
                 labelColorInversion,
-                colorLegend,
+                discreteLegend,
                 tooltip_tooltip,
                 pointStyle_pointStyle,
                 pointStateDimensionHover,
@@ -8494,12 +7756,6 @@
                         yAxis: linearAxis,
                         crosshairLine
                     },
-                    areaRange: {
-                        ...baseConfig,
-                        xAxis: bandAxis,
-                        yAxis: linearAxis,
-                        crosshairLine
-                    },
                     scatter: {
                         ...baseConfig,
                         xAxis: {
@@ -8832,12 +8088,6 @@
                         yAxis: linearAxis,
                         crosshairLine: crosshairLine
                     },
-                    areaRange: {
-                        ...baseConfig,
-                        xAxis: bandAxis,
-                        yAxis: linearAxis,
-                        crosshairLine: crosshairLine
-                    },
                     scatter: {
                         ...baseConfig,
                         xAxis: {
@@ -8935,7 +8185,6 @@
             registerBarPercent();
             registerArea();
             registerAreaPercent();
-            registerAreaRange();
             registerScatter();
             registerDualAxis();
             registerPie();
@@ -12252,7 +11501,6 @@
             'barParallel',
             'area',
             'areaPercent',
-            'areaRange',
             'scatter',
             'dualAxis',
             'rose',
@@ -12350,6 +11598,12 @@
             secondaryMeasures: schemas_array(zMeasure).or(zMeasure).optional()
         });
         const zDualMeasures = schemas_array(zDualMeasure);
+        const zScatterMeasure = schemas_object({
+            id: schemas_string(),
+            xMeasures: schemas_array(zMeasure).or(zMeasure).optional(),
+            yMeasures: schemas_array(zMeasure).or(zMeasure).optional()
+        });
+        const zScatterMeasures = schemas_array(zScatterMeasure);
         const zFoldInfo = schemas_object({
             foldMap: record(schemas_string(), schemas_string().or(schemas_undefined())),
             measureId: schemas_string(),
@@ -12357,10 +11611,14 @@
             measureValue: schemas_string()
         });
         const zUnfoldInfo = schemas_object({
+            encodingX: schemas_string(),
+            encodingY: schemas_string(),
+            encodingColor: schemas_string(),
+            encodingColorId: schemas_string(),
+            encodingDetail: schemas_string(),
+            encodingAngle: schemas_string(),
             colorItems: schemas_array(schemas_string()),
-            groupId: schemas_string(),
-            colorIdMap: record(schemas_string(), schemas_string()),
-            groupName: schemas_string()
+            colorIdMap: record(schemas_string(), schemas_string())
         });
         const zDatasetReshapeInfo = schemas_array(schemas_object({
             id: schemas_string(),
@@ -12369,16 +11627,21 @@
             foldInfoList: schemas_array(zFoldInfo).nullish(),
             unfoldInfo: zUnfoldInfo
         }));
-        const zEncoding = schemas_array(schemas_object({
+        const zEncoding = schemas_object({
             x: schemas_array(schemas_string()).nullish(),
             y: schemas_array(schemas_string()).nullish(),
-            color: schemas_array(schemas_string()).nullish(),
-            group: schemas_array(schemas_string()).nullish(),
             angle: schemas_array(schemas_string()).nullish(),
             radius: schemas_array(schemas_string()).nullish(),
+            detail: schemas_array(schemas_string()).nullish(),
+            color: schemas_array(schemas_string()).nullish(),
+            size: schemas_array(schemas_string()).nullish(),
             tooltip: schemas_array(schemas_string()).nullish(),
-            size: schemas_array(schemas_string()).nullish()
-        }));
+            label: schemas_array(schemas_string()).nullish(),
+            row: schemas_array(schemas_string()).nullish(),
+            column: schemas_array(schemas_string()).nullish(),
+            group: schemas_array(schemas_string()).nullish().describe("\u5DF2\u5F03\u7528, \u8BF7\u4F7F\u7528\u989C\u8272\u66FF\u4EE3")
+        });
+        const zEncodings = schemas_array(zEncoding);
         const zXBandAxis = schemas_object({
             visible: schemas_boolean().default(true).nullish(),
             labelAutoHide: schemas_boolean().default(true).nullish(),
@@ -12641,7 +11904,6 @@
             crosshairLine: zCrosshairLine.nullish()
         });
         const zAreaPercentConfig = zAreaConfig;
-        const zAreaRangeConfig = zAreaConfig;
         const zDualAxisConfig = schemas_object({
             backgroundColor: zBackgroundColor.nullish(),
             label: zLabel.nullish(),
@@ -12696,7 +11958,6 @@
             barPercent: zBarPercentConfig.nullish(),
             area: zAreaConfig.nullish(),
             areaPercent: zAreaPercentConfig.nullish(),
-            areaRange: zAreaRangeConfig.nullish(),
             scatter: zScatterConfig.nullish(),
             dualAxis: zDualAxisConfig.nullish(),
             rose: zRoseConfig.nullish(),
@@ -13135,6 +12396,7 @@
         const zLine = schemas_object({
             chartType: literal('line'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13159,6 +12421,7 @@
         const zColumn = schemas_object({
             chartType: literal('column'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13181,6 +12444,7 @@
         const zColumnParallel = schemas_object({
             chartType: literal('columnParallel'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13203,6 +12467,7 @@
         const zColumnPercent = schemas_object({
             chartType: literal('columnPercent'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13225,6 +12490,7 @@
         const zBar = schemas_object({
             chartType: literal('bar'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13247,6 +12513,7 @@
         const zBarParallel = schemas_object({
             chartType: literal('barParallel'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13269,6 +12536,7 @@
         const zBarPercent = schemas_object({
             chartType: literal('barPercent'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13291,6 +12559,7 @@
         const zArea = schemas_object({
             chartType: literal('area'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13314,6 +12583,7 @@
         const zAreaPercent = schemas_object({
             chartType: literal('areaPercent'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13334,31 +12604,13 @@
             annotationArea: schemas_array(zAnnotationArea).or(zAnnotationArea).nullish(),
             locale: zLocale.nullish()
         });
-        const zAreaRange = schemas_object({
-            chartType: literal('areaRange'),
-            dataset: zDataset.nullish(),
-            dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
-            backgroundColor: zBackgroundColor.nullish(),
-            label: zLabel.nullish(),
-            xAxis: zXBandAxis.nullish(),
-            yAxis: zYLinearAxis.nullish(),
-            crosshairLine: zCrosshairLine.nullish(),
-            theme: zTheme.nullish(),
-            pointStyle: schemas_array(zPointStyle).or(zPointStyle).nullish(),
-            lineStyle: schemas_array(zLineStyle).or(zLineStyle).nullish(),
-            areaStyle: schemas_array(zAreaStyle).or(zAreaStyle).nullish(),
-            annotationPoint: schemas_array(zAnnotationPoint).or(zAnnotationPoint).nullish(),
-            annotationVerticalLine: schemas_array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).nullish(),
-            annotationHorizontalLine: schemas_array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).nullish(),
-            annotationArea: schemas_array(zAnnotationArea).or(zAnnotationArea).nullish(),
-            locale: zLocale.nullish()
-        });
         const zScatter = schemas_object({
             chartType: literal('scatter'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
+            scatterMeasures: zScatterMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -13408,6 +12660,7 @@
         const zRose = schemas_object({
             chartType: literal('rose'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13421,6 +12674,7 @@
         const zRoseParallel = schemas_object({
             chartType: literal('roseParallel'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13434,6 +12688,7 @@
         const zPie = schemas_object({
             chartType: literal('pie'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13447,6 +12702,7 @@
         const zDonut = schemas_object({
             chartType: literal('donut'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13460,6 +12716,7 @@
         const zRadar = schemas_object({
             chartType: literal('radar'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13473,6 +12730,7 @@
         const zFunnel = schemas_object({
             chartType: literal('funnel'),
             dataset: zDataset.nullish(),
+            encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
@@ -13508,7 +12766,6 @@
             zBarPercent,
             zArea,
             zAreaPercent,
-            zAreaRange,
             zScatter,
             zDualAxis,
             zPie,
@@ -13526,6 +12783,7 @@
             dimensions: zDimensionTree,
             measures: zMeasureTree,
             encoding: zEncoding,
+            encodings: zEncodings,
             config: zConfig,
             analysis: zAnalysis,
             theme: zTheme,