@visactor/vseed 0.1.3 → 0.1.5

package/dist/index.js

@@ -1,4 +1,4 @@
-import { clone, groupBy, isArray, isEmpty, isNullish, isNumber, isObjectType, isString, merge, mergeDeep, omit, pick, sort, unique } from "remeda";
+import { clone, groupBy, isArray, isEmpty as external_remeda_isEmpty, isNullish, isNumber, isObjectType, isString, merge, mergeDeep, omit, pick, sort, unique, uniqueBy } from "remeda";
 import { z } from "zod";
 const execPipeline = (pipeline, context, initialValue = {})=>{
     const result = pipeline.reduce((prev, cur)=>cur(prev, context), initialValue);
@@ -519,7 +519,7 @@ const measureTreeToColumns = (spec, context)=>{
 const fieldFormat = (node, locale)=>(datum)=>{
         const { format = {}, autoFormat = true, id } = node;
         const value = datum[id];
-        if (!isEmpty(format)) {
+        if (!external_remeda_isEmpty(format)) {
             const formatter = createFormatter(format);
             return formatter(value);
         }
@@ -882,7 +882,7 @@ const pivotIndicators = (spec, context)=>{
 };
 const pivotIndicators_fieldFormat = (node, locale)=>(value)=>{
         const { format = {}, autoFormat = true } = node;
-        if (!isEmpty(format)) {
+        if (!external_remeda_isEmpty(format)) {
             const formatter = createFormatter(format);
             return formatter(value);
         }
@@ -1036,6 +1036,56 @@ 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`指标名称`
+    };
+    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;
+    }
+    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]) && ![
+            '',
+            null,
+            void 0
+        ].includes(key)).map((dim)=>({
+            id: dim,
+            alias: dim,
+            location: 'dimension'
+        }));
+    basicDimensions.push(MeaName);
+    return basicDimensions;
+};
 const getBasicMeasures = (vseed)=>{
     const { dataset, measures } = vseed;
     if (!measures || 0 === measures.length) return generateMeasuresByDataset(dataset);
@@ -1069,6 +1119,52 @@ const isMeasureTreeWithParentId = (vseed)=>{
     if (!measures) return false;
     return measures.some((measure)=>'parentId' in measure);
 };
+const encodingForLine = (advancedVSeed, context)=>{
+    const { vseed } = context;
+    const { measures: vseedMeasures = [] } = vseed;
+    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
+    const dimensions = getBasicDimensions(vseed);
+    const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+    const hasMeasureEncoding = measures.some((item)=>item.encoding);
+    const encoding = {};
+    if (hasDimensionEncoding) generateDimensionEncoding(dimensions, encoding);
+    else generateDefaultDimensionEncoding(dimensions, encoding);
+    if (hasMeasureEncoding) generateMeasureEncoding(measures, encoding);
+    else generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
+    };
+};
+const generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = unique(measures.map((item)=>item.id));
+    encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const generateDefaultDimensionEncoding = (dimensions, encoding)=>{
+    const uniqueDimIds = unique(dimensions.map((d)=>d.id));
+    encoding.x = uniqueDimIds.slice(0, 1);
+    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).map((item)=>item.id));
+    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    encoding.detail = [];
+    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);
+};
 const measureDepth = (measures = [])=>{
     if (!measures) return 0;
     let depth = 1;
@@ -1089,7 +1185,7 @@ const isPivotChart = (vseed)=>{
     if (isVTable(vseed)) return false;
     if (isMeasureTreeWithParentId(vseed)) {
         const parentIds = vseed.measures?.map((measure)=>measure.parentId);
-        return parentIds && parentIds.length > 1;
+        return parentIds && unique(parentIds).length > 1;
     }
     if ('dualAxis' === vseed.chartType || 'scatter' === vseed.chartType) {
         const { dimensions = [] } = vseed;
@@ -1160,22 +1256,6 @@ const basicMeasuresToMeasureTree = (measures)=>{
         }
     ];
 };
-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 autoDimensions_autoDimensions = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
@@ -1215,52 +1295,13 @@ const autoDimensions_autoDimensions = (advancedVSeed, context)=>{
     result.dimensions.push(MeaName);
     return result;
 };
-const encodingForLine = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { dimensions } = advancedVSeed;
-    if (!dimensions) return advancedVSeed;
-    const encoding = vseed.encoding;
-    if (encoding) {
-        const x = encoding.x || [
-            dimensions[0].id
-        ];
-        const color = encoding.color || [
-            (dimensions[1] || dimensions[0]).id
-        ];
-        const detail = encoding.detail || [];
-        const mergedDetail = 0 === detail.length ? dimensions.map((d)=>d.id).filter((id)=>!x.includes(id)) : encoding.detail;
-        return {
-            ...advancedVSeed,
-            encoding: {
-                ...encoding,
-                x,
-                color,
-                detail: mergedDetail
-            }
-        };
-    }
-    const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
-    const mergedEncoding = {
-        x: dimensions.slice(0, 1).map((item)=>item.id),
-        color: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
-        detail: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
-        tooltip: dimensions.map((item)=>item.id),
-        label: [],
-        row: [],
-        column: []
-    };
-    return {
-        ...advancedVSeed,
-        encoding: mergedEncoding
-    };
-};
 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, encoding, options)=>{
+const foldMeasures = (dataset, measures, options)=>{
     const { measureId, measureName, measureValue, colorMeasureId } = options || {};
     const foldInfo = {
         measureId,
@@ -1361,7 +1402,7 @@ const applyEncoding = (encoding, dimensions, datum, separator)=>{
 };
 const dataReshapeByEncoding = (dataset, dimensions, measures, encoding, options)=>{
     const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, colorItemAsId = false, colorMeasureId } = options || {};
-    const { dataset: foldedDataset, foldInfo } = foldMeasures(dataset, measures, encoding, {
+    const { dataset: foldedDataset, foldInfo } = foldMeasures(dataset, measures, {
         measureId: foldMeasureId,
         measureName: foldMeasureName,
         measureValue: foldMeasureValue,
@@ -1405,7 +1446,7 @@ const reshapeWithEncoding = (advancedVSeed, context)=>{
     const { dimensions, measures, encoding } = advancedVSeed;
     if (!measures || !dimensions || !dataset || !encoding) return result;
     if (0 === measures.length) throw new Error('measures can not be empty');
-    const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, measures, encoding, {
+    const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, uniqueBy(dimensions, (item)=>item.id), uniqueBy(findAllMeasures(measures), (item)=>item.id), encoding, {
         colorMeasureId: getColorMeasureId(advancedVSeed)
     });
     return {
@@ -1442,7 +1483,7 @@ const pivotReshapeWithEncoding = (advancedVSeed, context)=>{
         const measures = measureGroup.children;
         if (!measures) return;
         const groupId = measureGroup.id;
-        const { dataset: newSubDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, measures, encoding, {
+        const { dataset: newSubDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, uniqueBy(dimensions, (item)=>item.id), uniqueBy(measures, (item)=>item.id), encoding, {
             foldMeasureValue: `${FoldMeasureValue}${groupId}`,
             colorMeasureId: getColorMeasureId(advancedVSeed)
         });
@@ -1651,9 +1692,9 @@ const annotation_annotation = (advancedVSeed, context)=>{
 };
 const lineAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForLine,
     buildMeasures,
     autoDimensions_autoDimensions,
-    encodingForLine,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -2014,117 +2055,6 @@ const yLinear = (spec, context)=>{
     ];
     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 (!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 (!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 (!isEmpty(format)) {
-                            const formatter = createFormatter(format);
-                            return formatter(value);
-                        }
-                        if (autoFormat) return autoFormatter(value, locale);
-                        return String(value);
-                    },
-                    shapeType: 'rectRound'
-                }
-            ]
-        }
-    };
-    return result;
-};
 const verticalCrosshairLine = (spec, context)=>{
     const result = {
         ...spec
@@ -2633,72 +2563,183 @@ const lineStyle_lineStyle = (spec, context)=>{
         }
     };
 };
-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;
-        return true;
-    });
-const annotationPoint_annotationPoint = (spec, context)=>{
+const label_label = (spec, context)=>{
+    const result = {
+        ...spec
+    };
     const { advancedVSeed } = context;
-    const { annotation } = advancedVSeed;
-    if (!annotation || !annotation.annotationPoint) return spec;
-    const { annotationPoint } = annotation;
-    const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [
-        annotationPoint
-    ];
-    const markPoint = annotationPointList.flatMap((annotationPoint)=>{
-        const { selector: selectorPoint, text = '', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'center', textBaseline = 'top', textBackgroundBorderColor, textBackgroundBorderRadius = 4, textBackgroundBorderWidth = 1, textBackgroundColor = '#212121', textBackgroundPadding = 2, textBackgroundVisible = true, offsetX = 0, offsetY = 0 } = annotationPoint;
-        const dataset = advancedVSeed.dataset.flat();
-        const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
-        return selectedData.map((datum)=>({
-                zIndex: ANNOTATION_Z_INDEX,
-                regionRelative: true,
-                position: (data, context)=>{
-                    const targetDatum = data.find((item)=>isSubset(datum, item));
-                    if (targetDatum) {
-                        const { x, y } = context.dataToPosition(targetDatum);
-                        return {
-                            x,
-                            y
-                        };
-                    }
-                },
-                itemLine: {
-                    visible: false
-                },
-                itemContent: {
-                    offsetY,
-                    offsetX,
-                    text: {
-                        text: text,
-                        style: {
-                            visible: true,
-                            textAlign: textAlign,
-                            textBaseline: textBaseline,
-                            fill: textColor,
-                            stroke: textBackgroundColor,
-                            lineWidth: 1,
-                            fontSize: textFontSize,
-                            fontWeight: textFontWeight,
-                            dy: textFontSize
-                        },
-                        labelBackground: {
-                            visible: textBackgroundVisible,
-                            padding: textBackgroundPadding,
-                            style: {
-                                cornerRadius: textBackgroundBorderRadius ?? 4,
-                                fill: textBackgroundColor,
-                                stroke: textBackgroundBorderColor,
-                                lineWidth: textBackgroundBorderWidth,
-                                dy: textFontSize
-                            }
-                        }
-                    }
-                }
-            }));
-    });
-    return {
-        ...spec,
+    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;
+        return true;
+    });
+const annotationPoint_annotationPoint = (spec, context)=>{
+    const { advancedVSeed } = context;
+    const { annotation } = advancedVSeed;
+    if (!annotation || !annotation.annotationPoint) return spec;
+    const { annotationPoint } = annotation;
+    const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [
+        annotationPoint
+    ];
+    const markPoint = annotationPointList.flatMap((annotationPoint)=>{
+        const { selector: selectorPoint, text = '', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'center', textBaseline = 'top', textBackgroundBorderColor, textBackgroundBorderRadius = 4, textBackgroundBorderWidth = 1, textBackgroundColor = '#212121', textBackgroundPadding = 2, textBackgroundVisible = true, offsetX = 0, offsetY = 0 } = annotationPoint;
+        const dataset = advancedVSeed.dataset.flat();
+        const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
+        return selectedData.map((datum)=>({
+                zIndex: ANNOTATION_Z_INDEX,
+                regionRelative: true,
+                position: (data, context)=>{
+                    const targetDatum = data.find((item)=>isSubset(datum, item));
+                    if (targetDatum) {
+                        const { x, y } = context.dataToPosition(targetDatum);
+                        return {
+                            x,
+                            y
+                        };
+                    }
+                },
+                itemLine: {
+                    visible: false
+                },
+                itemContent: {
+                    offsetY,
+                    offsetX,
+                    text: {
+                        text: text,
+                        style: {
+                            visible: true,
+                            textAlign: textAlign,
+                            textBaseline: textBaseline,
+                            fill: textColor,
+                            stroke: textBackgroundColor,
+                            lineWidth: 1,
+                            fontSize: textFontSize,
+                            fontWeight: textFontWeight,
+                            dy: textFontSize
+                        },
+                        labelBackground: {
+                            visible: textBackgroundVisible,
+                            padding: textBackgroundPadding,
+                            style: {
+                                cornerRadius: textBackgroundBorderRadius ?? 4,
+                                fill: textBackgroundColor,
+                                stroke: textBackgroundBorderColor,
+                                lineWidth: textBackgroundBorderWidth,
+                                dy: textFontSize
+                            }
+                        }
+                    }
+                }
+            }));
+    });
+    return {
+        ...spec,
         markPoint
     };
 };
@@ -3391,6 +3432,93 @@ const pivotDiscreteLegend = (spec, context)=>{
         legends
     };
 };
+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 pivotAdapter_pivotAdapter = (pipeline, pivotPipeline)=>(spec, context)=>{
         const { vseed } = context;
         const usePivotChart = isPivotChart(vseed);
@@ -3405,13 +3533,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,
@@ -3424,18 +3552,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,
@@ -3443,7 +3571,7 @@ const pivotLine = [
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
-    pivotDiscreteLegend
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const lineSpecPipeline = [
     pivotAdapter_pivotAdapter(line_line, pivotLine)
@@ -3454,51 +3582,58 @@ const registerLine = ()=>{
 };
 const encodingForColumn = (advancedVSeed, context)=>{
     const { vseed } = context;
-    const { dimensions } = advancedVSeed;
-    if (!dimensions) return advancedVSeed;
-    const encoding = vseed.encoding;
-    if (encoding) {
-        const x = encoding.x || [
-            dimensions[0].id
-        ];
-        const color = encoding.color || [
-            (dimensions[1] || dimensions[0]).id
-        ];
-        const detail = encoding.detail || [];
-        const mergedDetail = 0 === detail.length ? unique([
-            ...color,
-            ...detail
-        ]) : detail;
-        return {
-            ...advancedVSeed,
-            encoding: {
-                ...encoding,
-                x,
-                color,
-                detail: mergedDetail
-            }
-        };
-    }
-    const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
-    const mergedEncoding = {
-        x: dimensions.slice(0, 1).map((item)=>item.id),
-        color: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
-        detail: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
-        tooltip: dimensions.map((item)=>item.id),
-        label: [],
-        row: [],
-        column: []
-    };
+    const { measures: vseedMeasures = [] } = vseed;
+    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
+    const dimensions = getBasicDimensions(vseed);
+    const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+    const hasMeasureEncoding = measures.some((item)=>item.encoding);
+    const encoding = {};
+    if (hasDimensionEncoding) column_generateDimensionEncoding(dimensions, encoding);
+    else column_generateDefaultDimensionEncoding(dimensions, encoding);
+    if (hasMeasureEncoding) column_generateMeasureEncoding(measures, encoding);
+    else column_generateDefaultMeasureEncoding(measures, encoding);
     return {
         ...advancedVSeed,
-        encoding: mergedEncoding
+        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));
+    encoding.x = uniqueDimIds.slice(0, 1);
+    encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
+    encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
+    encoding.tooltip = uniqueDimIds;
+    encoding.label = [];
+    encoding.row = [];
+    encoding.column = [];
+};
+const column_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = color;
+    return encoding;
+};
+const column_generateDimensionEncoding = (dimensions, encoding)=>{
+    encoding.x = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
+    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    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);
+};
 const columnAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForColumn,
     buildMeasures,
     autoDimensions_autoDimensions,
-    encodingForColumn,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -3801,93 +3936,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,
@@ -3945,9 +3993,9 @@ const registerColumn = ()=>{
 };
 const columnParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForColumn,
     buildMeasures,
     autoDimensions_autoDimensions,
-    encodingForColumn,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4042,9 +4090,9 @@ const registerColumnParallel = ()=>{
 };
 const columnPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForColumn,
     buildMeasures,
     autoDimensions_autoDimensions,
-    encodingForColumn,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4123,46 +4171,53 @@ const registerColumnPercent = ()=>{
 };
 const encodingForBar = (advancedVSeed, context)=>{
     const { vseed } = context;
-    const { dimensions } = advancedVSeed;
-    if (!dimensions) return advancedVSeed;
-    const encoding = vseed.encoding;
-    if (encoding) {
-        const y = encoding.y || [
-            dimensions[0].id
-        ];
-        const color = encoding.color || [
-            (dimensions[1] || dimensions[0]).id
-        ];
-        const detail = encoding.detail || [];
-        const mergedDetail = 0 === detail.length ? unique([
-            ...color,
-            ...detail
-        ]) : detail;
-        return {
-            ...advancedVSeed,
-            encoding: {
-                ...encoding,
-                y,
-                color,
-                detail: mergedDetail
-            }
-        };
-    }
-    const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
-    const mergedEncoding = {
-        y: dimensions.slice(0, 1).map((item)=>item.id),
-        color: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
-        detail: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
-        tooltip: dimensions.map((item)=>item.id),
-        label: [],
-        row: [],
-        column: []
-    };
+    const { measures: vseedMeasures = [] } = vseed;
+    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
+    const dimensions = getBasicDimensions(vseed);
+    const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+    const hasMeasureEncoding = measures.some((item)=>item.encoding);
+    const encoding = {};
+    if (hasDimensionEncoding) bar_generateDimensionEncoding(dimensions, encoding);
+    else bar_generateDefaultDimensionEncoding(dimensions, encoding);
+    if (hasMeasureEncoding) bar_generateMeasureEncoding(measures, encoding);
+    else bar_generateDefaultMeasureEncoding(measures, encoding);
     return {
         ...advancedVSeed,
-        encoding: mergedEncoding
+        encoding
     };
 };
+const bar_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = unique(measures.map((item)=>item.id));
+    encoding.x = unique(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const bar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
+    const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
+    const uniqueDimIds = unique(dimensions.map((d)=>d.id));
+    encoding.y = uniqueDimIds.slice(0, 1);
+    encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
+    encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
+    encoding.tooltip = uniqueDimIds;
+    encoding.label = [];
+    encoding.row = [];
+    encoding.column = [];
+};
+const bar_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.x = unique(measures.filter((item)=>'xAxis' === 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 bar_generateDimensionEncoding = (dimensions, encoding)=>{
+    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.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.y?.includes(item.id)).map((item)=>item.id);
+};
 const sortYBandAxis = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
@@ -4181,9 +4236,9 @@ const sortYBandAxis = (advancedVSeed, context)=>{
 };
 const barAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForBar,
     buildMeasures,
     autoDimensions_autoDimensions,
-    encodingForBar,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4701,9 +4756,9 @@ const registerBarPercent = ()=>{
 };
 const areaAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForLine,
     buildMeasures,
     autoDimensions_autoDimensions,
-    encodingForColumn,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4859,9 +4914,9 @@ const registerArea = ()=>{
 };
 const areaPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForLine,
     buildMeasures,
     autoDimensions_autoDimensions,
-    encodingForColumn,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4935,6 +4990,49 @@ 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 hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+    const hasMeasureEncoding = measures.some((item)=>item.encoding);
+    const encoding = {};
+    if (hasDimensionEncoding) scatter_generateDimensionEncoding(dimensions, encoding);
+    else scatter_generateDefaultDimensionEncoding(dimensions, encoding);
+    if (hasMeasureEncoding) scatter_generateMeasureEncoding(measures, encoding);
+    else scatter_generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
+    };
+};
+const scatter_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = unique(measures.map((item)=>item.id));
+    encoding.y = unique(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const scatter_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
+    const dimensionsWithoutMeasureName = dimensions.filter((item)=>item.id !== MeasureName);
+    const uniqueDimIds = unique(dimensionsWithoutMeasureName.map((d)=>d.id));
+    encoding.color = uniqueDimIds.slice(0);
+    encoding.detail = uniqueDimIds.slice(0);
+    encoding.tooltip = uniqueDimIds;
+    encoding.label = [];
+    encoding.row = [];
+    encoding.column = [];
+};
+const scatter_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.y = unique(measures.filter((item)=>'xAxis' === item.encoding || '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 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.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+};
 const buildMeasuresForScatter = (advancedVSeed, context)=>{
     const { vseed } = context;
     if (isMeasureTreeWithChildren(vseed)) {
@@ -5025,52 +5123,16 @@ const buildMeasuresForScatter_generateMeasuresByParentId = (measures)=>{
         const encoding = Array.isArray(item.encoding) ? item.encoding : [
             item.encoding
         ];
-        const isY = encoding.includes('yAxis');
         const isX = encoding.includes('xAxis');
+        const isY = encoding.includes('yAxis');
+        const isEmpty = !encoding.length;
         if (isY) scatterChart.yMeasures.push(item);
         else if (isX) scatterChart.xMeasures.push(item);
-        else if (!isY && !isX) if (0 === scatterChart.yMeasures.length) scatterChart.yMeasures.push(item);
+        else if (isEmpty) if (0 === scatterChart.yMeasures.length) scatterChart.yMeasures.push(item);
         else scatterChart.xMeasures.push(item);
     });
     return scatterMeasuresToMeasureTree(scatterMeasures);
 };
-const encodingForScatter = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { dimensions } = advancedVSeed;
-    if (!dimensions) return advancedVSeed;
-    const encoding = vseed.encoding;
-    if (encoding) {
-        const detail = encoding.detail || [];
-        const color = encoding.color || [
-            (dimensions[1] || dimensions[0]).id
-        ];
-        const mergedDetail = 0 === detail.length ? unique([
-            ...color,
-            ...detail
-        ]) : detail;
-        return {
-            ...advancedVSeed,
-            encoding: {
-                ...encoding,
-                color,
-                detail: mergedDetail
-            }
-        };
-    }
-    const dimensionsWithoutMeasureName = dimensions.filter((item)=>item.id !== MeasureName);
-    const mergedEncoding = {
-        color: dimensions.slice(0).map((item)=>item.id),
-        detail: dimensionsWithoutMeasureName.slice(0).map((item)=>item.id),
-        tooltip: dimensionsWithoutMeasureName.map((item)=>item.id),
-        label: [],
-        row: [],
-        column: []
-    };
-    return {
-        ...advancedVSeed,
-        encoding: mergedEncoding
-    };
-};
 const reshapeWithScatterEncoding = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
@@ -5087,7 +5149,7 @@ const reshapeWithScatterEncoding = (advancedVSeed, context)=>{
     const xMeasures = measures[0];
     const yMeasures = measures[1] || xMeasures;
     if (xMeasures && xMeasures.children) {
-        const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, xMeasures.children, encoding, {
+        const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, uniqueBy(dimensions, (d)=>d.id), uniqueBy(xMeasures.children, (d)=>d.id), encoding, {
             foldMeasureValue: FoldXMeasureValue,
             colorItemAsId: true,
             colorMeasureId: getColorMeasureId(advancedVSeed)
@@ -5097,7 +5159,7 @@ const reshapeWithScatterEncoding = (advancedVSeed, context)=>{
         unfoldInfoList.push(unfoldInfo);
     }
     if (yMeasures && yMeasures.children) {
-        const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(datasets[0], dimensions, yMeasures.children, encoding, {
+        const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(datasets[0], uniqueBy(dimensions, (d)=>d.id), uniqueBy(yMeasures.children, (d)=>d.id), encoding, {
             foldMeasureValue: FoldYMeasureValue,
             colorItemAsId: true,
             colorMeasureId: getColorMeasureId(advancedVSeed)
@@ -5201,9 +5263,9 @@ const pivotReshapeWithScatterEncoding = (advancedVSeed, context)=>{
 };
 const scatterAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForScatter,
     buildMeasuresForScatter,
     autoDimensions_autoDimensions,
-    encodingForScatter,
     pivotAdapter([
         reshapeWithScatterEncoding
     ], [
@@ -5339,7 +5401,7 @@ const pivotScatter = [
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
-    pivotDiscreteLegend
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const scatterSpecPipeline = [
     pivotAdapter_pivotAdapter(scatter, pivotScatter)
@@ -5348,6 +5410,55 @@ 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 hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+    const hasMeasureEncoding = measures.some((item)=>item.encoding);
+    const encoding = {};
+    if (hasDimensionEncoding) dualAxis_generateDimensionEncoding(dimensions, encoding);
+    else dualAxis_generateDefaultDimensionEncoding(dimensions, encoding);
+    if (hasMeasureEncoding) dualAxis_generateMeasureEncoding(measures, encoding);
+    else dualAxis_generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
+    };
+};
+const dualAxis_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = unique(measures.map((item)=>item.id));
+    encoding.y = unique(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const dualAxis_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.tooltip = uniqueDimIds;
+    encoding.label = [];
+    encoding.row = [];
+    encoding.column = [];
+};
+const dualAxis_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.y = unique(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === 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 dualAxis_generateDimensionEncoding = (dimensions, encoding)=>{
+    encoding.x = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
+    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    encoding.detail = 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);
+};
 const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
     const { vseed } = context;
     if (isMeasureTreeWithChildren(vseed)) {
@@ -5440,54 +5551,14 @@ const buildMeasuresForDualAxis_generateMeasuresByParentId = (measures)=>{
         ];
         const isPrimary = encoding.includes('primaryYAxis');
         const isSecondary = encoding.includes('secondaryYAxis');
+        const isEmpty = !item.encoding;
         if (isPrimary) dualChart.primaryMeasures.push(item);
         else if (isSecondary) dualChart.secondaryMeasures.push(item);
-        else if (!isPrimary && !isSecondary) if (0 === dualChart.primaryMeasures.length) dualChart.primaryMeasures.push(item);
+        else if (isEmpty) if (0 === dualChart.primaryMeasures.length) dualChart.primaryMeasures.push(item);
         else dualChart.secondaryMeasures.push(item);
     });
     return dualMeasuresToMeasureTree(dualMeasures);
 };
-const encodingForDualAxis = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { dimensions } = advancedVSeed;
-    if (!dimensions) return advancedVSeed;
-    const encoding = vseed.encoding;
-    if (encoding) {
-        const x = encoding.x || [
-            dimensions[0].id
-        ];
-        const color = encoding.color || [
-            (dimensions[1] || dimensions[0]).id
-        ];
-        const detail = encoding.detail || [];
-        const mergedDetail = 0 === detail.length ? unique([
-            ...color,
-            ...detail
-        ]) : detail;
-        return {
-            ...advancedVSeed,
-            encoding: {
-                ...encoding,
-                x,
-                color,
-                detail: mergedDetail
-            }
-        };
-    }
-    const mergedEncoding = {
-        x: dimensions.slice(0, 1).map((item)=>item.id),
-        color: dimensions.slice(1).map((item)=>item.id),
-        detail: dimensions.slice(1).map((item)=>item.id),
-        tooltip: dimensions.map((item)=>item.id),
-        label: [],
-        row: [],
-        column: []
-    };
-    return {
-        ...advancedVSeed,
-        encoding: mergedEncoding
-    };
-};
 const reshapeWithDualEncoding = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
@@ -5637,9 +5708,9 @@ const dualAxisConfig = (advancedVSeed, context)=>{
 };
 const dualAxisAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForDualAxis,
     buildMeasuresForDualAxis,
     autoDimensions_autoDimensions,
-    encodingForDualAxis,
     pivotAdapter([
         reshapeWithDualEncoding
     ], [
@@ -5942,7 +6013,7 @@ const labelPrimary = (spec, context)=>{
                 const measure = findMeasureById(measures, id);
                 if (!measure) return value;
                 const { format = {}, autoFormat = true } = measure;
-                if (!isEmpty(format)) {
+                if (!external_remeda_isEmpty(format)) {
                     const formatter = createFormatter(format);
                     return formatter(value);
                 }
@@ -5978,7 +6049,7 @@ const labelSecondary = (spec, context)=>{
                 const measure = findMeasureById(measures, id);
                 if (!measure) return value;
                 const { format = {}, autoFormat = true } = measure;
-                if (!isEmpty(format)) {
+                if (!external_remeda_isEmpty(format)) {
                     const formatter = createFormatter(format);
                     return formatter(value);
                 }
@@ -6034,7 +6105,7 @@ const tooltipPrimary = (spec, context)=>{
                         const measure = findMeasureById(measures, id);
                         if (!measure) return String(value);
                         const { format = {}, autoFormat = true } = measure;
-                        if (!isEmpty(format)) {
+                        if (!external_remeda_isEmpty(format)) {
                             const formatter = createFormatter(format);
                             return formatter(value);
                         }
@@ -6056,7 +6127,7 @@ const tooltipPrimary = (spec, context)=>{
                         const measure = findMeasureById(measures, id);
                         if (!measure) return String(value);
                         const { format = {}, autoFormat = true } = measure;
-                        if (!isEmpty(format)) {
+                        if (!external_remeda_isEmpty(format)) {
                             const formatter = createFormatter(format);
                             return formatter(value);
                         }
@@ -6114,7 +6185,7 @@ const tooltipSecondary = (spec, context)=>{
                         const measure = findMeasureById(measures, id);
                         if (!measure) return String(value);
                         const { format = {}, autoFormat = true } = measure;
-                        if (!isEmpty(format)) {
+                        if (!external_remeda_isEmpty(format)) {
                             const formatter = createFormatter(format);
                             return formatter(value);
                         }
@@ -6136,7 +6207,7 @@ const tooltipSecondary = (spec, context)=>{
                         const measure = findMeasureById(measures, id);
                         if (!measure) return String(value);
                         const { format = {}, autoFormat = true } = measure;
-                        if (!isEmpty(format)) {
+                        if (!external_remeda_isEmpty(format)) {
                             const formatter = createFormatter(format);
                             return formatter(value);
                         }
@@ -6162,7 +6233,7 @@ const yLinearPrimary = (spec, context)=>{
     const yAxisConfig = Array.isArray(primaryYAxis) ? primaryYAxis[index] || primaryYAxis[0] : primaryYAxis;
     const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
     const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
-    if (foldInfoList?.[0] && isEmpty(foldInfoList[0].foldMap)) return result;
+    if (foldInfoList?.[0] && external_remeda_isEmpty(foldInfoList[0].foldMap)) return result;
     const id = `${reshapeInfoId}-primary-axis`;
     const seriesIds = [
         `${reshapeInfoId}-primary-series`,
@@ -6474,33 +6545,51 @@ const registerDualAxis = ()=>{
 };
 const encodingForPie = (advancedVSeed, context)=>{
     const { vseed } = context;
-    const { dimensions } = advancedVSeed;
-    if (!dimensions) return advancedVSeed;
-    const encoding = vseed.encoding;
-    if (encoding) return {
-        ...advancedVSeed,
-        encoding: {
-            ...encoding
-        }
-    };
-    const mergedEncoding = {
-        color: dimensions.slice(0).map((item)=>item.id),
-        detail: dimensions.slice(0).map((item)=>item.id),
-        tooltip: dimensions.map((item)=>item.id),
-        label: [],
-        row: [],
-        column: []
-    };
+    const { measures: vseedMeasures = [] } = vseed;
+    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
+    const dimensions = getBasicDimensions(vseed);
+    const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+    const hasMeasureEncoding = measures.some((item)=>item.encoding);
+    const encoding = {};
+    if (hasDimensionEncoding) pie_generateDimensionEncoding(dimensions, encoding);
+    else pie_generateDefaultDimensionEncoding(dimensions, encoding);
+    if (hasMeasureEncoding) pie_generateMeasureEncoding(measures, encoding);
+    else pie_generateDefaultMeasureEncoding(measures, encoding);
     return {
         ...advancedVSeed,
-        encoding: mergedEncoding
-    };
+        encoding
+    };
+};
+const pie_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = unique(measures.map((item)=>item.id));
+    encoding.angle = unique(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const pie_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
+    const uniqueDimIds = unique(dimensions.map((d)=>d.id));
+    encoding.color = uniqueDimIds.slice(0);
+    encoding.detail = uniqueDimIds.slice(0);
+    encoding.tooltip = uniqueDimIds;
+    encoding.label = [];
+    encoding.row = [];
+    encoding.column = [];
+};
+const pie_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.angle = unique(measures.filter((item)=>'angle' === 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 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.detail.length) encoding.detail = dimensions.map((item)=>item.id);
 };
 const pieAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForPie,
     buildMeasures,
     autoDimensions_autoDimensions,
-    encodingForPie,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -6515,9 +6604,8 @@ const initPie = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { datasetReshapeInfo, dataset } = advancedVSeed;
+    const { datasetReshapeInfo } = advancedVSeed;
     const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
-    const showStroke = dataset.length <= 30;
     result.type = 'pie';
     result.outerRadius = 0.8;
     result.innerRadius = 0;
@@ -6529,30 +6617,57 @@ const initPie = (spec, context)=>{
             clip: true
         }
     ];
-    result.pie = {
-        style: {
-            stroke: '#ffffff',
-            lineWidth: showStroke ? 1 : 0,
-            centerOffset: 0
-        },
-        state: {
-            hover: {
-                outerRadius: 1.1 * result.outerRadius
+    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;
+    const result = {
+        ...spec,
+        pie: {
+            style: {}
+        }
+    };
+    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,
@@ -6565,10 +6680,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,
@@ -6578,7 +6694,7 @@ const pivotPie = [
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
-    pivotDiscreteLegend
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const pieSpecPipeline = [
     pivotAdapter_pivotAdapter(pie, pivotPie)
@@ -6606,43 +6722,32 @@ 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;
     result.valueField = foldInfo.measureValue;
     result.categoryField = unfoldInfo.encodingColorId;
     result.padding = 0;
-    result.region = [
-        {
-            clip: true
-        }
-    ];
-    result.pie = {
-        style: {
-            stroke: '#ffffff',
-            lineWidth: showStroke ? 1 : 0
-        },
-        state: {
-            hover: {
-                outerRadius: 1.1 * result.outerRadius
-            }
+    result.region = [
+        {
+            clip: true
         }
-    };
+    ];
     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,
@@ -6655,11 +6760,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,
@@ -6668,7 +6774,7 @@ const pivotDonut = [
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
-    pivotDiscreteLegend
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const donutSpecPipeline = [
     pivotAdapter_pivotAdapter(donut, pivotDonut)
@@ -6679,51 +6785,57 @@ const registerDonut = ()=>{
 };
 const encodingForRose = (advancedVSeed, context)=>{
     const { vseed } = context;
-    const { dimensions } = advancedVSeed;
-    if (!dimensions) return advancedVSeed;
-    const encoding = vseed.encoding;
-    if (encoding) {
-        const angle = encoding.angle || [
-            dimensions[0].id
-        ];
-        const color = encoding.color || [
-            (dimensions[1] || dimensions[0]).id
-        ];
-        const detail = encoding.detail || [];
-        const mergedDetail = 0 === detail.length ? unique([
-            ...color,
-            ...detail
-        ]) : detail;
-        return {
-            ...advancedVSeed,
-            encoding: {
-                ...encoding,
-                angle,
-                color,
-                detail: mergedDetail
-            }
-        };
-    }
-    const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
-    const mergedEncoding = {
-        angle: dimensions.slice(0, 1).map((item)=>item.id),
-        color: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
-        detail: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
-        tooltip: dimensions.map((item)=>item.id),
-        label: [],
-        row: [],
-        column: []
-    };
+    const { measures: vseedMeasures = [] } = vseed;
+    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
+    const dimensions = getBasicDimensions(vseed);
+    const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+    const hasMeasureEncoding = measures.some((item)=>item.encoding);
+    const encoding = {};
+    if (hasDimensionEncoding) rose_generateDimensionEncoding(dimensions, encoding);
+    else rose_generateDefaultDimensionEncoding(dimensions, encoding);
+    if (hasMeasureEncoding) rose_generateMeasureEncoding(measures, encoding);
+    else rose_generateDefaultMeasureEncoding(measures, encoding);
     return {
         ...advancedVSeed,
-        encoding: mergedEncoding
+        encoding
     };
 };
+const rose_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = unique(measures.map((item)=>item.id));
+    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const rose_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.tooltip = uniqueDimIds;
+    encoding.label = [];
+    encoding.row = [];
+    encoding.column = [];
+};
+const rose_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.radius = unique(measures.filter((item)=>'radius' === 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 rose_generateDimensionEncoding = (dimensions, encoding)=>{
+    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.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.angle?.includes(item.id)).map((item)=>item.id);
+};
 const roseAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForRose,
     buildMeasures,
     autoDimensions_autoDimensions,
-    encodingForRose,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -6750,18 +6862,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
@@ -6770,7 +6870,7 @@ const initRose = (spec, context)=>{
     result.animation = true;
     return result;
 };
-const radiusAxis = (spec, context)=>{
+const angleAxis = (spec, context)=>{
     const result = {
         ...spec
     };
@@ -6782,26 +6882,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
     };
@@ -6813,50 +6924,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,
@@ -6867,19 +7007,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)
@@ -6890,9 +7031,9 @@ const registerRose = ()=>{
 };
 const roseParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForRose,
     buildMeasures,
     autoDimensions_autoDimensions,
-    encodingForRose,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -6948,15 +7089,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,
@@ -6971,15 +7113,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,
@@ -6987,7 +7130,7 @@ const pivotRoseParallel = [
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
-    pivotDiscreteLegend
+    colorAdapter(pivotDiscreteLegend, pivotColorLegend)
 ];
 const roseParallelSpecPipeline = [
     pivotAdapter_pivotAdapter(roseParallel, pivotRoseParallel)
@@ -6998,50 +7141,55 @@ const registerRoseParallel = ()=>{
 };
 const encodingForRadar = (advancedVSeed, context)=>{
     const { vseed } = context;
-    const { dimensions } = advancedVSeed;
-    if (!dimensions) return advancedVSeed;
-    const encoding = vseed.encoding;
-    if (encoding) {
-        const angle = encoding.angle || [
-            dimensions[0].id
-        ];
-        const color = encoding.color || [
-            (dimensions[1] || dimensions[0]).id
-        ];
-        const detail = encoding.detail || [];
-        const mergedDetail = 0 === detail.length ? unique([
-            ...color,
-            ...detail
-        ]) : detail;
-        return {
-            ...advancedVSeed,
-            encoding: {
-                ...encoding,
-                angle,
-                color,
-                detail: mergedDetail
-            }
-        };
-    }
-    const mergedEncoding = {
-        angle: dimensions.slice(0, 1).map((item)=>item.id),
-        color: dimensions.slice(1).map((item)=>item.id),
-        detail: dimensions.slice(1).map((item)=>item.id),
-        tooltip: dimensions.map((item)=>item.id),
-        label: [],
-        row: [],
-        column: []
-    };
+    const { measures: vseedMeasures = [] } = vseed;
+    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
+    const dimensions = getBasicDimensions(vseed);
+    const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+    const hasMeasureEncoding = measures.some((item)=>item.encoding);
+    const encoding = {};
+    if (hasDimensionEncoding) radar_generateDimensionEncoding(dimensions, encoding);
+    else radar_generateDefaultDimensionEncoding(dimensions, encoding);
+    if (hasMeasureEncoding) radar_generateMeasureEncoding(measures, encoding);
+    else radar_generateDefaultMeasureEncoding(measures, encoding);
     return {
         ...advancedVSeed,
-        encoding: mergedEncoding
-    };
+        encoding
+    };
+};
+const radar_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = unique(measures.map((item)=>item.id));
+    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const radar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
+    const uniqueDimIds = unique(dimensions.map((d)=>d.id));
+    encoding.angle = uniqueDimIds.slice(0, 1);
+    encoding.color = uniqueDimIds.slice(1);
+    encoding.tooltip = uniqueDimIds;
+    encoding.detail = [];
+    encoding.label = [];
+    encoding.row = [];
+    encoding.column = [];
+};
+const radar_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.radius = unique(measures.filter((item)=>'radius' === 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 radar_generateDimensionEncoding = (dimensions, encoding)=>{
+    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 = [];
+    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);
 };
 const radarAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForRadar,
     buildMeasures,
     autoDimensions_autoDimensions,
-    encodingForRadar,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7177,33 +7325,51 @@ const registerRadar = ()=>{
 };
 const encodingForFunnel = (advancedVSeed, context)=>{
     const { vseed } = context;
-    const { dimensions } = advancedVSeed;
-    if (!dimensions) return advancedVSeed;
-    const encoding = vseed.encoding;
-    if (encoding) return {
-        ...advancedVSeed,
-        encoding: {
-            ...encoding
-        }
-    };
-    const mergedEncoding = {
-        color: dimensions.slice(0).map((item)=>item.id),
-        detail: dimensions.slice(0).map((item)=>item.id),
-        tooltip: dimensions.map((item)=>item.id),
-        label: [],
-        row: [],
-        column: []
-    };
+    const { measures: vseedMeasures = [] } = vseed;
+    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
+    const dimensions = getBasicDimensions(vseed);
+    const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+    const hasMeasureEncoding = measures.some((item)=>item.encoding);
+    const encoding = {};
+    if (hasDimensionEncoding) funnel_generateDimensionEncoding(dimensions, encoding);
+    else funnel_generateDefaultDimensionEncoding(dimensions, encoding);
+    if (hasMeasureEncoding) funnel_generateMeasureEncoding(measures, encoding);
+    else funnel_generateDefaultMeasureEncoding(measures, encoding);
     return {
         ...advancedVSeed,
-        encoding: mergedEncoding
-    };
+        encoding
+    };
+};
+const funnel_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = unique(measures.map((item)=>item.id));
+    encoding.size = unique(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const funnel_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
+    const uniqueDimIds = unique(dimensions.map((d)=>d.id));
+    encoding.color = uniqueDimIds.slice(0);
+    encoding.detail = uniqueDimIds.slice(0);
+    encoding.tooltip = uniqueDimIds;
+    encoding.label = [];
+    encoding.row = [];
+    encoding.column = [];
+};
+const funnel_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.size = unique(measures.filter((item)=>'size' === 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 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.detail.length) encoding.detail = dimensions.map((item)=>item.id);
 };
 const funnelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForFunnel,
     buildMeasures,
     autoDimensions_autoDimensions,
-    encodingForFunnel,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7233,34 +7399,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,
@@ -7275,17 +7462,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)
@@ -7296,45 +7484,61 @@ const registerFunnel = ()=>{
 };
 const encodingForHeatmap = (advancedVSeed, context)=>{
     const { vseed } = context;
-    const { dimensions } = advancedVSeed;
-    if (!dimensions) return advancedVSeed;
-    const encoding = vseed.encoding;
-    if (encoding) {
-        const x = encoding.x || [
-            dimensions[0].id
-        ];
-        const y = encoding.y || [
-            (dimensions[1] || dimensions[0]).id
-        ];
-        return {
-            ...advancedVSeed,
-            encoding: {
-                x,
-                y,
-                ...encoding
-            }
-        };
-    }
-    const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
-    const mergedEncoding = {
-        x: dimensions.slice(0, 1).map((item)=>item.id),
-        y: dimensions.slice(onlyMeasureName ? 0 : 1).map((item)=>item.id),
-        color: dimensions.slice(0).map((item)=>item.id),
-        tooltip: dimensions.map((item)=>item.id),
-        label: [],
-        row: [],
-        column: []
-    };
+    const { measures: vseedMeasures = [] } = vseed;
+    const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
+    const dimensions = getBasicDimensions(vseed);
+    const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+    const hasMeasureEncoding = measures.some((item)=>item.encoding);
+    const encoding = {};
+    if (hasDimensionEncoding) heatmap_generateDimensionEncoding(dimensions, encoding);
+    else heatmap_generateDefaultDimensionEncoding(dimensions, encoding);
+    if (hasMeasureEncoding) heatmap_generateMeasureEncoding(measures, encoding);
+    else heatmap_generateDefaultMeasureEncoding(measures, encoding);
     return {
         ...advancedVSeed,
-        encoding: mergedEncoding
+        encoding
     };
 };
+const heatmap_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = unique(measures.map((item)=>item.id));
+    encoding.color = unique(measures.filter((item)=>'color' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const heatmap_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.y = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
+    encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
+    encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
+    encoding.tooltip = uniqueDimIds;
+    encoding.label = [];
+    encoding.row = [];
+    encoding.column = [];
+};
+const heatmap_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.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 heatmap_generateDimensionEncoding = (dimensions, encoding)=>{
+    encoding.x = unique(dimensions.filter((item)=>'xAxis' === 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.x.length) encoding.x = [
+        dimensions[0].id
+    ];
+    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.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+};
 const heatmapAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
+    encodingForHeatmap,
     buildMeasures,
     autoDimensions_autoDimensions,
-    encodingForHeatmap,
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7356,6 +7560,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
@@ -7370,13 +7605,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',
@@ -7401,14 +7629,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,
@@ -7423,21 +7649,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)
@@ -8154,7 +8379,18 @@ const zDimension = z.object({
         'dimension',
         'rowDimension',
         'columnDimension'
-    ]).default('dimension')
+    ]).default('dimension'),
+    encoding: z["enum"]([
+        'xAxis',
+        'yAxis',
+        'angle',
+        'color',
+        'detail',
+        'tooltip',
+        'label',
+        'row',
+        'column'
+    ]).optional()
 });
 const zDimensionGroup = z.object({
     id: z.string(),