@visactor/vseed 0.2.9 → 0.3.1

package/dist/umd/index.js

@@ -115,7 +115,6 @@
             zMeasures: ()=>zMeasures,
             zDualAxis: ()=>zDualAxis,
             FoldMeasureName: ()=>FoldMeasureName,
-            zDualChartType: ()=>zDualChartType,
             darkTheme: ()=>darkTheme,
             isVTable: ()=>isVTable,
             BoxPlotPivotIndicator: ()=>BoxPlotPivotIndicator,
@@ -140,9 +139,9 @@
             findMeasureById: ()=>findMeasureById,
             AngleEncoding: ()=>AngleEncoding,
             areaPercentAdvancedPipeline: ()=>areaPercentAdvancedPipeline,
-            findTreeNodesBy: ()=>findTreeNodesBy,
-            zAreaPercentConfig: ()=>zAreaPercentConfig,
             zBackgroundColor: ()=>zBackgroundColor,
+            zAreaPercentConfig: ()=>zAreaPercentConfig,
+            findTreeNodesBy: ()=>findTreeNodesBy,
             MeasureId: ()=>MeasureId,
             registerRadar: ()=>registerRadar,
             zLocale: ()=>zLocale,
@@ -163,14 +162,14 @@
             zColumnPercent: ()=>zColumnPercent,
             foldMeasures: ()=>foldMeasures,
             isPivotTable: ()=>isPivotTable,
-            zDimensionEncoding: ()=>zDimensionEncoding,
             registerPie: ()=>registerPie,
+            zDimensionEncoding: ()=>zDimensionEncoding,
             LowerWhisker: ()=>LowerWhisker,
             zEcdfRegressionLine: ()=>zEcdfRegressionLine,
             zBarParallelConfig: ()=>zBarParallelConfig,
+            lineAdvancedPipeline: ()=>lineAdvancedPipeline,
             AXIS_LABEL_SPACE: ()=>8,
             FoldMeasureValue: ()=>FoldMeasureValue,
-            lineAdvancedPipeline: ()=>lineAdvancedPipeline,
             zFunnel: ()=>zFunnel,
             ANNOTATION_Z_INDEX: ()=>1000,
             Q3MeasureValue: ()=>"__Q3__",
@@ -198,7 +197,6 @@
             zLinearRegressionLine: ()=>zLinearRegressionLine,
             zRoseConfig: ()=>zRoseConfig,
             zBodyCellStyle: ()=>zBodyCellStyle,
-            zScatterMeasures: ()=>zScatterMeasures,
             zAnnotation: ()=>zAnnotation,
             selector: ()=>selector_selector,
             zKdeRegressionLine: ()=>zKdeRegressionLine,
@@ -230,7 +228,6 @@
             registerAreaPercent: ()=>registerAreaPercent,
             zMeasureEncoding: ()=>zMeasureEncoding,
             zBarPercent: ()=>zBarPercent,
-            zScatterMeasure: ()=>zScatterMeasure,
             zTheme: ()=>zTheme,
             zDatum: ()=>zDatum,
             barAdvancedPipeline: ()=>barAdvancedPipeline,
@@ -239,9 +236,10 @@
             registerHeatmap: ()=>registerHeatmap,
             isBarPercent: ()=>isBarPercent,
             checkVSeed: ()=>checkVSeed,
-            zPivotTable: ()=>zPivotTable,
+            flatReshapeMeasures: ()=>flatReshapeMeasures,
             registerLightTheme: ()=>registerLightTheme,
             selectByDmension: ()=>selectByDmension,
+            zPivotTable: ()=>zPivotTable,
             isPartialDatumSelector: ()=>isPartialDatumSelector,
             isDimensionGroup: ()=>isDimensionGroup,
             registerPivotTable: ()=>registerPivotTable,
@@ -312,7 +310,9 @@
             ColorEncoding: ()=>ColorEncoding,
             measureDepth: ()=>measureDepth,
             BinCountMeasureId: ()=>BinCountMeasureId,
+            DEFAULT_DUAL_CHART_TYPE: ()=>DEFAULT_DUAL_CHART_TYPE,
             zAdvancedVSeed: ()=>zAdvancedVSeed,
+            isRectungularCoordinate: ()=>isRectungularCoordinate,
             zAreaPercent: ()=>zAreaPercent,
             isValueSelector: ()=>isValueSelector,
             donutAdvancedPipeline: ()=>donutAdvancedPipeline,
@@ -320,12 +320,13 @@
             zScatterConfig: ()=>zScatterConfig,
             zTooltip: ()=>zTooltip,
             isBarLikeChart: ()=>isBarLikeChart,
+            isDualAxisChartType: ()=>isDualAxisChartType,
             barParallelAdvancedPipeline: ()=>barParallelAdvancedPipeline,
-            barPercentSpecPipeline: ()=>barPercentSpecPipeline,
             zBarPercentConfig: ()=>zBarPercentConfig,
-            deleteMeasureTreeByCallback: ()=>deleteMeasureTreeByCallback,
+            barPercentSpecPipeline: ()=>barPercentSpecPipeline,
             dataReshapeByEncoding: ()=>dataReshapeByEncoding,
             lineSpecPipeline: ()=>lineSpecPipeline,
+            deleteMeasureTreeByCallback: ()=>deleteMeasureTreeByCallback,
             zDimensionGroup: ()=>zDimensionGroup,
             isPositionMeasure: ()=>isPositionMeasure
         });
@@ -535,80 +536,20 @@
                 'tooltip',
                 'detail'
             ].includes(measure.encoding);
-        const preorderTraverse = (tree, callback, childrenKey = 'children')=>{
-            if (!tree || 0 === tree.length) return;
-            const stack = [
-                ...tree
-            ].reverse();
-            while(stack.length > 0){
-                const node = stack.pop();
-                const stop = callback(node);
-                if (true === stop) return;
-                const children = node[childrenKey];
-                if (Array.isArray(children) && children.length > 0) for(let i = children.length - 1; i >= 0; i--){
-                    const child = children[i];
-                    stack.push(child);
-                }
-            }
-        };
-        const findTreeNodesBy = (nodes = [], callback, childrenKey = 'children')=>{
-            if (!nodes) return [];
-            const result = [];
-            preorderTraverse(nodes, (node)=>{
-                if (!(childrenKey in node)) {
-                    if (callback(node)) result.push(node);
-                }
-                return false;
-            });
-            return result;
-        };
-        const measureDepth = (measures = [])=>{
-            if (!measures) return 0;
-            let depth = 1;
-            preorderTraverse(measures, (node)=>{
-                if ('children' in node) depth = Math.max(depth, 1 + measureDepth(node.children));
-                return false;
-            });
-            return depth;
-        };
-        const isMeasureTreeWithChildren = (measures)=>{
-            if (!measures) return false;
-            return measures.some((measure)=>'children' in measure);
-        };
         const isMeasureTreeWithParentId = (measures)=>{
             if (!measures) return false;
             return measures.some((measure)=>'parentId' in measure);
         };
-        const normalizeMeasureTree = (measures)=>{
-            const createEmptyMeasureGroup = ()=>({
-                    id: 'group',
-                    alias: '',
-                    children: []
-                });
-            let currentGroup = createEmptyMeasureGroup();
-            const measureGroups = [];
-            for (const measure of measures)if ('children' in measure) {
-                if (currentGroup.children?.length) {
-                    currentGroup.id = [
-                        currentGroup.id,
-                        ...currentGroup.children.map((item)=>item.id)
-                    ].join('-');
-                    currentGroup.alias = currentGroup.children.map((item)=>item.alias).join('-');
-                    measureGroups.push(currentGroup);
-                    currentGroup = createEmptyMeasureGroup();
-                }
-                measureGroups.push(measure);
-            } else currentGroup.children?.push(measure);
-            if (currentGroup.children?.length) {
-                currentGroup.id = [
-                    currentGroup.id,
-                    ...currentGroup.children.map((item)=>item.id)
-                ].join('-');
-                currentGroup.alias = currentGroup.children.map((item)=>item.alias).join('-');
-                measureGroups.push(currentGroup);
-                currentGroup = createEmptyMeasureGroup();
+        const isCommonMeasureEncoding = (encoding)=>[
+                'color',
+                'label',
+                'tooltip'
+            ].includes(encoding);
+        const ensureParentIdInitialized = (parentId, measuresByView, parentIds)=>{
+            if (!measuresByView[parentId]) {
+                measuresByView[parentId] = [];
+                parentIds.push(parentId);
             }
-            return measureGroups;
         };
         const DEFAULT_PARENT_ID = '__DefaultParentId__';
         const ChartTypeEnum = {
@@ -662,28 +603,40 @@
                 const parentIds = vseed.measures?.filter(isPositionMeasure).map((measure)=>measure.parentId || DEFAULT_PARENT_ID);
                 return parentIds && chunk_QJLMYOTX_i(parentIds).length > 1;
             }
-            if ('dualAxis' === vseed.chartType || 'scatter' === vseed.chartType) {
-                if ('scatter' === vseed.chartType) {
-                    if (isMeasureTreeWithChildren(vseed.measures)) {
-                        const depth = measureDepth(vseed.measures);
-                        return 3 === depth;
-                    }
-                    if (vseed.scatterMeasures && vseed.scatterMeasures.length > 1) return true;
-                    return false;
-                }
-                if ('dualAxis' === vseed.chartType) {
-                    if (isMeasureTreeWithChildren(vseed.measures)) {
-                        const depth = measureDepth(vseed.measures);
-                        return 3 === depth;
-                    }
-                    if (vseed.dualMeasures && vseed.dualMeasures.length > 1) return true;
-                }
-                return false;
-            }
             const { measures = [] } = vseed;
             const hasMeasureGroup = measures && measures.some((measure)=>measure && measure.children);
             return hasMeasureGroup;
         };
+        const isRectungularCoordinate = (chartType)=>[
+                ChartTypeEnum.Bar,
+                ChartTypeEnum.BarPercent,
+                ChartTypeEnum.BarParallel,
+                ChartTypeEnum.Column,
+                ChartTypeEnum.ColumnPercent,
+                ChartTypeEnum.ColumnParallel,
+                ChartTypeEnum.Line,
+                ChartTypeEnum.Area,
+                ChartTypeEnum.AreaPercent,
+                ChartTypeEnum.DualAxis,
+                ChartTypeEnum.Boxplot,
+                ChartTypeEnum.DualAxis,
+                ChartTypeEnum.Scatter,
+                ChartTypeEnum.Heatmap,
+                ChartTypeEnum.Boxplot
+            ].includes(chartType);
+        const DEFAULT_DUAL_CHART_TYPE = {
+            primary: 'column',
+            secondary: 'line'
+        };
+        const isDualAxisChartType = (chartType)=>chartType && [
+                'column',
+                'columnParallel',
+                'columnPercent',
+                'line',
+                'area',
+                'areaPercent',
+                'scatter'
+            ].includes(chartType);
         const getColorItems = (builder)=>{
             const advancedVSeed = builder.advancedVSeed;
             if (!advancedVSeed || isTable(builder.vseed) || isPivotTable(builder.vseed)) return [];
@@ -827,6 +780,33 @@
             for (let [e, c] of n.entries())r[e] = chunk_BCBB46UE_u(c, o, t);
             return r;
         }
+        const preorderTraverse = (tree, callback, childrenKey = 'children')=>{
+            if (!tree || 0 === tree.length) return;
+            const stack = [
+                ...tree
+            ].reverse();
+            while(stack.length > 0){
+                const node = stack.pop();
+                const stop = callback(node);
+                if (true === stop) return;
+                const children = node[childrenKey];
+                if (Array.isArray(children) && children.length > 0) for(let i = children.length - 1; i >= 0; i--){
+                    const child = children[i];
+                    stack.push(child);
+                }
+            }
+        };
+        const findTreeNodesBy = (nodes = [], callback, childrenKey = 'children')=>{
+            if (!nodes) return [];
+            const result = [];
+            preorderTraverse(nodes, (node)=>{
+                if (!(childrenKey in node)) {
+                    if (callback(node)) result.push(node);
+                }
+                return false;
+            });
+            return result;
+        };
         const defaultMeasures_defaultMeasures = (advancedVSeed, context)=>{
             const { vseed } = context;
             const { measures, dataset } = vseed;
@@ -838,7 +818,7 @@
                 });
                 return {
                     ...advancedVSeed,
-                    measures: clonedMeasures
+                    measureTree: clonedMeasures
                 };
             }
             const top100dataset = dataset.slice(0, 100);
@@ -856,7 +836,7 @@
                 }));
             return {
                 ...advancedVSeed,
-                measures: defaultMeasures
+                measureTree: defaultMeasures
             };
         };
         const isDimension = (dimension)=>!('children' in dimension);
@@ -896,18 +876,8 @@
             });
             return result;
         };
-        const hasMultipleMeasureInSingleView = (measures = [])=>{
-            if (measures.every((m)=>!('children' in m))) return measures.length > 1;
-            let found = false;
-            preorderTraverse(measures, (node)=>{
-                if (node.children && node.children.length > 1) {
-                    found = true;
-                    return true;
-                }
-                return false;
-            });
-            return found;
-        };
+        const hasMultipleMeasureInSingleView = (reshapeMeasures)=>reshapeMeasures.some((m)=>m.length > 1);
+        const flatReshapeMeasures = (reshapeMeasures)=>reshapeMeasures.flat();
         const defaultDimensions = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
@@ -922,10 +892,10 @@
                 });
                 return {
                     ...advancedVSeed,
-                    dimensions: clonedDimensions
+                    dimensionTree: clonedDimensions
                 };
             }
-            const measures = findAllMeasures(advancedVSeed.measures);
+            const measures = findAllMeasures(advancedVSeed.measureTree);
             const top100dataset = dataset.slice(0, 100);
             const sample = top100dataset.reduce((prev, cur)=>({
                     ...prev,
@@ -941,7 +911,7 @@
                 }));
             return {
                 ...result,
-                dimensions: newDimensions
+                dimensionTree: newDimensions
             };
         };
         function chunk_2T7K3PFL_i(...e) {
@@ -1129,7 +1099,7 @@
         };
         const dimensionTreeToColumns = (spec, context)=>{
             const { advancedVSeed } = context;
-            const dimensions = advancedVSeed.dimensions;
+            const dimensionTree = advancedVSeed.dimensionTree;
             const result = {
                 ...spec
             };
@@ -1139,7 +1109,7 @@
                 };
                 return {};
             };
-            const columns = treeTreeToColumns(dimensions, eachNode);
+            const columns = treeTreeToColumns(dimensionTree, eachNode);
             return {
                 ...result,
                 columns: [
@@ -1249,7 +1219,7 @@
         };
         const measureTreeToColumns = (spec, context)=>{
             const { advancedVSeed } = context;
-            const measures = advancedVSeed.measures;
+            const measureTree = advancedVSeed.measureTree;
             const result = {
                 ...spec
             };
@@ -1260,7 +1230,7 @@
                 };
                 return {};
             };
