@visactor/vseed 0.1.5 → 0.1.6

package/dist/umd/index.js

@@ -514,7 +514,8 @@
                     void 0
                 ].includes(key)).map((measure)=>({
                     id: measure,
-                    alias: measure
+                    alias: measure,
+                    encoding: 'column'
                 }));
             return result;
         };
@@ -598,7 +599,7 @@
                 ].includes(key) && !measures.some((measure)=>measure.id === key)).map((dim)=>({
                     id: dim,
                     alias: dim,
-                    location: 'dimension'
+                    encoding: 'column'
                 }));
             return result;
         };
@@ -1118,10 +1119,27 @@
                     void 0
                 ].includes(key)).map((measure)=>({
                     id: measure,
-                    alias: measure
+                    alias: measure,
+                    encoding: 'detail'
                 }));
             return result;
         };
+        const ORIGINAL_DATA = '__OriginalData__';
+        const Separator = '-';
+        const FoldMeasureName = '__MeaName__';
+        const FoldMeasureId = '__MeaId__';
+        const FoldMeasureValue = '__MeaValue__';
+        const MeasureName = FoldMeasureName;
+        const FoldPrimaryMeasureValue = '__MeaPrimaryValue__';
+        const FoldSecondaryMeasureValue = '__MeaSecondaryValue__';
+        const FoldXMeasureValue = '__MeaXValue__';
+        const FoldYMeasureValue = '__MeaYValue__';
+        const XEncoding = '__Dim_X__';
+        const YEncoding = '__Dim_Y__';
+        const AngleEncoding = '__Dim_Angle__';
+        const DetailEncoding = '__Dim_Detail__';
+        const ColorEncoding = '__Dim_Color__';
+        const ColorIdEncoding = '__Dim_ColorId__';
         const findAllDimensions = (dimensions = [])=>{
             if (!dimensions) return [];
             const result = [];
@@ -1138,15 +1156,21 @@
             const { vseed } = context;
             const { dimensions, dataset } = vseed;
             const measures = findAllMeasures(advancedVSeed.measures);
+            const MeaName = {
+                id: MeasureName,
+                alias: intl.i18n`指标名称`
+            };
             if (!dataset) throw new Error('dataset is required');
             if (0 === dataset.length) return result;
             if (dimensions) {
                 const newDimensions = findAllDimensions(dimensions);
+                if (!newDimensions.some((dim)=>dim.id === MeasureName)) newDimensions.push(MeaName);
                 result.dimensions = newDimensions.map((item, index)=>{
+                    if ('row' === item.encoding || 'column' === item.encoding) return item;
                     if ('rowDimension' === item.location || 'columnDimension' === item.location) return item;
                     return {
                         ...item,
-                        location: index % 2 === 0 ? 'columnDimension' : 'rowDimension'
+                        encoding: index % 2 === 0 ? 'column' : 'row'
                     };
                 });
                 return result;
@@ -1156,15 +1180,19 @@
                     ...prev,
                     ...cur
                 }), {});
-            let i = 0;
-            result.dimensions = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'string' == typeof item[key]) && ![
+            const newDimensions = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'string' == typeof item[key]) && ![
                     '',
                     null,
                     void 0
-                ].includes(key) && !measures.some((measure)=>measure.id === key)).map((dim)=>({
+                ].includes(key) && !measures.some((measure)=>measure.id === key));
+            result.dimensions = newDimensions.map((dim)=>({
                     id: dim,
-                    alias: dim,
-                    location: i++ % 2 === 0 ? 'columnDimension' : 'rowDimension'
+                    alias: dim
+                }));
+            result.dimensions.push(MeaName);
+            result.dimensions = result.dimensions.map((dim, index)=>({
+                    ...dim,
+                    encoding: index % 2 === 0 ? 'column' : 'row'
                 }));
             return result;
         };
@@ -1195,11 +1223,110 @@
             };
             return result;
         };
