@visactor/vseed 0.1.2 → 0.1.3

package/dist/umd/index.js

@@ -195,9 +195,8 @@
             zBackgroundColor: ()=>zBackgroundColor,
             registerBarParallel: ()=>registerBarParallel,
             registerRadar: ()=>registerRadar,
-            zEncodings: ()=>zEncodings,
-            pivotTableSpecPipeline: ()=>pivotTableSpecPipeline,
             zLocale: ()=>zLocale,
+            pivotTableSpecPipeline: ()=>pivotTableSpecPipeline,
             zMeasure: ()=>zMeasure,
             FoldXMeasureValue: ()=>FoldXMeasureValue,
             dualAxisAdvancedPipeline: ()=>dualAxisAdvancedPipeline,
@@ -1446,6 +1445,39 @@
                 locale: locale || 'zh-CN'
             };
         };
+        const getBasicMeasures = (vseed)=>{
+            const { dataset, measures } = vseed;
+            if (!measures || 0 === measures.length) return generateMeasuresByDataset(dataset);
+            return measures;
+        };
+        const generateMeasuresByDataset = (dataset)=>{
+            if (!dataset) throw new Error('dataset is required');
+            if (0 === dataset.length) return [];
+            const top100dataset = dataset.slice(0, 100);
+            const sample = top100dataset.reduce((prev, cur)=>({
+                    ...prev,
+                    ...cur
+                }), {});
+            const basicMeasures = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
+                    '',
+                    null,
+                    void 0
+                ].includes(key)).map((measure)=>({
+                    id: measure,
+                    alias: measure
+                }));
+            return basicMeasures;
+        };
+        const isMeasureTreeWithChildren = (vseed)=>{
+            const { measures } = vseed;
+            if (!measures) return false;
+            return measures.some((measure)=>'children' in measure);
+        };
+        const isMeasureTreeWithParentId = (vseed)=>{
+            const { measures } = vseed;
+            if (!measures) return false;
+            return measures.some((measure)=>'parentId' in measure);
+        };
         const measureDepth = (measures = [])=>{
             if (!measures) return 0;
             let depth = 1;
@@ -1464,23 +1496,26 @@
         const isVChart = (vseed)=>!isVTable(vseed);
         const isPivotChart = (vseed)=>{
             if (isVTable(vseed)) return false;
+            if (isMeasureTreeWithParentId(vseed)) {
+                const parentIds = vseed.measures?.map((measure)=>measure.parentId);
+                return parentIds && parentIds.length > 1;
+            }
             if ('dualAxis' === vseed.chartType || 'scatter' === vseed.chartType) {
                 const { dimensions = [] } = vseed;
                 const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'rowDimension' === dimension.location || 'columnDimension' === dimension.location);
                 if (hasRowOrColumnDimension) return true;
                 if ('scatter' === vseed.chartType) {
-                    if (vseed.measures) {
+                    if (isMeasureTreeWithChildren(vseed)) {
                         const depth = measureDepth(vseed.measures);
-                        if (3 === depth) return true;
-                        return false;
+                        return 3 === depth;
                     }
                     if (vseed.scatterMeasures && vseed.scatterMeasures.length > 1) return true;
+                    return false;
                 }
                 if ('dualAxis' === vseed.chartType) {
-                    if (vseed.measures) {
+                    if (isMeasureTreeWithChildren(vseed)) {
                         const depth = measureDepth(vseed.measures);
-                        if (3 === depth) return true;
-                        return false;
+                        return 3 === depth;
                     }
                     if (vseed.dualMeasures && vseed.dualMeasures.length > 1) return true;
                 }
@@ -1491,77 +1526,49 @@
             const hasMeasureGroup = measures && measures.some((measure)=>measure && measure.children);
             return hasRowOrColumnDimension || hasMeasureGroup;
         };
-        const autoMeasures_autoMeasures = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { vseed } = context;
-            const { measures, dataset } = vseed;
-            if (!dataset) throw new Error('dataset is required');
-            if (0 === dataset.length) return result;
-            if (isPivotChart(vseed)) return autoMeasureGroup(advancedVSeed, context);
-            if (measures) {
-                result.measures = measures;
-                return result;
-            }
-            const top100dataset = dataset.slice(0, 100);
-            const sample = top100dataset.reduce((prev, cur)=>({
-                    ...prev,
-                    ...cur
-                }), {});
-            result.measures = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
-                    '',
-                    null,
-                    void 0
-                ].includes(key)).map((measure)=>({
-                    id: measure,
-                    alias: measure
-                }));
-            return result;
-        };
-        const autoMeasureGroup = (advancedVSeed, context)=>{
+        const buildMeasures = (advancedVSeed, context)=>{
             const { vseed } = context;
-            const { measures } = vseed;
-            const hasMeasureGroup = measures?.some((measure)=>measure.children);
-            if (!measures) return advancedVSeed;
-            if (!hasMeasureGroup) {
-                const newMeasures = [
-                    {
-                        id: 'measureGroup',
-                        alias: 'measureGroup',
-                        children: measures
-                    }
-                ];
-                return {
-                    ...advancedVSeed,
-                    measures: newMeasures
-                };
+            if (isMeasureTreeWithChildren(vseed)) {
+                advancedVSeed.measures = vseed.measures;
+                return advancedVSeed;
             }
-            let currentGroup = createEmptyMeasureGroup();
-            const measureGroups = [];
-            for (const measure of measures)if ('children' in measure) {
-                if (currentGroup.children?.length) {
-                    currentGroup.alias = currentGroup.children.map((item)=>item.alias).join('-');
-                    currentGroup.id = currentGroup.alias + currentGroup.children.map((item)=>item.id).join('-');
-                    measureGroups.push(currentGroup);
-                    currentGroup = createEmptyMeasureGroup();
-                }
-                measureGroups.push(measure);
-            } else currentGroup.children?.push(measure);
-            if (currentGroup.children?.length) {
-                currentGroup.alias = currentGroup.children.map((item)=>item.alias).join('-');
-                currentGroup.id = currentGroup.alias + currentGroup.children.map((item)=>item.id).join('-');
-                measureGroups.push(currentGroup);
-                currentGroup = createEmptyMeasureGroup();
+            if (isMeasureTreeWithParentId(vseed)) {
+                advancedVSeed.measures = generateMeasuresByParentId(vseed.measures);
+                return advancedVSeed;
             }
-            advancedVSeed.measures = measureGroups;
+            const basicMeasures = getBasicMeasures(vseed);
+            if (isPivotChart(vseed)) advancedVSeed.measures = basicMeasuresToMeasureTree(basicMeasures);
+            else advancedVSeed.measures = basicMeasures;
             return advancedVSeed;
         };
-        const createEmptyMeasureGroup = ()=>({
-                id: '',
-                alias: '',
-                children: []
+        const generateMeasuresByParentId = (measures)=>{
+            const measureTree = [];
+            measures.forEach((measure)=>{
+                if (!measure.parentId) return;
+                const parent = measureTree.find((item)=>item.id === measure.parentId);
+                if (parent && 'children' in parent) {
+                    parent.children = parent.children || [];
+                    parent.children.push(measure);
+                } else measureTree.push({
+                    id: measure.parentId,
+                    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 ORIGINAL_DATA = '__OriginalData__';
         const Separator = '-';
         const FoldMeasureName = '__MeaName__';
@@ -1684,8 +1691,7 @@
             return o;
         }
         const foldMeasures = (dataset, measures, encoding, options)=>{
-            const { measureId = FoldMeasureId, measureName = FoldMeasureName, measureValue = FoldMeasureValue } = options || {};
-            const colorMeasureId = encoding?.color?.length === 1 && measures.some((m)=>m.id === encoding?.color?.[0]) ? encoding?.color?.[0] : void 0;
+            const { measureId, measureName, measureValue, colorMeasureId } = options || {};
             const foldInfo = {
                 measureId,
                 measureName,
@@ -1784,11 +1790,12 @@
             if (encoding && dimensions.length) datum[encoding] = dimensions.map((dim)=>String(datum[dim.id])).join(separator);
         };
         const dataReshapeByEncoding = (dataset, dimensions, measures, encoding, options)=>{
-            const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, colorItemAsId = false } = options || {};
+            const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, colorItemAsId = false, colorMeasureId } = options || {};
             const { dataset: foldedDataset, foldInfo } = foldMeasures(dataset, measures, encoding, {
                 measureId: foldMeasureId,
                 measureName: foldMeasureName,
-                measureValue: foldMeasureValue
+                measureValue: foldMeasureValue,
+                colorMeasureId
             });
             const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, dimensions, encoding, {
                 foldMeasureId,
@@ -1801,6 +1808,24 @@
                 unfoldInfo
             };
         };
+        const colorAdapter = (ordinalPipe, linearPipe)=>(spec, context)=>{
+                const { advancedVSeed } = context;
+                if (isLinearColor(advancedVSeed)) return linearPipe(spec, context);
+                return ordinalPipe(spec, context);
+            };
+        const isLinearColor = (advancedVSeed)=>{
+            const { encoding, measures } = advancedVSeed;
+            const measureIdList = findAllMeasures(measures).map((measure)=>measure.id);
+            const { color } = encoding;
+            return color?.length === 1 && measureIdList.includes(color[0]);
+        };
+        const getColorMeasureId = (advancedVSeed)=>{
+            if (isLinearColor(advancedVSeed)) {
+                const { encoding } = advancedVSeed;
+                const { color } = encoding;
+                return color?.[0];
+            }
+        };
         const reshapeWithEncoding = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
@@ -1810,7 +1835,9 @@
             const { dimensions, measures, encoding } = advancedVSeed;
             if (!measures || !dimensions || !dataset || !encoding) return result;
             if (0 === measures.length) throw new Error('measures can not be empty');
-            const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, measures, encoding);
+            const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, measures, encoding, {
+                colorMeasureId: getColorMeasureId(advancedVSeed)
+            });
             return {
                 ...result,
                 dataset: newDatasets,
@@ -1846,7 +1873,8 @@
                 if (!measures) return;
                 const groupId = measureGroup.id;
                 const { dataset: newSubDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, measures, encoding, {
-                    foldMeasureValue: `${FoldMeasureValue}${groupId}`
+                    foldMeasureValue: `${FoldMeasureValue}${groupId}`,
+                    colorMeasureId: getColorMeasureId(advancedVSeed)
                 });
                 const reshapeInfo = {
                     id: groupId,
@@ -2062,7 +2090,7 @@
         };
         const lineAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForLine,
             pivotAdapter([
@@ -2077,17 +2105,6 @@
             markStyle_markStyle,
             annotation_annotation
         ];
-        const colorAdapter = (ordinalPipe, linearPipe)=>(spec, context)=>{
-                const { advancedVSeed } = context;
-                if (isLinearColor(advancedVSeed)) return linearPipe(spec, context);
-                return ordinalPipe(spec, context);
-            };
-        const isLinearColor = (advancedVSeed)=>{
-            const { encoding, measures } = advancedVSeed;
-            const measureIdList = findAllMeasures(measures).map((measure)=>measure.id);
-            const { color } = encoding;
-            return color?.length === 1 && measureIdList.includes(color[0]);
-        };
         const initLine = (spec, context)=>{
             const result = {
                 ...spec
@@ -3937,7 +3954,7 @@
         };
         const columnAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForColumn,
             pivotAdapter([
@@ -4386,7 +4403,7 @@
         };
         const columnParallelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForColumn,
             pivotAdapter([
@@ -4483,7 +4500,7 @@
         };
         const columnPercentAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForColumn,
             pivotAdapter([
@@ -4622,7 +4639,7 @@
         };
         const barAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForBar,
             pivotAdapter([
@@ -4975,7 +4992,7 @@
         };
         const barParallelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForBar,
             pivotAdapter([
@@ -5071,7 +5088,7 @@
         };
         const barPercentAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForBar,
             pivotAdapter([
@@ -5142,7 +5159,7 @@
         };
         const areaAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForColumn,
             pivotAdapter([
@@ -5300,7 +5317,7 @@
         };
         const areaPercentAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForColumn,
             pivotAdapter([
@@ -5376,95 +5393,105 @@
             Builder._advancedPipelineMap.areaPercent = areaPercentAdvancedPipeline;
             Builder._specPipelineMap.areaPercent = areaPercentSpecPipeline;
         };
-        const autoScatterMeasures = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
+        const buildMeasuresForScatter = (advancedVSeed, context)=>{
             const { vseed } = context;
-            const { dataset, scatterMeasures, measures } = vseed;
-            if (!dataset) throw new Error('dataset is required');
-            if (0 === dataset.length) return result;
-            if (scatterMeasures) {
-                result.measures = scatterMeasuresToMeasureTree(scatterMeasures);
-                return result;
+            if (isMeasureTreeWithChildren(vseed)) {
+                advancedVSeed.measures = vseed.measures;
+                return advancedVSeed;
             }
-            if (measures && measureDepth(measures) > 1) {
-                result.measures = measures;
-                return result;
+            if (isMeasureTreeWithParentId(vseed)) {
+                advancedVSeed.measures = buildMeasuresForScatter_generateMeasuresByParentId(vseed.measures);
+                return advancedVSeed;
             }
-            const top100dataset = dataset.slice(0, 100);
-            const sample = top100dataset.reduce((prev, cur)=>({
-                    ...prev,
-                    ...cur
-                }), {});
-            const newMeasures = measures || Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
-                    '',
-                    null,
-                    void 0
-                ].includes(key)).map((measure)=>({
-                    id: measure,
-                    alias: measure
-                }));
-            if (0 === newMeasures.length) result.measures = [];
-            else if (1 === newMeasures.length) result.measures = [
-                {
-                    id: 'primary',
-                    alias: 'primary',
-                    children: newMeasures
-                }
-            ];
-            else if (newMeasures.length > 1) result.measures = [
-                {
-                    id: 'primary',
-                    alias: 'primary',
-                    children: newMeasures.slice(0, 1)
-                },
+            const basicMeasures = getBasicMeasures(vseed);
+            const scatterMeasures = vseed.scatterMeasures ? vseed.scatterMeasures : basicMeasuresToScatterMeasures(basicMeasures);
+            advancedVSeed.measures = scatterMeasuresToMeasureTree(scatterMeasures);
+            return advancedVSeed;
+        };
+        const basicMeasuresToScatterMeasures = (basicMeasures)=>{
+            const yMeasures = [];
+            const xMeasures = [];
+            for(let index = 0; index < basicMeasures.length; index++){
+                const item = basicMeasures[index];
+                const encoding = Array.isArray(item.encoding) ? item.encoding : [
+                    item.encoding
+                ];
+                const isYAxis = encoding.includes('yAxis');
+                const isXAxis = encoding.includes('xAxis');
+                if (isYAxis) yMeasures.push(item);
+                else if (isXAxis) xMeasures.push(item);
+                else if (0 === index) yMeasures.push(item);
+                else xMeasures.push(item);
+            }
+            return [
                 {
-                    id: 'secondary',
-                    alias: 'secondary',
-                    children: newMeasures.slice(1)
+                    id: 'scatterMeasures',
+                    xMeasures,
+                    yMeasures
                 }
             ];
-            return result;
         };
         const scatterMeasuresToMeasureTree = (scatterMeasures)=>{
             const measureTree = scatterMeasures.map((item, index)=>{
-                const { xMeasures, yMeasures } = item;
+                const { id, xMeasures, yMeasures } = item;
                 const groupChildren = [];
-                let id = '';
+                let groupId = `${id}-`;
                 if (xMeasures) {
-                    const arrXMeasures = Array.isArray(xMeasures) ? xMeasures : [
+                    const arrPrimaryMeasures = Array.isArray(xMeasures) ? xMeasures : [
                         xMeasures
                     ];
-                    const alias = arrXMeasures.map((item)=>item.alias || item.id).toString();
-                    id += alias;
+                    const alias = arrPrimaryMeasures.map((item)=>item.alias || item.id).toString();
+                    groupId += alias;
                     groupChildren.push({
                         id: `${index}-x`,
-                        alias: arrXMeasures.map((item)=>item.alias || item.id).toString(),
-                        children: arrXMeasures
+                        alias: arrPrimaryMeasures.map((item)=>item.alias || item.id).toString(),
+                        children: arrPrimaryMeasures
                     });
                 }
                 if (yMeasures) {
-                    const arrYMeasures = Array.isArray(yMeasures) ? yMeasures : [
+                    const arrSecondaryMeasures = Array.isArray(yMeasures) ? yMeasures : [
                         yMeasures
                     ];
-                    const alias = arrYMeasures.map((item)=>item.alias || item.id).toString();
-                    id += alias;
+                    const alias = arrSecondaryMeasures.map((item)=>item.alias || item.id).toString();
+                    groupId += alias;
                     groupChildren.push({
                         id: `${index}-y`,
-                        alias: arrYMeasures.map((item)=>item.alias || item.id).toString(),
-                        children: arrYMeasures
+                        alias: arrSecondaryMeasures.map((item)=>item.alias || item.id).toString(),
+                        children: arrSecondaryMeasures
                     });
                 }
                 return {
-                    id,
-                    alias: id,
+                    id: groupId,
+                    alias: groupId,
                     children: groupChildren
                 };
             });
             if (1 === scatterMeasures.length) return measureTree[0].children || [];
             return measureTree;
         };
+        const buildMeasuresForScatter_generateMeasuresByParentId = (measures)=>{
+            const scatterMeasures = [];
+            measures.forEach((item)=>{
+                if (!item.parentId) return;
+                if (!scatterMeasures.find((d)=>d.id === item.parentId)) scatterMeasures.push({
+                    id: item.parentId,
+                    yMeasures: [],
+                    xMeasures: []
+                });
+                const scatterChart = scatterMeasures.find((d)=>d.id === item.parentId);
+                if (!scatterChart || !Array.isArray(scatterChart.yMeasures) || !Array.isArray(scatterChart.xMeasures)) return;
+                const encoding = Array.isArray(item.encoding) ? item.encoding : [
+                    item.encoding
+                ];
+                const isY = encoding.includes('yAxis');
+                const isX = encoding.includes('xAxis');
+                if (isY) scatterChart.yMeasures.push(item);
+                else if (isX) scatterChart.xMeasures.push(item);
+                else if (!isY && !isX) if (0 === scatterChart.yMeasures.length) scatterChart.yMeasures.push(item);
+                else scatterChart.xMeasures.push(item);
+            });
+            return scatterMeasuresToMeasureTree(scatterMeasures);
+        };
         const encodingForScatter = (advancedVSeed, context)=>{
             const { vseed } = context;
             const { dimensions } = advancedVSeed;
@@ -5520,7 +5547,8 @@
             if (xMeasures && xMeasures.children) {
                 const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, xMeasures.children, encoding, {
                     foldMeasureValue: FoldXMeasureValue,
-                    colorItemAsId: true
+                    colorItemAsId: true,
+                    colorMeasureId: getColorMeasureId(advancedVSeed)
                 });
                 datasets.push(newDataset);
                 foldInfoList.push(foldInfo);
@@ -5529,7 +5557,8 @@
             if (yMeasures && yMeasures.children) {
                 const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(datasets[0], dimensions, yMeasures.children, encoding, {
                     foldMeasureValue: FoldYMeasureValue,
-                    colorItemAsId: true
+                    colorItemAsId: true,
+                    colorMeasureId: getColorMeasureId(advancedVSeed)
                 });
                 datasets[0] = newDataset;
                 foldInfoList.push(foldInfo);
@@ -5584,7 +5613,8 @@
                 if (xMeasures && xMeasures.children) {
                     const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, xMeasures.children, encoding, {
                         foldMeasureValue: `${FoldXMeasureValue}${index}`,
-                        colorItemAsId: true
+                        colorItemAsId: true,
+                        colorMeasureId: getColorMeasureId(advancedVSeed)
                     });
                     datasets.push(newDataset);
                     foldInfoList.push(foldInfo);
@@ -5593,7 +5623,8 @@
                 if (yMeasures && yMeasures.children) {
                     const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, yMeasures.children, encoding, {
                         foldMeasureValue: `${FoldYMeasureValue}${index}`,
-                        colorItemAsId: true
+                        colorItemAsId: true,
+                        colorMeasureId: getColorMeasureId(advancedVSeed)
                     });
                     datasets.push(newDataset);
                     foldInfoList.push(foldInfo);
@@ -5628,7 +5659,7 @@
         };
         const scatterAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoScatterMeasures,
+            buildMeasuresForScatter,
             autoDimensions_autoDimensions,
             encodingForScatter,
             pivotAdapter([
@@ -5775,68 +5806,55 @@
             Builder._advancedPipelineMap.scatter = scatterAdvancedPipeline;
             Builder._specPipelineMap.scatter = scatterSpecPipeline;
         };
-        const autoDualMeasures = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
+        const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
             const { vseed } = context;
-            const { dataset, dualMeasures, measures } = vseed;
-            if (!dataset) throw new Error('dataset is required');
-            if (0 === dataset.length) return result;
-            if (dualMeasures) {
-                result.measures = dualMeasuresToMeasureTree(dualMeasures);
-                return result;
+            if (isMeasureTreeWithChildren(vseed)) {
+                advancedVSeed.measures = vseed.measures;
+                return advancedVSeed;
             }
-            if (measures && measureDepth(measures) > 1) {
-                result.measures = measures;
-                return result;
+            if (isMeasureTreeWithParentId(vseed)) {
+                advancedVSeed.measures = buildMeasuresForDualAxis_generateMeasuresByParentId(vseed.measures);
+                return advancedVSeed;
             }
-            const top100dataset = dataset.slice(0, 100);
-            const sample = top100dataset.reduce((prev, cur)=>({
-                    ...prev,
-                    ...cur
-                }), {});
-            const newMeasures = measures || Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
-                    '',
-                    null,
-                    void 0
-                ].includes(key)).map((measure)=>({
-                    id: measure,
-                    alias: measure
-                }));
-            if (0 === newMeasures.length) result.measures = [];
-            else if (1 === newMeasures.length) result.measures = [
-                {
-                    id: 'primary',
-                    alias: 'primary',
-                    children: newMeasures
-                }
-            ];
-            else if (newMeasures.length > 1) result.measures = [
-                {
-                    id: 'primary',
-                    alias: 'primary',
-                    children: newMeasures.slice(0, 1)
-                },
+            const basicMeasures = getBasicMeasures(vseed);
+            const dualMeasures = vseed.dualMeasures ? vseed.dualMeasures : basicMeasuresToDualMeasures(basicMeasures);
+            advancedVSeed.measures = dualMeasuresToMeasureTree(dualMeasures);
+            return advancedVSeed;
+        };
+        const basicMeasuresToDualMeasures = (basicMeasures)=>{
+            const primaryMeasures = [];
+            const secondaryMeasures = [];
+            for(let index = 0; index < basicMeasures.length; index++){
+                const item = basicMeasures[index];
+                const encoding = Array.isArray(item.encoding) ? item.encoding : [
+                    item.encoding
+                ];
+                const isPrimaryYAxis = encoding.includes('primaryYAxis');
+                const isSecondaryYAxis = encoding.includes('secondaryYAxis');
+                if (isPrimaryYAxis) primaryMeasures.push(item);
+                else if (isSecondaryYAxis) secondaryMeasures.push(item);
+                else if (0 === index) primaryMeasures.push(item);
+                else secondaryMeasures.push(item);
+            }
+            return [
                 {
-                    id: 'secondary',
-                    alias: 'secondary',
-                    children: newMeasures.slice(1)
+                    id: 'dualMeasures',
+                    primaryMeasures,
+                    secondaryMeasures
                 }
             ];
-            return result;
         };
         const dualMeasuresToMeasureTree = (dualMeasures)=>{
             const measureTree = dualMeasures.map((item, index)=>{
-                const { primaryMeasures, secondaryMeasures } = item;
+                const { id, primaryMeasures, secondaryMeasures } = item;
                 const groupChildren = [];
-                let id = '';
+                let groupId = `${id}-`;
                 if (primaryMeasures) {
                     const arrPrimaryMeasures = Array.isArray(primaryMeasures) ? primaryMeasures : [
                         primaryMeasures
                     ];
                     const alias = arrPrimaryMeasures.map((item)=>item.alias || item.id).toString();
-                    id += alias;
+                    groupId += alias;
                     groupChildren.push({
                         id: `${index}-primary`,
                         alias: arrPrimaryMeasures.map((item)=>item.alias || item.id).toString(),
@@ -5848,7 +5866,7 @@
                         secondaryMeasures
                     ];
                     const alias = arrSecondaryMeasures.map((item)=>item.alias || item.id).toString();
-                    id += alias;
+                    groupId += alias;
                     groupChildren.push({
                         id: `${index}-secondary`,
                         alias: arrSecondaryMeasures.map((item)=>item.alias || item.id).toString(),
@@ -5856,14 +5874,37 @@
                     });
                 }
                 return {
-                    id,
-                    alias: id,
+                    id: groupId,
+                    alias: groupId,
                     children: groupChildren
                 };
             });
             if (1 === dualMeasures.length) return measureTree[0].children || [];
             return measureTree;
         };
+        const buildMeasuresForDualAxis_generateMeasuresByParentId = (measures)=>{
+            const dualMeasures = [];
+            measures.forEach((item)=>{
+                if (!item.parentId) return;
+                if (!dualMeasures.find((d)=>d.id === item.parentId)) dualMeasures.push({
+                    id: item.parentId,
+                    primaryMeasures: [],
+                    secondaryMeasures: []
+                });
+                const dualChart = dualMeasures.find((d)=>d.id === item.parentId);
+                if (!dualChart || !Array.isArray(dualChart.primaryMeasures) || !Array.isArray(dualChart.secondaryMeasures)) return;
+                const encoding = Array.isArray(item.encoding) ? item.encoding : [
+                    item.encoding
+                ];
+                const isPrimary = encoding.includes('primaryYAxis');
+                const isSecondary = encoding.includes('secondaryYAxis');
+                if (isPrimary) dualChart.primaryMeasures.push(item);
+                else if (isSecondary) dualChart.secondaryMeasures.push(item);
+                else if (!isPrimary && !isSecondary) if (0 === dualChart.primaryMeasures.length) dualChart.primaryMeasures.push(item);
+                else dualChart.secondaryMeasures.push(item);
+            });
+            return dualMeasuresToMeasureTree(dualMeasures);
+        };
         const encodingForDualAxis = (advancedVSeed, context)=>{
             const { vseed } = context;
             const { dimensions } = advancedVSeed;
@@ -5922,7 +5963,8 @@
             const secondaryMeasures = measures[1] || [];
             if (primaryMeasures && primaryMeasures.children) {
                 const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, primaryMeasures.children, encoding, {
-                    foldMeasureValue: FoldPrimaryMeasureValue
+                    foldMeasureValue: FoldPrimaryMeasureValue,
+                    colorMeasureId: getColorMeasureId(advancedVSeed)
                 });
                 datasets.push(newDataset);
                 foldInfoList.push(foldInfo);
@@ -5930,7 +5972,8 @@
             }
             if (secondaryMeasures && secondaryMeasures.children) {
                 const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, secondaryMeasures.children, encoding, {
-                    foldMeasureValue: FoldSecondaryMeasureValue
+                    foldMeasureValue: FoldSecondaryMeasureValue,
+                    colorMeasureId: getColorMeasureId(advancedVSeed)
                 });
                 datasets.push(newDataset);
                 foldInfoList.push(foldInfo);
@@ -5984,7 +6027,8 @@
                 const secondaryMeasures = measures[1] || [];
                 if (primaryMeasures && primaryMeasures.children) {
                     const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, primaryMeasures.children, encoding, {
-                        foldMeasureValue: `${FoldPrimaryMeasureValue}${index}`
+                        foldMeasureValue: `${FoldPrimaryMeasureValue}${index}`,
+                        colorMeasureId: getColorMeasureId(advancedVSeed)
                     });
                     datasets.push(newDataset);
                     foldInfoList.push(foldInfo);
@@ -5992,7 +6036,8 @@
                 }
                 if (secondaryMeasures && secondaryMeasures.children) {
                     const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, secondaryMeasures.children, encoding, {
-                        foldMeasureValue: `${FoldSecondaryMeasureValue}${index}`
+                        foldMeasureValue: `${FoldSecondaryMeasureValue}${index}`,
+                        colorMeasureId: getColorMeasureId(advancedVSeed)
                     });
                     datasets.push(newDataset);
                     foldInfoList.push(foldInfo);
@@ -6050,7 +6095,7 @@
         };
         const dualAxisAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoDualMeasures,
+            buildMeasuresForDualAxis,
             autoDimensions_autoDimensions,
             encodingForDualAxis,
             pivotAdapter([
@@ -6137,7 +6182,7 @@
             result.direction = 'vertical';
             result.xField = unfoldInfo.encodingX;
             if (foldInfoList?.[1]) result.yField = foldInfoList[1].measureValue;
-            result.seriesField = unfoldInfo.encodingColorId;
+            result.seriesField = isLinearColor(advancedVSeed) ? unfoldInfo.encodingDetail : unfoldInfo.encodingColorId;
             result.animation = true;
             return result;
         };
@@ -6763,6 +6808,37 @@
             ];
             return result;
         };
+        const linearColorForDualAxis = (spec, context)=>{
+            const result = {
+                ...spec
+            };
+            const { advancedVSeed } = context;
+            const { datasetReshapeInfo, chartType } = advancedVSeed;
+            const { unfoldInfo, id } = datasetReshapeInfo[0];
+            const baseConfig = advancedVSeed.config[chartType];
+            if (!baseConfig || !baseConfig.color) return result;
+            const { color } = baseConfig;
+            const { colorScheme, linearColorScheme } = color;
+            result.color = {
+                type: 'linear',
+                range: linearColorScheme || colorScheme || [],
+                domain: [
+                    {
+                        dataId: `${id}-primary-dataset`,
+                        fields: [
+                            unfoldInfo.encodingColor
+                        ]
+                    },
+                    {
+                        dataId: `${id}-secondary-dataset`,
+                        fields: [
+                            unfoldInfo.encodingColor
+                        ]
+                    }
+                ]
+            };
+            return result;
+        };
         const dualAxis = [
             seriesDualAxis([
                 initDualAxisPrimary,
@@ -6771,11 +6847,11 @@
                 labelPrimary,
                 tooltipPrimary,
                 progressive,
-                barStyle_barStyle,
-                pointStyle_pointStyle,
+                colorBarStyleFill(barStyle_barStyle),
+                colorPointStyleFill(pointStyle_pointStyle),
                 pointStateDimensionHover,
-                lineStyle_lineStyle,
-                areaStyle_areaStyle
+                colorLineStyleFill(lineStyle_lineStyle),
+                colorAreaStyleFill(areaStyle_areaStyle)
             ], [
                 initDualAxisSecondary,
                 dualChartTypeSecondary,
@@ -6783,18 +6859,18 @@
                 labelSecondary,
                 tooltipSecondary,
                 progressive,
-                barStyle_barStyle,
-                pointStyle_pointStyle,
+                colorBarStyleFill(barStyle_barStyle),
+                colorPointStyleFill(pointStyle_pointStyle),
                 pointStateDimensionHover,
-                lineStyle_lineStyle,
-                areaStyle_areaStyle
+                colorLineStyleFill(lineStyle_lineStyle),
+                colorAreaStyleFill(areaStyle_areaStyle)
             ]),
             xBand,
             yLinearPrimary,
             yLinearSecondary,
-            color_color,
+            colorAdapter(color_color, linearColorForDualAxis),
+            colorAdapter(discreteLegend, colorLegend),
             background_backgroundColor,
-            discreteLegend,
             verticalCrosshairRect,
             annotationPoint_annotationPoint,
             annotationVerticalLine_annotationVerticalLine,
@@ -6814,11 +6890,11 @@
                     labelPrimary,
                     tooltipPrimary,
                     progressive,
-                    barStyle_barStyle,
-                    pointStyle_pointStyle,
+                    colorBarStyleFill(barStyle_barStyle),
+                    colorPointStyleFill(pointStyle_pointStyle),
                     pointStateDimensionHover,
-                    lineStyle_lineStyle,
-                    areaStyle_areaStyle
+                    colorLineStyleFill(lineStyle_lineStyle),
+                    colorAreaStyleFill(areaStyle_areaStyle)
                 ], [
                     initDualAxisSecondary,
                     dualChartTypeSecondary,
@@ -6826,16 +6902,16 @@
                     labelSecondary,
                     tooltipSecondary,
                     progressive,
-                    barStyle_barStyle,
-                    pointStyle_pointStyle,
+                    colorBarStyleFill(barStyle_barStyle),
+                    colorPointStyleFill(pointStyle_pointStyle),
                     pointStateDimensionHover,
-                    lineStyle_lineStyle,
-                    areaStyle_areaStyle
+                    colorLineStyleFill(lineStyle_lineStyle),
+                    colorAreaStyleFill(areaStyle_areaStyle)
                 ]),
                 xBand,
                 yLinearPrimary,
                 yLinearSecondary,
-                color_color,
+                colorAdapter(color_color, linearColor),
                 background_backgroundColor,
                 verticalCrosshairRect,
                 annotationPoint_annotationPoint,
@@ -6845,7 +6921,7 @@
             ]),
             pivotRowDimensions,
             pivotColumnDimensions,
-            pivotDiscreteLegend
+            colorAdapter(pivotDiscreteLegend, pivotColorLegend)
         ];
         const dualAxisSpecPipeline = [
             pivotAdapter_pivotAdapter(dualAxis, pivotDualAxis)
@@ -6880,7 +6956,7 @@
         };
         const pieAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForPie,
             pivotAdapter([
@@ -6971,7 +7047,7 @@
         };
         const donutAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForPie,
             pivotAdapter([
@@ -7103,7 +7179,7 @@
         };
         const roseAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForRose,
             pivotAdapter([
@@ -7272,7 +7348,7 @@
         };
         const roseParallelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForRose,
             pivotAdapter([
@@ -7421,7 +7497,7 @@
         };
         const radarAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForRadar,
             pivotAdapter([
@@ -7583,7 +7659,7 @@
         };
         const funnelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForFunnel,
             pivotAdapter([
@@ -7714,7 +7790,7 @@
         };
         const heatmapAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            autoMeasures_autoMeasures,
+            buildMeasures,
             autoDimensions_autoDimensions,
             encodingForHeatmap,
             pivotAdapter([
@@ -11864,7 +11940,20 @@
             id: schemas_string(),
             alias: schemas_string().optional(),
             autoFormat: schemas_boolean().default(true),
-            format: zNumFormat["default"]({})
+            format: zNumFormat["default"]({}),
+            encoding: schemas_enum([
+                'primaryYAxis',
+                'secondaryYAxis',
+                'xAxis',
+                'yAxis',
+                'angle',
+                'radius',
+                'size',
+                'color',
+                'label',
+                'tooltip'
+            ]).optional(),
+            parentId: schemas_string().optional()
         });
         const zMeasureGroup = schemas_object({
             id: schemas_string(),
@@ -11926,7 +12015,6 @@
             column: schemas_array(schemas_string()).nullish(),
             group: schemas_array(schemas_string()).nullish().describe("\u5DF2\u5F03\u7528, \u8BF7\u4F7F\u7528\u989C\u8272\u66FF\u4EE3")
         });
-        const zEncodings = schemas_array(zEncoding);
         const zXBandAxis = schemas_object({
             visible: schemas_boolean().default(true).nullish(),
             labelAutoHide: schemas_boolean().default(true).nullish(),
@@ -13069,7 +13157,6 @@
             dimensions: zDimensionTree,
             measures: zMeasureTree,
             encoding: zEncoding,
-            encodings: zEncodings,
             config: zConfig,
             analysis: zAnalysis,
             theme: zTheme,