-            const columns = measuresToColumns_treeTreeToColumns(measures, eachNode);
+            const columns = measuresToColumns_treeTreeToColumns(measureTree, eachNode);
             return {
                 ...result,
                 columns: [
@@ -1692,8 +1662,8 @@
             const result = {
                 ...advancedVSeed
             };
-            const measures = findAllMeasures(advancedVSeed.measures);
-            if (measures.length > 1 && !result.dimensions?.some((dim)=>dim.id === MeasureName)) result.dimensions?.push({
+            const measures = findAllMeasures(advancedVSeed.measureTree);
+            if (measures.length > 1 && !findTreeNodesBy(advancedVSeed.dimensionTree, (dim)=>dim.id === MeasureId || dim.id === MeasureName).length) result.dimensionTree.push({
                 id: MeasureId,
                 alias: intl.i18n`指标名称`,
                 encoding: 'row'
@@ -1701,13 +1671,13 @@
             return result;
         };
         const encodingForPivotTable = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
-            const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+            const { measureTree = [], dimensionTree = [] } = advancedVSeed;
+            const measures = findAllMeasures(measureTree);
+            const hasDimensionEncoding = dimensionTree.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            if (hasDimensionEncoding) generateDimensionEncoding(dimensions, encoding);
-            else generateDefaultDimensionEncoding(dimensions, encoding);
+            if (hasDimensionEncoding) generateDimensionEncoding(dimensionTree, encoding);
+            else generateDefaultDimensionEncoding(dimensionTree, encoding);
             if (hasMeasureEncoding) generateMeasureEncoding(measures, encoding);
             else generateDefaultMeasureEncoding(measures, encoding);
             return {
@@ -1810,8 +1780,8 @@
             };
             const { vseed } = context;
             const { dataset, chartType } = vseed;
-            const { dimensions, measures } = advancedVSeed;
-            const { dataset: newDatasets, foldInfo } = foldMeasures(dataset, findAllMeasures(measures), {
+            const { measureTree } = advancedVSeed;
+            const { dataset: newDatasets, foldInfo } = foldMeasures(dataset, findAllMeasures(measureTree), {
                 measureId: FoldMeasureId,
                 measureName: FoldMeasureName,
                 measureValue: FoldMeasureValue,
@@ -1827,9 +1797,7 @@
             return {
                 ...result,
                 dataset: newDatasets,
-                datasetReshapeInfo: datasetReshapeInfo,
-                dimensions,
-                measures
+                datasetReshapeInfo: datasetReshapeInfo
             };
         };
         const pivotTableConfig = (advancedVSeed, context)=>{
@@ -1915,7 +1883,7 @@
         const pivotColumns = (spec, context)=>{
             const { advancedVSeed } = context;
             const { encoding } = advancedVSeed;
-            const dimensions = advancedVSeed.dimensions;
+            const dimensions = advancedVSeed.dimensionTree;
             const columns = dimensions.filter((item)=>encoding.column?.includes(item.id));
             return {
                 ...spec,
@@ -1928,10 +1896,10 @@
         };
         const pivotRows = (spec, context)=>{
             const { advancedVSeed } = context;
-            const dimensions = advancedVSeed.dimensions;
-            const { encoding, measures } = advancedVSeed;
+            const dimensions = advancedVSeed.dimensionTree;
+            const { encoding } = advancedVSeed;
             const rows = dimensions.filter((item)=>encoding.row?.includes(item.id));
-            const allMeasures = findAllMeasures(measures);
+            const allMeasures = findAllMeasures(advancedVSeed.measureTree);
             return {
                 ...spec,
                 rows: rows.map((item)=>{
@@ -1959,7 +1927,7 @@
         };
         const pivotIndicators = (spec, context)=>{
             const { advancedVSeed } = context;
-            const { measures, datasetReshapeInfo } = advancedVSeed;
+            const { measureTree, datasetReshapeInfo } = advancedVSeed;
             const { foldInfo } = datasetReshapeInfo[0];
             const hasRow = spec?.rows?.length > 0;
             const foldMapValues = Object.values(foldInfo.foldMap);
@@ -1974,18 +1942,18 @@
                         indicatorKey: foldInfo.measureValue,
                         title: foldMapValues.length > 1 ? '' : foldMapValues[0],
                         width: 'auto',
-                        format: pivotIndicators_fieldFormat(measures, foldInfo)
+                        format: pivotIndicators_fieldFormat(measureTree, foldInfo)
                     }
                 ]
             };
         };
-        const pivotIndicators_fieldFormat = (measures, foldInfo)=>(value, col, row, table)=>{
+        const pivotIndicators_fieldFormat = (measureTree, foldInfo)=>(value, col, row, table)=>{
                 if (!chunk_6GTAPB47_e(col) || !chunk_6GTAPB47_e(row) || !table) return value;
                 const datum = table.getCellOriginRecord(col, row);
                 if (!datum[0]) return value;
                 const { measureId: foldMeasureId } = foldInfo;
                 const measureId = datum[0][foldMeasureId];
-                const measure = findMeasureById(measures, measureId);
+                const measure = findMeasureById(measureTree, measureId);
                 const formatter = createFormatterByMeasure(measure);
                 return formatter(value);
             };
@@ -2143,7 +2111,7 @@
         };
         const dataConfig = (spec, context)=>{
             const { advancedVSeed } = context;
-            const measures = findAllMeasures(advancedVSeed.measures);
+            const measures = findAllMeasures(advancedVSeed.measureTree);
             const aggregationRules = measures.map((measure)=>({
                     field: measure.id,
                     aggregationType: 'NONE',
@@ -2190,9 +2158,8 @@
             const { measures, dataset } = vseed;
             if (measures && measures.length > 0) {
                 const clonedMeasures = chunk_BCBB46UE_d(measures);
-                preorderTraverse(clonedMeasures, (node)=>{
-                    node.alias = node.alias || node.id;
-                    return false;
+                clonedMeasures.forEach((m)=>{
+                    m.alias = m.alias ?? m.id;
                 });
                 return {
                     ...advancedVSeed,
@@ -2230,7 +2197,7 @@
                         alias: dim.alias || dim.id
                     })))
             };
-            const measures = findAllMeasures(advancedVSeed.measures);
+            const measures = advancedVSeed.measures;
             const top100dataset = dataset.slice(0, 100);
             const sample = top100dataset.reduce((prev, cur)=>({
                     ...prev,
@@ -2268,54 +2235,25 @@
                 if (hasEncoding) return execPipeline(hasEncodingPipeline, context, advancedVSeed);
                 return execPipeline(noEncodingPipeline, context, advancedVSeed);
             };
-        const buildMeasures = (advancedVSeed)=>{
-            if (isMeasureTreeWithChildren(advancedVSeed.measures)) {
-                advancedVSeed.measures = normalizeMeasureTree(advancedVSeed.measures);
-                return advancedVSeed;
-            }
-            if (isMeasureTreeWithParentId(advancedVSeed.measures)) {
-                advancedVSeed.measures = generateMeasuresByParentId(advancedVSeed.measures);
-                return advancedVSeed;
-            }
-            if (chatType_isPivotChart(advancedVSeed)) advancedVSeed.measures = basicMeasuresToMeasureTree(advancedVSeed.measures);
-            return advancedVSeed;
-        };
-        const generateMeasuresByParentId = (measures)=>{
-            const measureTree = [];
-            measures.forEach((measure)=>{
-                const parent = measureTree.find((item)=>item.id === measure.parentId);
-                if (parent && 'children' in parent) {
-                    parent.children = parent.children || [];
-                    if (parent.children.length > 0) parent.alias += `-${measure.alias ?? measure.id}`;
-                    parent.children.push(measure);
-                } else if (common_isValid(measure.parentId)) measureTree.push({
-                    id: measure.parentId,
-                    alias: measure.alias ?? measure.id,
-                    children: [
-                        measure
-                    ]
-                });
-                else measureTree.push({
-                    id: DEFAULT_PARENT_ID,
-                    alias: measure.alias ?? measure.id,
-                    children: [
-                        measure
-                    ]
-                });
-            });
-            return measureTree;
-        };
-        const basicMeasuresToMeasureTree = (measures)=>{
-            const id = measures.map((item)=>item.id).join('-');
-            const alias = measures.map((item)=>item.alias || item.id).join('-');
-            return [
-                {
-                    id,
-                    alias,
-                    children: measures
+        const buildMeasures = (encodingKeys)=>(advancedVSeed)=>{
+                const { measures = [] } = advancedVSeed;
+                const measuresByView = {};
+                const parentIds = [];
+                for(let index = 0; index < measures.length; index++){
+                    const item = measures[index];
+                    const encoding = item.encoding;
+                    const parentId = item.parentId || DEFAULT_PARENT_ID;
+                    const isOtherEncoding = item.encoding && isCommonMeasureEncoding(encoding);
+                    ensureParentIdInitialized(parentId, measuresByView, parentIds);
+                    if (encodingKeys.includes(encoding)) measuresByView[parentId].push(item);
+                    else if (!isOtherEncoding) {
+                        item.encoding = encodingKeys[0];
+                        measuresByView[parentId].push(item);
+                    }
                 }
-            ];
-        };
+                advancedVSeed.reshapeMeasures = parentIds.map((pid)=>measuresByView[pid]).filter((m)=>m.length > 0);
+                return advancedVSeed;
+            };
         const addColorToEncoding = (dimensions, encoding, isMultiMeasure)=>{
             encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             const measureId = dimensions.find((item)=>item.id === MeasureId);
@@ -2333,27 +2271,23 @@
             ];
         };
         const defaultEncodingForLine = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { reshapeMeasures = [], measures = [], dimensions = [] } = advancedVSeed;
             const encoding = {};
-            line_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(vseedMeasures));
-            line_generateDefaultMeasureEncoding(measures, encoding);
+            line_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(reshapeMeasures));
+            line_generateMeasureEncoding(measures, encoding);
             return {
                 ...advancedVSeed,
                 encoding
             };
         };
         const encodingForLine = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { reshapeMeasures = [], measures = [], dimensions = [] } = advancedVSeed;
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
-            const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            const hasMulti = hasMultipleMeasureInSingleView(vseedMeasures);
+            const hasMulti = hasMultipleMeasureInSingleView(reshapeMeasures);
             if (hasDimensionEncoding) line_generateDimensionEncoding(dimensions, encoding, hasMulti);
             else line_generateDefaultDimensionEncoding(dimensions, encoding, hasMulti);
-            if (hasMeasureEncoding) line_generateMeasureEncoding(measures, encoding);
-            else line_generateDefaultMeasureEncoding(measures, encoding);
+            line_generateMeasureEncoding(measures, encoding);
             return {
                 ...advancedVSeed,
                 encoding
@@ -2384,9 +2318,6 @@
             encoding.label = chunk_QJLMYOTX_i(dimensions.filter((item)=>'label' === item.encoding).map((item)=>item.id));
             encoding.label = encoding.label.filter((d)=>d !== MeasureId);
         };
-        const line_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-        };
         const line_generateMeasureEncoding = (measures, encoding)=>{
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
@@ -2403,95 +2334,12 @@
                 ...tooltip
             ]);
         };
-        const deleteMeasureTreeByCallback = (measureTree, callback)=>{
-            if (!measureTree) return;
-            const stack = [
-                ...measureTree
-            ].reverse();
-            const parents = new Map();
-            measureTree.forEach((node)=>{
-                parents.set(node, measureTree);
-            });
-            const nodesToProcess = [];
-            const visited = new Set();
-            while(stack.length > 0){
-                const node = stack[stack.length - 1];
-                if (isMeasureGroup(node) && node.children && !visited.has(node)) {
-                    visited.add(node);
-                    const children = node.children.slice().reverse();
-                    for (const child of children){
-                        parents.set(child, node.children);
-                        stack.push(child);
-                    }
-                } else {
-                    stack.pop();
-                    nodesToProcess.push(node);
-                }
-            }
-            const deleted = [];
-            for (const node of nodesToProcess){
-                const parentList = parents.get(node);
-                if (parentList) {
-                    const index = parentList.indexOf(node);
-                    if (isMeasure(node)) {
-                        if (callback?.(node, index, parentList)) {
-                            parentList.splice(index, 1);
-                            deleted.push(node);
-                        }
-                    }
-                }
-            }
-            return deleted;
-        };
-        const pickMeasuresForReshape = (encodingKeys)=>(advancedVSeed)=>{
-                const clonedMeasures = chunk_BCBB46UE_d(advancedVSeed.measures);
-                const deleteBy = (measure)=>encodingKeys.includes(measure.encoding);
-                deleteMeasureTreeByCallback(clonedMeasures, deleteBy);
-                return {
-                    ...advancedVSeed,
-                    reshapeMeasures: clonedMeasures
-                };
-            };
-        const deleteDimensionTreeByCallback = (dimensionTree, callback)=>{
-            if (!dimensionTree) return dimensionTree;
-            const stack = [
-                ...dimensionTree
-            ].reverse();
-            const parents = new Map();
-            dimensionTree.forEach((node)=>{
-                parents.set(node, dimensionTree);
-            });
-            const nodesToProcess = [];
-            const visited = new Set();
-            while(stack.length > 0){
-                const node = stack[stack.length - 1];
-                if (isDimensionGroup(node) && node.children && !visited.has(node)) {
-                    visited.add(node);
-                    const children = node.children.slice().reverse();
-                    for (const child of children){
-                        parents.set(child, node.children);
-                        stack.push(child);
-                    }
-                } else {
-                    stack.pop();
-                    nodesToProcess.push(node);
-                }
-            }
-            for (const node of nodesToProcess){
-                const parentList = parents.get(node);
-                if (parentList) {
-                    const index = parentList.indexOf(node);
-                    if (isDimension(node)) {
-                        if (callback?.(node, index, parentList)) parentList.splice(index, 1);
-                    }
-                }
-            }
-            return dimensionTree;
-        };
         const pickDimensionsForReshape = (advancedVSeed)=>{
             const deleteBy = (dimension)=>'tooltip' === dimension.encoding || 'label' === dimension.encoding;
-            const reshapeDimensions = chunk_BCBB46UE_d(advancedVSeed.dimensions);
-            deleteDimensionTreeByCallback(reshapeDimensions, deleteBy);
+            const reshapeDimensions = [];
+            (advancedVSeed.dimensions ?? []).forEach((d)=>{
+                if (!deleteBy(d)) reshapeDimensions.push(d);
+            });
             return {
                 ...advancedVSeed,
                 reshapeDimensions
@@ -2599,8 +2447,7 @@
         }
         const isLinearColor = (advancedVSeed, vseed)=>{
             const { encoding } = advancedVSeed;
-            const measures = vseed.measures || advancedVSeed.measures;
-            const measureIdList = findAllMeasures(measures).map((measure)=>measure.id);
+            const measureIdList = (vseed.measures || advancedVSeed.measures).map((measure)=>measure.id);
             const { color } = encoding;
             return color?.length === 1 && measureIdList.includes(color[0]);
         };
@@ -2619,7 +2466,7 @@
             const { dataset, chartType } = vseed;
             const { encoding } = advancedVSeed;
             const colorMeasureId = getColorMeasureId(advancedVSeed, vseed);
-            const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [], (item)=>item.id), T(findAllMeasures(advancedVSeed.reshapeMeasures ?? advancedVSeed.measures), (item)=>item.id), encoding, {
+            const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [], (item)=>item.id), T(advancedVSeed.reshapeMeasures?.[0] ?? [], (item)=>item.id), encoding, {
                 colorItemAsId: false,
                 colorMeasureId
             });
@@ -2643,24 +2490,19 @@
             const { vseed } = context;
             const { dataset } = vseed;
             const { encoding } = advancedVSeed;
-            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const reshapeMeasures = advancedVSeed.reshapeMeasures ?? [];
             const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
-            const allMeasures = findAllMeasures(measures);
-            const measureGroups = [];
-            if (measures) measures.forEach((measure)=>{
-                if (measure.children && measure.children.length > 0) measureGroups.push(measure);
-            });
+            const allMeasuresIds = reshapeMeasures.flatMap((measureGroup)=>measureGroup.map((m)=>m.id));
             const datasets = [];
             const datasetReshapeInfo = [];
-            measureGroups.forEach((measureGroup, index)=>{
-                const measures = measureGroup.children;
+            reshapeMeasures.forEach((measures, index)=>{
                 if (!measures) return;
-                const groupId = measureGroup.id;
+                const groupId = measures[0].parentId ?? DEFAULT_PARENT_ID;
                 const { dataset: newSubDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(measures, (item)=>item.id), encoding, {
                     colorItemAsId: false,
                     foldMeasureValue: `${FoldMeasureValue}${groupId}`,
                     colorMeasureId: getColorMeasureId(advancedVSeed, vseed),
-                    omitIds: allMeasures.map((item)=>item.id)
+                    omitIds: allMeasuresIds
                 });
                 const reshapeInfo = {
                     id: `${groupId}`,
@@ -2804,16 +2646,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'yAxis',
+                    'detail'
+                ]),
                 defaultEncodingForLine
             ], [
-                buildMeasures,
-                encodingForLine,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'yAxis',
+                    'detail'
                 ]),
+                encodingForLine,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -2992,16 +2835,13 @@
             result.progressiveThreshold = 1 / 0;
             return result;
         };
-        const defaultTitleText = (measures, dimensions, idList = [])=>{
-            const allMeasures = findAllMeasures(measures);
-            return idList.map((id)=>{
+        const defaultTitleText = (measures, dimensions, idList = [])=>idList.map((id)=>{
                 const alias = [
-                    ...allMeasures,
+                    ...measures,
                     ...dimensions
                 ].find((f)=>f.id === id)?.alias || '';
                 return alias;
             }).join(' & ');
-        };
         const isNull = (value)=>null === value;
         const common_isNull = isNull;
         const bandAxisStyle = (config)=>{
@@ -3071,7 +2911,7 @@
             };
             const { advancedVSeed, vseed } = context;
             const { chartType } = vseed;
-            const { measures, dimensions, encoding, datasetReshapeInfo, pivotAllDatasetReshapeInfo } = advancedVSeed;
+            const { measures = [], dimensions = [], encoding, datasetReshapeInfo, pivotAllDatasetReshapeInfo } = advancedVSeed;
             const config = advancedVSeed.config?.[chartType]?.xAxis ?? {};
             if (!result.axes) result.axes = [];
             const { labelAutoLimitLength = 80 } = config;
@@ -3194,7 +3034,7 @@
             };
             const { advancedVSeed, vseed } = context;
             const { chartType } = vseed;
-            const { measures, dimensions, encoding } = advancedVSeed;
+            const { measures = [], dimensions = [], encoding } = advancedVSeed;
             const config = advancedVSeed.config?.[chartType]?.yAxis ?? {};
             if (!result.axes) result.axes = [];
             const isPivot = chatType_isPivotChart(vseed);
@@ -3860,7 +3700,7 @@
                 ...spec
             };
             const { advancedVSeed, vseed } = context;
-            const { measures, datasetReshapeInfo, chartType, dimensions, encoding } = advancedVSeed;
+            const { measures = [], datasetReshapeInfo, chartType, dimensions = [], encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
                 enable: true
@@ -3874,7 +3714,7 @@
                     title: {
                         visible: false
                     },
-                    content: createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), foldInfo, unfoldInfo)
+                    content: createMarkContent(encoding.tooltip || [], dimensions, vseed.measures, foldInfo, unfoldInfo)
                 },
                 dimension: {
                     title: {
@@ -3886,7 +3726,7 @@
             };
             return result;
         };
-        const createDimensionContent = (dimensions, measures, foldInfo, unfoldInfo)=>{
+        const createDimensionContent = (dimensions = [], measures = [], foldInfo, unfoldInfo)=>{
             const { measureId, measureValue, foldMap } = foldInfo;
             const { encodingColor } = unfoldInfo;
             return [
@@ -3915,7 +3755,7 @@
                 }
             ];
         };
-        const createMarkContent = (tooltip, dimensions, measures, foldInfo, unfoldInfo)=>{
+        const createMarkContent = (tooltip, dimensions = [], measures = [], foldInfo, unfoldInfo)=>{
             const dims = C(dimensions.filter((item)=>tooltip.includes(item.id)), T((item)=>item.id), T((item)=>item.alias));
             const meas = C(measures.filter((item)=>tooltip.includes(item.id)), T((item)=>item.id), T((item)=>item.alias));
             const dimContent = dims.map((item)=>({
@@ -5276,12 +5116,12 @@
                     ...spec
                 };
                 const { advancedVSeed } = context;
-                const { measures, datasetReshapeInfo, dataset, encoding } = advancedVSeed;
+                const { datasetReshapeInfo, dataset, encoding, reshapeMeasures = [] } = advancedVSeed;
                 const colorItems = chunk_QJLMYOTX_i(datasetReshapeInfo.flatMap((d)=>d.unfoldInfo.colorItems));
                 const allMeasureIds = chunk_QJLMYOTX_i(datasetReshapeInfo.flatMap((d)=>Object.keys(d.foldInfo.foldMap || {})));
                 const indicators = datasetReshapeInfo.map((reshapeInfo, index)=>{
-                    const measureGroup = measures?.find((d)=>`${d.id}` === reshapeInfo.id);
-                    const subMeasuresId = (measureGroup?.children || []).map((d)=>d.id);
+                    const subMeasures = reshapeMeasures[index] || [];
+                    const subMeasuresId = (reshapeMeasures[index] || []).map((d)=>d.id);
                     const invalideMeasuresIds = allMeasureIds.filter((id)=>!subMeasuresId.includes(id));
                     const newDataset = dataset[index];
                     const newDatasetReshapeInfo = [
@@ -5309,7 +5149,7 @@
                     const chartSpec = execPipeline(chartPipeline, newContext, {});
                     return {
                         indicatorKey: `${reshapeInfo.id}`,
-                        title: measureGroup?.alias,
+                        title: isRectungularCoordinate(advancedVSeed.chartType) ? '' : subMeasures.map((m)=>m.alias ?? m.id).join('-'),
                         cellType: 'chart',
                         chartModule: 'vchart',
                         chartSpec: chartSpec,
@@ -5758,10 +5598,9 @@
             Builder._specPipelineMap.line = lineSpecPipeline;
         };
         const defaultEncodingForColumn = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const encoding = {};
-            column_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(vseedMeasures));
+            column_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(reshapeMeasures));
             column_generateDefaultMeasureEncoding(measures, encoding);
             return {
                 ...advancedVSeed,
@@ -5769,12 +5608,11 @@
             };
         };
         const encodingForColumn = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            const hasMulti = hasMultipleMeasureInSingleView(vseedMeasures);
+            const hasMulti = hasMultipleMeasureInSingleView(reshapeMeasures);
             if (hasDimensionEncoding) column_generateDimensionEncoding(dimensions, encoding, hasMulti);
             else column_generateDefaultDimensionEncoding(dimensions, encoding, hasMulti);
             if (hasMeasureEncoding) column_generateMeasureEncoding(measures, encoding);
@@ -5893,16 +5731,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'yAxis',
+                    'detail'
+                ]),
                 defaultEncodingForColumn
             ], [
-                buildMeasures,
-                encodingForColumn,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'yAxis',
+                    'detail'
                 ]),
+                encodingForColumn,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -6782,16 +6621,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'yAxis',
+                    'detail'
+                ]),
                 defaultEncodingForColumn
             ], [
-                buildMeasures,
-                encodingForColumn,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'yAxis',
+                    'detail'
                 ]),
+                encodingForColumn,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -6948,16 +6788,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'yAxis',
+                    'detail'
+                ]),
                 defaultEncodingForColumn
             ], [
-                buildMeasures,
-                encodingForColumn,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'yAxis',
+                    'detail'
                 ]),