+        function chunk_AIG3BDKO_i(...e) {
+            return chunk_WIMGWYZL_u(chunk_AIG3BDKO_n, e);
+        }
+        var chunk_AIG3BDKO_n = (e, r)=>e.length >= r;
+        function chunk_KI5X74E2_y(...t) {
+            return chunk_WIMGWYZL_u(chunk_KI5X74E2_f, t);
+        }
+        function chunk_KI5X74E2_f(t, e) {
+            if (!chunk_AIG3BDKO_i(e, 1)) return {
+                ...t
+            };
+            if (!chunk_AIG3BDKO_i(e, 2)) {
+                let { [e[0]]: r, ...m } = t;
+                return m;
+            }
+            let o = {
+                ...t
+            };
+            for (let r of e)delete o[r];
+            return o;
+        }
+        const foldMeasures = (dataset, measures, options)=>{
+            const { measureId, measureName, measureValue, colorMeasureId } = options || {};
+            const foldInfo = {
+                measureId,
+                measureName,
+                measureValue,
+                colorRange: [
+                    0,
+                    1
+                ],
+                measureRange: [
+                    0,
+                    1
+                ],
+                foldMap: {}
+            };
+            const result = new Array(dataset.length * measures.length);
+            let index = 0;
+            const ids = measures.map((d)=>d.id);
+            for(let i = 0; i < dataset.length; i++)for(let j = 0; j < measures.length; j++){
+                const datum = chunk_KI5X74E2_y({
+                    ...dataset[i]
+                }, ids);
+                datum[ORIGINAL_DATA] = dataset[i];
+                const measure = measures[j];
+                const { id, alias } = measure;
+                datum[id] = dataset[i][id];
+                datum[measureId] = id;
+                datum[measureName] = alias || id;
+                datum[measureValue] = dataset[i][id];
+                if (colorMeasureId) {
+                    const value = datum[ORIGINAL_DATA][colorMeasureId];
+                    datum[ColorEncoding] = value;
+                    datum[ColorIdEncoding] = colorMeasureId;
+                    foldInfo.colorRange = [
+                        Math.min(foldInfo.colorRange[0] || 1 / 0, Number(value)),
+                        Math.max(foldInfo.colorRange[1] || -1 / 0, Number(value))
+                    ];
+                }
+                foldInfo.measureRange = [
+                    Math.min(foldInfo.measureRange[0] || 1 / 0, Number(datum[id])),
+                    Math.max(foldInfo.measureRange[1] || -1 / 0, Number(datum[id]))
+                ];
+                foldInfo.foldMap[id] = alias;
+                result[index++] = datum;
+            }
+            return {
+                dataset: result,
+                foldInfo
+            };
+        };
+        const reshapePivotTable = (advancedVSeed, context)=>{
+            const result = {
+                ...advancedVSeed
+            };
+            const { vseed } = context;
+            const { dataset, chartType } = vseed;
+            const { dimensions, measures } = advancedVSeed;
+            const { dataset: newDatasets, foldInfo } = foldMeasures(dataset, findAllMeasures(measures), {
+                measureId: FoldMeasureId,
+                measureName: FoldMeasureName,
+                measureValue: FoldMeasureValue
+            });
+            const datasetReshapeInfo = [
+                {
+                    id: String(chartType),
+                    index: 0,
+                    foldInfo
+                }
+            ];
+            return {
+                ...result,
+                dataset: newDatasets,
+                datasetReshapeInfo: datasetReshapeInfo,
+                dimensions,
+                measures
+            };
+        };
         const pivotTableAdvancedPipeline = [
             initAdvancedVSeed,
             autoPivotMeasures,
             autoPivotDimensions,
-            records_records,
+            reshapePivotTable,
             pivotTableConfig,
             theme_theme
         ];
