@visactor/vseed 0.1.5 → 0.1.6

package/dist/index.js

@@ -190,7 +190,8 @@ const autoMeasures = (advancedVSeed, context)=>{
             void 0
         ].includes(key)).map((measure)=>({
             id: measure,
-            alias: measure
+            alias: measure,
+            encoding: 'column'
         }));
     return result;
 };
@@ -274,7 +275,7 @@ const autoDimensions = (advancedVSeed, context)=>{
         ].includes(key) && !measures.some((measure)=>measure.id === key)).map((dim)=>({
             id: dim,
             alias: dim,
-            location: 'dimension'
+            encoding: 'column'
         }));
     return result;
 };
@@ -709,10 +710,27 @@ const autoPivotMeasures = (advancedVSeed, context)=>{
             void 0
         ].includes(key)).map((measure)=>({
             id: measure,
-            alias: measure
+            alias: measure,
+            encoding: 'detail'
         }));
     return result;
 };
+const ORIGINAL_DATA = '__OriginalData__';
+const Separator = '-';
+const FoldMeasureName = '__MeaName__';
+const FoldMeasureId = '__MeaId__';
+const FoldMeasureValue = '__MeaValue__';
+const MeasureName = FoldMeasureName;
+const FoldPrimaryMeasureValue = '__MeaPrimaryValue__';
+const FoldSecondaryMeasureValue = '__MeaSecondaryValue__';
+const FoldXMeasureValue = '__MeaXValue__';
+const FoldYMeasureValue = '__MeaYValue__';
+const XEncoding = '__Dim_X__';
+const YEncoding = '__Dim_Y__';
+const AngleEncoding = '__Dim_Angle__';
+const DetailEncoding = '__Dim_Detail__';
+const ColorEncoding = '__Dim_Color__';
+const ColorIdEncoding = '__Dim_ColorId__';
 const findAllDimensions = (dimensions = [])=>{
     if (!dimensions) return [];
     const result = [];
@@ -729,15 +747,21 @@ const autoPivotDimensions = (advancedVSeed, context)=>{
     const { vseed } = context;
     const { dimensions, dataset } = vseed;
     const measures = findAllMeasures(advancedVSeed.measures);
+    const MeaName = {
+        id: MeasureName,
+        alias: intl.i18n`指标名称`
+    };
     if (!dataset) throw new Error('dataset is required');
     if (0 === dataset.length) return result;
     if (dimensions) {
         const newDimensions = findAllDimensions(dimensions);
+        if (!newDimensions.some((dim)=>dim.id === MeasureName)) newDimensions.push(MeaName);
         result.dimensions = newDimensions.map((item, index)=>{
+            if ('row' === item.encoding || 'column' === item.encoding) return item;
             if ('rowDimension' === item.location || 'columnDimension' === item.location) return item;
             return {
                 ...item,
-                location: index % 2 === 0 ? 'columnDimension' : 'rowDimension'
+                encoding: index % 2 === 0 ? 'column' : 'row'
             };
         });
         return result;
@@ -747,15 +771,19 @@ const autoPivotDimensions = (advancedVSeed, context)=>{
             ...prev,
             ...cur
         }), {});
-    let i = 0;
-    result.dimensions = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'string' == typeof item[key]) && ![
+    const newDimensions = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'string' == typeof item[key]) && ![
             '',
             null,
             void 0
-        ].includes(key) && !measures.some((measure)=>measure.id === key)).map((dim)=>({
+        ].includes(key) && !measures.some((measure)=>measure.id === key));
+    result.dimensions = newDimensions.map((dim)=>({
             id: dim,
-            alias: dim,
-            location: i++ % 2 === 0 ? 'columnDimension' : 'rowDimension'
+            alias: dim
+        }));
+    result.dimensions.push(MeaName);
+    result.dimensions = result.dimensions.map((dim, index)=>({
+            ...dim,
+            encoding: index % 2 === 0 ? 'column' : 'row'
         }));
     return result;
 };
@@ -786,11 +814,89 @@ const pivotTableConfig = (advancedVSeed, context)=>{
     };
     return result;
 };