+                encodingForColumn,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -7041,10 +6882,9 @@
             Builder._specPipelineMap.columnPercent = columnPercentSpecPipeline;
         };
         const defaultEncodingForBar = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const encoding = {};
-            bar_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(vseedMeasures));
+            bar_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(reshapeMeasures));
             bar_generateDefaultMeasureEncoding(measures, encoding);
             return {
                 ...advancedVSeed,
@@ -7052,12 +6892,11 @@
             };
         };
         const encodingForBar = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            const hasMulti = hasMultipleMeasureInSingleView(vseedMeasures);
+            const hasMulti = hasMultipleMeasureInSingleView(reshapeMeasures);
             if (hasDimensionEncoding) bar_generateDimensionEncoding(dimensions, encoding, hasMulti);
             else bar_generateDefaultDimensionEncoding(dimensions, encoding, hasMulti);
             if (hasMeasureEncoding) bar_generateMeasureEncoding(measures, encoding);
@@ -7131,16 +6970,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'xAxis',
+                    'detail'
+                ]),
                 defaultEncodingForBar
             ], [
-                buildMeasures,
-                encodingForBar,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'xAxis',
+                    'detail'
                 ]),
+                encodingForBar,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -7225,7 +7065,7 @@
                 ...spec
             };
             const { advancedVSeed, vseed } = context;
-            const { encoding, dimensions, measures } = advancedVSeed;
+            const { encoding, dimensions = [], measures = [] } = advancedVSeed;
             const { chartType } = vseed;
             const config = advancedVSeed.config?.[chartType]?.xAxis ?? {};
             if (!result.axes) result.axes = [];
@@ -7259,7 +7099,7 @@
             };
             const { advancedVSeed, vseed } = context;
             const { chartType } = vseed;
-            const { measures, dimensions, encoding, datasetReshapeInfo, pivotAllDatasetReshapeInfo } = advancedVSeed;
+            const { measures = [], dimensions = [], encoding, datasetReshapeInfo, pivotAllDatasetReshapeInfo } = advancedVSeed;
             const config = advancedVSeed.config?.[chartType]?.yAxis ?? {};
             if (!result.axes) result.axes = [];
             const { labelAutoLimitLength = 80 } = config;
@@ -7398,16 +7238,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'xAxis',
+                    'detail'
+                ]),
                 defaultEncodingForBar
             ], [
-                buildMeasures,
-                encodingForBar,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'xAxis',
+                    'detail'
                 ]),
+                encodingForBar,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -7513,16 +7354,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
-                defaultEncodingForBar
+                buildMeasures([
+                    'xAxis',
+                    'detail'
+                ]),
+                defaultEncodingForBar
             ], [
-                buildMeasures,
-                encodingForBar,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'xAxis',
+                    'detail'
                 ]),
+                encodingForBar,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -7601,16 +7443,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'yAxis',
+                    'detail'
+                ]),
                 defaultEncodingForLine
             ], [
-                buildMeasures,
-                encodingForLine,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'yAxis',
+                    'detail'
                 ]),
+                encodingForLine,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -7799,16 +7642,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'yAxis',
+                    'detail'
+                ]),
                 defaultEncodingForLine
             ], [
-                buildMeasures,
-                encodingForLine,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'yAxis',
+                    'detail'
                 ]),
+                encodingForLine,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -7886,130 +7730,44 @@
             Builder._advancedPipelineMap.areaPercent = areaPercentAdvancedPipeline;
             Builder._specPipelineMap.areaPercent = areaPercentSpecPipeline;
         };
-        const buildMeasuresForScatter = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            if (isMeasureTreeWithChildren(advancedVSeed.measures)) return advancedVSeed;
-            if (isMeasureTreeWithParentId(advancedVSeed.measures)) {
-                advancedVSeed.measures = buildMeasuresForScatter_generateMeasuresByParentId(advancedVSeed.measures);
-                return advancedVSeed;
-            }
-            if (vseed.scatterMeasures) {
-                advancedVSeed.measures = scatterMeasuresToMeasureTree(chunk_BCBB46UE_d(vseed.scatterMeasures));
-                return advancedVSeed;
-            }
-            const { scatterMeasures, encodedMeasures } = basicMeasuresToScatterMeasures(advancedVSeed.measures || []);
-            advancedVSeed.measures = scatterMeasuresToMeasureTree(scatterMeasures);
-            if (encodedMeasures.length) encodedMeasures.forEach((m)=>{
-                advancedVSeed.measures.push(m);
-            });
-            return advancedVSeed;
-        };
-        const basicMeasuresToScatterMeasures = (basicMeasures)=>{
-            const yMeasures = [];
-            const xMeasures = [];
-            const encodedMeasures = [];
-            for(let index = 0; index < basicMeasures.length; index++){
-                const item = basicMeasures[index];
+        const buildMeasuresForScatter = (advancedVSeed)=>{
+            const { measures = [] } = advancedVSeed;
+            const measuresByView = {};
+            const parentIds = [];
+            for(let index = 0; index < measures.length; index++){
+                const item = measures[index];
                 const encoding = item.encoding;
+                const parentId = item.parentId || DEFAULT_PARENT_ID;
                 const isYAxis = 'yAxis' === encoding;
                 const isXAxis = 'xAxis' === encoding;
-                const isOther = encoding && [
-                    'color',
-                    'label',
-                    'tooltip',
-                    'detail'
-                ].includes(encoding);
-                if (isYAxis) yMeasures.push(item);
-                else if (isXAxis) xMeasures.push(item);
-                else if (isOther) encodedMeasures.push(item);
-                else if (0 !== index) yMeasures.push(item);
-                else xMeasures.push(item);
-            }
-            if (0 === yMeasures.length && xMeasures.length > 0) yMeasures.push(xMeasures[0]);
-            return {
-                scatterMeasures: [
-                    {
-                        id: 'scatterMeasures',
-                        xMeasures,
-                        yMeasures
-                    }
-                ],
-                encodedMeasures
-            };
-        };
-        const scatterMeasuresToMeasureTree = (scatterMeasures)=>{
-            const measureTree = scatterMeasures.map((item, index)=>{
-                const { id, xMeasures, yMeasures } = item;
-                const groupChildren = [];
-                let groupId = `${id}-`;
-                if (xMeasures) {
-                    const arrPrimaryMeasures = Array.isArray(xMeasures) ? xMeasures : [
-                        xMeasures
-                    ];
-                    const alias = arrPrimaryMeasures.map((item)=>item.alias || item.id).toString();
-                    groupId += alias;
-                    groupChildren.push({
-                        id: `${index}-x`,
-                        alias: arrPrimaryMeasures.map((item)=>item.alias || item.id).toString(),
-                        children: arrPrimaryMeasures
-                    });
+                const isOtherEncoding = item.encoding && isCommonMeasureEncoding(encoding);
+                ensureParentIdInitialized(parentId, measuresByView, parentIds);
+                if (isYAxis) measuresByView[parentId].push(item);
+                else if (isXAxis) measuresByView[parentId].push(item);
+                else if (!isOtherEncoding && 'size' !== encoding) {
+                    const xCount = measuresByView[parentId].filter((m)=>'xAxis' === m.encoding).length;
+                    item.encoding = 0 === xCount ? 'xAxis' : 'yAxis';
+                    measuresByView[parentId].push(item);
                 }
-                if (yMeasures) {
-                    const arrSecondaryMeasures = Array.isArray(yMeasures) ? yMeasures : [
-                        yMeasures
+            }
+            advancedVSeed.reshapeMeasures = parentIds.map((pid)=>{
+                const basicMeasures = measuresByView[pid];
+                const xCount = basicMeasures.filter((m)=>'xAxis' === m.encoding).length;
+                const yCount = basicMeasures.filter((m)=>'yAxis' === m.encoding).length;
+                if (0 === yCount && xCount > 0) {
+                    const cloneMeasure = chunk_BCBB46UE_d(basicMeasures[0]);
+                    cloneMeasure.encoding = 'yAxis';
+                    return [
+                        ...basicMeasures,
+                        cloneMeasure
                     ];
-                    const alias = arrSecondaryMeasures.map((item)=>item.alias || item.id).toString();
-                    groupId += alias;
-                    groupChildren.push({
-                        id: `${index}-y`,
-                        alias: arrSecondaryMeasures.map((item)=>item.alias || item.id).toString(),
-                        children: arrSecondaryMeasures
-                    });
                 }
-                return {
-                    id: groupId,
-                    alias: groupId,
-                    children: groupChildren
-                };
-            });
-            if (1 === scatterMeasures.length) return measureTree[0].children || [];
-            return measureTree;
-        };
-        const buildMeasuresForScatter_generateMeasuresByParentId = (measures)=>{
-            const scatterMeasures = [];
-            const encodedMeasures = [];
-            measures.forEach((item)=>{
-                const id = item.parentId || DEFAULT_PARENT_ID;
-                if (!scatterMeasures.find((d)=>d.id === id)) scatterMeasures.push({
-                    id,
-                    yMeasures: [],
-                    xMeasures: []
-                });
-                const scatterChart = scatterMeasures.find((d)=>d.id === id);
-                if (!scatterChart || !Array.isArray(scatterChart.yMeasures) || !Array.isArray(scatterChart.xMeasures)) return;
-                const isYAxis = 'yAxis' === item.encoding;
-                const isXAxis = 'xAxis' === item.encoding;
-                const isOther = item.encoding && [
-                    'color',
-                    'label',
-                    'tooltip',
-                    'detail'
-                ].includes(item.encoding);
-                if (isYAxis) scatterChart.yMeasures.push(item);
-                else if (isXAxis) scatterChart.xMeasures.push(item);
-                else if (isOther) encodedMeasures.push(item);
-                else if (0 !== scatterChart.yMeasures.length) scatterChart.yMeasures.push(item);
-                else scatterChart.xMeasures.push(item);
-            });
-            const res = scatterMeasuresToMeasureTree(scatterMeasures);
-            if (encodedMeasures.length) encodedMeasures.forEach((m)=>{
-                res.push(m);
-            });
-            return res;
+                return basicMeasures;
+            }).filter((m)=>m.length > 0);
+            return advancedVSeed;
         };
         const defaultEncodingForScatter = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], dimensions = [] } = advancedVSeed;
             const encoding = {};
             scatter_generateDefaultDimensionEncoding(dimensions, encoding);
             scatter_generateDefaultMeasureEncoding(measures, encoding);
@@ -8019,8 +7777,7 @@
             };
         };
         const encodingForScatter = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], dimensions = [] } = advancedVSeed;
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
@@ -8109,37 +7866,32 @@
             };
             const { vseed } = context;
             const { dataset } = vseed;