@@ -1246,7 +1373,7 @@
         const pivotColumns = (spec, context)=>{
             const { advancedVSeed } = context;
             const dimensions = advancedVSeed.dimensions;
-            const columns = dimensions.filter((item)=>'columnDimension' === item['location']);
+            const columns = dimensions.filter((item)=>'columnDimension' === item['location'] || 'column' === item['encoding']);
             return {
                 ...spec,
                 columns: columns.map((item)=>({
@@ -1259,7 +1386,7 @@
         const pivotRows = (spec, context)=>{
             const { advancedVSeed } = context;
             const dimensions = advancedVSeed.dimensions;
-            const rows = dimensions.filter((item)=>'rowDimension' === item['location']);
+            const rows = dimensions.filter((item)=>'rowDimension' === item['location'] || 'row' === item['encoding']);
             return {
                 ...spec,
                 rows: rows.map((item)=>({
@@ -1271,25 +1398,31 @@
         };
         const pivotIndicators = (spec, context)=>{
             const { advancedVSeed } = context;
-            const { locale } = advancedVSeed;
-            const measures = advancedVSeed.measures;
+            const { locale, measures, datasetReshapeInfo } = advancedVSeed;
+            const { foldInfo } = datasetReshapeInfo[0];
             return {
                 ...spec,
                 indicatorsAsCol: true,
                 indicatorTitle: intl.i18n`指标名称`,
-                indicators: measures.map((item)=>{
-                    if (isMeasure(item)) return {
+                hideIndicatorName: true,
+                indicators: [
+                    {
                         cellType: 'text',
-                        indicatorKey: item.id,
-                        title: item.alias || item.id,
+                        indicatorKey: foldInfo.measureValue,
+                        title: 'indicator',
                         width: 'auto',
-                        format: pivotIndicators_fieldFormat(item, locale)
-                    };
-                    return {};
-                })
+                        format: pivotIndicators_fieldFormat(measures, foldInfo, locale)
+                    }
+                ]
             };
         };
-        const pivotIndicators_fieldFormat = (node, locale)=>(value)=>{
+        const pivotIndicators_fieldFormat = (measures, foldInfo, locale)=>(value, col, row, table)=>{
+                if (!chunk_6GTAPB47_e(col) || !chunk_6GTAPB47_e(row) || !table) return value;
+                const datum = table.getCellOriginRecord(col, row);
+                const { measureId: foldMeasureId } = foldInfo;
+                const measureId = datum[0][foldMeasureId];
+                const node = findMeasureById(measures, measureId);
+                if (!node) return value;
                 const { format = {}, autoFormat = true } = node;
                 if (!chunk_VCYTMP4D_n(format)) {
                     const formatter = createFormatter(format);
@@ -1445,94 +1578,81 @@
                 locale: locale || 'zh-CN'
             };
         };
-        const ORIGINAL_DATA = '__OriginalData__';
-        const Separator = '-';
-        const FoldMeasureName = '__MeaName__';
-        const FoldMeasureId = '__MeaId__';
-        const FoldMeasureValue = '__MeaValue__';
-        const MeasureName = FoldMeasureName;
-        const FoldPrimaryMeasureValue = '__MeaPrimaryValue__';
-        const FoldSecondaryMeasureValue = '__MeaSecondaryValue__';
-        const FoldXMeasureValue = '__MeaXValue__';
-        const FoldYMeasureValue = '__MeaYValue__';
-        const XEncoding = '__Dim_X__';
-        const YEncoding = '__Dim_Y__';
-        const AngleEncoding = '__Dim_Angle__';
-        const DetailEncoding = '__Dim_Detail__';
-        const ColorEncoding = '__Dim_Color__';
-        const ColorIdEncoding = '__Dim_ColorId__';
-        const getBasicDimensions = (vseed)=>{
-            const { dimensions, dataset } = vseed;
-            const MeaName = {
-                id: MeasureName,
-                alias: intl.i18n`指标名称`
+        const defaultMeasures_defaultMeasures = (advancedVSeed, context)=>{
+            const { vseed } = context;
+            const { measures, dataset } = vseed;
+            if (measures && measures.length > 0) return {
+                ...advancedVSeed,
+                measures
             };
             if (!dataset) throw new Error('dataset is required');
-            if (0 === dataset.length) return [];
-            if (dimensions) {
-                const basicDimensions = dimensions.map((dim)=>({
-                        location: 'dimension',
-                        ...dim
-                    }));
-                if (basicDimensions.some((dim)=>dim.id === MeasureName)) return basicDimensions;
-                basicDimensions.push(MeaName);
-                return basicDimensions;
-            }
+            if (0 === dataset.length) return {
+                ...advancedVSeed,
+                measures: []
+            };
             const top100dataset = dataset.slice(0, 100);
             const sample = top100dataset.reduce((prev, cur)=>({
                     ...prev,
                     ...cur
                 }), {});
-            const basicDimensions = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'string' == typeof item[key]) && ![
+            const defaultMeasures = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
                     '',
                     null,
                     void 0
-                ].includes(key)).map((dim)=>({
-                    id: dim,
-                    alias: dim,
-                    location: 'dimension'
+                ].includes(key)).map((measure)=>({
+                    id: measure,
+                    alias: measure
                 }));
-            basicDimensions.push(MeaName);
-            return basicDimensions;
-        };
-        const getBasicMeasures = (vseed)=>{
-            const { dataset, measures } = vseed;
-            if (!measures || 0 === measures.length) return generateMeasuresByDataset(dataset);
-            return measures;
+            return {
+                ...advancedVSeed,
+                measures: defaultMeasures
+            };
         };
-        const generateMeasuresByDataset = (dataset)=>{
+        const defaultDimensions = (advancedVSeed, context)=>{
+            const result = {
+                ...advancedVSeed
+            };
+            const { vseed } = context;
+            const { dimensions, dataset } = vseed;
+            if (dimensions && dimensions.length > 0) return {
+                ...result,
+                dimensions
+            };
             if (!dataset) throw new Error('dataset is required');
-            if (0 === dataset.length) return [];
+            if (0 === dataset.length) return result;
+            const measures = findAllMeasures(advancedVSeed.measures);
             const top100dataset = dataset.slice(0, 100);
             const sample = top100dataset.reduce((prev, cur)=>({
                     ...prev,
                     ...cur
                 }), {});
-            const basicMeasures = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
+            const newDimensions = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'string' == typeof item[key]) && ![
                     '',
                     null,
                     void 0
-                ].includes(key)).map((measure)=>({
-                    id: measure,
-                    alias: measure
+                ].includes(key) && !measures.some((measure)=>measure.id === key)).map((dim)=>({
+                    id: dim,
+                    alias: dim
                 }));
-            return basicMeasures;
-        };
-        const isMeasureTreeWithChildren = (vseed)=>{
-            const { measures } = vseed;
-            if (!measures) return false;
-            return measures.some((measure)=>'children' in measure);
+            return {
+                ...result,
+                dimensions: newDimensions
+            };
         };
-        const isMeasureTreeWithParentId = (vseed)=>{
-            const { measures } = vseed;
-            if (!measures) return false;
-            return measures.some((measure)=>'parentId' in measure);
+        const defaultMeasureName = (advancedVSeed)=>{
+            const result = {
+                ...advancedVSeed
+            };
+            const MeaName = {
+                id: MeasureName,
+                alias: intl.i18n`指标名称`
+            };
+            if (!result.dimensions?.some((dim)=>dim.id === MeasureName)) result.dimensions?.push(MeaName);
+            return result;
         };
-        const encodingForLine = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            const { measures: vseedMeasures = [] } = vseed;
-            const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-            const dimensions = getBasicDimensions(vseed);
+        const encodingForLine = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
@@ -1545,10 +1665,6 @@
                 encoding
             };
         };
-        const generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
-            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-        };
         const generateDefaultDimensionEncoding = (dimensions, encoding)=>{
             const uniqueDimIds = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
             encoding.x = uniqueDimIds.slice(0, 1);
@@ -1559,20 +1675,36 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
-            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-            const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            if (color.length > 0) encoding.color = color;
-        };
         const generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.x = chunk_QJLMYOTX_i(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
             encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            encoding.detail = [];
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.x.length) encoding.x = [
                 dimensions[0].id
             ];
-            if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+            if (0 === encoding.color.length) encoding.color = [
+                MeasureName
+            ];
+        };
+        const generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
+            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const generateMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = measures.map((item)=>item.id);
+            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+            const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+            if (color.length > 0) encoding.color = color;
+        };
+        const isMeasureTreeWithChildren = (vseed)=>{
+            const { measures } = vseed;
+            if (!measures) return false;
+            return measures.some((measure)=>'children' in measure);
+        };
+        const isMeasureTreeWithParentId = (vseed)=>{
+            const { measures } = vseed;
+            if (!measures) return false;
+            return measures.some((measure)=>'parentId' in measure);
         };
         const measureDepth = (measures = [])=>{
             if (!measures) return 0;
@@ -1632,9 +1764,7 @@
                 advancedVSeed.measures = generateMeasuresByParentId(vseed.measures);
                 return advancedVSeed;
             }
-            const basicMeasures = getBasicMeasures(vseed);
-            if (isPivotChart(vseed)) advancedVSeed.measures = basicMeasuresToMeasureTree(basicMeasures);
-            else advancedVSeed.measures = basicMeasures;
+            if (isPivotChart(vseed)) advancedVSeed.measures = basicMeasuresToMeasureTree(advancedVSeed.measures);
             return advancedVSeed;
         };
         const generateMeasuresByParentId = (measures)=>{
@@ -1665,45 +1795,6 @@
                 }
             ];
         };
-        const autoDimensions_autoDimensions = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { vseed } = context;
-            const { dimensions, dataset } = vseed;
-            const measures = findAllMeasures(advancedVSeed.measures);
-            const MeaName = {
-                id: MeasureName,
-                alias: intl.i18n`指标名称`
-            };
-            if (!dataset) throw new Error('dataset is required');
-            if (0 === dataset.length) return result;
-            if (dimensions) {
-                result.dimensions = dimensions.map((dim)=>({
-                        location: 'dimension',
-                        ...dim
-                    }));
-                if (result.dimensions.some((dim)=>dim.id === MeasureName)) return result;
-                result.dimensions.push(MeaName);
-                return result;
-            }
-            const top100dataset = dataset.slice(0, 100);
-            const sample = top100dataset.reduce((prev, cur)=>({
-                    ...prev,
-                    ...cur
-                }), {});
-            result.dimensions = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'string' == typeof item[key]) && ![
-                    '',
-                    null,
-                    void 0
-                ].includes(key) && !measures.some((measure)=>measure.id === key)).map((dim)=>({
-                    id: dim,
-                    alias: dim,
-                    location: 'dimension'
-                }));
-            result.dimensions.push(MeaName);
-            return result;
-        };
         const pivotAdapter = (pipeline, pivotPipeline)=>(advancedVSeed, context)=>{
                 const { vseed } = context;
                 const usePivotChart = isPivotChart(vseed);
@@ -1724,78 +1815,6 @@
                 });
             };
         }