+const foldMeasures = (dataset, measures, options)=>{
+    const { measureId, measureName, measureValue, colorMeasureId } = options || {};
+    const foldInfo = {
+        measureId,
+        measureName,
+        measureValue,
+        colorRange: [
+            0,
+            1
+        ],
+        measureRange: [
+            0,
+            1
+        ],
+        foldMap: {}
+    };
+    const result = new Array(dataset.length * measures.length);
+    let index = 0;
+    const ids = measures.map((d)=>d.id);
+    for(let i = 0; i < dataset.length; i++)for(let j = 0; j < measures.length; j++){
+        const datum = omit({
+            ...dataset[i]
+        }, ids);
+        datum[ORIGINAL_DATA] = dataset[i];
+        const measure = measures[j];
+        const { id, alias } = measure;
+        datum[id] = dataset[i][id];
+        datum[measureId] = id;
+        datum[measureName] = alias || id;
+        datum[measureValue] = dataset[i][id];
+        if (colorMeasureId) {
+            const value = datum[ORIGINAL_DATA][colorMeasureId];
+            datum[ColorEncoding] = value;
+            datum[ColorIdEncoding] = colorMeasureId;
+            foldInfo.colorRange = [
+                Math.min(foldInfo.colorRange[0] || 1 / 0, Number(value)),
+                Math.max(foldInfo.colorRange[1] || -1 / 0, Number(value))
+            ];
+        }
+        foldInfo.measureRange = [
+            Math.min(foldInfo.measureRange[0] || 1 / 0, Number(datum[id])),
+            Math.max(foldInfo.measureRange[1] || -1 / 0, Number(datum[id]))
+        ];
+        foldInfo.foldMap[id] = alias;
+        result[index++] = datum;
+    }
+    return {
+        dataset: result,
+        foldInfo
+    };
+};
+const reshapePivotTable = (advancedVSeed, context)=>{
+    const result = {
+        ...advancedVSeed
+    };
+    const { vseed } = context;
+    const { dataset, chartType } = vseed;
+    const { dimensions, measures } = advancedVSeed;
+    const { dataset: newDatasets, foldInfo } = foldMeasures(dataset, findAllMeasures(measures), {
+        measureId: FoldMeasureId,
+        measureName: FoldMeasureName,
+        measureValue: FoldMeasureValue
+    });
+    const datasetReshapeInfo = [
+        {
+            id: String(chartType),
+            index: 0,
+            foldInfo
+        }
+    ];
+    return {
+        ...result,
+        dataset: newDatasets,
+        datasetReshapeInfo: datasetReshapeInfo,
+        dimensions,
+        measures
+    };
+};
 const pivotTableAdvancedPipeline = [
     initAdvancedVSeed,
     autoPivotMeasures,
     autoPivotDimensions,
-    records_records,
+    reshapePivotTable,
     pivotTableConfig,
     theme_theme
 ];