-            const { encoding, chartType } = advancedVSeed;
-            const measures = (advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? []).filter((m)=>m && m.children);
+            const { encoding, chartType, reshapeMeasures } = advancedVSeed;
             const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
-            if (measures.length > 2) throw new Error('measures can not be more than 2 groups in scatter');
+            const measures = reshapeMeasures?.[0] ?? [];
             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, T(dimensions, (d)=>d.id), T(xMeasures.children, (d)=>d.id), encoding, {
-                    foldMeasureValue: FoldXMeasureValue,
-                    foldMeasureId: FoldXMeasureId,
-                    colorItemAsId: true,
-                    colorMeasureId: getColorMeasureId(advancedVSeed, vseed)
-                });
-                datasets.push(newDataset);
-                foldInfoList.push(foldInfo);
-                unfoldInfoList.push(unfoldInfo);
-            }
-            if (yMeasures && yMeasures.children) {
-                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(datasets[0], T(dimensions, (d)=>d.id), T(yMeasures.children, (d)=>d.id), encoding, {
-                    foldMeasureValue: FoldYMeasureValue,
-                    foldMeasureId: FoldYMeasureId,
-                    colorItemAsId: true,
-                    colorMeasureId: getColorMeasureId(advancedVSeed, vseed)
-                });
-                datasets[0] = newDataset;
-                foldInfoList.push(foldInfo);
-                unfoldInfoList.push(unfoldInfo);
-            }
+            const xMeasures = measures.filter((m)=>'xAxis' === m.encoding);
+            const yMeasures = measures.filter((m)=>'yAxis' === m.encoding);
+            const xResult = dataReshapeByEncoding(dataset, T(dimensions, (d)=>d.id), T(xMeasures, (d)=>d.id), encoding, {
+                foldMeasureValue: FoldXMeasureValue,
+                foldMeasureId: FoldXMeasureId,
+                colorItemAsId: true,
+                colorMeasureId: getColorMeasureId(advancedVSeed, vseed)
+            });
+            datasets.push(xResult.dataset);
+            foldInfoList.push(xResult.foldInfo);
+            unfoldInfoList.push(xResult.unfoldInfo);
+            const yResult = dataReshapeByEncoding(datasets[0], T(dimensions, (d)=>d.id), T(yMeasures, (d)=>d.id), encoding, {
+                foldMeasureValue: FoldYMeasureValue,
+                foldMeasureId: FoldYMeasureId,
+                colorItemAsId: true,
+                colorMeasureId: getColorMeasureId(advancedVSeed, vseed)
+            });
+            datasets[0] = yResult.dataset;
+            foldInfoList.push(yResult.foldInfo);
+            unfoldInfoList.push(yResult.unfoldInfo);
             const unfoldInfo = {
                 ...unfoldInfoList[0],
                 colorItems: unfoldInfoList.flatMap((d)=>d.colorItems),
@@ -8169,46 +7921,35 @@
             const { vseed } = context;
             const { dataset } = vseed;
             const { encoding, chartType } = advancedVSeed;
-            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const reshapeMeasures = advancedVSeed.reshapeMeasures ?? [];
             const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
-            const allMeasures = findAllMeasures(measures);
-            const measureGroups = [];
-            const depth = measureDepth(measures);
-            if (3 === depth) measures.forEach((measure)=>{
-                measureGroups.push(measure.children);
-            });
-            else if (2 === depth) measureGroups.push(measures);
+            const allMeasuresIds = reshapeMeasures.flatMap((measureGroup)=>measureGroup.map((m)=>m.id));
             const datasetList = [];
             const datasetReshapeInfo = [];
-            measureGroups.forEach((measures, index)=>{
-                if (measures.length > 2) throw new Error('measures can not be more than 2 groups in scatter');
+            reshapeMeasures.forEach((measures, index)=>{
                 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,
-                        colorMeasureId: getColorMeasureId(advancedVSeed, vseed),
-                        omitIds: allMeasures.map((item)=>item.id)
-                    });
-                    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,
-                        colorMeasureId: getColorMeasureId(advancedVSeed, vseed),
-                        omitIds: allMeasures.map((item)=>item.id)
-                    });
-                    datasets.push(newDataset);
-                    foldInfoList.push(foldInfo);
-                    unfoldInfoList.push(unfoldInfo);
-                }
+                const xMeasures = measures.filter((m)=>'xAxis' === m.encoding);
+                const yMeasures = measures.filter((m)=>'yAxis' === m.encoding);
+                const xResult = dataReshapeByEncoding(dataset, dimensions, xMeasures, encoding, {
+                    foldMeasureValue: `${FoldXMeasureValue}${index}`,
+                    colorItemAsId: true,
+                    colorMeasureId: getColorMeasureId(advancedVSeed, vseed),
+                    omitIds: allMeasuresIds
+                });
+                datasets.push(xResult.dataset);
+                foldInfoList.push(xResult.foldInfo);
+                unfoldInfoList.push(xResult.unfoldInfo);
+                const yResult = dataReshapeByEncoding(dataset, dimensions, yMeasures, encoding, {
+                    foldMeasureValue: `${FoldYMeasureValue}${index}`,
+                    colorItemAsId: true,
+                    colorMeasureId: getColorMeasureId(advancedVSeed, vseed),
+                    omitIds: allMeasuresIds
+                });
+                datasets.push(yResult.dataset);
+                foldInfoList.push(yResult.foldInfo);
+                unfoldInfoList.push(yResult.unfoldInfo);
                 const unfoldInfo = {
                     ...unfoldInfoList[0],
                     colorItems: unfoldInfoList.flatMap((d)=>d.colorItems),
@@ -8247,11 +7988,6 @@
             ], [
                 buildMeasuresForScatter,
                 encodingForScatter,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'size'
-                ]),
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -8338,7 +8074,7 @@
                 ...spec
             };
             const { advancedVSeed, vseed } = context;
-            const { datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
+            const { datasetReshapeInfo, chartType, locale, dimensions = [], encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
                 enable: true
@@ -8352,7 +8088,7 @@
                     title: {
                         visible: false
                     },
-                    content: tooltipScatter_createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), locale, foldInfoList)
+                    content: tooltipScatter_createMarkContent(encoding.tooltip || [], dimensions, vseed.measures, locale, foldInfoList)
                 },
                 dimension: {
                     visible: false
@@ -8361,7 +8097,7 @@
             };
             return result;
         };