-        function chunk_AIG3BDKO_i(...e) {
-            return chunk_WIMGWYZL_u(chunk_AIG3BDKO_n, e);
-        }
-        var chunk_AIG3BDKO_n = (e, r)=>e.length >= r;
-        function chunk_KI5X74E2_y(...t) {
-            return chunk_WIMGWYZL_u(chunk_KI5X74E2_f, t);
-        }
-        function chunk_KI5X74E2_f(t, e) {
-            if (!chunk_AIG3BDKO_i(e, 1)) return {
-                ...t
-            };
-            if (!chunk_AIG3BDKO_i(e, 2)) {
-                let { [e[0]]: r, ...m } = t;
-                return m;
-            }
-            let o = {
-                ...t
-            };
-            for (let r of e)delete o[r];
-            return o;
-        }
-        const foldMeasures = (dataset, measures, options)=>{
-            const { measureId, measureName, measureValue, colorMeasureId } = options || {};
-            const foldInfo = {
-                measureId,
-                measureName,
-                measureValue,
-                colorRange: [
-                    0,
-                    1
-                ],
-                measureRange: [
-                    0,
-                    1
-                ],
-                foldMap: {}
-            };
-            const result = new Array(dataset.length * measures.length);
-            let index = 0;
-            const ids = measures.map((d)=>d.id);
-            for(let i = 0; i < dataset.length; i++)for(let j = 0; j < measures.length; j++){
-                const datum = chunk_KI5X74E2_y({
-                    ...dataset[i]
-                }, ids);
-                datum[ORIGINAL_DATA] = dataset[i];
-                const measure = measures[j];
-                const { id, alias } = measure;
-                datum[id] = dataset[i][id];
-                datum[measureId] = id;
-                datum[measureName] = alias || id;
-                datum[measureValue] = dataset[i][id];
-                if (colorMeasureId) {
-                    const value = datum[ORIGINAL_DATA][colorMeasureId];
-                    datum[ColorEncoding] = value;
-                    datum[ColorIdEncoding] = colorMeasureId;
-                    foldInfo.colorRange = [
-                        Math.min(foldInfo.colorRange[0] || 1 / 0, Number(value)),
-                        Math.max(foldInfo.colorRange[1] || -1 / 0, Number(value))
-                    ];
-                }
-                foldInfo.measureRange = [
-                    Math.min(foldInfo.measureRange[0] || 1 / 0, Number(datum[id])),
-                    Math.max(foldInfo.measureRange[1] || -1 / 0, Number(datum[id]))
-                ];
-                foldInfo.foldMap[id] = alias;
-                result[index++] = datum;
-            }
-            return {
-                dataset: result,
-                foldInfo
-            };
-        };
         const unfoldDimensions = (dataset, dimensions, encoding, options)=>{
             const { foldMeasureId, separator, colorItemAsId } = options;
             const unfoldInfo = {
@@ -1890,7 +1909,9 @@
             const { dimensions, measures, encoding } = advancedVSeed;
             if (!measures || !dimensions || !dataset || !encoding) return result;
             if (0 === measures.length) throw new Error('measures can not be empty');
+            const hasEncoding = (vseed.dimensions || []).some((item)=>item.encoding);
             const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(findAllMeasures(measures), (item)=>item.id), encoding, {
+                colorItemAsId: hasEncoding,
                 colorMeasureId: getColorMeasureId(advancedVSeed)
             });
             return {
@@ -1921,6 +1942,7 @@
             if (measures) measures.forEach((measure)=>{
                 if (measure.children && measure.children.length > 0) measureGroups.push(measure);
             });
+            const hasEncoding = (vseed.dimensions || []).some((item)=>item.encoding);
             const datasets = [];
             const datasetReshapeInfo = [];
             measureGroups.forEach((measureGroup, index)=>{
@@ -1928,6 +1950,7 @@
                 if (!measures) return;
                 const groupId = measureGroup.id;
                 const { dataset: newSubDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(measures, (item)=>item.id), encoding, {
+                    colorItemAsId: hasEncoding,
                     foldMeasureValue: `${FoldMeasureValue}${groupId}`,
                     colorMeasureId: getColorMeasureId(advancedVSeed)
                 });
@@ -2145,9 +2168,11 @@
         };
         const lineAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForLine,
             buildMeasures,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -3762,7 +3787,7 @@
             const { advancedVSeed } = context;
             const dimensions = advancedVSeed.dimensions;
             if (!dimensions) return result;
-            const rowDimensions = dimensions.filter((dim)=>'rowDimension' === dim.location);
+            const rowDimensions = dimensions.filter((dim)=>'rowDimension' === dim.location || 'row' === dim.encoding);
             const rows = rowDimensions.map((dim)=>({
                     dimensionKey: dim.id,
                     title: dim.alias || dim.id
@@ -3779,7 +3804,7 @@
             const { advancedVSeed } = context;
             const dimensions = advancedVSeed.dimensions;
             if (!dimensions) return result;
-            const columnDimensions = dimensions.filter((dim)=>'columnDimension' === dim.location);
+            const columnDimensions = dimensions.filter((dim)=>'columnDimension' === dim.location || 'column' === dim.encoding);
             const columns = columnDimensions.map((dim)=>({
                     dimensionKey: dim.id,
                     title: dim.alias || dim.id
@@ -4052,11 +4077,9 @@
             Builder._advancedPipelineMap.line = lineAdvancedPipeline;
             Builder._specPipelineMap.line = lineSpecPipeline;
         };
-        const encodingForColumn = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            const { measures: vseedMeasures = [] } = vseed;
-            const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-            const dimensions = getBasicDimensions(vseed);
+        const encodingForColumn = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
@@ -4069,10 +4092,6 @@
                 encoding
             };
         };
-        const column_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
-            encoding.y = chunk_QJLMYOTX_i(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 = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
@@ -4084,13 +4103,6 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const column_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
-            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-            const color = chunk_QJLMYOTX_i(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 = chunk_QJLMYOTX_i(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
             encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
@@ -4098,14 +4110,28 @@
             if (0 === encoding.x.length) encoding.x = [
                 dimensions[0].id
             ];
-            if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
-            if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+            if (0 === encoding.color.length) encoding.color = [
+                MeasureName
+            ];
+        };
+        const column_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
+            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const column_generateMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = measures.map((item)=>item.id);
+            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+            const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+            if (color.length > 0) encoding.color = color;
+            return encoding;
         };
         const columnAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForColumn,
             buildMeasures,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -4465,9 +4491,11 @@
         };
         const columnParallelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForColumn,
             buildMeasures,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -4562,9 +4590,11 @@
         };
         const columnPercentAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForColumn,
             buildMeasures,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -4641,11 +4671,9 @@
             Builder._advancedPipelineMap.columnPercent = columnPercentAdvancedPipeline;
             Builder._specPipelineMap.columnPercent = columnPercentSpecPipeline;
         };
-        const encodingForBar = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            const { measures: vseedMeasures = [] } = vseed;
-            const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-            const dimensions = getBasicDimensions(vseed);
+        const encodingForBar = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
@@ -4687,7 +4715,9 @@
             if (0 === encoding.y.length) encoding.y = [
                 dimensions[0].id
             ];
-            if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.y?.includes(item.id)).map((item)=>item.id);
+            if (0 === encoding.color.length) encoding.color = [
+                MeasureName
+            ];
             if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.y?.includes(item.id)).map((item)=>item.id);
         };
         const sortYBandAxis = (advancedVSeed, context)=>{
@@ -4708,9 +4738,11 @@
         };
         const barAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForBar,
             buildMeasures,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -5061,9 +5093,11 @@
         };
         const barParallelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            buildMeasures,