@@ -837,7 +943,7 @@ const initPivotTable = (spec, context)=>{
 const pivotColumns = (spec, context)=>{
     const { advancedVSeed } = context;
     const dimensions = advancedVSeed.dimensions;
-    const columns = dimensions.filter((item)=>'columnDimension' === item['location']);
+    const columns = dimensions.filter((item)=>'columnDimension' === item['location'] || 'column' === item['encoding']);
     return {
         ...spec,
         columns: columns.map((item)=>({
@@ -850,7 +956,7 @@ const pivotColumns = (spec, context)=>{
 const pivotRows = (spec, context)=>{
     const { advancedVSeed } = context;
     const dimensions = advancedVSeed.dimensions;
-    const rows = dimensions.filter((item)=>'rowDimension' === item['location']);
+    const rows = dimensions.filter((item)=>'rowDimension' === item['location'] || 'row' === item['encoding']);
     return {
         ...spec,
         rows: rows.map((item)=>({
@@ -862,25 +968,31 @@ const pivotRows = (spec, context)=>{
 };
 const pivotIndicators = (spec, context)=>{
     const { advancedVSeed } = context;
-    const { locale } = advancedVSeed;
-    const measures = advancedVSeed.measures;
+    const { locale, measures, datasetReshapeInfo } = advancedVSeed;
+    const { foldInfo } = datasetReshapeInfo[0];
     return {
         ...spec,
         indicatorsAsCol: true,
         indicatorTitle: intl.i18n`指标名称`,
-        indicators: measures.map((item)=>{
-            if (isMeasure(item)) return {
+        hideIndicatorName: true,
+        indicators: [
+            {
                 cellType: 'text',
-                indicatorKey: item.id,
-                title: item.alias || item.id,
+                indicatorKey: foldInfo.measureValue,
+                title: 'indicator',
                 width: 'auto',
-                format: pivotIndicators_fieldFormat(item, locale)
-            };
-            return {};
-        })
+                format: pivotIndicators_fieldFormat(measures, foldInfo, locale)
+            }
+        ]
     };
 };
-const pivotIndicators_fieldFormat = (node, locale)=>(value)=>{
+const pivotIndicators_fieldFormat = (measures, foldInfo, locale)=>(value, col, row, table)=>{
+        if (!isNumber(col) || !isNumber(row) || !table) return value;
+        const datum = table.getCellOriginRecord(col, row);
+        const { measureId: foldMeasureId } = foldInfo;
+        const measureId = datum[0][foldMeasureId];
+        const node = findMeasureById(measures, measureId);
+        if (!node) return value;
         const { format = {}, autoFormat = true } = node;
         if (!external_remeda_isEmpty(format)) {
             const formatter = createFormatter(format);
@@ -1036,94 +1148,81 @@ const initAdvancedVSeed_initAdvancedVSeed = (advancedVSeed, context)=>{
         locale: locale || 'zh-CN'
     };
 };
-const ORIGINAL_DATA = '__OriginalData__';
-const Separator = '-';
-const FoldMeasureName = '__MeaName__';
-const FoldMeasureId = '__MeaId__';
-const FoldMeasureValue = '__MeaValue__';
-const MeasureName = FoldMeasureName;
-const FoldPrimaryMeasureValue = '__MeaPrimaryValue__';
-const FoldSecondaryMeasureValue = '__MeaSecondaryValue__';
-const FoldXMeasureValue = '__MeaXValue__';
-const FoldYMeasureValue = '__MeaYValue__';
-const XEncoding = '__Dim_X__';
-const YEncoding = '__Dim_Y__';
-const AngleEncoding = '__Dim_Angle__';
-const DetailEncoding = '__Dim_Detail__';
-const ColorEncoding = '__Dim_Color__';
-const ColorIdEncoding = '__Dim_ColorId__';
-const getBasicDimensions = (vseed)=>{
-    const { dimensions, dataset } = vseed;
-    const MeaName = {
-        id: MeasureName,
-        alias: intl.i18n`指标名称`
+const defaultMeasures_defaultMeasures = (advancedVSeed, context)=>{
+    const { vseed } = context;
+    const { measures, dataset } = vseed;
+    if (measures && measures.length > 0) return {
+        ...advancedVSeed,
+        measures
     };
     if (!dataset) throw new Error('dataset is required');
-    if (0 === dataset.length) return [];
-    if (dimensions) {
-        const basicDimensions = dimensions.map((dim)=>({
-                location: 'dimension',
-                ...dim
-            }));
-        if (basicDimensions.some((dim)=>dim.id === MeasureName)) return basicDimensions;
-        basicDimensions.push(MeaName);
-        return basicDimensions;
-    }
+    if (0 === dataset.length) return {
+        ...advancedVSeed,
+        measures: []
+    };
     const top100dataset = dataset.slice(0, 100);
     const sample = top100dataset.reduce((prev, cur)=>({
             ...prev,
             ...cur
         }), {});
-    const basicDimensions = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'string' == typeof item[key]) && ![
+    const defaultMeasures = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
             '',
             null,
             void 0
-        ].includes(key)).map((dim)=>({
-            id: dim,
-            alias: dim,
-            location: 'dimension'
+        ].includes(key)).map((measure)=>({
+            id: measure,
+            alias: measure
         }));
-    basicDimensions.push(MeaName);
-    return basicDimensions;
-};
-const getBasicMeasures = (vseed)=>{
-    const { dataset, measures } = vseed;
-    if (!measures || 0 === measures.length) return generateMeasuresByDataset(dataset);
-    return measures;
+    return {
+        ...advancedVSeed,
+        measures: defaultMeasures
+    };
 };
-const generateMeasuresByDataset = (dataset)=>{
+const defaultDimensions = (advancedVSeed, context)=>{
+    const result = {
+        ...advancedVSeed
+    };
+    const { vseed } = context;
+    const { dimensions, dataset } = vseed;
+    if (dimensions && dimensions.length > 0) return {
+        ...result,
+        dimensions
+    };
     if (!dataset) throw new Error('dataset is required');
-    if (0 === dataset.length) return [];
+    if (0 === dataset.length) return result;
+    const measures = findAllMeasures(advancedVSeed.measures);
     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]) && ![
+    const newDimensions = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'string' == typeof item[key]) && ![
             '',
             null,
             void 0
-        ].includes(key)).map((measure)=>({
-            id: measure,
-            alias: measure
+        ].includes(key) && !measures.some((measure)=>measure.id === key)).map((dim)=>({
+            id: dim,
+            alias: dim
         }));
-    return basicMeasures;
-};
-const isMeasureTreeWithChildren = (vseed)=>{
-    const { measures } = vseed;
-    if (!measures) return false;
-    return measures.some((measure)=>'children' in measure);
+    return {
+        ...result,
+        dimensions: newDimensions
+    };
 };
-const isMeasureTreeWithParentId = (vseed)=>{
-    const { measures } = vseed;
-    if (!measures) return false;
-    return measures.some((measure)=>'parentId' in measure);
+const defaultMeasureName = (advancedVSeed)=>{
+    const result = {
+        ...advancedVSeed
+    };
+    const MeaName = {
+        id: MeasureName,
+        alias: intl.i18n`指标名称`
+    };
+    if (!result.dimensions?.some((dim)=>dim.id === MeasureName)) result.dimensions?.push(MeaName);
+    return result;
 };
-const encodingForLine = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { measures: vseedMeasures = [] } = vseed;
-    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-    const dimensions = getBasicDimensions(vseed);
+const encodingForLine = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
     const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
     const hasMeasureEncoding = measures.some((item)=>item.encoding);
     const encoding = {};
@@ -1136,10 +1235,6 @@ const encodingForLine = (advancedVSeed, context)=>{
         encoding
     };
 };
-const generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
     encoding.x = uniqueDimIds.slice(0, 1);
@@ -1150,20 +1245,36 @@ const generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.row = [];
     encoding.column = [];
 };
-const generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
-    encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-};
 const generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = [];
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
-    if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+    if (0 === encoding.color.length) encoding.color = [
+        MeasureName
+    ];
+};
+const generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = unique(measures.map((item)=>item.id));
+    encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = color;
+};
+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;
@@ -1223,9 +1334,7 @@ const buildMeasures = (advancedVSeed, context)=>{
         advancedVSeed.measures = generateMeasuresByParentId(vseed.measures);
         return advancedVSeed;
     }
-    const basicMeasures = getBasicMeasures(vseed);
-    if (isPivotChart(vseed)) advancedVSeed.measures = basicMeasuresToMeasureTree(basicMeasures);
-    else advancedVSeed.measures = basicMeasures;
+    if (isPivotChart(vseed)) advancedVSeed.measures = basicMeasuresToMeasureTree(advancedVSeed.measures);
     return advancedVSeed;
 };
 const generateMeasuresByParentId = (measures)=>{
@@ -1256,102 +1365,12 @@ const basicMeasuresToMeasureTree = (measures)=>{
         }
     ];
 };
-const autoDimensions_autoDimensions = (advancedVSeed, context)=>{
-    const result = {
-        ...advancedVSeed
-    };
-    const { vseed } = context;
-    const { dimensions, dataset } = vseed;
-    const measures = findAllMeasures(advancedVSeed.measures);
-    const MeaName = {
-        id: MeasureName,
-        alias: intl.i18n`指标名称`
-    };
-    if (!dataset) throw new Error('dataset is required');
-    if (0 === dataset.length) return result;
-    if (dimensions) {
-        result.dimensions = dimensions.map((dim)=>({
-                location: 'dimension',
-                ...dim
-            }));
-        if (result.dimensions.some((dim)=>dim.id === MeasureName)) return result;
-        result.dimensions.push(MeaName);
-        return result;
-    }
-    const top100dataset = dataset.slice(0, 100);
-    const sample = top100dataset.reduce((prev, cur)=>({
-            ...prev,
-            ...cur
-        }), {});
-    result.dimensions = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'string' == typeof item[key]) && ![
-            '',
-            null,
-            void 0
-        ].includes(key) && !measures.some((measure)=>measure.id === key)).map((dim)=>({
-            id: dim,
-            alias: dim,
-            location: 'dimension'
-        }));
-    result.dimensions.push(MeaName);
-    return result;
-};
 const pivotAdapter = (pipeline, pivotPipeline)=>(advancedVSeed, context)=>{
         const { vseed } = context;
         const usePivotChart = isPivotChart(vseed);
         if (usePivotChart) return execPipeline(pivotPipeline, context, advancedVSeed);
         return execPipeline(pipeline, context, advancedVSeed);
     };
-const foldMeasures = (dataset, measures, options)=>{
-    const { measureId, measureName, measureValue, colorMeasureId } = options || {};
-    const foldInfo = {
-        measureId,
-        measureName,
-        measureValue,
-        colorRange: [
-            0,
-            1
-        ],
-        measureRange: [
-            0,
-            1
-        ],
-        foldMap: {}
-    };
-    const result = new Array(dataset.length * measures.length);
-    let index = 0;
-    const ids = measures.map((d)=>d.id);
-    for(let i = 0; i < dataset.length; i++)for(let j = 0; j < measures.length; j++){
-        const datum = omit({
-            ...dataset[i]
-        }, ids);
-        datum[ORIGINAL_DATA] = dataset[i];
-        const measure = measures[j];
-        const { id, alias } = measure;
-        datum[id] = dataset[i][id];
-        datum[measureId] = id;
-        datum[measureName] = alias || id;
-        datum[measureValue] = dataset[i][id];
-        if (colorMeasureId) {
-            const value = datum[ORIGINAL_DATA][colorMeasureId];
-            datum[ColorEncoding] = value;
-            datum[ColorIdEncoding] = colorMeasureId;
-            foldInfo.colorRange = [
-                Math.min(foldInfo.colorRange[0] || 1 / 0, Number(value)),
-                Math.max(foldInfo.colorRange[1] || -1 / 0, Number(value))
-            ];
-        }
-        foldInfo.measureRange = [
-            Math.min(foldInfo.measureRange[0] || 1 / 0, Number(datum[id])),
-            Math.max(foldInfo.measureRange[1] || -1 / 0, Number(datum[id]))
-        ];
-        foldInfo.foldMap[id] = alias;
-        result[index++] = datum;
-    }
-    return {
-        dataset: result,
-        foldInfo
-    };
-};
 const unfoldDimensions = (dataset, dimensions, encoding, options)=>{
     const { foldMeasureId, separator, colorItemAsId } = options;
     const unfoldInfo = {
@@ -1446,7 +1465,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 hasEncoding = (vseed.dimensions || []).some((item)=>item.encoding);
     const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, uniqueBy(dimensions, (item)=>item.id), uniqueBy(findAllMeasures(measures), (item)=>item.id), encoding, {
+        colorItemAsId: hasEncoding,
         colorMeasureId: getColorMeasureId(advancedVSeed)
     });
     return {
@@ -1477,6 +1498,7 @@ const pivotReshapeWithEncoding = (advancedVSeed, context)=>{
     if (measures) measures.forEach((measure)=>{
         if (measure.children && measure.children.length > 0) measureGroups.push(measure);
     });
+    const hasEncoding = (vseed.dimensions || []).some((item)=>item.encoding);
     const datasets = [];
     const datasetReshapeInfo = [];
     measureGroups.forEach((measureGroup, index)=>{
@@ -1484,6 +1506,7 @@ const pivotReshapeWithEncoding = (advancedVSeed, context)=>{
         if (!measures) return;
         const groupId = measureGroup.id;
         const { dataset: newSubDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, uniqueBy(dimensions, (item)=>item.id), uniqueBy(measures, (item)=>item.id), encoding, {
+            colorItemAsId: hasEncoding,
             foldMeasureValue: `${FoldMeasureValue}${groupId}`,
             colorMeasureId: getColorMeasureId(advancedVSeed)
         });
@@ -1692,9 +1715,11 @@ const annotation_annotation = (advancedVSeed, context)=>{
 };
 const lineAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForLine,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -3290,7 +3315,7 @@ const pivotRowDimensions = (spec, context)=>{
     const { advancedVSeed } = context;
     const dimensions = advancedVSeed.dimensions;
     if (!dimensions) return result;
-    const rowDimensions = dimensions.filter((dim)=>'rowDimension' === dim.location);
+    const rowDimensions = dimensions.filter((dim)=>'rowDimension' === dim.location || 'row' === dim.encoding);
     const rows = rowDimensions.map((dim)=>({
             dimensionKey: dim.id,
             title: dim.alias || dim.id
@@ -3307,7 +3332,7 @@ const pivotColumnDimensions = (spec, context)=>{
     const { advancedVSeed } = context;
     const dimensions = advancedVSeed.dimensions;
     if (!dimensions) return result;
-    const columnDimensions = dimensions.filter((dim)=>'columnDimension' === dim.location);
+    const columnDimensions = dimensions.filter((dim)=>'columnDimension' === dim.location || 'column' === dim.encoding);
     const columns = columnDimensions.map((dim)=>({
             dimensionKey: dim.id,
             title: dim.alias || dim.id
@@ -3580,11 +3605,9 @@ const registerLine = ()=>{
     Builder._advancedPipelineMap.line = lineAdvancedPipeline;
     Builder._specPipelineMap.line = lineSpecPipeline;
 };
-const encodingForColumn = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { measures: vseedMeasures = [] } = vseed;
-    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-    const dimensions = getBasicDimensions(vseed);
+const encodingForColumn = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
     const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
     const hasMeasureEncoding = measures.some((item)=>item.encoding);
     const encoding = {};
@@ -3597,10 +3620,6 @@ const encodingForColumn = (advancedVSeed, context)=>{
         encoding
     };
 };
-const column_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const column_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
@@ -3612,13 +3631,6 @@ const column_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.row = [];
     encoding.column = [];
 };
-const column_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
-    encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-    return encoding;
-};
 const column_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
@@ -3626,14 +3638,28 @@ const column_generateDimensionEncoding = (dimensions, encoding)=>{
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
-    if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
-    if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+    if (0 === encoding.color.length) encoding.color = [
+        MeasureName
+    ];
+};
+const column_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = unique(measures.map((item)=>item.id));
+    encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const column_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = color;
+    return encoding;
 };
 const columnAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForColumn,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -3993,9 +4019,11 @@ const registerColumn = ()=>{
 };
 const columnParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForColumn,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4090,9 +4118,11 @@ const registerColumnParallel = ()=>{
 };
 const columnPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForColumn,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4169,11 +4199,9 @@ const registerColumnPercent = ()=>{
     Builder._advancedPipelineMap.columnPercent = columnPercentAdvancedPipeline;
     Builder._specPipelineMap.columnPercent = columnPercentSpecPipeline;
 };
-const encodingForBar = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { measures: vseedMeasures = [] } = vseed;
-    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-    const dimensions = getBasicDimensions(vseed);
+const encodingForBar = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
     const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
     const hasMeasureEncoding = measures.some((item)=>item.encoding);
     const encoding = {};
@@ -4215,7 +4243,9 @@ const bar_generateDimensionEncoding = (dimensions, encoding)=>{
     if (0 === encoding.y.length) encoding.y = [
         dimensions[0].id
     ];
-    if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.y?.includes(item.id)).map((item)=>item.id);
+    if (0 === encoding.color.length) encoding.color = [
+        MeasureName
+    ];
     if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.y?.includes(item.id)).map((item)=>item.id);
 };
 const sortYBandAxis = (advancedVSeed, context)=>{
@@ -4236,9 +4266,11 @@ const sortYBandAxis = (advancedVSeed, context)=>{
 };
 const barAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForBar,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4589,9 +4621,11 @@ const registerBar = ()=>{
 };
 const barParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    buildMeasures,
-    autoDimensions_autoDimensions,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForBar,
+    buildMeasures,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4685,9 +4719,11 @@ const registerBarParallel = ()=>{
 };
 const barPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    buildMeasures,
-    autoDimensions_autoDimensions,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForBar,
+    buildMeasures,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4756,9 +4792,11 @@ const registerBarPercent = ()=>{
 };
 const areaAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForLine,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4914,9 +4952,11 @@ const registerArea = ()=>{
 };
 const areaPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForLine,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4990,11 +5030,9 @@ const registerAreaPercent = ()=>{
     Builder._advancedPipelineMap.areaPercent = areaPercentAdvancedPipeline;
     Builder._specPipelineMap.areaPercent = areaPercentSpecPipeline;
 };
-const encodingForScatter = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { measures: vseedMeasures = [] } = vseed;
-    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-    const dimensions = getBasicDimensions(vseed);
+const encodingForScatter = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
     const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
     const hasMeasureEncoding = measures.some((item)=>item.encoding);
     const encoding = {};
@@ -5030,7 +5068,9 @@ const scatter_generateMeasureEncoding = (measures, encoding)=>{
 const scatter_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
-    if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+    if (0 === encoding.color.length) encoding.color = [
+        MeasureName
+    ];
     if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
 };
 const buildMeasuresForScatter = (advancedVSeed, context)=>{
@@ -5043,8 +5083,7 @@ const buildMeasuresForScatter = (advancedVSeed, context)=>{
         advancedVSeed.measures = buildMeasuresForScatter_generateMeasuresByParentId(vseed.measures);
         return advancedVSeed;
     }
-    const basicMeasures = getBasicMeasures(vseed);
-    const scatterMeasures = vseed.scatterMeasures ? vseed.scatterMeasures : basicMeasuresToScatterMeasures(basicMeasures);
+    const scatterMeasures = vseed.scatterMeasures ? vseed.scatterMeasures : basicMeasuresToScatterMeasures(advancedVSeed.measures || []);
     advancedVSeed.measures = scatterMeasuresToMeasureTree(scatterMeasures);
     return advancedVSeed;
 };
@@ -5263,9 +5302,11 @@ const pivotReshapeWithScatterEncoding = (advancedVSeed, context)=>{
 };
 const scatterAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForScatter,
     buildMeasuresForScatter,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithScatterEncoding
     ], [
@@ -5410,11 +5451,9 @@ const registerScatter = ()=>{
     Builder._advancedPipelineMap.scatter = scatterAdvancedPipeline;
     Builder._specPipelineMap.scatter = scatterSpecPipeline;
 };
-const encodingForDualAxis = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { measures: vseedMeasures = [] } = vseed;
-    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-    const dimensions = getBasicDimensions(vseed);
+const encodingForDualAxis = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
     const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
     const hasMeasureEncoding = measures.some((item)=>item.encoding);
     const encoding = {};
@@ -5456,7 +5495,9 @@ const dualAxis_generateDimensionEncoding = (dimensions, encoding)=>{
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
-    if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+    if (0 === encoding.color.length) encoding.color = [
+        MeasureName
+    ];
     if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
 };
 const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
@@ -5469,8 +5510,7 @@ const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
         advancedVSeed.measures = buildMeasuresForDualAxis_generateMeasuresByParentId(vseed.measures);
         return advancedVSeed;
     }
-    const basicMeasures = getBasicMeasures(vseed);
-    const dualMeasures = vseed.dualMeasures ? vseed.dualMeasures : basicMeasuresToDualMeasures(basicMeasures);
+    const dualMeasures = vseed.dualMeasures ? vseed.dualMeasures : basicMeasuresToDualMeasures(advancedVSeed.measures || []);
     advancedVSeed.measures = dualMeasuresToMeasureTree(dualMeasures);
     return advancedVSeed;
 };
@@ -5574,8 +5614,10 @@ const reshapeWithDualEncoding = (advancedVSeed, context)=>{
     const datasets = [];
     const primaryMeasures = measures[0];
     const secondaryMeasures = measures[1] || [];
+    const hasEncoding = (vseed.dimensions || []).some((item)=>item.encoding);
     if (primaryMeasures && primaryMeasures.children) {
         const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, primaryMeasures.children, encoding, {
+            colorItemAsId: hasEncoding,
             foldMeasureValue: FoldPrimaryMeasureValue,
             colorMeasureId: getColorMeasureId(advancedVSeed)
         });
@@ -5622,6 +5664,7 @@ const pivotReshapeWithDualEncoding = (advancedVSeed, context)=>{
     const { dataset } = vseed;
     const { dimensions, measures, encoding, chartType } = advancedVSeed;
     if (!measures || !dimensions || !dataset || !encoding) return result;
+    const hasEncoding = (vseed.dimensions || []).some((item)=>item.encoding);
     const datasetList = [];
     const datasetReshapeInfo = [];
     const measureGroups = [];
@@ -5640,6 +5683,7 @@ const pivotReshapeWithDualEncoding = (advancedVSeed, context)=>{
         const secondaryMeasures = measures[1] || [];
         if (primaryMeasures && primaryMeasures.children) {
             const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, primaryMeasures.children, encoding, {
+                colorItemAsId: hasEncoding,
                 foldMeasureValue: `${FoldPrimaryMeasureValue}${index}`,
                 colorMeasureId: getColorMeasureId(advancedVSeed)
             });
@@ -5708,9 +5752,11 @@ const dualAxisConfig = (advancedVSeed, context)=>{
 };
 const dualAxisAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForDualAxis,
     buildMeasuresForDualAxis,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithDualEncoding
     ], [
@@ -6543,11 +6589,9 @@ const registerDualAxis = ()=>{
     Builder._advancedPipelineMap.dualAxis = dualAxisAdvancedPipeline;
     Builder._specPipelineMap.dualAxis = dualAxisSpecPipeline;
 };
-const encodingForPie = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { measures: vseedMeasures = [] } = vseed;
-    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-    const dimensions = getBasicDimensions(vseed);
+const encodingForPie = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
     const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
     const hasMeasureEncoding = measures.some((item)=>item.encoding);
     const encoding = {};
@@ -6582,14 +6626,18 @@ const pie_generateMeasureEncoding = (measures, encoding)=>{
 const pie_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
-    if (0 === encoding.color.length) encoding.color = dimensions.map((item)=>item.id);
+    if (0 === encoding.color.length) encoding.color = [
+        MeasureName
+    ];
     if (0 === encoding.detail.length) encoding.detail = dimensions.map((item)=>item.id);
 };
 const pieAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForPie,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -6705,8 +6753,10 @@ const registerPie = ()=>{
 };
 const donutAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     buildMeasures,
-    autoDimensions_autoDimensions,
     encodingForPie,
     pivotAdapter([
         reshapeWithEncoding
@@ -6783,11 +6833,9 @@ const registerDonut = ()=>{
     Builder._advancedPipelineMap.donut = donutAdvancedPipeline;
     Builder._specPipelineMap.donut = donutSpecPipeline;
 };
-const encodingForRose = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { measures: vseedMeasures = [] } = vseed;
-    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-    const dimensions = getBasicDimensions(vseed);
+const encodingForRose = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
     const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
     const hasMeasureEncoding = measures.some((item)=>item.encoding);
     const encoding = {};
@@ -6828,14 +6876,18 @@ const rose_generateDimensionEncoding = (dimensions, encoding)=>{
     if (0 === encoding.angle.length) encoding.angle = [
         dimensions[0].id
     ];
-    if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.angle?.includes(item.id)).map((item)=>item.id);
+    if (0 === encoding.color.length) encoding.color = [
+        MeasureName
+    ];
     if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.angle?.includes(item.id)).map((item)=>item.id);
 };
 const roseAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForRose,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7031,9 +7083,11 @@ const registerRose = ()=>{
 };
 const roseParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForRose,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7139,11 +7193,9 @@ const registerRoseParallel = ()=>{
     Builder._advancedPipelineMap.roseParallel = roseParallelAdvancedPipeline;
     Builder._specPipelineMap.roseParallel = roseParallelSpecPipeline;
 };
-const encodingForRadar = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { measures: vseedMeasures = [] } = vseed;
-    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-    const dimensions = getBasicDimensions(vseed);
+const encodingForRadar = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
     const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
     const hasMeasureEncoding = measures.some((item)=>item.encoding);
     const encoding = {};
@@ -7183,13 +7235,17 @@ const radar_generateDimensionEncoding = (dimensions, encoding)=>{
     if (0 === encoding.angle.length) encoding.angle = [
         dimensions[0].id
     ];
-    if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.angle?.includes(item.id)).map((item)=>item.id);
+    if (0 === encoding.color.length) encoding.color = [
+        MeasureName
+    ];
 };
 const radarAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForRadar,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7323,11 +7379,9 @@ const registerRadar = ()=>{
     Builder._advancedPipelineMap.radar = radarAdvancedPipeline;
     Builder._specPipelineMap.radar = radarSpecPipeline;
 };
-const encodingForFunnel = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { measures: vseedMeasures = [] } = vseed;
-    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-    const dimensions = getBasicDimensions(vseed);
+const encodingForFunnel = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
     const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
     const hasMeasureEncoding = measures.some((item)=>item.encoding);
     const encoding = {};
@@ -7362,14 +7416,18 @@ const funnel_generateMeasureEncoding = (measures, encoding)=>{
 const funnel_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
-    if (0 === encoding.color.length) encoding.color = dimensions.map((item)=>item.id);
+    if (0 === encoding.color.length) encoding.color = [
+        MeasureName
+    ];
     if (0 === encoding.detail.length) encoding.detail = dimensions.map((item)=>item.id);
 };
 const funnelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForFunnel,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7482,11 +7540,9 @@ const registerFunnel = ()=>{
     Builder._advancedPipelineMap.funnel = funnelAdvancedPipeline;
     Builder._specPipelineMap.funnel = funnelSpecPipeline;
 };
-const encodingForHeatmap = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { measures: vseedMeasures = [] } = vseed;
-    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-    const dimensions = getBasicDimensions(vseed);
+const encodingForHeatmap = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
     const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
     const hasMeasureEncoding = measures.some((item)=>item.encoding);
     const encoding = {};
@@ -7531,14 +7587,18 @@ const heatmap_generateDimensionEncoding = (dimensions, encoding)=>{
     ];
     if (0 === encoding.y.length) if (dimensions.length > 1) encoding.y = dimensions.slice(1).map((item)=>item.id);
     else encoding.y = dimensions.slice(0).map((item)=>item.id);
-    if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+    if (0 === encoding.color.length) encoding.color = [
+        MeasureName
+    ];
     if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
 };
 const heatmapAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForHeatmap,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -8446,7 +8506,9 @@ const zMeasure = z.object({
         'size',
         'color',
         'label',
-        'tooltip'
+        'tooltip',
+        'detail',
+        'column'
     ]).optional(),
     parentId: z.string().optional()
 });