-        const tooltipScatter_createMarkContent = (tooltip, dimensions, measures, locale, foldInfoList)=>{
+        const tooltipScatter_createMarkContent = (tooltip, dimensions, measures = [], locale, foldInfoList)=>{
             const dims = T(dimensions.filter((item)=>tooltip.includes(item.id)), (item)=>item.id);
             const meas = T(measures.filter((item)=>tooltip.includes(item.id)), (item)=>item.id);
             const dimContent = dims.map((item)=>({
@@ -8976,140 +8712,38 @@
             Builder._advancedPipelineMap.scatter = scatterAdvancedPipeline;
             Builder._specPipelineMap.scatter = scatterSpecPipeline;
         };
-        const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            if (isMeasureTreeWithChildren(advancedVSeed.measures)) return advancedVSeed;
-            if (isMeasureTreeWithParentId(advancedVSeed.measures)) {
-                advancedVSeed.measures = buildMeasuresForDualAxis_generateMeasuresByParentId(advancedVSeed.measures);
-                return advancedVSeed;
-            }
-            if (vseed.dualMeasures) {
-                advancedVSeed.measures = dualMeasuresToMeasureTree(chunk_BCBB46UE_d(vseed.dualMeasures));
-                return advancedVSeed;
-            }
-            const { dualMeasures, encodedMeasures } = basicMeasuresToDualMeasures(advancedVSeed.measures || []);
-            advancedVSeed.measures = dualMeasuresToMeasureTree(dualMeasures);
-            if (encodedMeasures.length) encodedMeasures.forEach((m)=>{
-                advancedVSeed.measures.push(m);
-            });
-            return advancedVSeed;
-        };
-        const basicMeasuresToDualMeasures = (basicMeasures)=>{
-            const primaryMeasures = [];
-            const secondaryMeasures = [];
-            const encodedMeasures = [];
-            for(let index = 0; index < basicMeasures.length; index++){
-                const item = basicMeasures[index];
+        const buildMeasuresForDualAxis = (advancedVSeed)=>{
+            const { measures = [] } = advancedVSeed;
+            const measuresByView = {};
+            const parentIds = [];
+            for(let index = 0; index < measures.length; index++){
+                const item = measures[index];
                 const encoding = item.encoding;
+                const parentId = item.parentId || DEFAULT_PARENT_ID;
                 const isPrimaryYAxis = 'primaryYAxis' === encoding;
                 const isSecondaryYAxis = 'secondaryYAxis' === encoding;
-                const isOtherEncoding = item.encoding && [
-                    'color',
-                    'label',
-                    'tooltip',
-                    'detail'
-                ].includes(item.encoding);
-                if (isPrimaryYAxis) primaryMeasures.push(item);
-                else if (isSecondaryYAxis) secondaryMeasures.push(item);
-                else if (isOtherEncoding) encodedMeasures.push(item);
-                else if (0 === index) primaryMeasures.push(item);
-                else secondaryMeasures.push(item);
-            }
-            return {
-                dualMeasures: [
-                    {
-                        id: 'dualMeasures',
-                        primaryMeasures,
-                        secondaryMeasures
-                    }
-                ],
-                encodedMeasures
-            };
-        };
-        const dualMeasuresToMeasureTree = (dualMeasures)=>{
-            const measureTree = dualMeasures.map((item, index)=>{
-                const { id, primaryMeasures, secondaryMeasures } = item;
-                const groupChildren = [];
-                let groupId = `${id}-`;
-                if (primaryMeasures) {
-                    const arrPrimaryMeasures = Array.isArray(primaryMeasures) ? primaryMeasures : [
-                        primaryMeasures
-                    ];
-                    const alias = arrPrimaryMeasures.map((item)=>item.alias || item.id).toString();
-                    groupId += 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();
-                    groupId += alias;
-                    groupChildren.push({
-                        id: `${index}-secondary`,
-                        alias: arrSecondaryMeasures.map((item)=>item.alias || item.id).toString(),
-                        children: arrSecondaryMeasures
-                    });
+                const isOtherEncoding = item.encoding && isCommonMeasureEncoding(encoding);
+                ensureParentIdInitialized(parentId, measuresByView, parentIds);
+                if (isPrimaryYAxis) {
+                    measuresByView[parentId].push(item);
+                    if (!isDualAxisChartType(item.chartType)) item.chartType = DEFAULT_DUAL_CHART_TYPE.primary;
+                } else if (isSecondaryYAxis) {
+                    measuresByView[parentId].push(item);
+                    if (!isDualAxisChartType(item.chartType)) item.chartType = DEFAULT_DUAL_CHART_TYPE.secondary;
+                } else if (!isOtherEncoding) {
+                    const primaryCount = measuresByView[parentId].filter((m)=>'primaryYAxis' === m.encoding).length;
+                    item.encoding = 0 === primaryCount ? 'primaryYAxis' : 'secondaryYAxis';
+                    if (!isDualAxisChartType(item.chartType)) item.chartType = 'primaryYAxis' === item.encoding ? DEFAULT_DUAL_CHART_TYPE.primary : DEFAULT_DUAL_CHART_TYPE.secondary;
+                    measuresByView[parentId].push(item);
                 }
-                return {
-                    id: groupId,
-                    alias: groupId,
-                    children: groupChildren
-                };
-            });
-            if (1 === dualMeasures.length) return measureTree[0].children || [];
-            return measureTree;
-        };
-        const buildMeasuresForDualAxis_generateMeasuresByParentId = (measures)=>{
-            const dualMeasures = [];
-            const encodedMeasures = [];
-            measures.forEach((item)=>{
-                const id = item.parentId || DEFAULT_PARENT_ID;
-                if (!dualMeasures.find((d)=>d.id === id)) dualMeasures.push({
-                    id,
-                    primaryMeasures: [],
-                    secondaryMeasures: []
-                });
-                const dualChart = dualMeasures.find((d)=>d.id === id);
-                if (!dualChart || !Array.isArray(dualChart.primaryMeasures) || !Array.isArray(dualChart.secondaryMeasures)) return;
-                const encoding = item.encoding;
-                const isPrimaryYAxis = 'primaryYAxis' === encoding;
-                const isSecondaryYAxis = 'secondaryYAxis' === encoding;
-                const isOtherEncoding = item.encoding && [
-                    'color',
-                    'label',
-                    'tooltip',
-                    'detail'
-                ].includes(item.encoding);
-                if (isPrimaryYAxis) dualChart.primaryMeasures.push(item);
-                else if (isSecondaryYAxis) dualChart.secondaryMeasures.push(item);
-                else if (isOtherEncoding) encodedMeasures.push(item);
-                else if (0 === dualChart.primaryMeasures.length) dualChart.primaryMeasures.push(item);
-                else dualChart.secondaryMeasures.push(item);
-            });
-            const res = dualMeasuresToMeasureTree(dualMeasures);
-            if (encodedMeasures.length) encodedMeasures.forEach((m)=>{
-                res.push(m);
-            });
-            return res;
-        };
-        const checkSingleViewMultiMeasures = (measures = [])=>measures.length <= 1 && (measures[0].children ?? []).length <= 1;
-        const dualAxis_hasMultipleMeasureInSingleView = (measures = [])=>{
-            const depth = measureDepth(measures);
-            if (depth >= 3) return measures.some((m)=>m && m.children && !checkSingleViewMultiMeasures(m.children));
-            if (2 === depth) return !checkSingleViewMultiMeasures(measures);
-            if (1 === depth) return measures.length >= 1;
-            return false;
+            }
+            advancedVSeed.reshapeMeasures = parentIds.map((pid)=>measuresByView[pid]).filter((m)=>m.length > 0);
+            return advancedVSeed;
         };
         const defaultEncodingForDualAxis = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const encoding = {};
-            dualAxis_generateDefaultDimensionEncoding(dimensions, encoding, dualAxis_hasMultipleMeasureInSingleView(vseedMeasures));
+            dualAxis_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(reshapeMeasures));
             dualAxis_generateDefaultMeasureEncoding(measures, encoding);
             return {
                 ...advancedVSeed,
@@ -9117,12 +8751,11 @@
             };
         };
         const encodingForDualAxis = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            const hasMulti = dualAxis_hasMultipleMeasureInSingleView(vseedMeasures);
+            const hasMulti = hasMultipleMeasureInSingleView(reshapeMeasures);
             if (hasDimensionEncoding) dualAxis_generateDimensionEncoding(dimensions, encoding, hasMulti);
             else dualAxis_generateDefaultDimensionEncoding(dimensions, encoding, hasMulti);
             if (hasMeasureEncoding) dualAxis_generateMeasureEncoding(measures, encoding);
@@ -9181,34 +8814,37 @@
             const { vseed } = context;
             const { dataset } = vseed;
             const { encoding, chartType } = advancedVSeed;
-            const measures = (advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? []).filter((m)=>m && m.children);
+            const measures = advancedVSeed.reshapeMeasures?.[0] ?? [];
             const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
-            if (measures.length > 2) throw new Error('measures can not be more than 2 groups in dualAxis');
             const foldInfoList = [];
             const unfoldInfoList = [];
             const datasets = [];
-            const primaryMeasures = measures[0];
-            const secondaryMeasures = measures[1] || [];
-            if (primaryMeasures && primaryMeasures.children) {
-                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(primaryMeasures.children, (item)=>item.id), encoding, {
+            const primaryMeasures = measures.filter((m)=>'primaryYAxis' === m.encoding);
+            const secondaryMeasures = measures.filter((m)=>'secondaryYAxis' === m.encoding);
+            const primaryChartTypes = chunk_QJLMYOTX_i(primaryMeasures.map((m)=>m.chartType));
+            const secondaryChartTypes = chunk_QJLMYOTX_i(secondaryMeasures.map((m)=>m.chartType));
+            if (!primaryChartTypes.length) primaryChartTypes.push(DEFAULT_DUAL_CHART_TYPE.primary);
+            if (!secondaryChartTypes.length) secondaryChartTypes.push(DEFAULT_DUAL_CHART_TYPE.secondary);
+            primaryChartTypes.forEach((chartType)=>{
+                const primaryResult = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(primaryMeasures.filter((m)=>m.chartType === chartType), (item)=>item.id), encoding, {
                     colorItemAsId: false,
                     foldMeasureValue: FoldPrimaryMeasureValue,
                     colorMeasureId: getColorMeasureId(advancedVSeed, vseed)
                 });
-                datasets.push(newDataset);
-                foldInfoList.push(foldInfo);
-                unfoldInfoList.push(unfoldInfo);
-            }
-            if (secondaryMeasures && secondaryMeasures.children) {
-                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(secondaryMeasures.children, (item)=>item.id), encoding, {
+                datasets.push(primaryResult.dataset);
+                foldInfoList.push(primaryResult.foldInfo);
+                unfoldInfoList.push(primaryResult.unfoldInfo);
+            });
+            secondaryChartTypes.forEach((chartType)=>{
+                const secondaryResult = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(secondaryMeasures.filter((m)=>m.chartType === chartType), (item)=>item.id), encoding, {
                     colorItemAsId: false,
                     foldMeasureValue: FoldSecondaryMeasureValue,
                     colorMeasureId: getColorMeasureId(advancedVSeed, vseed)
                 });
-                datasets.push(newDataset);
-                foldInfoList.push(foldInfo);
-                unfoldInfoList.push(unfoldInfo);
-            }
+                datasets.push(secondaryResult.dataset);
+                foldInfoList.push(secondaryResult.foldInfo);
+                unfoldInfoList.push(secondaryResult.unfoldInfo);
+            });
             const unfoldInfo = {
                 ...unfoldInfoList[0],
                 colorItems: unfoldInfoList.flatMap((d)=>d.colorItems),
@@ -9238,46 +8874,43 @@
             const { vseed } = context;
             const { dataset } = vseed;
             const { encoding, chartType } = advancedVSeed;
-            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const reshapeMeasures = advancedVSeed.reshapeMeasures ?? [];
             const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
-            const allMeasures = findAllMeasures(measures);
+            const allMeasuresIds = reshapeMeasures.flatMap((measureGroup)=>measureGroup.map((m)=>m.id));
             const datasetList = [];
             const datasetReshapeInfo = [];
-            const measureGroups = [];
-            const depth = measureDepth(measures);
-            if (3 === depth) measures.forEach((measure)=>{
-                if (measure.children) measureGroups.push(measure.children);
-            });
-            else if (2 === depth) measureGroups.push(measures.filter((m)=>m && m.children));
-            measureGroups.forEach((measures, index)=>{
-                if (measures.length > 2) throw new Error('measures can not be more than 2 groups in dualAxis');
+            reshapeMeasures.forEach((measures, index)=>{
                 const foldInfoList = [];
                 const unfoldInfoList = [];
                 const datasets = [];
-                const primaryMeasures = measures[0];
-                const secondaryMeasures = measures[1] || [];
-                if (primaryMeasures && primaryMeasures.children) {
-                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(primaryMeasures.children, (item)=>item.id), encoding, {
+                const primaryMeasures = measures.filter((m)=>'primaryYAxis' === m.encoding);
+                const secondaryMeasures = measures.filter((m)=>'secondaryYAxis' === m.encoding);
+                const primaryChartTypes = chunk_QJLMYOTX_i(primaryMeasures.map((m)=>m.chartType));
+                const secondaryChartTypes = chunk_QJLMYOTX_i(secondaryMeasures.map((m)=>m.chartType));
+                if (!primaryChartTypes.length) primaryChartTypes.push(DEFAULT_DUAL_CHART_TYPE.primary);
+                if (!secondaryChartTypes.length) secondaryChartTypes.push(DEFAULT_DUAL_CHART_TYPE.secondary);
+                primaryChartTypes.forEach((chartType)=>{
+                    const primaryResult = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(primaryMeasures.filter((m)=>m.chartType === chartType), (item)=>item.id), encoding, {
                         colorItemAsId: false,
                         foldMeasureValue: `${FoldPrimaryMeasureValue}${index}`,
                         colorMeasureId: getColorMeasureId(advancedVSeed, vseed),
-                        omitIds: allMeasures.map((item)=>item.id)
+                        omitIds: allMeasuresIds
                     });
-                    datasets.push(newDataset);
-                    foldInfoList.push(foldInfo);
-                    unfoldInfoList.push(unfoldInfo);
-                }
-                if (secondaryMeasures && secondaryMeasures.children) {
-                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(secondaryMeasures.children, (item)=>item.id), encoding, {
+                    datasets.push(primaryResult.dataset);
+                    foldInfoList.push(primaryResult.foldInfo);
+                    unfoldInfoList.push(primaryResult.unfoldInfo);
+                });
+                secondaryChartTypes.forEach((chartType)=>{
+                    const secondaryResult = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(secondaryMeasures.filter((m)=>m.chartType === chartType), (item)=>item.id), encoding, {
                         colorItemAsId: false,
                         foldMeasureValue: `${FoldSecondaryMeasureValue}${index}`,
                         colorMeasureId: getColorMeasureId(advancedVSeed, vseed),
-                        omitIds: allMeasures.map((item)=>item.id)
+                        omitIds: allMeasuresIds
                     });
-                    datasets.push(newDataset);
-                    foldInfoList.push(foldInfo);
-                    unfoldInfoList.push(unfoldInfo);
-                }
+                    datasets.push(secondaryResult.dataset);
+                    foldInfoList.push(secondaryResult.foldInfo);
+                    unfoldInfoList.push(secondaryResult.unfoldInfo);
+                });
                 const unfoldInfo = {
                     ...unfoldInfoList[0],
                     colorItems: unfoldInfoList.flatMap((d)=>d.colorItems),
@@ -9315,7 +8948,6 @@
                 'legend',
                 'tooltip',
                 'xAxis',
-                'dualChartType',
                 'alignTicks',
                 'primaryYAxis',
                 'secondaryYAxis',
@@ -9346,11 +8978,6 @@
             ], [
                 buildMeasuresForDualAxis,
                 encodingForDualAxis,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
-                ]),
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -9365,7 +8992,7 @@
             markStyle_markStyle,
             annotation_annotation
         ];
-        const series_series = (...args)=>{
+        const series_series = (pipeByAxis, pipes)=>{
             const result = {
                 type: 'common',
                 padding: 0,
@@ -9376,11 +9003,28 @@
                 ]
             };
             return (_, context)=>{
-                result.series = args.map((pipeline)=>execPipeline(pipeline, context, {}));
+                const { advancedVSeed } = context;
+                const { datasetReshapeInfo, reshapeMeasures = [] } = advancedVSeed;
+                const { foldInfoList = [], index } = datasetReshapeInfo[0];
+                result.series = foldInfoList.map((foldInfo)=>{
+                    const measureId = Object.keys(foldInfo.foldMap)[0];
+                    const axisType = foldInfo.measureValue === `${FoldPrimaryMeasureValue}${index}` ? 'primary' : 'secondary';
+                    const measure = (reshapeMeasures[index] ?? []).find((m)=>m.id === measureId);
+                    const options = {
+                        axisType,
+                        chartType: measure?.chartType ?? ('primary' === axisType ? DEFAULT_DUAL_CHART_TYPE.primary : DEFAULT_DUAL_CHART_TYPE.secondary),
+                        foldInfo
+                    };
+                    const pipeline = [
+                        ...pipeByAxis.map((p)=>p(options)),
+                        ...pipes
+                    ];
+                    return execPipeline(pipeline, context, {});
+                });
                 return result;
             };
         };
-        const seriesDualAxis = (...args)=>{
+        const seriesDualAxis = (pipeByAxis, pipes)=>{
             const result = {
                 type: 'common',
                 padding: 0,
@@ -9391,129 +9035,52 @@
                     }
                 ]
             };
-            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);
+                const { advancedVSeed } = context;
+                const { datasetReshapeInfo, dataset, reshapeMeasures = [] } = advancedVSeed;
+                result.series = dataset.map((d, index)=>{
+                    const seriesContext = {
+                        ...context,
+                        advancedVSeed: {
+                            ...advancedVSeed,
+                            dataset: d
+                        }
+                    };
+                    const foldInfo = datasetReshapeInfo[0].foldInfoList[index];
+                    const measureId = Object.keys(foldInfo.foldMap)[0];
+                    const axisType = foldInfo.measureValue === FoldPrimaryMeasureValue ? 'primary' : 'secondary';
+                    const measure = (reshapeMeasures[0] ?? []).find((m)=>m.id === measureId);
+                    const options = {
+                        axisType,
+                        chartType: measure?.chartType ?? ('primary' === axisType ? DEFAULT_DUAL_CHART_TYPE.primary : DEFAULT_DUAL_CHART_TYPE.secondary),
+                        foldInfo
+                    };
+                    const pipeline = [
+                        ...pipeByAxis.map((p)=>p(options)),
+                        ...pipes
+                    ];
                     return execPipeline(pipeline, seriesContext, {});
                 });
                 return result;
             };
         };
-        const initDualAxisPrimary = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed } = context;
-            const { datasetReshapeInfo } = advancedVSeed;
-            const { unfoldInfo, foldInfoList, id } = datasetReshapeInfo[0];
-            result.id = `${id}-primary-series`;
-            result.type = 'bar';
-            result.direction = 'vertical';
-            result.xField = unfoldInfo.encodingX;
-            result.seriesField = unfoldInfo.encodingColorId;
-            result.yField = foldInfoList?.[0].measureValue;
-            result.animation = true;
-            return result;
-        };
-        const initDualAxisSecondary = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed, vseed } = context;
-            const { datasetReshapeInfo } = advancedVSeed;
-            const { unfoldInfo, foldInfoList, id } = datasetReshapeInfo[0];
-            result.id = `${id}-secondary-series`;
-            result.type = 'line';
-            result.direction = 'vertical';
-            result.xField = unfoldInfo.encodingX;
-            if (foldInfoList?.[1]) result.yField = foldInfoList[1].measureValue;
-            result.seriesField = isLinearColor(advancedVSeed, vseed) ? unfoldInfo.encodingDetail : unfoldInfo.encodingColorId;
-            result.animation = true;
-            return result;
-        };
-        const DEFAULT_DUAL_CHART_TYPE = {
-            primary: 'column',
-            secondary: 'line'
-        };
-        const dualChartTypePrimary = (spec, context)=>{
-            const result = {
-                ...spec,
-                zIndex: 1001
-            };
-            const { advancedVSeed, vseed } = context;
-            const { chartType } = vseed;
-            const { datasetReshapeInfo } = advancedVSeed;
-            const index = datasetReshapeInfo[0].index;
-            const config = advancedVSeed.config?.[chartType]?.dualChartType || DEFAULT_DUAL_CHART_TYPE;
-            const primary = (Array.isArray(config) ? config[index]?.primary || config[0]?.primary : config.primary) ?? DEFAULT_DUAL_CHART_TYPE.primary;
-            const secondary = (Array.isArray(config) ? config[index]?.secondary || config[0]?.secondary : config.secondary) ?? DEFAULT_DUAL_CHART_TYPE.secondary;
-            const bothColumn = 'column' === primary && 'column' === secondary;
-            const type = bothColumn ? 'columnParallel' : primary;
-            switch(type){
-                case 'line':
-                    result.type = 'line';
-                    break;
-                case 'column':
-                    result.type = 'bar';
-                    result.zIndex = 1000;
-                    break;
-                case 'columnParallel':
-                    {
-                        const columnSpec = result;
-                        if (Array.isArray(columnSpec.xField)) columnSpec.xField.push(datasetReshapeInfo[0].unfoldInfo.encodingDetail);
-                        else if (columnSpec.xField) columnSpec.xField = [
-                            columnSpec.xField,
-                            datasetReshapeInfo[0].unfoldInfo.encodingDetail
-                        ];
-                        columnSpec.type = 'bar';
-                        result.zIndex = 1000;
-                        break;
-                    }
-                case 'columnPercent':
-                    result.type = 'bar';
-                    result.percent = true;
-                    result.zIndex = 1000;
-                    break;
-                case 'area':
-                    result.type = 'area';
-                    break;
-                case 'areaPercent':
-                    result.type = 'area';
-                    result.percent = true;
-                    break;
-                case 'scatter':
-                    result.type = 'scatter';
-                    break;
-                default:
-                    result.type = primary;
-            }
-            return result;
-        };
-        const dualChartTypeSecondary = (spec, context)=>{
-            const result = {
-                ...spec,
-                zIndex: 1001
+        const initDualAxis = (options)=>(spec, context)=>{
+                const result = {
+                    ...spec
+                };
+                const { advancedVSeed, vseed } = context;
+                const { datasetReshapeInfo } = advancedVSeed;
+                const { unfoldInfo, id } = datasetReshapeInfo[0];
+                result.id = `${id}-${options.axisType}-${options.chartType}`;
+                result.type = 'line' === options.chartType ? 'line' : 'bar';
+                result.direction = 'vertical';
+                result.xField = unfoldInfo.encodingX;
+                result.seriesField = isLinearColor(advancedVSeed, vseed) ? unfoldInfo.encodingDetail : unfoldInfo.encodingColorId;
+                result.yField = options.foldInfo.measureValue;
+                result.animation = true;
+                return result;
             };
-            const { advancedVSeed, vseed } = context;
-            const { chartType } = vseed;
-            const { datasetReshapeInfo } = advancedVSeed;
-            const config = advancedVSeed.config?.[chartType]?.dualChartType || DEFAULT_DUAL_CHART_TYPE;
-            const index = datasetReshapeInfo[0].index;
-            const primary = (Array.isArray(config) ? config[index]?.primary || config[0]?.primary : config.primary) ?? DEFAULT_DUAL_CHART_TYPE.primary;
-            const secondary = (Array.isArray(config) ? config[index]?.secondary || config[0]?.secondary : config.secondary) ?? DEFAULT_DUAL_CHART_TYPE.secondary;
-            const bothColumn = 'column' === primary && 'column' === secondary;
-            const type = bothColumn ? 'columnParallel' : secondary;
+        function applyChartType(result, type, datasetReshapeInfo) {
             switch(type){
                 case 'line':
                     result.type = 'line';
@@ -9550,181 +9117,105 @@
                     result.type = 'scatter';
                     break;
                 default:
-                    result.type = secondary ?? DEFAULT_DUAL_CHART_TYPE.secondary;
-            }
-            return result;
-        };
-        const datasetPrimary = (spec, context)=>{
-            const { advancedVSeed, vseed } = context;
-            const { analysis, datasetReshapeInfo } = advancedVSeed;
-            const orderMapping = analysis?.orderMapping || {};
-            const { unfoldInfo } = datasetReshapeInfo[0];
-            const x = unfoldInfo.encodingX;
-            const colorId = unfoldInfo.encodingColorId;
-            const id = datasetReshapeInfo[0].id;
-            const fields = {};
-            if (x) {
-                const order = orderMapping[x];
-                if (order) fields[x] = {
-                    sortIndex: 0,
-                    domain: order,
-                    lockStatisticsByDomain: true
-                };
-                else fields[x] = {
-                    sortIndex: 0
-                };
+                    result.type = type;
             }
-            if (colorId) {
-                const order = orderMapping[colorId];
-                if (order) fields[colorId] = {
-                    sortIndex: 0,
-                    domain: order,
-                    lockStatisticsByDomain: true
-                };
-                else fields[colorId] = {
-                    sortIndex: 0
+        }
+        const dualChartType = (options)=>(spec, context)=>{
+                const result = {
+                    ...spec,
+                    zIndex: 1001
                 };
-            }
-            return {
-                ...spec,
-                data: {
-                    id: `${id}-primary-dataset`,
-                    values: chatType_isPivotChart(vseed) ? void 0 : advancedVSeed.dataset,
-                    fields: fields
-                }
+                const { advancedVSeed } = context;
+                const { datasetReshapeInfo, reshapeMeasures = [] } = advancedVSeed;
+                const index = datasetReshapeInfo[0].index;
+                const chartTypes = reshapeMeasures[index].map((m)=>m.chartType);
+                const type = chartTypes.every((ct)=>'column' === ct) && reshapeMeasures[index].length > 1 && reshapeMeasures[index].some((m)=>'primaryYAxis' === m.encoding) && reshapeMeasures[index].some((m)=>'secondaryYAxis' === m.encoding) ? 'columnParallel' : options.chartType;
+                applyChartType(result, type, datasetReshapeInfo);
+                return result;
             };
-        };
-        const datasetSecondary = (spec, context)=>{
-            const { advancedVSeed, vseed } = context;
-            const { analysis, datasetReshapeInfo } = advancedVSeed;
-            const orderMapping = analysis?.orderMapping || {};
-            const { unfoldInfo } = datasetReshapeInfo[0];
-            const x = unfoldInfo.encodingX;
-            const colorId = unfoldInfo.encodingColorId;
-            const id = datasetReshapeInfo[0].id;
-            const fields = {};
-            if (x) {
-                const order = orderMapping[x];
-                if (order) fields[x] = {
-                    sortIndex: 0,
-                    domain: order,
-                    lockStatisticsByDomain: true
-                };
-                else fields[x] = {
-                    sortIndex: 0
-                };
-            }
-            if (colorId) {
-                const order = orderMapping[colorId];
-                if (order) fields[colorId] = {
-                    sortIndex: 0,
-                    domain: order,
-                    lockStatisticsByDomain: true
-                };
-                else fields[colorId] = {
-                    sortIndex: 0
-                };
-            }
-            return {
-                ...spec,
-                data: {
-                    id: `${id}-secondary-dataset`,
-                    values: chatType_isPivotChart(vseed) ? void 0 : advancedVSeed.dataset,
-                    fields: fields
+        const datasetDualAxis = (options)=>(spec, context)=>{
+                const { advancedVSeed, vseed } = context;
+                const { analysis, datasetReshapeInfo } = advancedVSeed;
+                const orderMapping = analysis?.orderMapping || {};
+                const { unfoldInfo } = datasetReshapeInfo[0];
+                const x = unfoldInfo.encodingX;
+                const colorId = unfoldInfo.encodingColorId;
+                const id = datasetReshapeInfo[0].id;
+                const fields = {};
+                if (x) {
+                    const order = orderMapping[x];
+                    if (order) fields[x] = {
+                        sortIndex: 0,
+                        domain: order,
+                        lockStatisticsByDomain: true
+                    };
+                    else fields[x] = {
+                        sortIndex: 0
+                    };
                 }
-            };
-        };
-        const labelPrimary = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed, vseed } = context;
-            const { datasetReshapeInfo, encoding } = advancedVSeed;
-            const { chartType } = advancedVSeed;
-            const baseConfig = advancedVSeed.config[chartType];
-            const foldInfoList = datasetReshapeInfo[0].foldInfoList;
-            result.label = buildLabel(baseConfig.label, vseed.measures, vseed.dimensions, advancedVSeed.dimensions, advancedVSeed.measures, encoding, [
-                foldInfoList[0]
-            ]);
-            result.label.zIndex = 1002;
-            return result;
-        };
-        const labelSecondary = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed, vseed } = context;
-            const { datasetReshapeInfo, encoding } = advancedVSeed;
-            const { chartType } = advancedVSeed;
-            const baseConfig = advancedVSeed.config[chartType];
-            const foldInfoList = datasetReshapeInfo[0].foldInfoList;
-            result.label = buildLabel(baseConfig.label, vseed.measures, vseed.dimensions, advancedVSeed.dimensions, advancedVSeed.measures, encoding, [
-                foldInfoList[1]
-            ]);
-            result.label.zIndex = 1002;
-            return result;
-        };
-        const tooltipPrimary = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed, vseed } = context;
-            const { measures, datasetReshapeInfo, chartType, dimensions, encoding } = advancedVSeed;
-            const baseConfig = advancedVSeed.config[chartType];
-            const { tooltip = {
-                enable: true
-            } } = baseConfig;
-            const { enable } = tooltip;
-            const foldInfoList = datasetReshapeInfo[0].foldInfoList;
-            const unfoldInfo = datasetReshapeInfo[0].unfoldInfo;
-            result.tooltip = {
-                visible: enable,
-                mark: {
-                    title: {
-                        visible: false
-                    },
-                    content: createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), foldInfoList[0], unfoldInfo)
-                },
-                dimension: {
-                    title: {
-                        visible: true
-                    },
-                    content: createDimensionContent(dimensions, measures, foldInfoList[0], unfoldInfo)
+                if (colorId) {
+                    const order = orderMapping[colorId];
+                    if (order) fields[colorId] = {
+                        sortIndex: 0,
+                        domain: order,
+                        lockStatisticsByDomain: true
+                    };
+                    else fields[colorId] = {
+                        sortIndex: 0
+                    };
                 }
+                return {
+                    ...spec,
+                    data: {
+                        id: `${id}-${options.axisType}-${options.chartType}`,
+                        values: chatType_isPivotChart(vseed) ? void 0 : advancedVSeed.dataset,
+                        fields: fields
+                    }
+                };
             };