-            autoDimensions_autoDimensions,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForBar,
+            buildMeasures,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -5157,9 +5191,11 @@
         };
         const barPercentAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            buildMeasures,
-            autoDimensions_autoDimensions,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForBar,
+            buildMeasures,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -5228,9 +5264,11 @@
         };
         const areaAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForLine,
             buildMeasures,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -5386,9 +5424,11 @@
         };
         const areaPercentAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForLine,
             buildMeasures,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -5462,11 +5502,9 @@
             Builder._advancedPipelineMap.areaPercent = areaPercentAdvancedPipeline;
             Builder._specPipelineMap.areaPercent = areaPercentSpecPipeline;
         };
-        const encodingForScatter = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            const { measures: vseedMeasures = [] } = vseed;
-            const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-            const dimensions = getBasicDimensions(vseed);
+        const encodingForScatter = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
@@ -5502,7 +5540,9 @@
         const scatter_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
-            if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+            if (0 === encoding.color.length) encoding.color = [
+                MeasureName
+            ];
             if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
         };
         const buildMeasuresForScatter = (advancedVSeed, context)=>{
@@ -5515,8 +5555,7 @@
                 advancedVSeed.measures = buildMeasuresForScatter_generateMeasuresByParentId(vseed.measures);
                 return advancedVSeed;
             }
