@visactor/vseed 0.1.4 → 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,95 +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`指标名称`,
-        encoding: 'detail'
+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 = {};
@@ -1137,36 +1235,46 @@ 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 onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
     encoding.x = uniqueDimIds.slice(0, 1);
-    encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-    encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
+    encoding.color = uniqueDimIds.slice(1);
     encoding.tooltip = uniqueDimIds;
+    encoding.detail = [];
     encoding.label = [];
     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 || !item.encoding).map((item)=>item.id));
+    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 = 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.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 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;
@@ -1226,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)=>{
@@ -1259,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 = {
@@ -1449,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 {
@@ -1480,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)=>{
@@ -1487,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)
         });
@@ -1695,9 +1715,11 @@ const annotation_annotation = (advancedVSeed, context)=>{
 };
 const lineAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForLine,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -2044,129 +2066,18 @@ const yLinear = (spec, context)=>{
         domainLine: {
             visible: line?.visible,
             style: {
-                lineWidth: line?.lineWidth,
-                stroke: line?.lineColor
-            }
-        },
-        innerOffset: {
-            top: LINEAR_AXIS_INNER_OFFSET_TOP
-        }
-    };
-    result.axes = [
-        ...result.axes,
-        linearAxis
-    ];
-    return result;
-};
-const label_label = (spec, context)=>{
-    const result = {
-        ...spec
-    };
-    const { advancedVSeed } = context;
-    const { measures, datasetReshapeInfo, locale } = advancedVSeed;
-    const { chartType } = advancedVSeed;
-    const baseConfig = advancedVSeed.config[chartType];
-    if (!baseConfig || !baseConfig.label) return result;
-    const { measureId, measureValue } = datasetReshapeInfo[0].foldInfo;
-    const { label } = baseConfig;
-    const { enable } = label;
-    result.label = {
-        visible: enable,
-        formatMethod: (value, datum)=>{
-            const result = [];
-            const formatValue = (value)=>{
-                const id = datum[measureId];
-                const measure = findMeasureById(measures, id);
-                if (!measure) return value;
-                const { format = {}, autoFormat = true } = measure;
-                if (!external_remeda_isEmpty(format)) {
-                    const formatter = createFormatter(format);
-                    return formatter(value);
-                }
-                if (autoFormat) return autoFormatter(value, locale);
-                return String(value);
-            };
-            result.push(formatValue(datum[measureValue]));
-            return result.join(' ');
-        }
-    };
-    return result;
-};
-const tooltip_tooltip = (spec, context)=>{
-    const result = {
-        ...spec
-    };
-    const { advancedVSeed } = context;
-    const { measures, datasetReshapeInfo, chartType, locale, dimensions } = advancedVSeed;
-    const baseConfig = advancedVSeed.config[chartType];
-    const { tooltip = {
-        enable: true
-    } } = baseConfig;
-    const { enable } = tooltip;
-    const { measureId, measureValue, measureName } = datasetReshapeInfo[0].foldInfo;
-    const { encodingColor: colorName } = datasetReshapeInfo[0].unfoldInfo;
-    result.tooltip = {
-        visible: enable,
-        mark: {
-            title: {
-                visible: true
-            },
-            content: [
-                ...dimensions.map((item)=>({
-                        visible: true,
-                        hasShape: true,
-                        shapeType: 'rectRound',
-                        key: (datum)=>{
-                            if (item.alias || item.id) return item.alias || item.id;
-                            return datum && datum[item.id];
-                        },
-                        value: (datum)=>datum && datum[item.id]
-                    })),
-                {
-                    visible: true,
-                    hasShape: true,
-                    key: (datum)=>datum && datum[measureName || colorName] || '',
-                    value: (datum)=>{
-                        if (!datum) return '';
-                        const value = datum[measureValue];
-                        const id = datum[measureId];
-                        const measure = findMeasureById(measures, id);
-                        if (!measure) return String(value);
-                        const { format = {}, autoFormat = true } = measure;
-                        if (!external_remeda_isEmpty(format)) {
-                            const formatter = createFormatter(format);
-                            return formatter(value);
-                        }
-                        if (autoFormat) return autoFormatter(value, locale);
-                        return String(value);
-                    }
-                }
-            ]
+                lineWidth: line?.lineWidth,
+                stroke: line?.lineColor
+            }
         },
-        dimension: {
-            content: [
-                {
-                    visible: true,
-                    key: (datum)=>datum && datum[colorName] || '',
-                    value: (datum)=>{
-                        if (!datum) return '';
-                        const value = datum[measureValue];
-                        const id = datum[measureId];
-                        const measure = findMeasureById(measures, id);
-                        if (!measure) return String(value);
-                        const { format = {}, autoFormat = true } = measure;
-                        if (!external_remeda_isEmpty(format)) {
-                            const formatter = createFormatter(format);
-                            return formatter(value);
-                        }
-                        if (autoFormat) return autoFormatter(value, locale);
-                        return String(value);
-                    },
-                    shapeType: 'rectRound'
-                }
-            ]
+        innerOffset: {
+            top: LINEAR_AXIS_INNER_OFFSET_TOP
         }
     };
+    result.axes = [
+        ...result.axes,
+        linearAxis
+    ];
     return result;
 };
 const verticalCrosshairLine = (spec, context)=>{
@@ -2677,6 +2588,117 @@ const lineStyle_lineStyle = (spec, context)=>{
         }
     };
 };