-            return result;
-        };
-        const tooltipSecondary = (spec, context)=>{
-            const result = {
-                ...spec
+        const labelDualAxis = (options)=>(spec, context)=>{
+                const result = {
+                    ...spec
+                };
+                const { advancedVSeed, vseed } = context;
+                const { encoding } = advancedVSeed;
+                const { chartType } = advancedVSeed;
+                const baseConfig = advancedVSeed.config[chartType];
+                result.label = buildLabel(baseConfig.label, vseed.measures, vseed.dimensions, advancedVSeed.dimensions, advancedVSeed.measures, encoding, [
+                    options.foldInfo
+                ]);
+                result.label.zIndex = 1002;
+                return result;
             };
-            const { advancedVSeed, vseed } = context;
-            const { measures, datasetReshapeInfo, chartType, dimensions, encoding } = advancedVSeed;
-            const baseConfig = advancedVSeed.config[chartType];
-            const { tooltip = {
-                enable: true
-            } } = baseConfig;
-            const { enable } = tooltip;
-            if (chunk_JK3VNB42_n(datasetReshapeInfo[0].foldInfoList?.[1])) return result;
-            const foldInfoList = datasetReshapeInfo[0].foldInfoList;
-            const unfoldInfo = datasetReshapeInfo[0].unfoldInfo;
-            result.tooltip = {
-                visible: enable,
-                mark: {
-                    title: {
-                        visible: false
-                    },
-                    content: createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), foldInfoList[1], unfoldInfo)
-                },
-                dimension: {
-                    title: {
-                        visible: true
+        const tooltipOfDualAxisSeries = (options)=>(spec, context)=>{
+                const result = {
+                    ...spec
+                };
+                const { advancedVSeed, vseed } = context;
+                const { measures = [], datasetReshapeInfo, chartType, dimensions = [], encoding } = advancedVSeed;
+                const baseConfig = advancedVSeed.config[chartType];
+                const { tooltip = {
+                    enable: true
+                } } = baseConfig;
+                const { enable } = tooltip;
+                const unfoldInfo = datasetReshapeInfo[0].unfoldInfo;
+                result.tooltip = {
+                    visible: enable,
+                    mark: {
+                        title: {
+                            visible: false
+                        },
+                        content: createMarkContent(encoding.tooltip || [], dimensions, vseed.measures, options.foldInfo, unfoldInfo)
                     },
-                    content: createDimensionContent(dimensions, measures, foldInfoList[1], unfoldInfo)
-                }
+                    dimension: {
+                        title: {
+                            visible: true
+                        },
+                        content: createDimensionContent(dimensions, measures, options.foldInfo, unfoldInfo)
+                    }
+                };
+                return result;
             };
-            return result;
-        };
         const tooltipDualAxis = (spec, context)=>{
             const result = {
                 ...spec
@@ -9763,25 +9254,29 @@
             };
             const { advancedVSeed, vseed } = context;
             const { chartType } = vseed;
-            const { datasetReshapeInfo, encoding, measures, dimensions } = advancedVSeed;
+            const { datasetReshapeInfo, reshapeMeasures = [] } = advancedVSeed;
             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 (chunk_JK3VNB42_n(foldInfoList?.[0])) return result;
-            const isEmptySecondary = chunk_VCYTMP4D_n(foldInfoList?.[0].foldMap);
+            if (!foldInfoList) return result;
+            const primaryFoldInfoList = foldInfoList.filter((f)=>f.measureValue.startsWith(FoldPrimaryMeasureValue));
+            const isEmpty = !primaryFoldInfoList.length || primaryFoldInfoList.every((foldInfo)=>!Object.keys(foldInfo.foldMap).length);
             const id = `${reshapeInfoId}-primary-axis`;
-            const seriesIds = [
-                `${reshapeInfoId}-primary-series`,
-                `${reshapeInfoId}-secondary-series`
-            ];
-            const seriesId = alignTicksConfig ? seriesIds : seriesIds[0];
+            const seriesId = alignTicksConfig ? spec.series.map((s)=>s.id) : spec.series.filter((s)=>s.yField.startsWith(FoldPrimaryMeasureValue)).map((s)=>s.id);
             if (!result.axes) result.axes = [];
             const { autoFormat, numFormat = {} } = yAxisConfig ?? {};
             const formatter = createNumFormatter(numFormat);
             const formatMethod = (value)=>createLinearFormat(value, autoFormat, numFormat, formatter);
-            const titleText = yAxisConfig?.title?.titleText || defaultTitleText(measures, dimensions, encoding.y);
+            const measures = flatReshapeMeasures(reshapeMeasures);
+            const measureIds = primaryFoldInfoList.reduce((res, foldInfo)=>{
+                Object.keys(foldInfo.foldMap).forEach((k)=>{
+                    if (!res.includes(k)) res.push(k);
+                });
+                return res;
+            }, []);
+            const titleText = yAxisConfig?.title?.titleText || measures.filter((m)=>'primaryYAxis' === m.encoding && measureIds.includes(m.id)).map((m)=>m.alias ?? m.id).join(' & ');
             const linearAxis = {
                 ...linearAxisStyle({
                     ...yAxisConfig,
@@ -9791,7 +9286,7 @@
                     id,
                     seriesId
                 }),
-                visible: isEmptySecondary ? false : yAxisConfig?.visible ?? true
+                visible: isEmpty ? false : yAxisConfig?.visible ?? true
             };
             result.axes = [
                 ...result.axes,
@@ -9805,30 +9300,28 @@
             };
             const { advancedVSeed, vseed } = context;
             const { chartType } = vseed;
-            const { datasetReshapeInfo, measures, dimensions, encoding } = advancedVSeed;
+            const { datasetReshapeInfo, reshapeMeasures = [] } = advancedVSeed;
             const { index, id: reshapeInfoId, foldInfoList } = datasetReshapeInfo[0];
             const secondaryYAxis = advancedVSeed.config?.[chartType]?.secondaryYAxis;
             const yAxisConfig = Array.isArray(secondaryYAxis) ? secondaryYAxis[index] || secondaryYAxis[0] : secondaryYAxis;
             const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
             const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
-            if (chunk_JK3VNB42_n(foldInfoList?.[1])) return result;
-            const isEmptySecondary = chunk_VCYTMP4D_n(foldInfoList?.[1].foldMap);
-            const onlySecondary = chunk_VCYTMP4D_n(foldInfoList?.[0].foldMap) && !isEmptySecondary;
+            if (!foldInfoList) return result;
+            const secondaryFoldInfoList = foldInfoList.filter((f)=>f.measureValue.startsWith(FoldSecondaryMeasureValue));
+            const isEmptySecondary = !secondaryFoldInfoList.length || secondaryFoldInfoList.every((foldInfo)=>!Object.keys(foldInfo.foldMap).length);
+            const onlySecondary = !isEmptySecondary && foldInfoList.length && foldInfoList.every((f)=>f.measureValue.startsWith(FoldSecondaryMeasureValue) || 0 === Object.keys(f.foldMap).length);
             const sync = {
                 axisId: `${reshapeInfoId}-primary-axis`,
                 zeroAlign: true
             };
             const id = `${reshapeInfoId}-secondary-axis`;
-            const seriesIds = [
-                `${reshapeInfoId}-primary-series`,
-                `${reshapeInfoId}-secondary-series`
-            ];
-            const seriesId = alignTicksConfig ? seriesIds : seriesIds[1];
+            const seriesId = alignTicksConfig ? spec.series.map((s)=>s.id) : spec.series.filter((s)=>s.yField.startsWith(FoldSecondaryMeasureValue)).map((s)=>s.id);
             if (!result.axes) result.axes = [];
             const { autoFormat, numFormat = {} } = yAxisConfig ?? {};
             const formatter = createNumFormatter(numFormat);
             const formatMethod = (value)=>createLinearFormat(value, autoFormat, numFormat, formatter);
-            const titleText = yAxisConfig?.title?.titleText || defaultTitleText(measures, dimensions, encoding.y);
+            const measures = flatReshapeMeasures(reshapeMeasures);
+            const titleText = yAxisConfig?.title?.titleText || measures.filter((m)=>'secondaryYAxis' === m.encoding).map((m)=>m.alias ?? m.id).join(' & ');
             const baseStyle = linearAxisStyle({
                 ...yAxisConfig,
                 orient: 'right',
@@ -9858,7 +9351,7 @@
             };
             const { advancedVSeed } = context;
             const { datasetReshapeInfo, chartType } = advancedVSeed;
-            const { unfoldInfo, id } = datasetReshapeInfo[0];
+            const { unfoldInfo } = datasetReshapeInfo[0];
             const baseConfig = advancedVSeed.config[chartType];
             if (!baseConfig || !baseConfig.color) return result;
             const { color } = baseConfig;
@@ -9866,20 +9359,12 @@
             result.color = {
                 type: 'linear',
                 range: linearColorScheme || colorScheme || [],
-                domain: [
-                    {
-                        dataId: `${id}-primary-dataset`,
-                        fields: [
-                            unfoldInfo.encodingColor
-                        ]
-                    },
-                    {
-                        dataId: `${id}-secondary-dataset`,
+                domain: spec.series.map((s)=>({
+                        dataId: s.data.id,
                         fields: [
                             unfoldInfo.encodingColor
                         ]
-                    }
-                ]
+                    }))
             };
             return result;
         };
@@ -9912,14 +9397,14 @@
         const annotationPointOfDualAxis = generateAnnotationPointPipe({
             findSelectedDatas: (dataset, s, spec, context)=>dataset.reduce((res, d)=>{
                     const { advancedVSeed } = context;
-                    const allMeasureIds = findAllMeasures(advancedVSeed.reshapeMeasures ?? advancedVSeed.measures).map((m)=>m.id);
+                    const allMeasureIds = flatReshapeMeasures(advancedVSeed.reshapeMeasures ?? []).map((m)=>m.id);
                     const pickedDatum = pickWithout(d, allMeasureIds.filter((id)=>id !== d[MeasureId]));
                     if (selector_selector(pickedDatum, s)) res.push(pickedDatum);
                     return res;
                 }, []),
             generateMarkPoint: (datum, spec, context)=>{
                 const { advancedVSeed } = context;
-                const allMeasureIds = findAllMeasures(advancedVSeed.reshapeMeasures ?? advancedVSeed.measures).map((m)=>m.id);
+                const allMeasureIds = flatReshapeMeasures(advancedVSeed.reshapeMeasures ?? []).map((m)=>m.id);
                 return spec.series?.map((s, index)=>({
                         relativeSeriesIndex: index,
                         coordinate: (data)=>data.find((item)=>isSubset(datum, item, allMeasureIds.filter((id)=>id !== item[MeasureId])))
@@ -9928,26 +9413,12 @@
         });
         const dualAxis = [
             seriesDualAxis([
-                initDualAxisPrimary,
-                dualChartTypePrimary,
-                datasetPrimary,
-                labelPrimary,
-                tooltipPrimary,
-                progressive,
-                barMaxWidth_barMaxWidth,
-                barGapInGroup_barGapInGroup,
-                stackCornerRadius_stackCornerRadius,
-                barStyleFilter(colorBarStyleFill(barStyle_barStyle)),
-                pointStyleFilter(colorPointStyleFill(pointStyle_pointStyle)),
-                pointStyleFilter(pointStateDimensionHover),
-                lineStyleFilter(colorLineStyleFill(lineStyle_lineStyle)),
-                areaStyleFilter(colorAreaStyleFill(areaStyle_areaStyle))
+                initDualAxis,
+                dualChartType,
+                datasetDualAxis,
+                labelDualAxis,
+                tooltipOfDualAxisSeries
             ], [
-                initDualAxisSecondary,
-                dualChartTypeSecondary,
-                datasetSecondary,
-                labelSecondary,
-                tooltipSecondary,
                 progressive,
                 barMaxWidth_barMaxWidth,
                 barGapInGroup_barGapInGroup,
@@ -9978,35 +9449,21 @@
             datasetPivot,
             pivotIndicators_pivotIndicators([
                 series_series([
-                    initDualAxisPrimary,
-                    dualChartTypePrimary,
-                    datasetPrimary,
-                    labelPrimary,
-                    tooltipPrimary,
-                    progressive,
-                    stackCornerRadius_stackCornerRadius,
-                    barMaxWidth_barMaxWidth,
-                    barGapInGroup_barGapInGroup,
-                    colorBarStyleFill(barStyle_barStyle),
-                    colorPointStyleFill(pointStyle_pointStyle),
-                    pointStateDimensionHover,
-                    colorLineStyleFill(lineStyle_lineStyle),
-                    colorAreaStyleFill(areaStyle_areaStyle)
+                    initDualAxis,
+                    dualChartType,
+                    datasetDualAxis,
+                    labelDualAxis,
+                    tooltipOfDualAxisSeries
                 ], [
-                    initDualAxisSecondary,
-                    dualChartTypeSecondary,
-                    datasetSecondary,
-                    labelSecondary,
-                    tooltipSecondary,
                     progressive,
-                    stackCornerRadius_stackCornerRadius,
                     barMaxWidth_barMaxWidth,
                     barGapInGroup_barGapInGroup,
-                    colorBarStyleFill(barStyle_barStyle),
-                    colorPointStyleFill(pointStyle_pointStyle),
-                    pointStateDimensionHover,
-                    colorLineStyleFill(lineStyle_lineStyle),
-                    colorAreaStyleFill(areaStyle_areaStyle)
+                    stackCornerRadius_stackCornerRadius,
+                    barStyleFilter(colorBarStyleFill(barStyle_barStyle)),
+                    pointStyleFilter(colorPointStyleFill(pointStyle_pointStyle)),
+                    pointStyleFilter(pointStateDimensionHover),
+                    lineStyleFilter(colorLineStyleFill(lineStyle_lineStyle)),
+                    areaStyleFilter(colorAreaStyleFill(areaStyle_areaStyle))
                 ]),
                 xBand,
                 yLinearPrimary,
@@ -10034,10 +9491,9 @@
             Builder._specPipelineMap.dualAxis = dualAxisSpecPipeline;
         };
         const defaultEncodingForPie = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const encoding = {};
-            pie_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(vseedMeasures));
+            pie_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(reshapeMeasures));
             pie_generateDefaultMeasureEncoding(measures, encoding);
             return {
                 ...advancedVSeed,
@@ -10045,12 +9501,11 @@
             };
         };
         const encodingForPie = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            const hasMulti = hasMultipleMeasureInSingleView(vseedMeasures);
+            const hasMulti = hasMultipleMeasureInSingleView(reshapeMeasures);
             if (hasDimensionEncoding) pie_generateDimensionEncoding(dimensions, encoding, hasMulti);
             else pie_generateDefaultDimensionEncoding(dimensions, encoding, hasMulti);
             if (hasMeasureEncoding) pie_generateMeasureEncoding(measures, encoding);
@@ -10106,16 +9561,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'angle',
+                    'detail'
+                ]),
                 defaultEncodingForPie
             ], [
-                buildMeasures,
-                encodingForPie,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'angle',
+                    'detail'
                 ]),
+                encodingForPie,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -10271,16 +9727,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'angle',
+                    'detail'
+                ]),
                 defaultEncodingForPie
             ], [
-                buildMeasures,
-                encodingForPie,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'angle',
+                    'detail'
                 ]),