-            const basicMeasures = getBasicMeasures(vseed);
-            const scatterMeasures = vseed.scatterMeasures ? vseed.scatterMeasures : basicMeasuresToScatterMeasures(basicMeasures);
+            const scatterMeasures = vseed.scatterMeasures ? vseed.scatterMeasures : basicMeasuresToScatterMeasures(advancedVSeed.measures || []);
             advancedVSeed.measures = scatterMeasuresToMeasureTree(scatterMeasures);
             return advancedVSeed;
         };
@@ -5735,9 +5774,11 @@
         };
         const scatterAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForScatter,
             buildMeasuresForScatter,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithScatterEncoding
             ], [
@@ -5882,11 +5923,9 @@
             Builder._advancedPipelineMap.scatter = scatterAdvancedPipeline;
             Builder._specPipelineMap.scatter = scatterSpecPipeline;
         };
-        const encodingForDualAxis = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            const { measures: vseedMeasures = [] } = vseed;
-            const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-            const dimensions = getBasicDimensions(vseed);
+        const encodingForDualAxis = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
@@ -5928,7 +5967,9 @@
             if (0 === encoding.x.length) encoding.x = [
                 dimensions[0].id
             ];
-            if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+            if (0 === encoding.color.length) encoding.color = [
+                MeasureName
+            ];
             if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
         };
         const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
