@visactor/vseed 0.1.2 → 0.1.3

package/dist/index.cjs

@@ -189,9 +189,8 @@ __webpack_require__.d(__webpack_exports__, {
     zBackgroundColor: ()=>zBackgroundColor,
     registerBarParallel: ()=>registerBarParallel,
     registerRadar: ()=>registerRadar,
-    zEncodings: ()=>zEncodings,
-    pivotTableSpecPipeline: ()=>pivotTableSpecPipeline,
     zLocale: ()=>zLocale,
+    pivotTableSpecPipeline: ()=>pivotTableSpecPipeline,
     zMeasure: ()=>zMeasure,
     FoldXMeasureValue: ()=>FoldXMeasureValue,
     dualAxisAdvancedPipeline: ()=>dualAxisAdvancedPipeline,
@@ -1272,6 +1271,39 @@ const initAdvancedVSeed_initAdvancedVSeed = (advancedVSeed, context)=>{
         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;
@@ -1290,23 +1322,26 @@ const isVTable = (vseed)=>[
 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;
         }
@@ -1317,77 +1352,49 @@ const isPivotChart = (vseed)=>{
     const hasMeasureGroup = measures && measures.some((measure)=>measure && measure.children);
     return hasRowOrColumnDimension || hasMeasureGroup;
 };
-const autoMeasures_autoMeasures = (advancedVSeed, context)=>{
-    const result = {
-        ...advancedVSeed
-    };
+const buildMeasures = (advancedVSeed, context)=>{
     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 { 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__';
@@ -1489,8 +1496,7 @@ const pivotAdapter = (pipeline, pivotPipeline)=>(advancedVSeed, context)=>{
         return execPipeline(pipeline, context, advancedVSeed);
     };
 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,
@@ -1589,11 +1595,12 @@ const applyEncoding = (encoding, dimensions, datum, separator)=>{
     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,
@@ -1606,6 +1613,24 @@ const dataReshapeByEncoding = (dataset, dimensions, measures, encoding, options)
         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
@@ -1615,7 +1640,9 @@ const reshapeWithEncoding = (advancedVSeed, context)=>{
     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,
@@ -1651,7 +1678,8 @@ const pivotReshapeWithEncoding = (advancedVSeed, context)=>{
         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,
@@ -1858,7 +1886,7 @@ const annotation_annotation = (advancedVSeed, context)=>{
 };
 const lineAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForLine,
     pivotAdapter([
@@ -1873,17 +1901,6 @@ const lineAdvancedPipeline = [
     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
@@ -3714,7 +3731,7 @@ const encodingForColumn = (advancedVSeed, context)=>{
 };
 const columnAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForColumn,
     pivotAdapter([
@@ -4163,7 +4180,7 @@ const registerColumn = ()=>{
 };
 const columnParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForColumn,
     pivotAdapter([
@@ -4260,7 +4277,7 @@ const registerColumnParallel = ()=>{
 };
 const columnPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForColumn,
     pivotAdapter([
@@ -4399,7 +4416,7 @@ const sortYBandAxis = (advancedVSeed, context)=>{
 };
 const barAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForBar,
     pivotAdapter([
@@ -4752,7 +4769,7 @@ const registerBar = ()=>{
 };
 const barParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForBar,
     pivotAdapter([
@@ -4848,7 +4865,7 @@ const registerBarParallel = ()=>{
 };
 const barPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForBar,
     pivotAdapter([
@@ -4919,7 +4936,7 @@ const registerBarPercent = ()=>{
 };
 const areaAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForColumn,
     pivotAdapter([
@@ -5077,7 +5094,7 @@ const registerArea = ()=>{
 };
 const areaPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForColumn,
     pivotAdapter([
@@ -5153,95 +5170,105 @@ const registerAreaPercent = ()=>{
     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;
@@ -5297,7 +5324,8 @@ const reshapeWithScatterEncoding = (advancedVSeed, context)=>{
     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);
@@ -5306,7 +5334,8 @@ const reshapeWithScatterEncoding = (advancedVSeed, context)=>{
     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);
@@ -5361,7 +5390,8 @@ const pivotReshapeWithScatterEncoding = (advancedVSeed, context)=>{
         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);
@@ -5370,7 +5400,8 @@ const pivotReshapeWithScatterEncoding = (advancedVSeed, context)=>{
         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);
@@ -5405,7 +5436,7 @@ const pivotReshapeWithScatterEncoding = (advancedVSeed, context)=>{
 };
 const scatterAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoScatterMeasures,
+    buildMeasuresForScatter,
     autoDimensions_autoDimensions,
     encodingForScatter,
     pivotAdapter([
@@ -5552,68 +5583,55 @@ const registerScatter = ()=>{
     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(),
@@ -5625,7 +5643,7 @@ const dualMeasuresToMeasureTree = (dualMeasures)=>{
                 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(),
@@ -5633,14 +5651,37 @@ const dualMeasuresToMeasureTree = (dualMeasures)=>{
             });
         }
         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;
@@ -5699,7 +5740,8 @@ const reshapeWithDualEncoding = (advancedVSeed, context)=>{
     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);
@@ -5707,7 +5749,8 @@ const reshapeWithDualEncoding = (advancedVSeed, context)=>{
     }
     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);
@@ -5761,7 +5804,8 @@ const pivotReshapeWithDualEncoding = (advancedVSeed, context)=>{
         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);
@@ -5769,7 +5813,8 @@ const pivotReshapeWithDualEncoding = (advancedVSeed, context)=>{
         }
         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);
@@ -5827,7 +5872,7 @@ const dualAxisConfig = (advancedVSeed, context)=>{
 };
 const dualAxisAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoDualMeasures,
+    buildMeasuresForDualAxis,
     autoDimensions_autoDimensions,
     encodingForDualAxis,
     pivotAdapter([
@@ -5914,7 +5959,7 @@ const initDualAxisSecondary = (spec, context)=>{
     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;
 };
@@ -6540,6 +6585,37 @@ const yLinearSecondary = (spec, context)=>{
     ];
     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,
@@ -6548,11 +6624,11 @@ const dualAxis = [
         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,
@@ -6560,18 +6636,18 @@ const dualAxis = [
         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,
@@ -6591,11 +6667,11 @@ const pivotDualAxis = [
             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,
@@ -6603,16 +6679,16 @@ const pivotDualAxis = [
             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,
@@ -6622,7 +6698,7 @@ const pivotDualAxis = [
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
-    pivotDiscreteLegend
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const dualAxisSpecPipeline = [
     pivotAdapter_pivotAdapter(dualAxis, pivotDualAxis)
@@ -6657,7 +6733,7 @@ const encodingForPie = (advancedVSeed, context)=>{
 };
 const pieAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForPie,
     pivotAdapter([
@@ -6748,7 +6824,7 @@ const registerPie = ()=>{
 };
 const donutAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForPie,
     pivotAdapter([
@@ -6880,7 +6956,7 @@ const encodingForRose = (advancedVSeed, context)=>{
 };
 const roseAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForRose,
     pivotAdapter([
@@ -7049,7 +7125,7 @@ const registerRose = ()=>{
 };
 const roseParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForRose,
     pivotAdapter([
@@ -7198,7 +7274,7 @@ const encodingForRadar = (advancedVSeed, context)=>{
 };
 const radarAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForRadar,
     pivotAdapter([
@@ -7360,7 +7436,7 @@ const encodingForFunnel = (advancedVSeed, context)=>{
 };
 const funnelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForFunnel,
     pivotAdapter([
@@ -7491,7 +7567,7 @@ const encodingForHeatmap = (advancedVSeed, context)=>{
 };
 const heatmapAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    autoMeasures_autoMeasures,
+    buildMeasures,
     autoDimensions_autoDimensions,
     encodingForHeatmap,
     pivotAdapter([
@@ -8359,7 +8435,20 @@ const zMeasure = external_zod_namespaceObject.z.object({
     id: external_zod_namespaceObject.z.string(),
     alias: external_zod_namespaceObject.z.string().optional(),
     autoFormat: external_zod_namespaceObject.z.boolean().default(true),
-    format: zNumFormat["default"]({})
+    format: zNumFormat["default"]({}),
+    encoding: external_zod_namespaceObject.z["enum"]([
+        'primaryYAxis',
+        'secondaryYAxis',
+        'xAxis',
+        'yAxis',
+        'angle',
+        'radius',
+        'size',
+        'color',
+        'label',
+        'tooltip'
+    ]).optional(),
+    parentId: external_zod_namespaceObject.z.string().optional()
 });
 const zMeasureGroup = external_zod_namespaceObject.z.object({
     id: external_zod_namespaceObject.z.string(),
@@ -8421,7 +8510,6 @@ const zEncoding = external_zod_namespaceObject.z.object({
     column: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish(),
     group: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).nullish().describe("\u5DF2\u5F03\u7528, \u8BF7\u4F7F\u7528\u989C\u8272\u66FF\u4EE3")
 });
-const zEncodings = external_zod_namespaceObject.z.array(zEncoding);
 const zXBandAxis = external_zod_namespaceObject.z.object({
     visible: external_zod_namespaceObject.z.boolean().default(true).nullish(),
     labelAutoHide: external_zod_namespaceObject.z.boolean().default(true).nullish(),
@@ -9564,7 +9652,6 @@ const zAdvancedVSeed = external_zod_namespaceObject.z.object({
     dimensions: zDimensionTree,
     measures: zMeasureTree,
     encoding: zEncoding,
-    encodings: zEncodings,
     config: zConfig,
     analysis: zAnalysis,
     theme: zTheme,
@@ -9736,7 +9823,6 @@ exports.zDualChartType = __webpack_exports__.zDualChartType;
 exports.zDualMeasure = __webpack_exports__.zDualMeasure;
 exports.zDualMeasures = __webpack_exports__.zDualMeasures;
 exports.zEncoding = __webpack_exports__.zEncoding;
-exports.zEncodings = __webpack_exports__.zEncodings;
 exports.zFoldInfo = __webpack_exports__.zFoldInfo;
 exports.zFunnel = __webpack_exports__.zFunnel;
 exports.zFunnelConfig = __webpack_exports__.zFunnelConfig;
@@ -9947,7 +10033,6 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "zDualMeasure",
     "zDualMeasures",
     "zEncoding",
-    "zEncodings",
     "zFoldInfo",
     "zFunnel",
     "zFunnelConfig",