+const label_label = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { measures, datasetReshapeInfo, locale } = advancedVSeed;
+    const { chartType } = advancedVSeed;
+    const baseConfig = advancedVSeed.config[chartType];
+    if (!baseConfig || !baseConfig.label) return result;
+    const { measureId, measureValue } = datasetReshapeInfo[0].foldInfo;
+    const { label } = baseConfig;
+    const { enable } = label;
+    result.label = {
+        visible: enable,
+        formatMethod: (value, datum)=>{
+            const result = [];
+            const formatValue = (value)=>{
+                const id = datum[measureId];
+                const measure = findMeasureById(measures, id);
+                if (!measure) return value;
+                const { format = {}, autoFormat = true } = measure;
+                if (!external_remeda_isEmpty(format)) {
+                    const formatter = createFormatter(format);
+                    return formatter(value);
+                }
+                if (autoFormat) return autoFormatter(value, locale);
+                return String(value);
+            };
+            result.push(formatValue(datum[measureValue]));
+            return result.join(' ');
+        }
+    };
+    return result;
+};
+const tooltip_tooltip = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { measures, datasetReshapeInfo, chartType, locale, dimensions } = advancedVSeed;
+    const baseConfig = advancedVSeed.config[chartType];
+    const { tooltip = {
+        enable: true
+    } } = baseConfig;
+    const { enable } = tooltip;
+    const { measureId, measureValue, measureName } = datasetReshapeInfo[0].foldInfo;
+    const { encodingColor: colorName } = datasetReshapeInfo[0].unfoldInfo;
+    result.tooltip = {
+        visible: enable,
+        mark: {
+            title: {
+                visible: true
+            },
+            content: [
+                ...dimensions.map((item)=>({
+                        visible: true,
+                        hasShape: true,
+                        shapeType: 'rectRound',
+                        key: (datum)=>{
+                            if (item.alias || item.id) return item.alias || item.id;
+                            return datum && datum[item.id];
+                        },
+                        value: (datum)=>datum && datum[item.id]
+                    })),
+                {
+                    visible: true,
+                    hasShape: true,
+                    key: (datum)=>datum && datum[measureName || colorName] || '',
+                    value: (datum)=>{
+                        if (!datum) return '';
+                        const value = datum[measureValue];
+                        const id = datum[measureId];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!external_remeda_isEmpty(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    }
+                }
+            ]
+        },
+        dimension: {
+            content: [
+                {
+                    visible: true,
+                    key: (datum)=>datum && datum[colorName] || '',
+                    value: (datum)=>{
+                        if (!datum) return '';
+                        const value = datum[measureValue];
+                        const id = datum[measureId];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!external_remeda_isEmpty(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    },
+                    shapeType: 'rectRound'
+                }
+            ]
+        }
+    };
+    return result;
+};
 const isSubset = (sub, obj)=>Object.entries(sub).every(([key, value])=>{
         if ('string' == typeof value) return obj[key] === value;
         if ('number' == typeof value) return obj[key] === value;
@@ -3293,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
@@ -3310,17 +3332,132 @@ 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
         }));
     return {
         ...result,
-        columns: columns
+        columns: columns
+    };
+};
+const pivotDiscreteLegend = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { chartType } = advancedVSeed;
+    const baseConfig = advancedVSeed.config[chartType];
+    if (!baseConfig || !baseConfig.legend) return result;
+    const { datasetReshapeInfo } = advancedVSeed;
+    const colorItems = unique(datasetReshapeInfo.flatMap((d)=>d.unfoldInfo.colorItems));
+    const colorIdMap = datasetReshapeInfo.reduce((prev, cur)=>({
+            ...prev,
+            ...cur.unfoldInfo.colorIdMap
+        }), {});
+    const { legend, color } = baseConfig;
+    const { colorScheme, colorMapping } = color;
+    const colorSpecified = createSpecifiedForColorMapping(colorMapping, colorIdMap, colorItems);
+    const { enable, position = 'bottom', labelFontColor, labelFontSize = 12, labelFontWeight = 400, maxSize = 1, border, shapeType = 'rectRound' } = legend || {};
+    const orient = [
+        'bottom',
+        'bottomLeft',
+        'bottomRight',
+        'bl',
+        'br'
+    ].includes(position) ? 'bottom' : [
+        'top',
+        'topLeft',
+        'topRight',
+        'tl',
+        'tr'
+    ].includes(position) ? 'top' : [
+        'left',
+        'leftTop',
+        'leftBottom',
+        'lt',
+        'lb'
+    ].includes(position) ? 'left' : 'right';
+    const legendPosition = [
+        'topLeft',
+        'bottomLeft',
+        'leftTop',
+        'rightTop',
+        'lt',
+        'rt',
+        'tl',
+        'bl'
+    ].includes(position) ? 'start' : [
+        'topRight',
+        'bottomRight',
+        'leftBottom',
+        'rightBottom',
+        'lb',
+        'rb',
+        'rt',
+        'br'
+    ].includes(position) ? 'end' : 'middle';
+    const legends = {
+        visible: enable,
+        type: 'discrete',
+        orient,
+        position: legendPosition,
+        maxCol: Math.max(1, maxSize),
+        maxRow: Math.max(1, maxSize),
+        data: colorItems.map((d, index)=>{
+            const color = colorSpecified?.[d] ?? colorScheme?.[index % colorScheme.length];
+            return {
+                label: d,
+                shape: {
+                    outerBorder: border ? {
+                        stroke: color,
+                        distance: 3,
+                        lineWidth: 1
+                    } : void 0,
+                    fill: color
+                }
+            };
+        }),
+        item: {
+            focus: true,
+            maxWidth: '30%',
+            focusIconStyle: {
+                size: labelFontSize + 2,
+                fill: labelFontColor,
+                fontWeight: labelFontWeight
+            },
+            shape: {
+                space: border ? 6 : 4,
+                style: {
+                    symbolType: shapeType,
+                    size: border ? 8 : 10
+                }
+            },
+            label: {
+                formatMethod: (value)=>colorIdMap[value] ?? value,
+                style: {
+                    fontSize: labelFontSize,
+                    fill: labelFontColor,
+                    fontWeight: labelFontWeight
+                }
+            },
+            background: {
+                state: {
+                    selectedHover: {
+                        fill: labelFontColor,
+                        fillOpacity: 0.05
+                    }
+                }
+            }
+        }
+    };
+    return {
+        ...result,
+        legends
     };
 };
