@visactor/vseed 0.0.40 → 0.1.0

package/dist/index.cjs

@@ -34,14 +34,16 @@ __webpack_require__.d(__webpack_exports__, {
     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,
@@ -51,12 +53,11 @@ __webpack_require__.d(__webpack_exports__, {
     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,
@@ -69,16 +70,16 @@ __webpack_require__.d(__webpack_exports__, {
     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,
@@ -90,25 +91,26 @@ __webpack_require__.d(__webpack_exports__, {
     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,
@@ -117,15 +119,15 @@ __webpack_require__.d(__webpack_exports__, {
     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,
@@ -159,8 +161,9 @@ __webpack_require__.d(__webpack_exports__, {
     zRadarConfig: ()=>zRadarConfig,
     zAnnotationArea: ()=>zAnnotationArea,
     zStackCornerRadius: ()=>zStackCornerRadius,
-    zUnfoldInfo: ()=>zUnfoldInfo,
+    DetailEncoding: ()=>DetailEncoding,
     zRose: ()=>zRose,
+    zUnfoldInfo: ()=>zUnfoldInfo,
     columnParallelSpecPipeline: ()=>columnParallelSpecPipeline,
     i18n: ()=>i18n,
     zPointStyle: ()=>zPointStyle,
@@ -182,30 +185,30 @@ __webpack_require__.d(__webpack_exports__, {
     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,
@@ -216,20 +219,20 @@ __webpack_require__.d(__webpack_exports__, {
     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,
@@ -1320,13 +1323,26 @@ const isVTable = (vseed)=>[
 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;
@@ -1405,6 +1421,24 @@ const createEmptyMeasureGroup = ()=>({
         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
@@ -1412,6 +1446,10 @@ const autoDimensions_autoDimensions = (advancedVSeed, context)=>{
     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) {
@@ -1419,6 +1457,8 @@ const autoDimensions_autoDimensions = (advancedVSeed, context)=>{
                 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);
@@ -1435,23 +1475,51 @@ const autoDimensions_autoDimensions = (advancedVSeed, context)=>{
             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__';
 const foldMeasures = (dataset, measures, measureId = FoldMeasureId, measureName = FoldMeasureName, measureValue = FoldMeasureValue)=>{
     const foldInfo = {
         measureId,
@@ -1481,84 +1549,53 @@ const foldMeasures = (dataset, measures, measureId = FoldMeasureId, measureName
         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 dimensionsToBeRemain = dimensions.slice(0, 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;
-        if (dimensionsToBeRemain.length > 0) for (const dim of dimensionsToBeRemain){
-            const dimValue = datum[dim.id];
-            if ('number' == typeof dimValue) datum[dim.id] = String(dimValue);
-        }
+        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 = (0, external_remeda_namespaceObject.unique)(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 = (0, external_remeda_namespaceObject.unique)(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: [],
@@ -1569,69 +1606,47 @@ const emptyReshapeResult = {
         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
@@ -1641,31 +1656,27 @@ const reshapeTo2D1M0Name = (advancedVSeed, context)=>{
         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,
@@ -1673,93 +1684,60 @@ const pivotReshapeTo2D1M0Name = (advancedVSeed, context)=>{
             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
-    };
-};
 const sortXBandAxis = (advancedVSeed, context)=>{
     const result = {
         ...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 = (0, external_remeda_namespaceObject.sort)(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 (0, external_remeda_namespaceObject.unique)(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) {
@@ -1768,15 +1746,14 @@ const sort_sortLegend = (advancedVSeed, context)=>{
             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;
@@ -1908,14 +1885,14 @@ const lineAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     autoMeasures_autoMeasures,
     autoDimensions_autoDimensions,
+    encodingForColumn,
     pivotAdapter([
-        reshapeTo2D1M0Name
+        reshapeWithEncoding
     ], [
-        pivotReshapeTo2D1M0Name
+        pivotReshapeWithEncoding
     ]),
-    encodingXY,
     sortXBandAxis,
-    sort_sortLegend,
+    sortLegend_sortLegend,
     lineConfig,
     theme_theme,
     markStyle_markStyle,
@@ -1926,13 +1903,13 @@ const initLine = (spec, context)=>{
         ...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 = [
         {
@@ -2008,11 +1985,12 @@ const background_backgroundColor = (spec, context)=>{
 };
 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] = {
@@ -2029,14 +2007,14 @@ const datasetXY = (spec, context)=>{
             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
         };
     }
@@ -2289,7 +2267,7 @@ const tooltip_tooltip = (spec, context)=>{
     } } = 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: {
@@ -2310,7 +2288,7 @@ const tooltip_tooltip = (spec, context)=>{
                 {
                     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];
@@ -2332,7 +2310,7 @@ const tooltip_tooltip = (spec, context)=>{
             content: [
                 {
                     visible: true,
-                    key: (datum)=>datum && datum[groupName] || '',
+                    key: (datum)=>datum && datum[colorName] || '',
                     value: (datum)=>{
                         if (!datum) return '';
                         const value = datum[measureValue];
@@ -2670,7 +2648,8 @@ const pointStateDimensionHover = (spec)=>{
 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: {
@@ -2681,7 +2660,7 @@ const pointStateHover = (spec, context)=>{
                     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;
                     },
@@ -2695,7 +2674,8 @@ const pointStateHover = (spec, context)=>{
 };
 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 = {
@@ -2704,8 +2684,8 @@ const lineStyle_lineStyle = (spec, context)=>{
     const lineStyles = Array.isArray(lineStyle) ? lineStyle : [
         lineStyle
     ];
-    const group = encoding[0]?.group?.[0];
-    const lineGroups = (0, external_remeda_namespaceObject.groupBy)(dataset, (d)=>d[group ?? '']);
+    const colorId = unfoldInfo.encodingColorId;
+    const lineGroups = (0, external_remeda_namespaceObject.groupBy)(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;
@@ -2726,7 +2706,7 @@ const lineStyle_lineStyle = (spec, context)=>{
             [`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;
                 },
@@ -2821,7 +2801,8 @@ const annotationPoint_annotationPoint = (spec, context)=>{
 };
 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 : [
@@ -2901,7 +2882,7 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
         }
         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]);
         });
@@ -2918,7 +2899,8 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
 };
 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 : [
@@ -2998,7 +2980,7 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
         }
         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]);
         });
@@ -3279,13 +3261,10 @@ const pivotIndicators_pivotIndicators = (chartPipeline)=>(spec, context)=>{
             ...spec
         };
         const { advancedVSeed } = context;
-        const { measures, datasetReshapeInfo, encoding, dataset } = advancedVSeed;
+        const { measures, datasetReshapeInfo, dataset } = advancedVSeed;
         const colorItems = (0, external_remeda_namespaceObject.unique)(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 = [
                 {
@@ -3301,8 +3280,7 @@ const pivotIndicators_pivotIndicators = (chartPipeline)=>(spec, context)=>{
                 advancedVSeed: {
                     ...advancedVSeed,
                     datasetReshapeInfo: newDatasetReshapeInfo,
-                    dataset: newDataset,
-                    encoding: newEncoding
+                    dataset: newDataset
                 }
             };
             const chartSpec = execPipeline(chartPipeline, newContext, {});
@@ -3488,7 +3466,7 @@ const pivotDiscreteLegend = (spec, context)=>{
                 }
             },
             label: {
-                formatMethod: (value)=>colorIdMap[String(value)] ?? value,
+                formatMethod: (value)=>colorIdMap[value] ?? value,
                 style: {
                     fontSize: labelFontSize,
                     fill: labelFontColor,
@@ -3571,151 +3549,18 @@ const registerLine = ()=>{
     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,
@@ -3726,13 +3571,13 @@ const initColumn = (spec, context)=>{
         ...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 = [
         {
@@ -4052,14 +3897,14 @@ const columnParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     autoMeasures_autoMeasures,
     autoDimensions_autoDimensions,
+    encodingForColumn,
     pivotAdapter([
-        reshapeTo2D1M
+        reshapeWithEncoding
     ], [
-        pivotReshapeTo2D1M
+        pivotReshapeWithEncoding
     ]),
-    encodingXY,
     sortXBandAxis,
-    sort_sortLegend,
+    sortLegend_sortLegend,
     columnParallelConfig,
     theme_theme,
     markStyle_markStyle,
@@ -4070,20 +3915,19 @@ const initColumnParallel = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { encoding, datasetReshapeInfo, dimensions } = 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 = sameDimensionsMode ? [
-        encoding[0].x[0]
+        unfoldInfo.encodingX
     ] : [
-        encoding[0].x[0],
-        unfoldInfo.groupId
+        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 = [
         {
@@ -4150,14 +3994,14 @@ const columnPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     autoMeasures_autoMeasures,
     autoDimensions_autoDimensions,
+    encodingForColumn,
     pivotAdapter([
-        reshapeTo2D1M
+        reshapeWithEncoding
     ], [
-        pivotReshapeTo2D1M
+        pivotReshapeWithEncoding
     ]),
-    encodingXY,
     sortXBandAxis,
-    sort_sortLegend,
+    sortLegend_sortLegend,
     columnPercentConfig,
     theme_theme,
     markStyle_markStyle,
@@ -4227,55 +4071,70 @@ const registerColumnPercent = ()=>{
     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,
@@ -4286,13 +4145,13 @@ const initBar = (spec, context)=>{
         ...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 = [
         {
@@ -4304,11 +4163,12 @@ const initBar = (spec, context)=>{
 };
 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] = {
@@ -4325,14 +4185,14 @@ const datasetYX = (spec, context)=>{
             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
         };
     }
@@ -4620,14 +4480,14 @@ const barParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     autoMeasures_autoMeasures,
     autoDimensions_autoDimensions,
+    encodingForBar,
     pivotAdapter([
-        reshapeTo2D1M
+        reshapeWithEncoding
     ], [
-        pivotReshapeTo2D1M
+        pivotReshapeWithEncoding
     ]),
-    encodingYX,
     sortYBandAxis,
-    sort_sortLegend,
+    sortLegend_sortLegend,
     barParallelConfig,
     theme_theme,
     markStyle_markStyle,
@@ -4638,20 +4498,19 @@ const initBarParallel = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { encoding, datasetReshapeInfo, dimensions } = 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 = sameDimensionsMode ? [
-        encoding[0].y[0]
+        unfoldInfo.encodingY
     ] : [
-        encoding[0].y[0],
-        unfoldInfo.groupId
+        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 = [
         {
@@ -4717,14 +4576,14 @@ const barPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     autoMeasures_autoMeasures,
     autoDimensions_autoDimensions,
+    encodingForBar,
     pivotAdapter([
-        reshapeTo2D1M
+        reshapeWithEncoding
     ], [
-        pivotReshapeTo2D1M
+        pivotReshapeWithEncoding
     ]),
-    encodingYX,
     sortYBandAxis,
-    sort_sortLegend,
+    sortLegend_sortLegend,
     barPercentConfig,
     theme_theme,
     markStyle_markStyle,
@@ -4788,14 +4647,14 @@ const areaAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     autoMeasures_autoMeasures,
     autoDimensions_autoDimensions,
+    encodingForColumn,
     pivotAdapter([
-        reshapeTo2D1M0Name
+        reshapeWithEncoding
     ], [
-        pivotReshapeTo2D1M0Name
+        pivotReshapeWithEncoding
     ]),
-    encodingXY,
     sortXBandAxis,
-    sort_sortLegend,
+    sortLegend_sortLegend,
     areaConfig,
     theme_theme,
     markStyle_markStyle,
@@ -4806,13 +4665,13 @@ const initArea = (spec, context)=>{
         ...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 = [
         {
@@ -4824,8 +4683,9 @@ const initArea = (spec, context)=>{
 };
 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: {
@@ -4838,7 +4698,7 @@ const areaStyle_areaStyle = (spec, context)=>{
     const areaStyles = Array.isArray(areaStyle) ? areaStyle : [
         areaStyle
     ];
-    const group = encoding[0]?.group?.[0];
+    const group = unfoldInfo.encodingColorId;
     const areaGroups = (0, external_remeda_namespaceObject.groupBy)(dataset, (d)=>d[group ?? '']);
     const customMap = areaStyles.reduce((result, style, index)=>{
         const { areaColor, areaColorOpacity, areaVisible = true } = style;
@@ -4932,14 +4792,14 @@ const areaPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     autoMeasures_autoMeasures,
     autoDimensions_autoDimensions,
+    encodingForColumn,
     pivotAdapter([
-        reshapeTo2D1M0Name
+        reshapeWithEncoding
     ], [
-        pivotReshapeTo2D1M0Name
+        pivotReshapeWithEncoding
     ]),
-    encodingXY,
     sortXBandAxis,
-    sort_sortLegend,
+    sortLegend_sortLegend,
     areaPercentConfig,
     theme_theme,
     markStyle_markStyle,
@@ -5004,16 +4864,20 @@ const registerAreaPercent = ()=>{
     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);
@@ -5021,7 +4885,7 @@ const autoMeasuresBy2M1Group = (advancedVSeed, context)=>{
             ...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
@@ -5029,693 +4893,277 @@ const autoMeasuresBy2M1Group = (advancedVSeed, context)=>{
             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 = (0, external_remeda_namespaceObject.unique)([
+            ...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 (!(0, external_remeda_namespaceObject.isEmpty)(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 (!(0, external_remeda_namespaceObject.isEmpty)(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;
@@ -5761,7 +5209,7 @@ const scatter = [
     initScatter,
     color_color,
     background_backgroundColor,
-    datasetXY,
+    datasetScatter,
     progressive,
     xLinear,
     yLinear,
@@ -5786,7 +5234,7 @@ const pivotScatter = [
         initScatter,
         color_color,
         background_backgroundColor,
-        datasetXY,
+        datasetScatter,
         progressive,
         xLinear,
         yLinear,
@@ -5812,41 +5260,163 @@ const registerScatter = ()=>{
     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,
@@ -5858,7 +5428,7 @@ const reshapeTo2D2M = (advancedVSeed, context)=>{
         dataset: datasets,
         datasetReshapeInfo: [
             {
-                id: '2D2M',
+                id: String(chartType),
                 index: 0,
                 foldInfo: foldInfoList[0],
                 foldInfoList: foldInfoList,
@@ -5867,46 +5437,48 @@ const reshapeTo2D2M = (advancedVSeed, context)=>{
         ]
     };
 };
-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,
@@ -5914,53 +5486,19 @@ const pivotReshapeTo2D2M = (advancedVSeed, context)=>{
                 }), {})
         };
         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)=>{
@@ -5989,125 +5527,80 @@ const dualAxisConfig = (advancedVSeed, context)=>{
     };
     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;
 };
@@ -6116,14 +5609,14 @@ const initDualAxisSecondary = (spec, context)=>{
         ...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;
 };
@@ -6155,10 +5648,10 @@ const dualChartTypePrimary = (spec, context)=>{
         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;
@@ -6211,10 +5704,10 @@ const dualChartTypeSecondary = (spec, context)=>{
         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;
@@ -6241,10 +5734,11 @@ const dualChartTypeSecondary = (spec, context)=>{
 };
 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) {
@@ -6258,14 +5752,14 @@ const datasetPrimary = (spec, context)=>{
             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
         };
     }
@@ -6280,10 +5774,11 @@ const datasetPrimary = (spec, context)=>{
 };
 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) {
@@ -6297,14 +5792,14 @@ const datasetSecondary = (spec, context)=>{
             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
         };
     }
@@ -6402,7 +5897,7 @@ const tooltipPrimary = (spec, context)=>{
     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: {
@@ -6423,7 +5918,7 @@ const tooltipPrimary = (spec, context)=>{
                 {
                     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];
@@ -6445,7 +5940,7 @@ const tooltipPrimary = (spec, context)=>{
             content: [
                 {
                     visible: true,
-                    key: (datum)=>datum && datum[groupName] || '',
+                    key: (datum)=>datum && datum[colorName] || '',
                     value: (datum)=>{
                         if (!datum) return '';
                         const value = datum[measureValue];
@@ -6482,7 +5977,7 @@ const tooltipSecondary = (spec, context)=>{
     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: {
@@ -6503,7 +5998,7 @@ const tooltipSecondary = (spec, context)=>{
                 {
                     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];
@@ -6525,7 +6020,7 @@ const tooltipSecondary = (spec, context)=>{
             content: [
                 {
                     visible: true,
-                    key: (datum)=>datum && datum[groupName] || '',
+                    key: (datum)=>datum && datum[encodingColorId] || '',
                     value: (datum)=>{
                         if (!datum) return '';
                         const value = datum[measureValue];
@@ -6554,16 +6049,16 @@ const yLinearPrimary = (spec, context)=>{
     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] && (0, external_remeda_namespaceObject.isEmpty)(datasetReshapeInfo[0].foldInfoList[0].foldMap)) return result;
-    const id = `${datasetReshapeInfo[0].id}-primary-axis`;
+    if (foldInfoList?.[0] && (0, external_remeda_namespaceObject.isEmpty)(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 = [];
@@ -6651,20 +6146,20 @@ const yLinearSecondary = (spec, context)=>{
     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 ((0, external_remeda_namespaceObject.isNullish)(datasetReshapeInfo[0].foldInfoList?.[1])) return result;
+    if ((0, external_remeda_namespaceObject.isNullish)(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 = [];
@@ -6805,210 +6300,74 @@ const pivotDualAxis = [
             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
@@ -7018,15 +6377,15 @@ const initPie = (spec, context)=>{
         ...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 = [
         {
@@ -7095,12 +6454,12 @@ const donutAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     autoMeasures_autoMeasures,
     autoDimensions_autoDimensions,
+    encodingForPie,
     pivotAdapter([
-        reshapeTo1D1M
+        reshapeWithEncoding
     ], [
-        pivotReshapeTo1D1M
+        pivotReshapeWithEncoding
     ]),
-    encodingPie,
     donutConfig,
     theme_theme,
     annotation_annotation
@@ -7110,15 +6469,15 @@ const initDonut = (spec, context)=>{
         ...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 = [
         {
@@ -7182,54 +6541,52 @@ const registerDonut = ()=>{
     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,
@@ -7240,13 +6597,12 @@ const initRose = (spec, context)=>{
         ...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;
@@ -7394,12 +6750,12 @@ const roseParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     autoMeasures_autoMeasures,
     autoDimensions_autoDimensions,
+    encodingForRose,
     pivotAdapter([
-        reshapeTo2D1M
+        reshapeWithEncoding
     ], [
-        pivotReshapeTo2D1M
+        pivotReshapeWithEncoding
     ]),
-    encodingRose,
     roseParallelConfig,
     theme_theme,
     markStyle_markStyle,
@@ -7410,19 +6766,18 @@ const initRoseParallel = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { encoding, datasetReshapeInfo, dataset, dimensions } = 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 = sameDimensionsMode ? [
-        encoding[0].angle[0]
+        unfoldInfo.encodingAngle
     ] : [
-        encoding[0].angle[0],
-        unfoldInfo.groupId
+        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;
@@ -7499,54 +6854,52 @@ const registerRoseParallel = ()=>{
     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,
@@ -7557,12 +6910,12 @@ const initRadar = (spec, context)=>{
         ...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 = [
         {
@@ -7674,47 +7027,40 @@ const registerRadar = ()=>{
     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
@@ -7724,11 +7070,12 @@ const initFunnel = (spec, context)=>{
         ...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';
@@ -7743,7 +7090,7 @@ const initFunnel = (spec, context)=>{
         style: {
             cornerRadius: 4,
             fill: {
-                field: encoding[0].color[0],
+                field: unfoldInfo.encodingColorId,
                 scale: 'color'
             }
         },
@@ -7759,99 +7106,13 @@ const initFunnel = (spec, context)=>{
     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,
@@ -7864,12 +7125,11 @@ const pivotFunnel = [
     datasetPivot,
     pivotIndicators_pivotIndicators([
         initFunnel,
-        linearColor,
         background_backgroundColor,
         datasetXY,
         label_label,
         tooltip_tooltip,
-        colorLegend,
+        discreteLegend,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
@@ -7885,49 +7145,42 @@ const registerFunnel = ()=>{
     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,
@@ -7949,23 +7202,20 @@ const initHeatmap = (spec, context)=>{
         ...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 = [
@@ -7990,12 +7240,11 @@ const initHeatmap = (spec, context)=>{
 };
 const heatmap = [
     initHeatmap,
-    linearColor,
     background_backgroundColor,
     datasetXY,
     label_label,
     labelColorInversion,
-    colorLegend,
+    discreteLegend,
     tooltip_tooltip,
     pointStyle_pointStyle,
     pointStateDimensionHover,
@@ -8012,12 +7261,11 @@ const pivotHeatmap = [
     datasetPivot,
     pivotIndicators_pivotIndicators([
         initHeatmap,
-        linearColor,
         background_backgroundColor,
         datasetXY,
         label_label,
         labelColorInversion,
-        colorLegend,
+        discreteLegend,
         tooltip_tooltip,
         pointStyle_pointStyle,
         pointStateDimensionHover,
@@ -8285,12 +7533,6 @@ const lightTheme = ()=>{
                 yAxis: linearAxis,
                 crosshairLine
             },
-            areaRange: {
-                ...baseConfig,
-                xAxis: bandAxis,
-                yAxis: linearAxis,
-                crosshairLine
-            },
             scatter: {
                 ...baseConfig,
                 xAxis: {
@@ -8623,12 +7865,6 @@ const darkTheme = ()=>{
                 yAxis: linearAxis,
                 crosshairLine: crosshairLine
             },
-            areaRange: {
-                ...baseConfig,
-                xAxis: bandAxis,
-                yAxis: linearAxis,
-                crosshairLine: crosshairLine
-            },
             scatter: {
                 ...baseConfig,
                 xAxis: {
@@ -8726,7 +7962,6 @@ const registerAll = ()=>{
     registerBarPercent();
     registerArea();
     registerAreaPercent();
-    registerAreaRange();
     registerScatter();
     registerDualAxis();
     registerPie();
@@ -8761,7 +7996,6 @@ const zChartType = external_zod_namespaceObject.z["enum"]([
     'barParallel',
     'area',
     'areaPercent',
-    'areaRange',
     'scatter',
     'dualAxis',
     'rose',
@@ -8859,6 +8093,12 @@ const zDualMeasure = external_zod_namespaceObject.z.object({
     secondaryMeasures: external_zod_namespaceObject.z.array(zMeasure).or(zMeasure).optional()
 });
 const zDualMeasures = external_zod_namespaceObject.z.array(zDualMeasure);
+const zScatterMeasure = external_zod_namespaceObject.z.object({
+    id: external_zod_namespaceObject.z.string(),
+    xMeasures: external_zod_namespaceObject.z.array(zMeasure).or(zMeasure).optional(),
+    yMeasures: external_zod_namespaceObject.z.array(zMeasure).or(zMeasure).optional()
+});
+const zScatterMeasures = external_zod_namespaceObject.z.array(zScatterMeasure);
 const zFoldInfo = external_zod_namespaceObject.z.object({
     foldMap: external_zod_namespaceObject.z.record(external_zod_namespaceObject.z.string(), external_zod_namespaceObject.z.string().or(external_zod_namespaceObject.z.undefined())),
     measureId: external_zod_namespaceObject.z.string(),
@@ -8866,10 +8106,14 @@ const zFoldInfo = external_zod_namespaceObject.z.object({
     measureValue: external_zod_namespaceObject.z.string()
 });
 const zUnfoldInfo = external_zod_namespaceObject.z.object({
+    encodingX: external_zod_namespaceObject.z.string(),
+    encodingY: external_zod_namespaceObject.z.string(),
+    encodingColor: external_zod_namespaceObject.z.string(),
+    encodingColorId: external_zod_namespaceObject.z.string(),
+    encodingDetail: external_zod_namespaceObject.z.string(),
+    encodingAngle: external_zod_namespaceObject.z.string(),
     colorItems: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()),
-    groupId: external_zod_namespaceObject.z.string(),
-    colorIdMap: external_zod_namespaceObject.z.record(external_zod_namespaceObject.z.string(), external_zod_namespaceObject.z.string()),
-    groupName: external_zod_namespaceObject.z.string()
+    colorIdMap: external_zod_namespaceObject.z.record(external_zod_namespaceObject.z.string(), external_zod_namespaceObject.z.string())
 });
 const zDatasetReshapeInfo = external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.object({
     id: external_zod_namespaceObject.z.string(),
@@ -8878,16 +8122,21 @@ const zDatasetReshapeInfo = external_zod_namespaceObject.z.array(external_zod_na
     foldInfoList: external_zod_namespaceObject.z.array(zFoldInfo).nullish(),
     unfoldInfo: zUnfoldInfo
 }));
-const zEncoding = external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.object({
+const zEncoding = external_zod_namespaceObject.z.object({
     x: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
     y: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
-    color: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
-    group: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
     angle: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
     radius: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
+    detail: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
+    color: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
+    size: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
     tooltip: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
-    size: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish()
-}));
+    label: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
+    row: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
+    column: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
+    group: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish().describe("\u5DF2\u5F03\u7528, \u8BF7\u4F7F\u7528\u989C\u8272\u66FF\u4EE3")
+});
+const zEncodings = external_zod_namespaceObject.z.array(zEncoding);
 const zXBandAxis = external_zod_namespaceObject.z.object({
     visible: external_zod_namespaceObject.z.boolean().default(true).nullish(),
     labelAutoHide: external_zod_namespaceObject.z.boolean().default(true).nullish(),
@@ -9150,7 +8399,6 @@ const zAreaConfig = external_zod_namespaceObject.z.object({
     crosshairLine: zCrosshairLine.nullish()
 });
 const zAreaPercentConfig = zAreaConfig;
-const zAreaRangeConfig = zAreaConfig;
 const zDualAxisConfig = external_zod_namespaceObject.z.object({
     backgroundColor: zBackgroundColor.nullish(),
     label: zLabel.nullish(),
@@ -9205,7 +8453,6 @@ const zConfig = external_zod_namespaceObject.z.object({
     barPercent: zBarPercentConfig.nullish(),
     area: zAreaConfig.nullish(),
     areaPercent: zAreaPercentConfig.nullish(),
-    areaRange: zAreaRangeConfig.nullish(),
     scatter: zScatterConfig.nullish(),
     dualAxis: zDualAxisConfig.nullish(),
     rose: zRoseConfig.nullish(),
@@ -9644,6 +8891,7 @@ const zPivotTable = external_zod_namespaceObject.z.object({
 const zLine = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('line'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9668,6 +8916,7 @@ const zLine = external_zod_namespaceObject.z.object({
 const zColumn = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('column'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9690,6 +8939,7 @@ const zColumn = external_zod_namespaceObject.z.object({
 const zColumnParallel = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('columnParallel'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9712,6 +8962,7 @@ const zColumnParallel = external_zod_namespaceObject.z.object({
 const zColumnPercent = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('columnPercent'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9734,6 +8985,7 @@ const zColumnPercent = external_zod_namespaceObject.z.object({
 const zBar = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('bar'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9756,6 +9008,7 @@ const zBar = external_zod_namespaceObject.z.object({
 const zBarParallel = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('barParallel'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9778,6 +9031,7 @@ const zBarParallel = external_zod_namespaceObject.z.object({
 const zBarPercent = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('barPercent'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9800,6 +9054,7 @@ const zBarPercent = external_zod_namespaceObject.z.object({
 const zArea = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('area'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9823,6 +9078,7 @@ const zArea = external_zod_namespaceObject.z.object({
 const zAreaPercent = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('areaPercent'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9843,31 +9099,13 @@ const zAreaPercent = external_zod_namespaceObject.z.object({
     annotationArea: external_zod_namespaceObject.z.array(zAnnotationArea).or(zAnnotationArea).nullish(),
     locale: zLocale.nullish()
 });
-const zAreaRange = external_zod_namespaceObject.z.object({
-    chartType: external_zod_namespaceObject.z.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: external_zod_namespaceObject.z.array(zPointStyle).or(zPointStyle).nullish(),
-    lineStyle: external_zod_namespaceObject.z.array(zLineStyle).or(zLineStyle).nullish(),
-    areaStyle: external_zod_namespaceObject.z.array(zAreaStyle).or(zAreaStyle).nullish(),
-    annotationPoint: external_zod_namespaceObject.z.array(zAnnotationPoint).or(zAnnotationPoint).nullish(),
-    annotationVerticalLine: external_zod_namespaceObject.z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).nullish(),
-    annotationHorizontalLine: external_zod_namespaceObject.z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).nullish(),
-    annotationArea: external_zod_namespaceObject.z.array(zAnnotationArea).or(zAnnotationArea).nullish(),
-    locale: zLocale.nullish()
-});
 const zScatter = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.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(),
@@ -9917,6 +9155,7 @@ const zDualAxis = external_zod_namespaceObject.z.object({
 const zRose = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('rose'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9930,6 +9169,7 @@ const zRose = external_zod_namespaceObject.z.object({
 const zRoseParallel = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('roseParallel'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9943,6 +9183,7 @@ const zRoseParallel = external_zod_namespaceObject.z.object({
 const zPie = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('pie'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9956,6 +9197,7 @@ const zPie = external_zod_namespaceObject.z.object({
 const zDonut = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('donut'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9969,6 +9211,7 @@ const zDonut = external_zod_namespaceObject.z.object({
 const zRadar = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('radar'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9982,6 +9225,7 @@ const zRadar = external_zod_namespaceObject.z.object({
 const zFunnel = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('funnel'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -10017,7 +9261,6 @@ const zVSeed = external_zod_namespaceObject.z.discriminatedUnion('chartType', [
     zBarPercent,
     zArea,
     zAreaPercent,
-    zAreaRange,
     zScatter,
     zDualAxis,
     zPie,
@@ -10035,6 +9278,7 @@ const zAdvancedVSeed = external_zod_namespaceObject.z.object({
     dimensions: zDimensionTree,
     measures: zMeasureTree,
     encoding: zEncoding,
+    encodings: zEncodings,
     config: zConfig,
     analysis: zAnalysis,
     theme: zTheme,
@@ -10043,21 +9287,28 @@ const zAdvancedVSeed = external_zod_namespaceObject.z.object({
     annotation: zAnnotation,
     locale: zLocale
 });
+exports.AngleEncoding = __webpack_exports__.AngleEncoding;
 exports.Builder = __webpack_exports__.Builder;
+exports.ColorEncoding = __webpack_exports__.ColorEncoding;
+exports.ColorIdEncoding = __webpack_exports__.ColorIdEncoding;
+exports.DetailEncoding = __webpack_exports__.DetailEncoding;
 exports.FoldMeasureId = __webpack_exports__.FoldMeasureId;
 exports.FoldMeasureName = __webpack_exports__.FoldMeasureName;
 exports.FoldMeasureValue = __webpack_exports__.FoldMeasureValue;
 exports.FoldPrimaryMeasureValue = __webpack_exports__.FoldPrimaryMeasureValue;
 exports.FoldSecondaryMeasureValue = __webpack_exports__.FoldSecondaryMeasureValue;
+exports.FoldXMeasureValue = __webpack_exports__.FoldXMeasureValue;
+exports.FoldYMeasureValue = __webpack_exports__.FoldYMeasureValue;
+exports.MeasureName = __webpack_exports__.MeasureName;
 exports.ORIGINAL_DATA = __webpack_exports__.ORIGINAL_DATA;
 exports.Separator = __webpack_exports__.Separator;
 exports.UnfoldDimensionGroup = __webpack_exports__.UnfoldDimensionGroup;
 exports.UnfoldDimensionGroupId = __webpack_exports__.UnfoldDimensionGroupId;
+exports.XEncoding = __webpack_exports__.XEncoding;
+exports.YEncoding = __webpack_exports__.YEncoding;
 exports.areaAdvancedPipeline = __webpack_exports__.areaAdvancedPipeline;
 exports.areaPercentAdvancedPipeline = __webpack_exports__.areaPercentAdvancedPipeline;
 exports.areaPercentSpecPipeline = __webpack_exports__.areaPercentSpecPipeline;
-exports.areaRangeAdvancedPipeline = __webpack_exports__.areaRangeAdvancedPipeline;
-exports.areaRangeSpecPipeline = __webpack_exports__.areaRangeSpecPipeline;
 exports.areaSpecPipeline = __webpack_exports__.areaSpecPipeline;
 exports.autoFormatter = __webpack_exports__.autoFormatter;
 exports.autoNumFormatter = __webpack_exports__.autoNumFormatter;
@@ -10076,11 +9327,7 @@ exports.columnSpecPipeline = __webpack_exports__.columnSpecPipeline;
 exports.createFormatter = __webpack_exports__.createFormatter;
 exports.createNumFormatter = __webpack_exports__.createNumFormatter;
 exports.darkTheme = __webpack_exports__.darkTheme;
-exports.dataReshapeFor1D = __webpack_exports__.dataReshapeFor1D;
-exports.dataReshapeFor1D1M = __webpack_exports__.dataReshapeFor1D1M;
-exports.dataReshapeFor1D2M = __webpack_exports__.dataReshapeFor1D2M;
-exports.dataReshapeFor2D1M = __webpack_exports__.dataReshapeFor2D1M;
-exports.dataReshapeFor2D1M0Name = __webpack_exports__.dataReshapeFor2D1M0Name;
+exports.dataReshapeByEncoding = __webpack_exports__.dataReshapeByEncoding;
 exports.donutAdvancedPipeline = __webpack_exports__.donutAdvancedPipeline;
 exports.donutSpecPipeline = __webpack_exports__.donutSpecPipeline;
 exports.dualAxisAdvancedPipeline = __webpack_exports__.dualAxisAdvancedPipeline;
@@ -10128,7 +9375,6 @@ exports.radarSpecPipeline = __webpack_exports__.radarSpecPipeline;
 exports.registerAll = __webpack_exports__.registerAll;
 exports.registerArea = __webpack_exports__.registerArea;
 exports.registerAreaPercent = __webpack_exports__.registerAreaPercent;
-exports.registerAreaRange = __webpack_exports__.registerAreaRange;
 exports.registerBar = __webpack_exports__.registerBar;
 exports.registerBarParallel = __webpack_exports__.registerBarParallel;
 exports.registerBarPercent = __webpack_exports__.registerBarPercent;
@@ -10172,8 +9418,6 @@ exports.zArea = __webpack_exports__.zArea;
 exports.zAreaConfig = __webpack_exports__.zAreaConfig;
 exports.zAreaPercent = __webpack_exports__.zAreaPercent;
 exports.zAreaPercentConfig = __webpack_exports__.zAreaPercentConfig;
-exports.zAreaRange = __webpack_exports__.zAreaRange;
-exports.zAreaRangeConfig = __webpack_exports__.zAreaRangeConfig;
 exports.zAreaStyle = __webpack_exports__.zAreaStyle;
 exports.zAxis = __webpack_exports__.zAxis;
 exports.zBackgroundColor = __webpack_exports__.zBackgroundColor;
@@ -10213,6 +9457,7 @@ exports.zDualChartType = __webpack_exports__.zDualChartType;
 exports.zDualMeasure = __webpack_exports__.zDualMeasure;
 exports.zDualMeasures = __webpack_exports__.zDualMeasures;
 exports.zEncoding = __webpack_exports__.zEncoding;
+exports.zEncodings = __webpack_exports__.zEncodings;
 exports.zFoldInfo = __webpack_exports__.zFoldInfo;
 exports.zFunnel = __webpack_exports__.zFunnel;
 exports.zFunnelConfig = __webpack_exports__.zFunnelConfig;
@@ -10244,6 +9489,8 @@ exports.zRoseParallel = __webpack_exports__.zRoseParallel;
 exports.zRoseParallelConfig = __webpack_exports__.zRoseParallelConfig;
 exports.zScatter = __webpack_exports__.zScatter;
 exports.zScatterConfig = __webpack_exports__.zScatterConfig;
+exports.zScatterMeasure = __webpack_exports__.zScatterMeasure;
+exports.zScatterMeasures = __webpack_exports__.zScatterMeasures;
 exports.zSort = __webpack_exports__.zSort;
 exports.zSortLegend = __webpack_exports__.zSortLegend;
 exports.zStackCornerRadius = __webpack_exports__.zStackCornerRadius;
@@ -10258,21 +9505,28 @@ exports.zXLinearAxis = __webpack_exports__.zXLinearAxis;
 exports.zYBandAxis = __webpack_exports__.zYBandAxis;
 exports.zYLinearAxis = __webpack_exports__.zYLinearAxis;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "AngleEncoding",
     "Builder",
+    "ColorEncoding",
+    "ColorIdEncoding",
+    "DetailEncoding",
     "FoldMeasureId",
     "FoldMeasureName",
     "FoldMeasureValue",
     "FoldPrimaryMeasureValue",
     "FoldSecondaryMeasureValue",
+    "FoldXMeasureValue",
+    "FoldYMeasureValue",
+    "MeasureName",
     "ORIGINAL_DATA",
     "Separator",
     "UnfoldDimensionGroup",
     "UnfoldDimensionGroupId",
+    "XEncoding",
+    "YEncoding",
     "areaAdvancedPipeline",
     "areaPercentAdvancedPipeline",
     "areaPercentSpecPipeline",
-    "areaRangeAdvancedPipeline",
-    "areaRangeSpecPipeline",
     "areaSpecPipeline",
     "autoFormatter",
     "autoNumFormatter",
@@ -10291,11 +9545,7 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "createFormatter",
     "createNumFormatter",
     "darkTheme",
-    "dataReshapeFor1D",
-    "dataReshapeFor1D1M",
-    "dataReshapeFor1D2M",
-    "dataReshapeFor2D1M",
-    "dataReshapeFor2D1M0Name",
+    "dataReshapeByEncoding",
     "donutAdvancedPipeline",
     "donutSpecPipeline",
     "dualAxisAdvancedPipeline",
@@ -10343,7 +9593,6 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "registerAll",
     "registerArea",
     "registerAreaPercent",
-    "registerAreaRange",
     "registerBar",
     "registerBarParallel",
     "registerBarPercent",
@@ -10387,8 +9636,6 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "zAreaConfig",
     "zAreaPercent",
     "zAreaPercentConfig",
-    "zAreaRange",
-    "zAreaRangeConfig",
     "zAreaStyle",
     "zAxis",
     "zBackgroundColor",
@@ -10428,6 +9675,7 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "zDualMeasure",
     "zDualMeasures",
     "zEncoding",
+    "zEncodings",
     "zFoldInfo",
     "zFunnel",
     "zFunnelConfig",
@@ -10459,6 +9707,8 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "zRoseParallelConfig",
     "zScatter",
     "zScatterConfig",
+    "zScatterMeasure",
+    "zScatterMeasures",
     "zSort",
     "zSortLegend",
     "zStackCornerRadius",