+                encodingForPie,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -10362,10 +9819,9 @@
             Builder._specPipelineMap.donut = donutSpecPipeline;
         };
         const defaultEncodingForRose = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const encoding = {};
-            rose_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(vseedMeasures));
+            rose_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(reshapeMeasures));
             rose_generateDefaultMeasureEncoding(measures, encoding);
             return {
                 ...advancedVSeed,
@@ -10373,12 +9829,11 @@
             };
         };
         const encodingForRose = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            const hasMulti = hasMultipleMeasureInSingleView(vseedMeasures);
+            const hasMulti = hasMultipleMeasureInSingleView(reshapeMeasures);
             if (hasDimensionEncoding) rose_generateDimensionEncoding(dimensions, encoding, hasMulti);
             else rose_generateDefaultDimensionEncoding(dimensions, encoding, hasMulti);
             if (hasMeasureEncoding) rose_generateMeasureEncoding(measures, encoding);
@@ -10436,16 +9891,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'angle',
+                    'detail'
+                ]),
                 defaultEncodingForRose
             ], [
-                buildMeasures,
-                encodingForRose,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'angle',
+                    'detail'
                 ]),
+                encodingForRose,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -10589,16 +10045,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'radius',
+                    'detail'
+                ]),
                 defaultEncodingForRose
             ], [
-                buildMeasures,
-                encodingForRose,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'radius',
+                    'detail'
                 ]),
+                encodingForRose,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -10709,10 +10166,9 @@
             Builder._specPipelineMap.roseParallel = roseParallelSpecPipeline;
         };
         const defaultEncodingForRadar = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const encoding = {};
-            radar_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(vseedMeasures));
+            radar_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(reshapeMeasures));
             radar_generateDefaultMeasureEncoding(measures, encoding);
             return {
                 ...advancedVSeed,
@@ -10720,12 +10176,11 @@
             };
         };
         const encodingForRadar = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            const hasMulti = hasMultipleMeasureInSingleView(vseedMeasures);
+            const hasMulti = hasMultipleMeasureInSingleView(reshapeMeasures);
             if (hasDimensionEncoding) radar_generateDimensionEncoding(dimensions, encoding, hasMulti);
             else radar_generateDefaultDimensionEncoding(dimensions, encoding, hasMulti);
             if (hasMeasureEncoding) radar_generateMeasureEncoding(measures, encoding);
@@ -10785,16 +10240,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'radius',
+                    'detail'
+                ]),
                 defaultEncodingForRadar
             ], [
-                buildMeasures,
-                encodingForRadar,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'radius',
+                    'detail'
                 ]),
+                encodingForRadar,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -10928,10 +10384,9 @@
             Builder._specPipelineMap.radar = radarSpecPipeline;
         };
         const defaultEncodingForFunnel = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const encoding = {};
-            funnel_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(vseedMeasures));
+            funnel_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(reshapeMeasures));
             funnel_generateDefaultMeasureEncoding(measures, encoding);
             return {
                 ...advancedVSeed,
@@ -10939,12 +10394,11 @@
             };
         };
         const encodingForFunnel = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            const hasMulti = hasMultipleMeasureInSingleView(vseedMeasures);
+            const hasMulti = hasMultipleMeasureInSingleView(reshapeMeasures);
             if (hasDimensionEncoding) funnel_generateDimensionEncoding(dimensions, encoding, hasMulti);
             else funnel_generateDefaultDimensionEncoding(dimensions, encoding, hasMulti);
             if (hasMeasureEncoding) funnel_generateMeasureEncoding(measures, encoding);
@@ -11001,16 +10455,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'size',
+                    'detail'
+                ]),
                 defaultEncodingForFunnel
             ], [
-                buildMeasures,
-                encodingForFunnel,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'size',
+                    'detail'
                 ]),
+                encodingForFunnel,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -11146,8 +10601,7 @@
             Builder._specPipelineMap.funnel = funnelSpecPipeline;
         };
         const defaultEncodingForHeatmap = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], dimensions = [] } = advancedVSeed;
             const encoding = {};
             heatmap_generateDefaultDimensionEncoding(dimensions, encoding);
             heatmap_generateDefaultMeasureEncoding(measures, encoding);
@@ -11157,12 +10611,11 @@
             };
         };
         const encodingForHeatmap = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            if (hasDimensionEncoding) heatmap_generateDimensionEncoding(dimensions, encoding, measures.length > 1);
+            if (hasDimensionEncoding) heatmap_generateDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(reshapeMeasures));
             else heatmap_generateDefaultDimensionEncoding(dimensions, encoding);
             if (hasMeasureEncoding) heatmap_generateMeasureEncoding(measures, encoding);
             else heatmap_generateDefaultMeasureEncoding(measures, encoding);
@@ -11228,15 +10681,17 @@
             defaultDimensions_defaultDimensions,
             defaultMeasureId_defaultMeasureId,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'color',
+                    'detail'
+                ]),
                 defaultEncodingForHeatmap
             ], [
-                buildMeasures,
-                encodingForHeatmap,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label'
+                buildMeasures([
+                    'color',
+                    'detail'
                 ]),
+                encodingForHeatmap,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -11324,7 +10779,7 @@
                 ...spec
             };
             const { advancedVSeed, vseed } = context;
-            const { datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
+            const { datasetReshapeInfo, chartType, locale, dimensions = [], encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
                 enable: true
@@ -11338,7 +10793,7 @@
                     title: {
                         visible: false
                     },
-                    content: tooltipHeatmap_createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), locale, foldInfo)
+                    content: tooltipHeatmap_createMarkContent(encoding.tooltip || [], dimensions, vseed.measures, locale, foldInfo)
                 },
                 dimension: {
                     visible: false
@@ -11347,7 +10802,7 @@
             };
             return result;
         };
-        const tooltipHeatmap_createMarkContent = (tooltip, dimensions, measures, locale, foldInfo)=>{
+        const tooltipHeatmap_createMarkContent = (tooltip, dimensions, measures = [], locale, foldInfo)=>{
             const dims = T(dimensions.filter((item)=>tooltip.includes(item.id)), (item)=>item.id);
             const meas = T(measures.filter((item)=>tooltip.includes(item.id)), (item)=>item.id);
             const dimContent = dims.map((item)=>({
@@ -11508,10 +10963,9 @@
             return result;
         };
         const defaultEncodingForBoxplot = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const encoding = {};
-            boxplot_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(vseedMeasures));
+            boxplot_generateDefaultDimensionEncoding(dimensions, encoding, hasMultipleMeasureInSingleView(reshapeMeasures));
             boxplot_generateDefaultMeasureEncoding(measures, encoding);
             return {
                 ...advancedVSeed,
@@ -11519,12 +10973,11 @@
             };
         };
         const encodingForBoxplot = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], reshapeMeasures = [], dimensions = [] } = advancedVSeed;
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            const hasMulti = hasMultipleMeasureInSingleView(vseedMeasures);
+            const hasMulti = hasMultipleMeasureInSingleView(reshapeMeasures);
             if (hasDimensionEncoding) boxplot_generateDimensionEncoding(dimensions, encoding, hasMulti);
             else boxplot_generateDefaultDimensionEncoding(dimensions, encoding, hasMulti);
             if (hasMeasureEncoding) boxplot_generateMeasureEncoding(measures, encoding);
@@ -11642,19 +11095,17 @@
             };
             const { vseed } = context;
             const { dataset, chartType } = vseed;
-            const { encoding = {}, config } = advancedVSeed;
-            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const { encoding = {}, config, measures = [] } = advancedVSeed;
             const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
             const uniqDims = T(dimensions, (item)=>item.id);
             const whiskers = config?.[chartType]?.whiskers;
             let newDatasets = [];
             let foldInfo = {};
             let unfoldInfo = {};
-            const allMeasures = findAllMeasures(measures);
             if (encoding.value?.length) {
                 const boxPlotDataList = [];
                 encoding.value.forEach((f)=>{
-                    const m = allMeasures.find((m)=>m.id === f);
+                    const m = measures.find((m)=>m.id === f);
                     const boxPlotData = boxplot_boxplot(dataset, {
                         field: f,
                         groupField: [
@@ -11713,9 +11164,7 @@
                         foldInfo,
                         unfoldInfo
                     }
-                ],
-                dimensions,
-                measures
+                ]
             };
         };
         const revisedBoxPlotFieldKey = (fieldKey, groupId, isPivotChart = true)=>{
@@ -11729,30 +11178,24 @@
             const { vseed } = context;
             const { dataset, chartType } = vseed;
             const { encoding = {}, config } = advancedVSeed;
-            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const reshapeMeasures = advancedVSeed.reshapeMeasures ?? [];
             const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
             const uniqDims = T(dimensions, (item)=>item.id);
             const chartConfig = config?.[chartType];
             const whiskers = chartConfig?.whiskers;
-            const measureGroups = [];
-            if (measures) measures.forEach((measure)=>{
-                if (measure.children && measure.children.length > 0) measureGroups.push(measure);
-            });
             const rowColumnFields = T(dimensions.filter((dim)=>'row' === dim.encoding || 'column' === dim.encoding), (item)=>item.id);
             const datasets = [];
             const datasetReshapeInfo = [];
-            measureGroups.forEach((measureGroup, index)=>{
-                const subMeasures = measureGroup.children;
-                if (!subMeasures) return;
-                const groupId = measureGroup.id;
+            reshapeMeasures.forEach((measureGroup, index)=>{
+                const groupId = measureGroup[0].parentId ?? DEFAULT_PARENT_ID;
                 let newDatasets = [];
                 let foldInfo = {};
                 let unfoldInfo = {};
-                const validEncodingIds = (encoding.value || []).filter((id)=>subMeasures.find((field)=>field.id === id));
+                const validEncodingIds = (encoding.value || []).filter((id)=>measureGroup.find((field)=>field.id === id));
                 if (validEncodingIds.length) {
                     const boxPlotDataList = [];
                     validEncodingIds.forEach((f)=>{
-                        const m = subMeasures.find((m)=>m.id === f);
+                        const m = measureGroup.find((m)=>m.id === f);
                         const boxPlotData = boxplot_boxplot(dataset, {
                             field: f,
                             groupField: [
@@ -11835,16 +11278,27 @@
             defaultMeasureId_defaultMeasureId,
             boxplotConfig,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'value',
+                    'q1',
+                    'q3',
+                    'min',
+                    'max',
+                    'median',
+                    'outliers'
+                ]),
                 defaultEncodingForBoxplot
             ], [
-                buildMeasures,
-                encodingForBoxplot,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'value',
+                    'q1',
+                    'q3',
+                    'min',
+                    'max',
+                    'median',
+                    'outliers'
                 ]),
+                encodingForBoxplot,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -11953,13 +11407,13 @@
                 ...spec
             };
             const { advancedVSeed, vseed } = context;
-            const { chartType, dimensions, encoding, datasetReshapeInfo } = advancedVSeed;
+            const { chartType, dimensions = [], encoding, datasetReshapeInfo } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
                 enable: true
             } } = baseConfig;
             const { enable } = tooltip;
-            const meas = findAllMeasures(vseed.measures);
+            const meas = vseed.measures ?? [];
             const valueMeasure = meas.find((item)=>'value' === item.encoding || chunk_JK3VNB42_n(item.encoding));
             const defaultFormatter = valueMeasure ? createFormatterByMeasure(valueMeasure) : (v)=>v;
             const measureAliasMapping = {
@@ -12383,8 +11837,7 @@
             return result;
         };
         const defaultEncodingForHistogram = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], dimensions = [] } = advancedVSeed;
             const encoding = {};
             histogram_generateDefaultDimensionEncoding(dimensions, encoding);
             histogram_generateDefaultMeasureEncoding(measures, encoding);
@@ -12394,8 +11847,7 @@
             };
         };
         const encodingForHistogram = (advancedVSeed)=>{
-            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
-            const measures = findAllMeasures(vseedMeasures);
+            const { measures = [], dimensions = [] } = advancedVSeed;
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
@@ -12595,8 +12047,7 @@
             };
             const { vseed } = context;
             const { dataset, chartType } = vseed;
-            const { encoding = {}, config } = advancedVSeed;
-            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const { encoding = {}, config, measures = [] } = advancedVSeed;
             const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
             const uniqDims = T(dimensions, (item)=>item.id);
             const chartConfig = config?.[chartType];
@@ -12620,10 +12071,9 @@
             };
             let unfoldInfo = {};
             const colorMeasureId = getColorMeasureId(advancedVSeed, vseed);