-const pivotDiscreteLegend = (spec, context)=>{
+const pivotColorLegend = (spec, context)=>{
     const result = {
         ...spec
     };
@@ -3329,15 +3466,11 @@ const pivotDiscreteLegend = (spec, context)=>{
     const baseConfig = advancedVSeed.config[chartType];
     if (!baseConfig || !baseConfig.legend) return result;
     const { datasetReshapeInfo } = advancedVSeed;
-    const colorItems = unique(datasetReshapeInfo.flatMap((d)=>d.unfoldInfo.colorItems));
-    const colorIdMap = datasetReshapeInfo.reduce((prev, cur)=>({
-            ...prev,
-            ...cur.unfoldInfo.colorIdMap
-        }), {});
+    const max = Math.max(...datasetReshapeInfo.map((d)=>d.foldInfo.colorRange[1]));
+    const min = Math.min(...datasetReshapeInfo.map((d)=>d.foldInfo.colorRange[0]));
     const { legend, color } = baseConfig;
-    const { colorScheme, colorMapping } = color;
-    const colorSpecified = createSpecifiedForColorMapping(colorMapping, colorIdMap, colorItems);
-    const { enable, position = 'bottom', labelFontColor, labelFontSize = 12, labelFontWeight = 400, maxSize = 1, border, shapeType = 'rectRound' } = legend || {};
+    const { colorScheme, linearColorScheme } = color;
+    const { enable, position = 'bottom', labelFontColor, labelFontSize = 12, labelFontWeight = 400 } = legend || {};
     const orient = [
         'bottom',
         'bottomLeft',
@@ -3378,55 +3511,31 @@ const pivotDiscreteLegend = (spec, context)=>{
     ].includes(position) ? 'end' : 'middle';
     const legends = {
         visible: enable,
-        type: 'discrete',
+        type: 'color',
         orient,
         position: legendPosition,
-        maxCol: Math.max(1, maxSize),
-        maxRow: Math.max(1, maxSize),
-        data: colorItems.map((d, index)=>{
-            const color = colorSpecified?.[d] ?? colorScheme?.[index % colorScheme.length];
-            return {
-                label: d,
-                shape: {
-                    outerBorder: border ? {
-                        stroke: color,
-                        distance: 3,
-                        lineWidth: 1
-                    } : void 0,
-                    fill: color
-                }
-            };
-        }),
-        item: {
-            focus: true,
-            maxWidth: '30%',
-            focusIconStyle: {
-                size: labelFontSize + 2,
+        colors: linearColorScheme || colorScheme || [],
+        value: [
+            min,
+            max
+        ],
+        min: min,
+        max: max,
+        maxWidth: '30%',
+        startText: {
+            visible: true,
+            style: {
                 fill: labelFontColor,
+                fontSize: labelFontSize,
+                fontWeight: labelFontWeight
+            }
+        },
+        endText: {
+            visible: true,
+            style: {
+                fill: labelFontColor,
+                fontSize: labelFontSize,
                 fontWeight: labelFontWeight
-            },
-            shape: {
-                space: border ? 6 : 4,
-                style: {
-                    symbolType: shapeType,
-                    size: border ? 8 : 10
-                }
-            },
-            label: {
-                formatMethod: (value)=>colorIdMap[value] ?? value,
-                style: {
-                    fontSize: labelFontSize,
-                    fill: labelFontColor,
-                    fontWeight: labelFontWeight
-                }
-            },
-            background: {
-                state: {
-                    selectedHover: {
-                        fill: labelFontColor,
-                        fillOpacity: 0.05
-                    }
-                }
             }
         }
     };
@@ -3449,13 +3558,13 @@ const line_line = [
     progressive,
     xBand,
     yLinear,
-    label_label,
-    tooltip_tooltip,
     verticalCrosshairLine,
     colorAdapter(discreteLegend, colorLegend),
     colorPointStyleFill(pointStyle_pointStyle),
     pointStateDimensionHover,
     colorLineStyleFill(lineStyle_lineStyle),
+    label_label,
+    tooltip_tooltip,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
@@ -3468,18 +3577,18 @@ const pivotLine = [
     datasetPivot,
     pivotIndicators_pivotIndicators([
         initLine,
-        color_color,
+        colorAdapter(color_color, linearColor),
         background_backgroundColor,
         datasetXY,
         progressive,
         xBand,
         yLinear,
-        label_label,
-        tooltip_tooltip,
         verticalCrosshairLine,
-        pointStyle_pointStyle,
+        colorPointStyleFill(pointStyle_pointStyle),
         pointStateDimensionHover,
-        lineStyle_lineStyle,
+        colorLineStyleFill(lineStyle_lineStyle),
+        label_label,
+        tooltip_tooltip,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
@@ -3487,7 +3596,7 @@ const pivotLine = [
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
-    pivotDiscreteLegend
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const lineSpecPipeline = [
     pivotAdapter_pivotAdapter(line_line, pivotLine)
@@ -3496,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 = {};
@@ -3513,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));
@@ -3528,28 +3631,35 @@ 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 || !item.encoding).map((item)=>item.id));
+    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 = 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.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
     ], [
@@ -3852,93 +3962,6 @@ const annotationAreaBand = (spec, context)=>{
         markArea: markArea
     };
 };
-const pivotColorLegend = (spec, context)=>{
-    const result = {
-        ...spec
-    };
-    const { advancedVSeed } = context;
-    const { chartType } = advancedVSeed;
-    const baseConfig = advancedVSeed.config[chartType];
-    if (!baseConfig || !baseConfig.legend) return result;
-    const { datasetReshapeInfo } = advancedVSeed;
-    const max = Math.max(...datasetReshapeInfo.map((d)=>d.foldInfo.colorRange[1]));
-    const min = Math.min(...datasetReshapeInfo.map((d)=>d.foldInfo.colorRange[0]));
-    const { legend, color } = baseConfig;
-    const { colorScheme, linearColorScheme } = color;
-    const { enable, position = 'bottom', labelFontColor, labelFontSize = 12, labelFontWeight = 400 } = legend || {};
-    const orient = [
-        'bottom',
-        'bottomLeft',
-        'bottomRight',
-        'bl',
-        'br'
-    ].includes(position) ? 'bottom' : [
-        'top',
-        'topLeft',
-        'topRight',
-        'tl',
-        'tr'
-    ].includes(position) ? 'top' : [
-        'left',
-        'leftTop',
-        'leftBottom',
-        'lt',
-        'lb'
-    ].includes(position) ? 'left' : 'right';
-    const legendPosition = [
-        'topLeft',
-        'bottomLeft',
-        'leftTop',
-        'rightTop',
-        'lt',
-        'rt',
-        'tl',
-        'bl'
-    ].includes(position) ? 'start' : [
-        'topRight',
-        'bottomRight',
-        'leftBottom',
-        'rightBottom',
-        'lb',
-        'rb',
-        'rt',
-        'br'
-    ].includes(position) ? 'end' : 'middle';
-    const legends = {
-        visible: enable,
-        type: 'color',
-        orient,
-        position: legendPosition,
-        colors: linearColorScheme || colorScheme || [],
-        value: [
-            min,
-            max
-        ],
-        min: min,
-        max: max,
-        maxWidth: '30%',
-        startText: {
-            visible: true,
-            style: {
-                fill: labelFontColor,
-                fontSize: labelFontSize,
-                fontWeight: labelFontWeight
-            }
-        },
-        endText: {
-            visible: true,
-            style: {
-                fill: labelFontColor,
-                fontSize: labelFontSize,
-                fontWeight: labelFontWeight
-            }
-        }
-    };
-    return {
-        ...result,
-        legends
-    };
-};
 const column = [
     initColumn,
     stackCornerRadius_stackCornerRadius,
@@ -3996,9 +4019,11 @@ const registerColumn = ()=>{
 };
 const columnParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForColumn,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4093,9 +4118,11 @@ const registerColumnParallel = ()=>{
 };
 const columnPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForColumn,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4172,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 = {};
@@ -4212,13 +4237,15 @@ const bar_generateMeasureEncoding = (measures, encoding)=>{
     return encoding;
 };
 const bar_generateDimensionEncoding = (dimensions, encoding)=>{
-    encoding.y = unique(dimensions.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+    encoding.y = unique(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
     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.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)=>{
@@ -4239,9 +4266,11 @@ const sortYBandAxis = (advancedVSeed, context)=>{
 };
 const barAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForBar,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4592,9 +4621,11 @@ const registerBar = ()=>{
 };
 const barParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    buildMeasures,
-    autoDimensions_autoDimensions,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForBar,
+    buildMeasures,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4688,9 +4719,11 @@ const registerBarParallel = ()=>{
 };
 const barPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    buildMeasures,
-    autoDimensions_autoDimensions,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForBar,
+    buildMeasures,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4759,9 +4792,11 @@ const registerBarPercent = ()=>{
 };
 const areaAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    encodingForColumn,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
+    encodingForLine,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4917,9 +4952,11 @@ const registerArea = ()=>{
 };
 const areaPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    encodingForColumn,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
+    encodingForLine,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4993,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 = {};
@@ -5033,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)=>{
@@ -5046,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;
 };
@@ -5266,9 +5302,11 @@ const pivotReshapeWithScatterEncoding = (advancedVSeed, context)=>{
 };
 const scatterAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForScatter,
     buildMeasuresForScatter,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithScatterEncoding
     ], [
@@ -5404,7 +5442,7 @@ const pivotScatter = [
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
-    pivotDiscreteLegend
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const scatterSpecPipeline = [
     pivotAdapter_pivotAdapter(scatter, pivotScatter)
@@ -5413,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 = {};
@@ -5453,13 +5489,15 @@ const dualAxis_generateMeasureEncoding = (measures, encoding)=>{
     return encoding;
 };
 const dualAxis_generateDimensionEncoding = (dimensions, encoding)=>{
-    encoding.x = unique(dimensions.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+    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 = 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
+    ];
     if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
 };
 const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
@@ -5472,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;
 };
@@ -5577,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)
         });
@@ -5625,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 = [];
@@ -5643,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)
             });
@@ -5711,9 +5752,11 @@ const dualAxisConfig = (advancedVSeed, context)=>{
 };
 const dualAxisAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForDualAxis,
     buildMeasuresForDualAxis,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithDualEncoding
     ], [
@@ -6546,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 = {};
@@ -6585,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
     ], [
@@ -6607,44 +6652,70 @@ const initPie = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { datasetReshapeInfo, dataset } = advancedVSeed;
+    const { datasetReshapeInfo } = advancedVSeed;
     const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
+    result.type = 'pie';
+    result.outerRadius = 0.8;
+    result.innerRadius = 0;
+    result.valueField = foldInfo.measureValue;
+    result.categoryField = unfoldInfo.encodingColorId;
+    result.padding = 0;
+    result.region = [
+        {
+            clip: true
+        }
+    ];
+    result.animation = true;
+    return result;
+};
+const colorPieStyleFill = (stylePipe)=>(spec, context)=>{
+        const result = stylePipe(spec, context);
+        const { advancedVSeed } = context;
+        const { datasetReshapeInfo } = advancedVSeed;
+        const { unfoldInfo } = datasetReshapeInfo[0];
+        if (isLinearColor(advancedVSeed)) {
+            if (result?.pie?.style) result.pie.style.fill = {
+                field: unfoldInfo.encodingColor,
+                scale: 'color'
+            };
+        }
+        return result;
+    };
+const pieStyle = (spec, context)=>{
+    const { advancedVSeed } = context;
+    const { dataset } = advancedVSeed;
     const showStroke = dataset.length <= 30;
-    result.type = 'pie';
-    result.outerRadius = 0.8;
-    result.innerRadius = 0;
-    result.valueField = foldInfo.measureValue;
-    result.categoryField = unfoldInfo.encodingColorId;
-    result.padding = 0;
-    result.region = [
-        {
-            clip: true
+    const result = {
+        ...spec,
+        pie: {
+            style: {}
         }
-    ];
-    result.pie = {
-        style: {
-            stroke: '#ffffff',
-            lineWidth: showStroke ? 1 : 0,
-            centerOffset: 0
-        },
-        state: {
-            hover: {
-                outerRadius: 1.1 * result.outerRadius
+    };
+    return {
+        ...result,
+        pie: {
+            style: {
+                stroke: '#ffffff',
+                lineWidth: showStroke ? 1 : 0
+            },
+            state: {
+                hover: {
+                    outerRadius: 1.1 * result.outerRadius
+                }
             }
         }
     };
-    result.animation = true;
-    return result;
 };
 const pie = [
     initPie,
-    color_color,
+    colorAdapter(color_color, linearColor),
     background_backgroundColor,
     datasetXY,
     progressive,
+    colorPieStyleFill(pieStyle),
+    colorAdapter(discreteLegend, colorLegend),
     label_label,
     tooltip_tooltip,
-    discreteLegend,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
@@ -6657,10 +6728,11 @@ const pivotPie = [
     datasetPivot,
     pivotIndicators_pivotIndicators([
         initPie,
-        color_color,
+        colorAdapter(color_color, linearColor),
         background_backgroundColor,
         datasetXY,
         progressive,
+        colorPieStyleFill(pieStyle),
         label_label,
         tooltip_tooltip,
         annotationPoint_annotationPoint,
@@ -6670,7 +6742,7 @@ const pivotPie = [
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
-    pivotDiscreteLegend
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const pieSpecPipeline = [
     pivotAdapter_pivotAdapter(pie, pivotPie)
@@ -6681,8 +6753,10 @@ const registerPie = ()=>{
 };
 const donutAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     buildMeasures,
-    autoDimensions_autoDimensions,
     encodingForPie,
     pivotAdapter([
         reshapeWithEncoding
@@ -6698,9 +6772,8 @@ const initDonut = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { datasetReshapeInfo, dataset } = advancedVSeed;
+    const { datasetReshapeInfo } = advancedVSeed;
     const { foldInfo, unfoldInfo } = datasetReshapeInfo[0];
-    const showStroke = dataset.length <= 30;
     result.type = 'pie';
     result.outerRadius = 0.8;
     result.innerRadius = 0.8 * result.outerRadius;
@@ -6712,29 +6785,19 @@ const initDonut = (spec, context)=>{
             clip: true
         }
     ];
-    result.pie = {
-        style: {
-            stroke: '#ffffff',
-            lineWidth: showStroke ? 1 : 0
-        },
-        state: {
-            hover: {
-                outerRadius: 1.1 * result.outerRadius
-            }
-        }
-    };
     result.animation = true;
     return result;
 };
 const donut = [
     initDonut,
-    color_color,
+    colorAdapter(color_color, linearColor),
     background_backgroundColor,
     datasetXY,
     progressive,
     label_label,
+    colorPieStyleFill(pieStyle),
+    colorAdapter(discreteLegend, colorLegend),
     tooltip_tooltip,
-    discreteLegend,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
@@ -6747,11 +6810,12 @@ const pivotDonut = [
     datasetPivot,
     pivotIndicators_pivotIndicators([
         initDonut,
-        color_color,
+        colorAdapter(color_color, linearColor),
         background_backgroundColor,
         datasetXY,
         progressive,
         label_label,
+        colorPieStyleFill(pieStyle),
         tooltip_tooltip,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
@@ -6760,7 +6824,7 @@ const pivotDonut = [
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
-    pivotDiscreteLegend
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const donutSpecPipeline = [
     pivotAdapter_pivotAdapter(donut, pivotDonut)
@@ -6769,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 = {};
@@ -6808,20 +6870,24 @@ const rose_generateMeasureEncoding = (measures, encoding)=>{
     if (color.length > 0) encoding.color = color;
 };
 const rose_generateDimensionEncoding = (dimensions, encoding)=>{
-    encoding.angle = unique(dimensions.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
+    encoding.angle = unique(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
     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.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
     ], [
@@ -6848,18 +6914,6 @@ const initRose = (spec, context)=>{
     result.innerRadius = 0;
     const hasNegativeValue = dataset.flat().find((d)=>d[foldInfo.measureValue] < 0);
     if (hasNegativeValue) result.innerRadius = 0.05;
-    result.rose = {
-        style: {
-            stroke: '#ffffff',
-            lineWidth: 1
-        },
-        state: {
-            hover: {
-                lineWidth: 1,
-                fillOpacity: 0.6
-            }
-        }
-    };
     result.region = [
         {
             clip: true
@@ -6868,7 +6922,7 @@ const initRose = (spec, context)=>{
     result.animation = true;
     return result;
 };
-const radiusAxis = (spec, context)=>{
+const angleAxis = (spec, context)=>{
     const result = {
         ...spec
     };
@@ -6880,26 +6934,37 @@ const radiusAxis = (spec, context)=>{
     const showAxis = !(is0D || is1M1D);
     if (!result.axes) result.axes = [];
     result.axes.push({
-        orient: 'radius',
+        orient: 'angle',
         visible: showAxis,
         zero: true,
         nice: !!showAxis,
+        paddingInner: showAxis ? [
+            0.15,
+            0.1
+        ] : [
+            0,
+            0
+        ],
+        paddingOuter: showAxis ? [
+            0.075,
+            0.1
+        ] : [
+            0,
+            0
+        ],
         grid: {
             visible: showAxis
         },
-        tick: {
-            visible: showAxis
-        },
-        label: {
+        domainLine: {
             visible: showAxis
         },
-        domainLine: {
+        tick: {
             visible: showAxis
         }
     });
     return result;
 };
-const angleAxis = (spec, context)=>{
+const radiusAxis = (spec, context)=>{
     const result = {
         ...spec
     };
@@ -6911,50 +6976,79 @@ const angleAxis = (spec, context)=>{
     const showAxis = !(is0D || is1M1D);
     if (!result.axes) result.axes = [];
     result.axes.push({
-        orient: 'angle',
+        orient: 'radius',
         visible: showAxis,
         zero: true,
         nice: !!showAxis,
-        paddingInner: showAxis ? [
-            0.15,
-            0.1
-        ] : [
-            0,
-            0
-        ],
-        paddingOuter: showAxis ? [
-            0.075,
-            0.1
-        ] : [
-            0,
-            0
-        ],
         grid: {
             visible: showAxis
         },
-        domainLine: {
+        tick: {
             visible: showAxis
         },
-        tick: {
+        label: {
+            visible: showAxis
+        },
+        domainLine: {
             visible: showAxis
         }
     });
     return result;
 };
+const colorRoseStyleFill = (stylePipe)=>(spec, context)=>{
+        const result = stylePipe(spec, context);
+        const { advancedVSeed } = context;
+        const { datasetReshapeInfo } = advancedVSeed;
+        const { unfoldInfo } = datasetReshapeInfo[0];
+        if (isLinearColor(advancedVSeed)) {
+            if (result?.rose?.style) result.rose.style.fill = {
+                field: unfoldInfo.encodingColor,
+                scale: 'color'
+            };
+        }
+        return result;
+    };
+const roseStyle = (spec, context)=>{
+    const { advancedVSeed } = context;
+    const { dataset } = advancedVSeed;
+    const showStroke = dataset.length <= 30;
+    const result = {
+        ...spec,
+        rose: {
+            style: {}
+        }
+    };
+    return {
+        ...result,
+        rose: {
+            style: {
+                stroke: '#ffffff',
+                lineWidth: showStroke ? 1 : 0
+            },
+            state: {
+                hover: {
+                    lineWidth: 1,
+                    fillOpacity: 0.6
+                }
+            }
+        }
+    };
+};
 const rose = [
     initRose,
     stackCornerRadius_stackCornerRadius,
     stackInverse,
-    color_color,
+    colorAdapter(color_color, linearColor),
     background_backgroundColor,
     datasetXY,
     progressive,
-    radiusAxis,
     angleAxis,
-    label_label,
-    tooltip_tooltip,
+    radiusAxis,
     verticalCrosshairRect,
-    discreteLegend
+    colorRoseStyleFill(roseStyle),
+    colorAdapter(discreteLegend, colorLegend),
+    label_label,
+    tooltip_tooltip
 ];
 const pivotRose = [
     initPivot,
@@ -6965,19 +7059,20 @@ const pivotRose = [
         initRose,
         stackCornerRadius_stackCornerRadius,
         stackInverse,
-        color_color,
+        colorAdapter(color_color, linearColor),
         background_backgroundColor,
         datasetXY,
         progressive,
         radiusAxis,
         angleAxis,
+        verticalCrosshairRect,
+        colorRoseStyleFill(roseStyle),
         label_label,
-        tooltip_tooltip,
-        verticalCrosshairRect
+        tooltip_tooltip
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
-    pivotDiscreteLegend
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const roseSpecPipeline = [
     pivotAdapter_pivotAdapter(rose, pivotRose)
@@ -6988,9 +7083,11 @@ const registerRose = ()=>{
 };
 const roseParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
     encodingForRose,
     buildMeasures,
-    autoDimensions_autoDimensions,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7046,15 +7143,16 @@ const initRoseParallel = (spec, context)=>{
 const roseParallel = [
     initRoseParallel,
     stackCornerRadius_stackCornerRadius,
-    color_color,
+    colorAdapter(color_color, linearColor),
     background_backgroundColor,
     datasetXY,
     progressive,
     radiusAxis,
     angleAxis,
+    colorRoseStyleFill(roseStyle),
+    colorAdapter(discreteLegend, colorLegend),
     label_label,
     tooltip_tooltip,
-    discreteLegend,
     verticalCrosshairRect,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
@@ -7069,15 +7167,16 @@ const pivotRoseParallel = [
     pivotIndicators_pivotIndicators([
         initRoseParallel,
         stackCornerRadius_stackCornerRadius,
-        color_color,
+        colorAdapter(color_color, linearColor),
         background_backgroundColor,
         datasetXY,
         progressive,
         radiusAxis,
         angleAxis,
+        verticalCrosshairRect,
+        colorRoseStyleFill(roseStyle),
         label_label,
         tooltip_tooltip,
-        verticalCrosshairRect,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
@@ -7085,7 +7184,7 @@ const pivotRoseParallel = [
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
-    pivotDiscreteLegend
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const roseParallelSpecPipeline = [
     pivotAdapter_pivotAdapter(roseParallel, pivotRoseParallel)
@@ -7094,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 = {};
@@ -7116,12 +7213,11 @@ const radar_generateDefaultMeasureEncoding = (measures, encoding)=>{
     encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const radar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
-    const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
     encoding.angle = uniqueDimIds.slice(0, 1);
-    encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-    encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
+    encoding.color = uniqueDimIds.slice(1);
     encoding.tooltip = uniqueDimIds;
+    encoding.detail = [];
     encoding.label = [];
     encoding.row = [];
     encoding.column = [];
@@ -7133,20 +7229,23 @@ const radar_generateMeasureEncoding = (measures, encoding)=>{
     if (color.length > 0) encoding.color = color;
 };
 const radar_generateDimensionEncoding = (dimensions, encoding)=>{
-    encoding.angle = unique(dimensions.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
+    encoding.angle = unique(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
     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));
+    encoding.detail = [];
     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.detail.length) encoding.detail = 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
     ], [
@@ -7280,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 = {};
@@ -7319,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
     ], [
@@ -7356,34 +7457,55 @@ const initFunnel = (spec, context)=>{
             clip: true
         }
     ];
-    result.funnel = {
-        style: {
-            cornerRadius: 4,
-            fill: {
-                field: unfoldInfo.encodingColorId,
-                scale: 'color'
-            }
-        },
-        state: {
-            hover: {
-                fillOpacity: 0.6
-            }
-        }
-    };
     result.transformLabel = {
         visible: true
     };
     result.animation = true;
     return result;
 };
+const colorFunnelStyleFill = (stylePipe)=>(spec, context)=>{
+        const result = stylePipe(spec, context);
+        const { advancedVSeed } = context;
+        const { datasetReshapeInfo } = advancedVSeed;
+        const { unfoldInfo } = datasetReshapeInfo[0];
+        if (isLinearColor(advancedVSeed)) {
+            if (result?.funnel?.style) result.funnel.style.fill = {
+                field: unfoldInfo.encodingColor,
+                scale: 'color'
+            };
+        }
+        return result;
+    };
+const funnelStyle = (spec)=>{
+    const result = {
+        ...spec,
+        funnel: {
+            style: {}
+        }
+    };
+    return {
+        ...result,
+        funnel: {
+            style: {
+                cornerRadius: 4
+            },
+            state: {
+                hover: {
+                    fillOpacity: 0.6
+                }
+            }
+        }
+    };
+};
 const funnel = [
     initFunnel,
     background_backgroundColor,
     datasetXY,
-    color_color,
+    colorAdapter(color_color, linearColor),
     label_label,
+    colorAdapter(discreteLegend, colorLegend),
+    colorFunnelStyleFill(funnelStyle),
     tooltip_tooltip,
-    discreteLegend,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
@@ -7398,17 +7520,18 @@ const pivotFunnel = [
         initFunnel,
         background_backgroundColor,
         datasetXY,
-        color_color,
+        colorAdapter(color_color, linearColor),
         label_label,
         tooltip_tooltip,
-        discreteLegend,
+        colorFunnelStyleFill(funnelStyle),
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
         annotationArea_annotationArea
     ]),
     pivotRowDimensions,
-    pivotColumnDimensions
+    pivotColumnDimensions,
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const funnelSpecPipeline = [
     pivotAdapter_pivotAdapter(funnel, pivotFunnel)
@@ -7417,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 = {};
@@ -7466,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
     ], [
@@ -7495,6 +7620,37 @@ const labelColorInversion = (spec)=>{
     };
     return result;
 };
+const colorCellStyleFill = (stylePipe)=>(spec, context)=>{
+        const result = stylePipe(spec, context);
+        const { advancedVSeed } = context;
+        const { datasetReshapeInfo } = advancedVSeed;
+        const { unfoldInfo } = datasetReshapeInfo[0];
+        if (isLinearColor(advancedVSeed)) {
+            if (result?.cell?.style) result.cell.style.fill = {
+                field: unfoldInfo.encodingColor,
+                scale: 'color'
+            };
+        }
+        return result;
+    };
+const cellStyle = (spec)=>{
+    const result = {
+        ...spec,
+        cell: {
+            style: {}
+        }
+    };
+    return {
+        ...result,
+        cell: {
+            style: {
+                shape: 'rect',
+                stroke: '#ffffff',
+                lineWidth: 1
+            }
+        }
+    };
+};
 const initHeatmap = (spec, context)=>{
     const result = {
         ...spec
@@ -7509,13 +7665,6 @@ const initHeatmap = (spec, context)=>{
     result.seriesField = unfoldInfo.encodingColorId;
     result.valueField = foldInfo.measureValue;
     result.padding = 0;
-    result.cell = {
-        style: {
-            shape: 'rect',
-            stroke: '#ffffff',
-            lineWidth: 1
-        }
-    };
     result.axes = [
         {
             type: 'band',
@@ -7540,14 +7689,12 @@ const heatmap = [
     initHeatmap,
     background_backgroundColor,
     datasetXY,
-    color_color,
+    colorAdapter(color_color, linearColor),
     label_label,
     labelColorInversion,
-    discreteLegend,
+    colorAdapter(discreteLegend, colorLegend),
+    colorCellStyleFill(cellStyle),
     tooltip_tooltip,
-    pointStyle_pointStyle,
-    pointStateDimensionHover,
-    lineStyle_lineStyle,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
@@ -7562,21 +7709,20 @@ const pivotHeatmap = [
         initHeatmap,
         background_backgroundColor,
         datasetXY,
-        color_color,
+        colorAdapter(color_color, linearColor),
         label_label,
         labelColorInversion,
         discreteLegend,
         tooltip_tooltip,
-        pointStyle_pointStyle,
-        pointStateDimensionHover,
-        lineStyle_lineStyle,
+        colorCellStyleFill(cellStyle),
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
         annotationArea_annotationArea
     ]),
     pivotRowDimensions,
-    pivotColumnDimensions
+    pivotColumnDimensions,
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const heatmapSpecPipeline = [
     pivotAdapter_pivotAdapter(heatmap, pivotHeatmap)
@@ -8360,7 +8506,9 @@ const zMeasure = z.object({
         'size',
         'color',
         'label',
-        'tooltip'
+        'tooltip',
+        'detail',
+        'column'
     ]).optional(),
     parentId: z.string().optional()
 });