@visactor/vseed 0.0.39 → 0.1.0

package/dist/index.js

@@ -1080,13 +1080,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;
@@ -1165,6 +1178,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
@@ -1172,6 +1203,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) {
@@ -1179,6 +1214,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);
@@ -1195,23 +1232,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,
@@ -1241,79 +1306,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 unfoldDimensions = (dataset, dimensions, encoding, options)=>{
+    const { foldMeasureId, separator, colorItemAsId } = options;
     const unfoldInfo = {
-        groupName: unfoldGroupName,
-        groupId: unfoldGroupId,
+        encodingAngle: AngleEncoding,
+        encodingX: XEncoding,
+        encodingY: YEncoding,
+        encodingDetail: DetailEncoding,
+        encodingColor: ColorEncoding,
+        encodingColorId: ColorIdEncoding,
         colorItems: [],
         colorIdMap: {}
     };
-    if (0 === dimensions.length || 0 === measures.length) return {
-        dataset,
-        unfoldInfo: {
-            groupName: unfoldGroupName,
-            groupId: unfoldGroupId,
-            colorItems: [],
-            colorIdMap: {}
-        }
-    };
-    const colorItems = [];
-    const colorMap = {};
+    const { color, x, y, detail, angle } = encoding;
+    const angleDimensions = angle ? dimensions.filter((dim)=>angle.includes(dim.id)) : [];
+    const xDimensions = x ? dimensions.filter((dim)=>x.includes(dim.id)) : [];
+    const yDimensions = y ? dimensions.filter((dim)=>y.includes(dim.id)) : [];
+    const colorDimensions = color ? dimensions.filter((dim)=>color.includes(dim.id)) : [];
+    const detailDimensions = detail ? dimensions.filter((dim)=>detail.includes(dim.id)) : [];
+    const colorItems = new Set();
+    const colorIdMap = {};
     for(let i = 0; i < dataset.length; i++){
         const datum = dataset[i];
-        const colorName = generateDimGroupName(dimensionsToBeUnfolded, datum, dimensionsSeparator);
-        const colorId = datum[foldMeasureId] ? [
-            colorName,
-            datum[foldMeasureId]
-        ].join(dimensionsSeparator) : colorName;
-        datum[unfoldGroupName] = colorName;
-        datum[unfoldGroupId] = colorId;
-        colorItems.push(colorId);
-        colorMap[colorId] = colorName;
+        applyEncoding(AngleEncoding, angleDimensions, datum, separator);
+        applyEncoding(XEncoding, xDimensions, datum, separator);
+        applyEncoding(YEncoding, yDimensions, datum, separator);
+        applyEncoding(ColorEncoding, colorDimensions, datum, separator);
+        applyEncoding(DetailEncoding, detailDimensions, datum, separator);
+        if (!datum[ColorEncoding]) continue;
+        const measureId = String(datum[foldMeasureId]);
+        const colorItem = String(datum[ColorEncoding]);
+        const colorId = colorItemAsId ? colorItem : measureId ? [
+            colorItem,
+            measureId
+        ].join(separator) : colorItem;
+        datum[ColorIdEncoding] = colorId;
+        colorIdMap[colorId] = colorItem;
+        colorItems.add(colorId);
     }
-    unfoldInfo.colorItems = 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 = 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: [],
@@ -1324,69 +1363,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
@@ -1396,31 +1413,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,
@@ -1428,93 +1441,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 = 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 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) {
@@ -1523,15 +1503,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;
@@ -1663,14 +1642,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,
@@ -1681,13 +1660,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 = [
         {
@@ -1763,11 +1742,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] = {
@@ -1784,14 +1764,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
         };
     }
@@ -2044,7 +2024,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: {
@@ -2065,7 +2045,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];
@@ -2087,7 +2067,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];
@@ -2425,7 +2405,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: {
@@ -2436,7 +2417,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;
                     },