@@ -5941,8 +5982,7 @@
                 advancedVSeed.measures = buildMeasuresForDualAxis_generateMeasuresByParentId(vseed.measures);
                 return advancedVSeed;
             }
-            const basicMeasures = getBasicMeasures(vseed);
-            const dualMeasures = vseed.dualMeasures ? vseed.dualMeasures : basicMeasuresToDualMeasures(basicMeasures);
+            const dualMeasures = vseed.dualMeasures ? vseed.dualMeasures : basicMeasuresToDualMeasures(advancedVSeed.measures || []);
             advancedVSeed.measures = dualMeasuresToMeasureTree(dualMeasures);
             return advancedVSeed;
         };
@@ -6046,8 +6086,10 @@
             const datasets = [];
             const primaryMeasures = measures[0];
             const secondaryMeasures = measures[1] || [];
+            const hasEncoding = (vseed.dimensions || []).some((item)=>item.encoding);
             if (primaryMeasures && primaryMeasures.children) {
                 const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, primaryMeasures.children, encoding, {
+                    colorItemAsId: hasEncoding,
                     foldMeasureValue: FoldPrimaryMeasureValue,
                     colorMeasureId: getColorMeasureId(advancedVSeed)
                 });
@@ -6094,6 +6136,7 @@
             const { dataset } = vseed;
             const { dimensions, measures, encoding, chartType } = advancedVSeed;
             if (!measures || !dimensions || !dataset || !encoding) return result;
+            const hasEncoding = (vseed.dimensions || []).some((item)=>item.encoding);
             const datasetList = [];
             const datasetReshapeInfo = [];
             const measureGroups = [];
@@ -6112,6 +6155,7 @@
                 const secondaryMeasures = measures[1] || [];
                 if (primaryMeasures && primaryMeasures.children) {
                     const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, primaryMeasures.children, encoding, {
+                        colorItemAsId: hasEncoding,
                         foldMeasureValue: `${FoldPrimaryMeasureValue}${index}`,
                         colorMeasureId: getColorMeasureId(advancedVSeed)
                     });
@@ -6180,9 +6224,11 @@
         };
         const dualAxisAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForDualAxis,
             buildMeasuresForDualAxis,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithDualEncoding
             ], [
@@ -7015,11 +7061,9 @@
             Builder._advancedPipelineMap.dualAxis = dualAxisAdvancedPipeline;
             Builder._specPipelineMap.dualAxis = dualAxisSpecPipeline;
         };