-            const allMeasures = findAllMeasures(measures);
             if (encoding.value?.length) {
                 const valueField = encoding.value[0];
-                const m = allMeasures.find((m)=>m.id === valueField);
+                const m = measures.find((m)=>m.id === valueField);
                 const binData = bin_bin(dataset, {
                     field: valueField,
                     groupField: [
@@ -12661,7 +12111,7 @@
                 });
                 unfoldInfo = res.unfoldInfo;
             } else if (encoding.x0?.length && encoding.x1?.length && encoding.y?.length) {
-                const res = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), findAllMeasures(measures).filter((item)=>encoding.y?.includes(item.id)).slice(0, 1), encoding, {
+                const res = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), measures.filter((item)=>encoding.y?.includes(item.id)).slice(0, 1), encoding, {
                     colorItemAsId: false,
                     colorMeasureId
                 });
@@ -12683,9 +12133,7 @@
                         foldInfo,
                         unfoldInfo
                     }
-                ],
-                dimensions,
-                measures
+                ]
             };
         };
         const pivotReshapeWithHistogramEncoding = (advancedVSeed, context)=>{
@@ -12695,7 +12143,7 @@
             const { vseed } = context;
             const { dataset, chartType } = vseed;
             const { encoding = {}, config } = advancedVSeed;
-            const measures = advancedVSeed.reshapeMeasures ?? advancedVSeed.measures ?? [];
+            const reshapeMeasures = advancedVSeed.reshapeMeasures ?? [];
             const dimensions = advancedVSeed.reshapeDimensions ?? advancedVSeed.dimensions ?? [];
             const colorMeasureId = getColorMeasureId(advancedVSeed, vseed);
             const uniqDims = T(dimensions, (item)=>item.id);
@@ -12703,17 +12151,12 @@
             const binCount = chartConfig?.binCount;
             const binStep = chartConfig?.binStep;
             const binValueType = chartConfig?.binValueType;
-            const measureGroups = [];
-            if (measures) measures.forEach((measure)=>{
-                if (measure.children && measure.children.length > 0) measureGroups.push(measure);
-            });
             const rowColumnFields = T(dimensions.filter((dim)=>'row' === dim.encoding || 'column' === dim.encoding), (item)=>item.id);
             const datasets = [];
             const datasetReshapeInfo = [];
-            measureGroups.forEach((measureGroup, index)=>{
-                const subMeasures = measureGroup.children;
+            reshapeMeasures.forEach((subMeasures, index)=>{
                 if (!subMeasures) return;
-                const groupId = measureGroup.id;
+                const groupId = subMeasures[0].id ?? DEFAULT_PARENT_ID;
                 let newDatasets = [];
                 let foldInfo = {
                     foldMap: {},
@@ -12805,16 +12248,23 @@
             defaultDimensions_defaultDimensions,
             histogramConfig,
             encodingAdapter([
-                buildMeasures,
+                buildMeasures([
+                    'value',
+                    'x0',
+                    'x1',
+                    'yAxis',
+                    'detail'
+                ]),
                 defaultEncodingForHistogram
             ], [
-                buildMeasures,
-                encodingForHistogram,
-                pickMeasuresForReshape([
-                    'tooltip',
-                    'label',
-                    'color'
+                buildMeasures([
+                    'value',
+                    'x0',
+                    'x1',
+                    'yAxis',
+                    'detail'
                 ]),
+                encodingForHistogram,
                 pickDimensionsForReshape
             ]),
             pivotAdapter([
@@ -12869,7 +12319,7 @@
                 ...spec
             };
             const { advancedVSeed, vseed } = context;
-            const { encoding, dimensions, measures, dataset } = advancedVSeed;
+            const { encoding, dimensions = [], measures = [], dataset } = advancedVSeed;
             const { chartType } = vseed;
             const config = advancedVSeed.config?.[chartType]?.xAxis ?? {};
             if (!result.axes) result.axes = [];
@@ -12922,7 +12372,7 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { chartType, dimensions, encoding } = advancedVSeed;
+            const { chartType, dimensions = [], encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { binValueType, tooltip = {
                 enable: true
@@ -13134,7 +12584,7 @@
                 ...spec
             };
             const { advancedVSeed, vseed } = context;
-            const { chartType, encoding = {}, dimensions, regressionLine } = advancedVSeed;
+            const { chartType, encoding = {}, dimensions = [], regressionLine } = advancedVSeed;
             const { dataset } = vseed;
             const lineTheme = advancedVSeed.config[chartType]?.regressionLine;
             const binValueType = advancedVSeed.config[chartType]?.binValueType;
@@ -13278,7 +12728,7 @@
                 ...spec
             };
             const { advancedVSeed, vseed } = context;
-            const { chartType, encoding = {}, dimensions, regressionLine } = advancedVSeed;
+            const { chartType, encoding = {}, dimensions = [], regressionLine } = advancedVSeed;
             const { dataset } = vseed;
             const lineTheme = advancedVSeed.config[chartType]?.regressionLine;
             if (!regressionLine || !regressionLine.ecdfRegressionLine) return result;
@@ -14211,10 +13661,6 @@
                                 visible: false
                             }
                         },
-                        dualChartType: {
-                            primary: 'column',
-                            secondary: 'line'
-                        },
                         crosshairRect,
                         pivotGrid: getLightPivotChartGridConfig(),
                         annotation: getLightAnnotation()
@@ -14479,10 +13925,6 @@
                                 visible: false
                             }
                         },
-                        dualChartType: {
-                            primary: 'column',
-                            secondary: 'line'
-                        },
                         crosshairRect,
                         pivotGrid: getDarkPivotChartGridConfig(),
                         annotation: getDarkAnnotation()
@@ -14613,6 +14055,91 @@
         const updateSpec = (chartType, specPipe)=>{
             Builder._customSpecPipe[chartType] = specPipe;
         };
+        const measureDepth = (measures = [])=>{
+            if (!measures) return 0;
+            let depth = 1;
+            preorderTraverse(measures, (node)=>{
+                if ('children' in node) depth = Math.max(depth, 1 + measureDepth(node.children));
+                return false;
+            });
+            return depth;
+        };
+        const deleteMeasureTreeByCallback = (measureTree, callback)=>{
+            if (!measureTree) return;
+            const stack = [
+                ...measureTree
+            ].reverse();
+            const parents = new Map();
+            measureTree.forEach((node)=>{
+                parents.set(node, measureTree);
+            });
+            const nodesToProcess = [];
+            const visited = new Set();
+            while(stack.length > 0){
+                const node = stack[stack.length - 1];
+                if (isMeasureGroup(node) && node.children && !visited.has(node)) {
+                    visited.add(node);
+                    const children = node.children.slice().reverse();
+                    for (const child of children){
+                        parents.set(child, node.children);
+                        stack.push(child);
+                    }
+                } else {
+                    stack.pop();
+                    nodesToProcess.push(node);
+                }
+            }
+            const deleted = [];
+            for (const node of nodesToProcess){
+                const parentList = parents.get(node);
+                if (parentList) {
+                    const index = parentList.indexOf(node);
+                    if (isMeasure(node)) {
+                        if (callback?.(node, index, parentList)) {
+                            parentList.splice(index, 1);
+                            deleted.push(node);
+                        }
+                    }
+                }
+            }
+            return deleted;
+        };
+        const deleteDimensionTreeByCallback = (dimensionTree, callback)=>{
+            if (!dimensionTree) return dimensionTree;
+            const stack = [
+                ...dimensionTree
+            ].reverse();
+            const parents = new Map();
+            dimensionTree.forEach((node)=>{
+                parents.set(node, dimensionTree);
+            });
+            const nodesToProcess = [];
+            const visited = new Set();
+            while(stack.length > 0){
+                const node = stack[stack.length - 1];
+                if (isDimensionGroup(node) && node.children && !visited.has(node)) {
+                    visited.add(node);
+                    const children = node.children.slice().reverse();
+                    for (const child of children){
+                        parents.set(child, node.children);
+                        stack.push(child);
+                    }
+                } else {
+                    stack.pop();
+                    nodesToProcess.push(node);
+                }
+            }
+            for (const node of nodesToProcess){
+                const parentList = parents.get(node);
+                if (parentList) {
+                    const index = parentList.indexOf(node);
+                    if (isDimension(node)) {
+                        if (callback?.(node, index, parentList)) parentList.splice(index, 1);
+                    }
+                }
+            }
+            return dimensionTree;
+        };
         Object.freeze({
             status: "aborted"
         });
@@ -17927,22 +17454,6 @@
             'boxPlot',
             'histogram'
         ]);
-        const zDualChartType = schemas_object({
-            primary: schemas_enum([
-                'line',
-                'column',
-                'columnParallel',
-                'area',
-                'scatter'
-            ]).default('column'),
-            secondary: schemas_enum([
-                'line',
-                'column',
-                'columnParallel',
-                'area',
-                'scatter'
-            ]).default('line')
-        });
         const zDatum = record(schemas_string().or(schemas_number()), any());
         const zDataset = schemas_array(zDatum);
         const zDimension = schemas_object({
@@ -18028,7 +17539,16 @@
                 'x0',
                 'x1'
             ]).optional(),
-            parentId: schemas_string().optional()
+            parentId: schemas_string().optional(),
+            chartType: schemas_enum([
+                'line',
+                'column',
+                'columnParallel',
+                'columnPercent',
+                'area',
+                'areaPercent',
+                'scatter'
+            ]).optional()
         });
         const zMeasureGroup = schemas_object({
             id: schemas_string(),
@@ -18039,30 +17559,23 @@
         });
         const zMeasures = schemas_array(zMeasure);
         const zMeasureTree = schemas_array(zMeasureGroup.or(zMeasure));
-        const zDualMeasure = schemas_object({
-            id: schemas_string(),
-            primaryMeasures: schemas_array(zMeasure.omit({
-                encoding: true,
-                parentId: true
-            })).or(zMeasure.omit({
-                parentId: true,
-                encoding: true
-            })).optional(),
-            secondaryMeasures: schemas_array(zMeasure).or(zMeasure).optional()
+        const zDualMeasure = zMeasure.extend({
+            chartType: schemas_enum([
+                'line',
+                'column',
+                'columnParallel',
+                'area',
+                'scatter'
+            ]).optional(),
+            encoding: schemas_enum([
+                'primaryYAxis',
+                'secondaryYAxis',
+                'color',
+                'label',
+                'tooltip'
+            ]).optional()
         });
         const zDualMeasures = schemas_array(zDualMeasure);
-        const zScatterMeasure = schemas_object({
-            id: schemas_string(),
-            xMeasures: schemas_array(zMeasure.omit({
-                parentId: true,
-                encoding: true
-            })).or(zMeasure).optional(),
-            yMeasures: schemas_array(zMeasure.omit({
-                parentId: true,
-                encoding: true
-            })).or(zMeasure).optional()
-        });
-        const zScatterMeasures = schemas_array(zScatterMeasure);
         const zFoldInfo = schemas_object({
             foldMap: record(schemas_string(), schemas_string().or(schemas_undefined())),
             statistics: schemas_object({
@@ -18810,7 +18323,6 @@
             color: zColor.nullish(),
             tooltip: zTooltip.nullish(),
             legend: zLegend.nullish(),
-            dualChartType: schemas_array(zDualChartType).or(zDualChartType).nullish(),
             alignTicks: schemas_array(schemas_boolean()).or(schemas_boolean()).nullish(),
             primaryYAxis: schemas_array(zYLinearAxis).or(zYLinearAxis).nullish(),
             secondaryYAxis: schemas_array(zYLinearAxis).or(zYLinearAxis).nullish(),
@@ -19189,7 +18701,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19215,7 +18727,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19243,7 +18755,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19269,7 +18781,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19294,7 +18806,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19319,7 +18831,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19345,7 +18857,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19370,7 +18882,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19395,7 +18907,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19420,8 +18932,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
-            scatterMeasures: zScatterMeasures.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             size: schemas_number().or(schemas_array(schemas_number())).nullish(),
             sizeRange: schemas_number().or(schemas_array(schemas_number())).nullish(),
@@ -19449,9 +18960,7 @@
             chartType: literal('dualAxis'),
             dataset: zDataset.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
-            dualMeasures: zDualMeasures.nullish(),
-            dualChartType: schemas_array(zDualChartType).or(zDualChartType).nullish(),
+            measures: zDualMeasures.nullish(),
             alignTicks: schemas_array(schemas_boolean()).or(schemas_boolean()).nullish(),
             primaryYAxis: schemas_array(zYLinearAxis).or(zYLinearAxis).nullish(),
             secondaryYAxis: schemas_array(zYLinearAxis).or(zYLinearAxis).nullish(),
@@ -19483,7 +18992,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19511,7 +19020,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19525,7 +19034,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19539,7 +19048,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zPieLabel.nullish(),
@@ -19553,7 +19062,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zPieLabel.nullish(),
@@ -19567,7 +19076,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19581,7 +19090,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19594,7 +19103,7 @@
             chartType: literal('heatmap'),
             dataset: zDataset.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19608,7 +19117,7 @@
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
             dimensions: zDimensions.nullish(),
-            measures: zMeasureTree.nullish(),
+            measures: zMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
@@ -19664,10 +19173,12 @@
             dataset: zDataset,
             datasetReshapeInfo: zDatasetReshapeInfo,
             pivotAllDatasetReshapeInfo: zDatasetReshapeInfo,
-            dimensions: zDimensionTree,
-            measures: zMeasureTree,
-            reshapeMeasures: zMeasureTree.optional(),
-            reshapeDimensions: zDimensionTree.optional(),
+            dimensions: zDimensions.optional(),
+            measures: zMeasures.optional(),
+            reshapeMeasures: schemas_array(zMeasures).optional(),
+            reshapeDimensions: zDimensions.optional(),
+            measureTree: zMeasureTree.optional(),
+            dimensionTree: zDimensionTree.optional(),
             encoding: zEncoding,
             config: zConfig,
             analysis: zAnalysis,