@@ -2450,7 +2431,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 = {
@@ -2459,8 +2441,8 @@ const lineStyle_lineStyle = (spec, context)=>{
     const lineStyles = Array.isArray(lineStyle) ? lineStyle : [
         lineStyle
     ];
-    const group = encoding[0]?.group?.[0];
-    const lineGroups = groupBy(dataset, (d)=>d[group ?? '']);
+    const colorId = unfoldInfo.encodingColorId;
+    const lineGroups = 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;
@@ -2481,7 +2463,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;
                 },
@@ -2576,7 +2558,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 : [
@@ -2656,7 +2639,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]);
         });
@@ -2673,7 +2656,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 : [
@@ -2753,7 +2737,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]);
         });
@@ -3034,13 +3018,10 @@ const pivotIndicators_pivotIndicators = (chartPipeline)=>(spec, context)=>{
             ...spec
         };
         const { advancedVSeed } = context;
-        const { measures, datasetReshapeInfo, encoding, dataset } = advancedVSeed;
+        const { measures, datasetReshapeInfo, dataset } = advancedVSeed;
         const colorItems = 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 = [
                 {
@@ -3056,8 +3037,7 @@ const pivotIndicators_pivotIndicators = (chartPipeline)=>(spec, context)=>{
                 advancedVSeed: {
                     ...advancedVSeed,
                     datasetReshapeInfo: newDatasetReshapeInfo,
-                    dataset: newDataset,
-                    encoding: newEncoding
+                    dataset: newDataset
                 }
             };
             const chartSpec = execPipeline(chartPipeline, newContext, {});
@@ -3243,7 +3223,7 @@ const pivotDiscreteLegend = (spec, context)=>{
                 }
             },
             label: {
-                formatMethod: (value)=>colorIdMap[String(value)] ?? value,
+                formatMethod: (value)=>colorIdMap[value] ?? value,
                 style: {
                     fontSize: labelFontSize,
                     fill: labelFontColor,
@@ -3326,151 +3306,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,
@@ -3481,13 +3328,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 = [
         {
@@ -3807,14 +3654,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,
@@ -3825,17 +3672,19 @@ const initColumnParallel = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { encoding, datasetReshapeInfo } = advancedVSeed;
-    const { unfoldInfo } = datasetReshapeInfo[0];
-    if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
+    const { datasetReshapeInfo, dimensions } = advancedVSeed;
+    const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
+    const sameDimensionsMode = dimensions.length > 1 && dimensions.every((dim)=>dim.id === dimensions[0].id);
     result.type = 'bar';
     result.direction = 'vertical';
-    result.xField = [
-        encoding[0].x[0],
-        unfoldInfo.groupId
+    result.xField = sameDimensionsMode ? [
+        unfoldInfo.encodingX
+    ] : [
+        unfoldInfo.encodingX,
+        unfoldInfo.encodingDetail
     ];
-    result.yField = encoding[0].y[0];
-    result.seriesField = encoding[0].group[0];
+    result.yField = foldInfo.measureValue;
+    result.seriesField = unfoldInfo.encodingColorId;
     result.padding = 0;
     result.region = [
         {
@@ -3902,14 +3751,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,
@@ -3979,58 +3828,73 @@ 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 barAdvancedPipeline = [
-    initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
-    autoDimensions_autoDimensions,
-    pivotAdapter([
-        reshapeTo2D1M
-    ], [
-        pivotReshapeTo2D1M
-    ]),
-    encodingYX,
-    sortYBandAxis,
-    sort_sortLegend,
-    barConfig,
-    theme_theme,
-    markStyle_markStyle,
+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([
+        reshapeWithEncoding
+    ], [
+        pivotReshapeWithEncoding
+    ]),
+    sortYBandAxis,
+    sortLegend_sortLegend,
+    barConfig,
+    theme_theme,
+    markStyle_markStyle,
     annotation_annotation
 ];
 const initBar = (spec, context)=>{
@@ -4038,13 +3902,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 = [
         {
@@ -4056,11 +3920,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] = {
@@ -4077,14 +3942,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
         };
     }
@@ -4372,14 +4237,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,
@@ -4390,17 +4255,19 @@ const initBarParallel = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { encoding, datasetReshapeInfo } = advancedVSeed;
-    const { unfoldInfo } = datasetReshapeInfo[0];
-    if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
+    const { datasetReshapeInfo, dimensions } = advancedVSeed;
+    const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
+    const sameDimensionsMode = dimensions.length > 1 && dimensions.every((dim)=>dim.id === dimensions[0].id);
     result.type = 'bar';
     result.direction = 'horizontal';
-    result.yField = [
-        encoding[0].y[0],
-        unfoldInfo.groupId
+    result.yField = sameDimensionsMode ? [
+        unfoldInfo.encodingY
+    ] : [
+        unfoldInfo.encodingY,
+        unfoldInfo.encodingDetail
     ];
-    result.xField = encoding[0].x[0];
-    result.seriesField = encoding[0].group[0];
+    result.xField = foldInfo.measureValue;
+    result.seriesField = unfoldInfo.encodingColorId;
     result.padding = 0;
     result.region = [
         {
@@ -4466,14 +4333,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,
@@ -4537,14 +4404,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,
@@ -4555,13 +4422,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 = [
         {
@@ -4573,8 +4440,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: {
@@ -4587,7 +4455,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 = groupBy(dataset, (d)=>d[group ?? '']);
     const customMap = areaStyles.reduce((result, style, index)=>{
         const { areaColor, areaColorOpacity, areaVisible = true } = style;
@@ -4681,14 +4549,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,
@@ -4753,16 +4621,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);
@@ -4770,7 +4642,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
@@ -4778,689 +4650,273 @@ 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 = 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 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 initAreaRange = (spec, context)=>{
+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;
-    const { color } = advancedVSeed.config.areaRange;
-    result.type = 'rangeArea';
+    const { datasetReshapeInfo } = advancedVSeed;
+    const { unfoldInfo, foldInfoList } = datasetReshapeInfo[0];
+    result.type = 'scatter';
     result.direction = 'vertical';
-    result.stack = false;
-    result.xField = encoding[0].x[0];
-    result.yField = [
-        encoding[0].y[0],
-        encoding[0].y[1]
+    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;
-    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 (!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 (!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
-            }
-        ];
-    }, []);
+const datasetScatter = (spec, context)=>{
+    const { advancedVSeed, vseed } = context;
+    const { datasetReshapeInfo } = advancedVSeed;
+    const id = datasetReshapeInfo[0].id;
+    const fields = {};
     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
+        ...spec,
+        data: {
+            id,
+            values: isPivotChart(vseed) ? void 0 : advancedVSeed.dataset.flat(),
+            fields: fields
         }
-    ];
-    result.animation = true;
-    return result;
+    };
 };
 const horizontalCrosshairLine = (spec, context)=>{
     const result = {
@@ -5510,7 +4966,7 @@ const scatter = [
     initScatter,
     color_color,
     background_backgroundColor,
-    datasetXY,
+    datasetScatter,
     progressive,
     xLinear,
     yLinear,
@@ -5535,7 +4991,7 @@ const pivotScatter = [
         initScatter,
         color_color,
         background_backgroundColor,
-        datasetXY,
+        datasetScatter,
         progressive,
         xLinear,
         yLinear,
@@ -5561,41 +5017,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,
@@ -5607,7 +5185,7 @@ const reshapeTo2D2M = (advancedVSeed, context)=>{
         dataset: datasets,
         datasetReshapeInfo: [
             {
-                id: '2D2M',
+                id: String(chartType),
                 index: 0,
                 foldInfo: foldInfoList[0],
                 foldInfoList: foldInfoList,
@@ -5616,46 +5194,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,
@@ -5663,53 +5243,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)=>{
@@ -5738,125 +5284,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;
 };
@@ -5865,14 +5366,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;
 };
@@ -5904,10 +5405,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;
@@ -5960,10 +5461,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;
@@ -5990,10 +5491,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) {
@@ -6007,14 +5509,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
         };
     }
@@ -6029,10 +5531,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) {
@@ -6046,14 +5549,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
         };
     }
@@ -6151,7 +5654,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: {
@@ -6172,7 +5675,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];
@@ -6194,7 +5697,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];
@@ -6231,7 +5734,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: {
@@ -6252,7 +5755,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];
@@ -6274,7 +5777,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];
@@ -6303,16 +5806,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] && isEmpty(datasetReshapeInfo[0].foldInfoList[0].foldMap)) return result;
-    const id = `${datasetReshapeInfo[0].id}-primary-axis`;
+    if (foldInfoList?.[0] && 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 = [];
@@ -6400,20 +5903,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 (isNullish(datasetReshapeInfo[0].foldInfoList?.[1])) return result;
+    if (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 = [];
@@ -6554,210 +6057,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
@@ -6767,15 +6134,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 = [
         {
@@ -6844,12 +6211,12 @@ const donutAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     autoMeasures_autoMeasures,
     autoDimensions_autoDimensions,
+    encodingForPie,
     pivotAdapter([
-        reshapeTo1D1M
+        reshapeWithEncoding
     ], [
-        pivotReshapeTo1D1M
+        pivotReshapeWithEncoding
     ]),
-    encodingPie,
     donutConfig,
     theme_theme,
     annotation_annotation
@@ -6859,15 +6226,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 = [
         {
@@ -6931,54 +6298,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,
@@ -6989,13 +6354,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;
@@ -7143,12 +6507,12 @@ const roseParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
     autoMeasures_autoMeasures,
     autoDimensions_autoDimensions,
+    encodingForRose,
     pivotAdapter([
-        reshapeTo2D1M
+        reshapeWithEncoding
     ], [
-        pivotReshapeTo2D1M
+        pivotReshapeWithEncoding
     ]),
-    encodingRose,
     roseParallelConfig,
     theme_theme,
     markStyle_markStyle,
@@ -7159,16 +6523,18 @@ const initRoseParallel = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { encoding, datasetReshapeInfo, dataset } = advancedVSeed;
+    const { datasetReshapeInfo, dataset, dimensions } = advancedVSeed;
     const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
-    if (!encoding[0].radius || !encoding[0].angle || !encoding[0].group) return result;
+    const sameDimensionsMode = dimensions.length > 1 && dimensions.every((dim)=>dim.id === dimensions[0].id);
     result.type = 'rose';
-    result.categoryField = [
-        encoding[0].angle[0],
-        unfoldInfo.groupId
+    result.categoryField = sameDimensionsMode ? [
+        unfoldInfo.encodingAngle
+    ] : [
+        unfoldInfo.encodingAngle,
+        unfoldInfo.encodingDetail
     ];
-    result.valueField = encoding[0].radius[0];
-    result.seriesField = encoding[0].group[0];
+    result.valueField = foldInfo.measureValue;
+    result.seriesField = unfoldInfo.encodingColorId;
     result.padding = 0;
     result.outerRadius = 0.9;
     result.innerRadius = 0;
@@ -7245,54 +6611,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,
@@ -7303,12 +6667,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 = [
         {
@@ -7420,47 +6784,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
@@ -7470,11 +6827,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';
@@ -7489,7 +6847,7 @@ const initFunnel = (spec, context)=>{
         style: {
             cornerRadius: 4,
             fill: {
-                field: encoding[0].color[0],
+                field: unfoldInfo.encodingColorId,
                 scale: 'color'
             }
         },
@@ -7505,99 +6863,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,
@@ -7610,12 +6882,11 @@ const pivotFunnel = [
     datasetPivot,
     pivotIndicators_pivotIndicators([
         initFunnel,
-        linearColor,
         background_backgroundColor,
         datasetXY,
         label_label,
         tooltip_tooltip,
-        colorLegend,
+        discreteLegend,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
@@ -7631,49 +6902,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,
@@ -7695,23 +6959,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 = [
@@ -7736,12 +6997,11 @@ const initHeatmap = (spec, context)=>{
 };
 const heatmap = [
     initHeatmap,
-    linearColor,
     background_backgroundColor,
     datasetXY,
     label_label,
     labelColorInversion,
-    colorLegend,
+    discreteLegend,
     tooltip_tooltip,
     pointStyle_pointStyle,
     pointStateDimensionHover,
@@ -7758,12 +7018,11 @@ const pivotHeatmap = [
     datasetPivot,
     pivotIndicators_pivotIndicators([
         initHeatmap,
-        linearColor,
         background_backgroundColor,
         datasetXY,
         label_label,
         labelColorInversion,
-        colorLegend,
+        discreteLegend,
         tooltip_tooltip,
         pointStyle_pointStyle,
         pointStateDimensionHover,
@@ -8031,12 +7290,6 @@ const lightTheme = ()=>{
                 yAxis: linearAxis,
                 crosshairLine
             },
-            areaRange: {
-                ...baseConfig,
-                xAxis: bandAxis,
-                yAxis: linearAxis,
-                crosshairLine
-            },
             scatter: {
                 ...baseConfig,
                 xAxis: {
@@ -8369,12 +7622,6 @@ const darkTheme = ()=>{
                 yAxis: linearAxis,
                 crosshairLine: crosshairLine
             },
-            areaRange: {
-                ...baseConfig,
-                xAxis: bandAxis,
-                yAxis: linearAxis,
-                crosshairLine: crosshairLine
-            },
             scatter: {
                 ...baseConfig,
                 xAxis: {
@@ -8472,7 +7719,6 @@ const registerAll = ()=>{
     registerBarPercent();
     registerArea();
     registerAreaPercent();
-    registerAreaRange();
     registerScatter();
     registerDualAxis();
     registerPie();
@@ -8506,7 +7752,6 @@ const zChartType = z["enum"]([
     'barParallel',
     'area',
     'areaPercent',
-    'areaRange',
     'scatter',
     'dualAxis',
     'rose',
@@ -8604,6 +7849,12 @@ const zDualMeasure = z.object({
     secondaryMeasures: z.array(zMeasure).or(zMeasure).optional()
 });
 const zDualMeasures = z.array(zDualMeasure);
+const zScatterMeasure = z.object({
+    id: z.string(),
+    xMeasures: z.array(zMeasure).or(zMeasure).optional(),
+    yMeasures: z.array(zMeasure).or(zMeasure).optional()
+});
+const zScatterMeasures = z.array(zScatterMeasure);
 const zFoldInfo = z.object({
     foldMap: z.record(z.string(), z.string().or(z.undefined())),
     measureId: z.string(),
@@ -8611,10 +7862,14 @@ const zFoldInfo = z.object({
     measureValue: z.string()
 });
 const zUnfoldInfo = z.object({
+    encodingX: z.string(),
+    encodingY: z.string(),
+    encodingColor: z.string(),
+    encodingColorId: z.string(),
+    encodingDetail: z.string(),
+    encodingAngle: z.string(),
     colorItems: z.array(z.string()),
-    groupId: z.string(),
-    colorIdMap: z.record(z.string(), z.string()),
-    groupName: z.string()
+    colorIdMap: z.record(z.string(), z.string())
 });
 const zDatasetReshapeInfo = z.array(z.object({
     id: z.string(),
@@ -8623,16 +7878,21 @@ const zDatasetReshapeInfo = z.array(z.object({
     foldInfoList: z.array(zFoldInfo).nullish(),
     unfoldInfo: zUnfoldInfo
 }));
-const zEncoding = z.array(z.object({
+const zEncoding = z.object({
     x: z.array(z.string()).nullish(),
     y: z.array(z.string()).nullish(),
-    color: z.array(z.string()).nullish(),
-    group: z.array(z.string()).nullish(),
     angle: z.array(z.string()).nullish(),
     radius: z.array(z.string()).nullish(),
+    detail: z.array(z.string()).nullish(),
+    color: z.array(z.string()).nullish(),
+    size: z.array(z.string()).nullish(),
     tooltip: z.array(z.string()).nullish(),
-    size: z.array(z.string()).nullish()
-}));
+    label: z.array(z.string()).nullish(),
+    row: z.array(z.string()).nullish(),
+    column: z.array(z.string()).nullish(),
+    group: z.array(z.string()).nullish().describe("\u5DF2\u5F03\u7528, \u8BF7\u4F7F\u7528\u989C\u8272\u66FF\u4EE3")
+});
+const zEncodings = z.array(zEncoding);
 const zXBandAxis = z.object({
     visible: z.boolean().default(true).nullish(),
     labelAutoHide: z.boolean().default(true).nullish(),
@@ -8895,7 +8155,6 @@ const zAreaConfig = z.object({
     crosshairLine: zCrosshairLine.nullish()
 });
 const zAreaPercentConfig = zAreaConfig;
-const zAreaRangeConfig = zAreaConfig;
 const zDualAxisConfig = z.object({
     backgroundColor: zBackgroundColor.nullish(),
     label: zLabel.nullish(),
@@ -8950,7 +8209,6 @@ const zConfig = z.object({
     barPercent: zBarPercentConfig.nullish(),
     area: zAreaConfig.nullish(),
     areaPercent: zAreaPercentConfig.nullish(),
-    areaRange: zAreaRangeConfig.nullish(),
     scatter: zScatterConfig.nullish(),
     dualAxis: zDualAxisConfig.nullish(),
     rose: zRoseConfig.nullish(),
@@ -9389,6 +8647,7 @@ const zPivotTable = z.object({
 const zLine = z.object({
     chartType: z.literal('line'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9413,6 +8672,7 @@ const zLine = z.object({
 const zColumn = z.object({
     chartType: z.literal('column'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9435,6 +8695,7 @@ const zColumn = z.object({
 const zColumnParallel = z.object({
     chartType: z.literal('columnParallel'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9457,6 +8718,7 @@ const zColumnParallel = z.object({
 const zColumnPercent = z.object({
     chartType: z.literal('columnPercent'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9479,6 +8741,7 @@ const zColumnPercent = z.object({
 const zBar = z.object({
     chartType: z.literal('bar'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9501,6 +8764,7 @@ const zBar = z.object({
 const zBarParallel = z.object({
     chartType: z.literal('barParallel'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9523,6 +8787,7 @@ const zBarParallel = z.object({
 const zBarPercent = z.object({
     chartType: z.literal('barPercent'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9545,6 +8810,7 @@ const zBarPercent = z.object({
 const zArea = z.object({
     chartType: z.literal('area'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9568,6 +8834,7 @@ const zArea = z.object({
 const zAreaPercent = z.object({
     chartType: z.literal('areaPercent'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9588,31 +8855,13 @@ const zAreaPercent = z.object({
     annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).nullish(),
     locale: zLocale.nullish()
 });
-const zAreaRange = z.object({
-    chartType: 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: z.array(zPointStyle).or(zPointStyle).nullish(),
-    lineStyle: z.array(zLineStyle).or(zLineStyle).nullish(),
-    areaStyle: z.array(zAreaStyle).or(zAreaStyle).nullish(),
-    annotationPoint: z.array(zAnnotationPoint).or(zAnnotationPoint).nullish(),
-    annotationVerticalLine: z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).nullish(),
-    annotationHorizontalLine: z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).nullish(),
-    annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).nullish(),
-    locale: zLocale.nullish()
-});
 const zScatter = z.object({
     chartType: 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(),
@@ -9662,6 +8911,7 @@ const zDualAxis = z.object({
 const zRose = z.object({
     chartType: z.literal('rose'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9675,6 +8925,7 @@ const zRose = z.object({
 const zRoseParallel = z.object({
     chartType: z.literal('roseParallel'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9688,6 +8939,7 @@ const zRoseParallel = z.object({
 const zPie = z.object({
     chartType: z.literal('pie'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9701,6 +8953,7 @@ const zPie = z.object({
 const zDonut = z.object({
     chartType: z.literal('donut'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9714,6 +8967,7 @@ const zDonut = z.object({
 const zRadar = z.object({
     chartType: z.literal('radar'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9727,6 +8981,7 @@ const zRadar = z.object({
 const zFunnel = z.object({
     chartType: z.literal('funnel'),
     dataset: zDataset.nullish(),
+    encoding: zEncoding.nullish(),
     dimensions: zDimensions.nullish(),
     measures: zMeasureTree.nullish(),
     backgroundColor: zBackgroundColor.nullish(),
@@ -9762,7 +9017,6 @@ const zVSeed = z.discriminatedUnion('chartType', [
     zBarPercent,
     zArea,
     zAreaPercent,
-    zAreaRange,
     zScatter,
     zDualAxis,
     zPie,
@@ -9780,6 +9034,7 @@ const zAdvancedVSeed = z.object({
     dimensions: zDimensionTree,
     measures: zMeasureTree,
     encoding: zEncoding,
+    encodings: zEncodings,
     config: zConfig,
     analysis: zAnalysis,
     theme: zTheme,
@@ -9788,6 +9043,6 @@ const zAdvancedVSeed = z.object({
     annotation: zAnnotation,
     locale: zLocale
 });
-export { Builder, FoldMeasureId, FoldMeasureName, FoldMeasureValue, FoldPrimaryMeasureValue, FoldSecondaryMeasureValue, ORIGINAL_DATA, Separator, UnfoldDimensionGroup, UnfoldDimensionGroupId, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaRangeAdvancedPipeline, areaRangeSpecPipeline, areaSpecPipeline, autoFormatter, autoNumFormatter, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, createFormatter, createNumFormatter, darkTheme, dataReshapeFor1D, dataReshapeFor1D1M, dataReshapeFor1D2M, dataReshapeFor2D1M, dataReshapeFor2D1M0Name, donutAdvancedPipeline, donutSpecPipeline, dualAxisAdvancedPipeline, dualAxisSpecPipeline, execPipeline, findAllDimensions, findAllMeasures, findDimensionById, findFirstDimension, findFirstMeasure, findMeasureById, foldMeasures, funnelAdvancedPipeline, funnelSpecPipeline, heatmapAdvancedPipeline, heatmapSpecPipeline, i18n, intl, isDimension, isDimensionGroup, isDimensionSelector, isDimensions, isMeasure, isMeasureGroup, isMeasureSelector, isMeasures, isPartialDatumSelector, isPivotChart, isPivotTable, isTable, isVChart, isVTable, isValueSelector, lightTheme, lineAdvancedPipeline, lineSpecPipeline, measureDepth, pieAdvancedPipeline, pieSpecPipeline, pivotTableAdvancedPipeline, pivotTableSpecPipeline, preorderTraverse, radarAdvancedPipeline, radarSpecPipeline, registerAll, registerArea, registerAreaPercent, registerAreaRange, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerDonut, registerFunnel, registerHeatmap, registerLightTheme, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable, roseAdvancedPipeline, roseParallelAdvancedPipeline, roseParallelSpecPipeline, roseSpecPipeline, scatterAdvancedPipeline, scatterSpecPipeline, selector_selector as selector, tableAdvancedPipeline, tableSpecPipeline, unfoldDimensions, updateAdvanced, updateSpec, zAdvancedVSeed, zAnalysis, zAnnotation, zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zArea, zAreaConfig, zAreaPercent, zAreaPercentConfig, zAreaRange, zAreaRangeConfig, zAreaStyle, zAxis, zBackgroundColor, zBar, zBarConfig, zBarParallel, zBarParallelConfig, zBarPercent, zBarPercentConfig, zBarStyle, zChartType, zColor, zColorLegend, zColumn, zColumnConfig, zColumnParallel, zColumnParallelConfig, zColumnPercent, zColumnPercentConfig, zConfig, zCrosshairLine, zCrosshairRect, zCustomTheme, zCustomThemeConfig, zDataset, zDatasetReshapeInfo, zDatum, zDimension, zDimensionGroup, zDimensionTree, zDimensions, zDonut, zDonutConfig, zDualAxis, zDualAxisConfig, zDualChartType, zDualMeasure, zDualMeasures, zEncoding, zFoldInfo, zFunnel, zFunnelConfig, zHeatmap, zHeatmapConfig, zLabel, zLegend, zLine, zLineConfig, zLineStyle, zLinearColor, zLocale, zMarkStyle, zMeasure, zMeasureGroup, zMeasureTree, zMeasures, zNumFormat, zPie, zPieConfig, zPivotTable, zPivotTableConfig, zPointStyle, zRadar, zRadarConfig, zRose, zRoseConfig, zRoseParallel, zRoseParallelConfig, zScatter, zScatterConfig, zSort, zSortLegend, zStackCornerRadius, zTable, zTableConfig, zTheme, zTooltip, zUnfoldInfo, zVSeed, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis };
+export { AngleEncoding, Builder, ColorEncoding, ColorIdEncoding, DetailEncoding, FoldMeasureId, FoldMeasureName, FoldMeasureValue, FoldPrimaryMeasureValue, FoldSecondaryMeasureValue, FoldXMeasureValue, FoldYMeasureValue, MeasureName, ORIGINAL_DATA, Separator, UnfoldDimensionGroup, UnfoldDimensionGroupId, XEncoding, YEncoding, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaSpecPipeline, autoFormatter, autoNumFormatter, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, createFormatter, createNumFormatter, darkTheme, dataReshapeByEncoding, donutAdvancedPipeline, donutSpecPipeline, dualAxisAdvancedPipeline, dualAxisSpecPipeline, execPipeline, findAllDimensions, findAllMeasures, findDimensionById, findFirstDimension, findFirstMeasure, findMeasureById, foldMeasures, funnelAdvancedPipeline, funnelSpecPipeline, heatmapAdvancedPipeline, heatmapSpecPipeline, i18n, intl, isDimension, isDimensionGroup, isDimensionSelector, isDimensions, isMeasure, isMeasureGroup, isMeasureSelector, isMeasures, isPartialDatumSelector, isPivotChart, isPivotTable, isTable, isVChart, isVTable, isValueSelector, lightTheme, lineAdvancedPipeline, lineSpecPipeline, measureDepth, pieAdvancedPipeline, pieSpecPipeline, pivotTableAdvancedPipeline, pivotTableSpecPipeline, preorderTraverse, radarAdvancedPipeline, radarSpecPipeline, registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerDonut, registerFunnel, registerHeatmap, registerLightTheme, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable, roseAdvancedPipeline, roseParallelAdvancedPipeline, roseParallelSpecPipeline, roseSpecPipeline, scatterAdvancedPipeline, scatterSpecPipeline, selector_selector as selector, tableAdvancedPipeline, tableSpecPipeline, unfoldDimensions, updateAdvanced, updateSpec, zAdvancedVSeed, zAnalysis, zAnnotation, zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zArea, zAreaConfig, zAreaPercent, zAreaPercentConfig, zAreaStyle, zAxis, zBackgroundColor, zBar, zBarConfig, zBarParallel, zBarParallelConfig, zBarPercent, zBarPercentConfig, zBarStyle, zChartType, zColor, zColorLegend, zColumn, zColumnConfig, zColumnParallel, zColumnParallelConfig, zColumnPercent, zColumnPercentConfig, zConfig, zCrosshairLine, zCrosshairRect, zCustomTheme, zCustomThemeConfig, zDataset, zDatasetReshapeInfo, zDatum, zDimension, zDimensionGroup, zDimensionTree, zDimensions, zDonut, zDonutConfig, zDualAxis, zDualAxisConfig, zDualChartType, zDualMeasure, zDualMeasures, zEncoding, zEncodings, zFoldInfo, zFunnel, zFunnelConfig, zHeatmap, zHeatmapConfig, zLabel, zLegend, zLine, zLineConfig, zLineStyle, zLinearColor, zLocale, zMarkStyle, zMeasure, zMeasureGroup, zMeasureTree, zMeasures, zNumFormat, zPie, zPieConfig, zPivotTable, zPivotTableConfig, zPointStyle, zRadar, zRadarConfig, zRose, zRoseConfig, zRoseParallel, zRoseParallelConfig, zScatter, zScatterConfig, zScatterMeasure, zScatterMeasures, zSort, zSortLegend, zStackCornerRadius, zTable, zTableConfig, zTheme, zTooltip, zUnfoldInfo, zVSeed, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis };
 
 //# sourceMappingURL=index.js.map