-        const encodingForPie = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            const { measures: vseedMeasures = [] } = vseed;
-            const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-            const dimensions = getBasicDimensions(vseed);
+        const encodingForPie = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
@@ -7054,14 +7098,18 @@
         const pie_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
-            if (0 === encoding.color.length) encoding.color = dimensions.map((item)=>item.id);
+            if (0 === encoding.color.length) encoding.color = [
+                MeasureName
+            ];
             if (0 === encoding.detail.length) encoding.detail = dimensions.map((item)=>item.id);
         };
         const pieAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForPie,
             buildMeasures,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7177,8 +7225,10 @@
         };
         const donutAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             buildMeasures,
-            autoDimensions_autoDimensions,
             encodingForPie,
             pivotAdapter([
                 reshapeWithEncoding
@@ -7255,11 +7305,9 @@
             Builder._advancedPipelineMap.donut = donutAdvancedPipeline;
             Builder._specPipelineMap.donut = donutSpecPipeline;
         };
-        const encodingForRose = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            const { measures: vseedMeasures = [] } = vseed;
-            const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-            const dimensions = getBasicDimensions(vseed);
+        const encodingForRose = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
@@ -7300,14 +7348,18 @@
             if (0 === encoding.angle.length) encoding.angle = [
                 dimensions[0].id
             ];
-            if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.angle?.includes(item.id)).map((item)=>item.id);
+            if (0 === encoding.color.length) encoding.color = [
+                MeasureName
+            ];
             if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.angle?.includes(item.id)).map((item)=>item.id);
         };
         const roseAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForRose,
             buildMeasures,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7503,9 +7555,11 @@
         };
         const roseParallelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForRose,
             buildMeasures,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7611,11 +7665,9 @@
             Builder._advancedPipelineMap.roseParallel = roseParallelAdvancedPipeline;
             Builder._specPipelineMap.roseParallel = roseParallelSpecPipeline;
         };
-        const encodingForRadar = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            const { measures: vseedMeasures = [] } = vseed;
-            const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-            const dimensions = getBasicDimensions(vseed);
+        const encodingForRadar = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
@@ -7655,13 +7707,17 @@
             if (0 === encoding.angle.length) encoding.angle = [
                 dimensions[0].id
             ];
-            if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.angle?.includes(item.id)).map((item)=>item.id);
+            if (0 === encoding.color.length) encoding.color = [
+                MeasureName
+            ];
         };
         const radarAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForRadar,
             buildMeasures,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7795,11 +7851,9 @@
             Builder._advancedPipelineMap.radar = radarAdvancedPipeline;
             Builder._specPipelineMap.radar = radarSpecPipeline;
         };
-        const encodingForFunnel = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            const { measures: vseedMeasures = [] } = vseed;
-            const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-            const dimensions = getBasicDimensions(vseed);
+        const encodingForFunnel = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
@@ -7834,14 +7888,18 @@
         const funnel_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
-            if (0 === encoding.color.length) encoding.color = dimensions.map((item)=>item.id);
+            if (0 === encoding.color.length) encoding.color = [
+                MeasureName
+            ];
             if (0 === encoding.detail.length) encoding.detail = dimensions.map((item)=>item.id);
         };
         const funnelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForFunnel,
             buildMeasures,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7954,11 +8012,9 @@
             Builder._advancedPipelineMap.funnel = funnelAdvancedPipeline;
             Builder._specPipelineMap.funnel = funnelSpecPipeline;
         };
-        const encodingForHeatmap = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            const { measures: vseedMeasures = [] } = vseed;
-            const measures = vseedMeasures.length ? findAllMeasures(vseedMeasures) : getBasicMeasures(vseed);
-            const dimensions = getBasicDimensions(vseed);
+        const encodingForHeatmap = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
@@ -8003,14 +8059,18 @@
             ];
             if (0 === encoding.y.length) if (dimensions.length > 1) encoding.y = dimensions.slice(1).map((item)=>item.id);
             else encoding.y = dimensions.slice(0).map((item)=>item.id);
-            if (0 === encoding.color.length) encoding.color = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+            if (0 === encoding.color.length) encoding.color = [
+                MeasureName
+            ];
             if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
         };
         const heatmapAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
             encodingForHeatmap,
             buildMeasures,
-            autoDimensions_autoDimensions,
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -12201,7 +12261,9 @@
                 'size',
                 'color',
                 'label',
-                'tooltip'
+                'tooltip',
+                'detail',
+                'column'
             ]).optional(),
             parentId: schemas_string().optional()
         });