@visactor/vseed 0.1.6 → 0.1.7

package/dist/umd/index.js

@@ -491,33 +491,35 @@
                 locale: locale || 'zh-CN'
             };
         };
-        const autoMeasures = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
+        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 result;
-            if (measures) {
-                result.measures = measures;
-                return result;
-            }
+            if (0 === dataset.length) return {
+                ...advancedVSeed,
+                measures: []
+            };
             const top100dataset = dataset.slice(0, 100);
             const sample = top100dataset.reduce((prev, cur)=>({
                     ...prev,
                     ...cur
                 }), {});
-            result.measures = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
+            const defaultMeasures = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
                     '',
                     null,
                     void 0
                 ].includes(key)).map((measure)=>({
                     id: measure,
-                    alias: measure,
-                    encoding: 'column'
+                    alias: measure
                 }));
-            return result;
+            return {
+                ...advancedVSeed,
+                measures: defaultMeasures
+            };
         };
         const preorderTraverse = (tree, callback)=>{
             if (!tree || 0 === tree.length) return;
@@ -571,37 +573,36 @@
             });
             return result;
         };
-        const autoDimensions = (advancedVSeed, context)=>{
+        const defaultDimensions = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
             };
             const { vseed } = context;
             const { dimensions, dataset } = vseed;
-            const measures = findAllMeasures(advancedVSeed.measures);
+            if (dimensions && dimensions.length > 0) return {
+                ...result,
+                dimensions
+            };
             if (!dataset) throw new Error('dataset is required');
             if (0 === dataset.length) return result;
-            if (dimensions) {
-                result.dimensions = dimensions.map((dim)=>({
-                        location: 'dimension',
-                        ...dim
-                    }));
-                return result;
-            }
+            const measures = findAllMeasures(advancedVSeed.measures);
             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]) && ![
+            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)=>({
                     id: dim,
-                    alias: dim,
-                    encoding: 'column'
+                    alias: dim
                 }));
-            return result;
+            return {
+                ...result,
+                dimensions: newDimensions
+            };
         };
         const records_records = (advancedVSeed, context)=>{
             const { vseed } = context;
@@ -755,8 +756,8 @@
         };
         const tableAdvancedPipeline = [
             initAdvancedVSeed,
-            autoMeasures,
-            autoDimensions,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
             records_records,
             tableConfig_tableConfig,
             theme_theme
@@ -980,9 +981,9 @@
                 borderColor: borderColor,
                 borderLineWidth: 1,
                 padding: [
-                    8.6,
+                    8,
                     12,
-                    8.6,
+                    8,
                     12
                 ],
                 textAlign: 'right',
@@ -1095,35 +1096,6 @@
             Builder._advancedPipelineMap.table = tableAdvancedPipeline;
             Builder._specPipelineMap.table = tableSpecPipeline;
         };
-        const autoPivotMeasures = (advancedVSeed, context)=>{
-            const result = {
-                ...advancedVSeed
-            };
-            const { vseed } = context;
-            const { dataset } = vseed;
-            const measures = findAllMeasures(vseed.measures);
-            if (!dataset) throw new Error('dataset is required');
-            if (0 === dataset.length) return result;
-            if (vseed.measures) {
-                result.measures = findAllMeasures(measures);
-                return result;
-            }
-            const top100dataset = dataset.slice(0, 100);
-            const sample = top100dataset.reduce((prev, cur)=>({
-                    ...prev,
-                    ...cur
-                }), {});
-            result.measures = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
-                    '',
-                    null,
-                    void 0
-                ].includes(key)).map((measure)=>({
-                    id: measure,
-                    alias: measure,
-                    encoding: 'detail'
-                }));
-            return result;
-        };
         const ORIGINAL_DATA = '__OriginalData__';
         const Separator = '-';
         const FoldMeasureName = '__MeaName__';
@@ -1140,88 +1112,62 @@
         const DetailEncoding = '__Dim_Detail__';
         const ColorEncoding = '__Dim_Color__';
         const ColorIdEncoding = '__Dim_ColorId__';
-        const findAllDimensions = (dimensions = [])=>{
-            if (!dimensions) return [];
-            const result = [];
-            preorderTraverse(dimensions, (node)=>{
-                if (!('children' in node)) result.push(node);
-                return false;
-            });
-            return result;
-        };
-        const autoPivotDimensions = (advancedVSeed, context)=>{
+        const defaultMeasureName = (advancedVSeed)=>{
             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) {
-                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,
-                        encoding: index % 2 === 0 ? 'column' : 'row'
-                    };
-                });
-                return result;
-            }
-            const top100dataset = dataset.slice(0, 100);
-            const sample = top100dataset.reduce((prev, cur)=>({
-                    ...prev,
-                    ...cur
-                }), {});
-            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));
-            result.dimensions = newDimensions.map((dim)=>({
-                    id: dim,
-                    alias: dim
-                }));
-            result.dimensions.push(MeaName);
-            result.dimensions = result.dimensions.map((dim, index)=>({
-                    ...dim,
-                    encoding: index % 2 === 0 ? 'column' : 'row'
-                }));
+            if (!result.dimensions?.some((dim)=>dim.id === MeasureName)) result.dimensions?.push(MeaName);
             return result;
         };
-        const pivotTableConfig = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            const { chartType } = vseed;
-            const result = {
-                ...advancedVSeed
-            };
-            const config = chunk_2T7K3PFL_i(vseed, [
-                'backgroundColor',
-                'bodyFontSize',
-                'bodyFontColor',
-                'bodyBackgroundColor',
-                'headerFontSize',
-                'headerFontColor',
-                'headerBackgroundColor',
-                'hoverHeaderBackgroundColor',
-                'hoverHeaderInlineBackgroundColor',
-                'selectedBorderColor',
-                'selectedBackgroundColor'
-            ]);
-            result.config = {
-                ...result.config || {},
-                [chartType]: {
-                    ...config
-                }
+        const encodingForPivotTable = (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 = {};
+            if (hasDimensionEncoding) generateDimensionEncoding(dimensions, encoding);
+            else generateDefaultDimensionEncoding(dimensions, encoding);
+            if (hasMeasureEncoding) generateMeasureEncoding(measures, encoding);
+            else generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
             };
-            return result;
+        };
+        const generateDefaultDimensionEncoding = (dimensions, encoding)=>{
+            const uniqueDimIds = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
+            encoding.tooltip = uniqueDimIds;
+            encoding.row = [];
+            encoding.column = [];
+            uniqueDimIds.forEach((item, index)=>{
+                if (index % 2 === 0) encoding.column.push(item);
+                else encoding.row.push(item);
+            });
+        };
+        const generateDimensionEncoding = (dimensions, encoding)=>{
+            const uniqueDimIds = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
+            encoding.tooltip = uniqueDimIds;
+            encoding.row = [];
+            encoding.column = [];
+            dimensions.forEach((dim, index)=>{
+                const id = dim.id;
+                if ('row' === dim.encoding) encoding.row.push(id);
+                else if ('column' === dim.encoding) encoding.column.push(id);
+                else if (index % 2 === 0) encoding.column.push(id);
+                else encoding.row.push(id);
+            });
+        };
+        const generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
+            encoding.detail = chunk_QJLMYOTX_i(measures.filter((item)=>'detail' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const generateMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = measures.map((item)=>item.id);
+            encoding.detail = chunk_QJLMYOTX_i(measures.filter((item)=>'detail' === item.encoding || !item.encoding).map((item)=>item.id));
         };
         function chunk_AIG3BDKO_i(...e) {
             return chunk_WIMGWYZL_u(chunk_AIG3BDKO_n, e);
@@ -1322,10 +1268,39 @@
                 measures
             };
         };
+        const pivotTableConfig = (advancedVSeed, context)=>{
+            const { vseed } = context;
+            const { chartType } = vseed;
+            const result = {
+                ...advancedVSeed
+            };
+            const config = chunk_2T7K3PFL_i(vseed, [
+                'backgroundColor',
+                'bodyFontSize',
+                'bodyFontColor',
+                'bodyBackgroundColor',
+                'headerFontSize',
+                'headerFontColor',
+                'headerBackgroundColor',
+                'hoverHeaderBackgroundColor',
+                'hoverHeaderInlineBackgroundColor',
+                'selectedBorderColor',
+                'selectedBackgroundColor'
+            ]);
+            result.config = {
+                ...result.config || {},
+                [chartType]: {
+                    ...config
+                }
+            };
+            return result;
+        };
         const pivotTableAdvancedPipeline = [
             initAdvancedVSeed,
-            autoPivotMeasures,
-            autoPivotDimensions,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
+            defaultMeasureName,
+            encodingForPivotTable,
             reshapePivotTable,
             pivotTableConfig,
             theme_theme
@@ -1372,8 +1347,9 @@
         };
         const pivotColumns = (spec, context)=>{
             const { advancedVSeed } = context;
+            const { encoding } = advancedVSeed;
             const dimensions = advancedVSeed.dimensions;
-            const columns = dimensions.filter((item)=>'columnDimension' === item['location'] || 'column' === item['encoding']);
+            const columns = dimensions.filter((item)=>encoding.column?.includes(item.id));
             return {
                 ...spec,
                 columns: columns.map((item)=>({
@@ -1386,7 +1362,8 @@
         const pivotRows = (spec, context)=>{
             const { advancedVSeed } = context;
             const dimensions = advancedVSeed.dimensions;
-            const rows = dimensions.filter((item)=>'rowDimension' === item['location'] || 'row' === item['encoding']);
+            const { encoding } = advancedVSeed;
+            const rows = dimensions.filter((item)=>encoding.row?.includes(item.id));
             return {
                 ...spec,
                 rows: rows.map((item)=>({
@@ -1419,6 +1396,7 @@
         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);
+                if (!datum[0]) return value;
                 const { measureId: foldMeasureId } = foldInfo;
                 const measureId = datum[0][foldMeasureId];
                 const node = findMeasureById(measures, measureId);
@@ -1448,9 +1426,9 @@
                 borderColor: borderColor,
                 borderLineWidth: 1,
                 padding: [
-                    8.6,
+                    8,
                     12,
-                    8.6,
+                    8,
                     12
                 ],
                 textAlign: 'left',
@@ -1578,7 +1556,7 @@
                 locale: locale || 'zh-CN'
             };
         };
-        const defaultMeasures_defaultMeasures = (advancedVSeed, context)=>{
+        const default_defaultMeasures_defaultMeasures = (advancedVSeed, context)=>{
             const { vseed } = context;
             const { measures, dataset } = vseed;
             if (measures && measures.length > 0) return {
@@ -1608,7 +1586,7 @@
                 measures: defaultMeasures
             };
         };
-        const defaultDimensions = (advancedVSeed, context)=>{
+        const defaultDimensions_defaultDimensions = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
             };
@@ -1639,7 +1617,7 @@
                 dimensions: newDimensions
             };
         };
-        const defaultMeasureName = (advancedVSeed)=>{
+        const defaultMeasureName_defaultMeasureName = (advancedVSeed)=>{
             const result = {
                 ...advancedVSeed
             };
@@ -1656,16 +1634,16 @@
             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);
+            if (hasDimensionEncoding) line_generateDimensionEncoding(dimensions, encoding);
+            else line_generateDefaultDimensionEncoding(dimensions, encoding);
+            if (hasMeasureEncoding) line_generateMeasureEncoding(measures, encoding);
+            else line_generateDefaultMeasureEncoding(measures, encoding);
             return {
                 ...advancedVSeed,
                 encoding
             };
         };
-        const generateDefaultDimensionEncoding = (dimensions, encoding)=>{
+        const line_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
             const uniqueDimIds = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
             encoding.x = uniqueDimIds.slice(0, 1);
             encoding.color = uniqueDimIds.slice(1);
@@ -1675,7 +1653,7 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const generateDimensionEncoding = (dimensions, encoding)=>{
+        const line_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 = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
@@ -1685,12 +1663,15 @@
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
         };
-        const generateDefaultMeasureEncoding = (measures, encoding)=>{
+        const line_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)=>{
+        const line_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));
@@ -1730,7 +1711,7 @@
             }
             if ('dualAxis' === vseed.chartType || 'scatter' === vseed.chartType) {
                 const { dimensions = [] } = vseed;
-                const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'rowDimension' === dimension.location || 'columnDimension' === dimension.location);
+                const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'row' === dimension.encoding || 'column' === dimension.encoding);
                 if (hasRowOrColumnDimension) return true;
                 if ('scatter' === vseed.chartType) {
                     if (isMeasureTreeWithChildren(vseed)) {
@@ -1750,7 +1731,7 @@
                 return false;
             }
             const { measures = [], dimensions = [] } = vseed;
-            const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'rowDimension' === dimension.location || 'columnDimension' === dimension.location);
+            const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'row' === dimension.encoding || 'column' === dimension.encoding);
             const hasMeasureGroup = measures && measures.some((measure)=>measure && measure.children);
             return hasRowOrColumnDimension || hasMeasureGroup;
         };
@@ -2168,9 +2149,9 @@
         };
         const lineAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForLine,
             buildMeasures,
             pivotAdapter([
@@ -3243,7 +3224,7 @@
         const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
             const { advancedVSeed } = context;
             const { annotation, datasetReshapeInfo } = advancedVSeed;
-            const { unfoldInfo } = datasetReshapeInfo[0];
+            const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
             if (!annotation || !annotation.annotationVerticalLine) return spec;
             const { annotationVerticalLine } = annotation;
             const annotationVerticalLineList = Array.isArray(annotationVerticalLine) ? annotationVerticalLine : [
@@ -3323,9 +3304,9 @@
                 }
                 const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
                 return selectedData.map((datum)=>{
-                    const x = unfoldInfo.encodingX;
-                    if (!x) return {};
-                    return generateOneMarkLine(datum[x]);
+                    if (datum[unfoldInfo.encodingX]) return generateOneMarkLine(datum[unfoldInfo.encodingX]);
+                    if (datum[foldInfo.measureValue]) return generateOneMarkLine(datum[foldInfo.measureValue]);
+                    return {};
                 });
             });
             const specMarkLine = spec.markLine || [];
@@ -3341,10 +3322,10 @@
         const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
             const { advancedVSeed } = context;
             const { annotation, datasetReshapeInfo } = advancedVSeed;
-            const { unfoldInfo } = datasetReshapeInfo[0];
+            const { foldInfo, unfoldInfo } = datasetReshapeInfo[0];
             if (!annotation || !annotation.annotationHorizontalLine) return spec;
             const { annotationHorizontalLine } = annotation;
-            const annotationVerticalLineList = Array.isArray(annotationHorizontalLine) ? annotationHorizontalLine : [
+            const annotationHorizontalLineList = Array.isArray(annotationHorizontalLine) ? annotationHorizontalLine : [
                 annotationHorizontalLine
             ];
             const positionMap = {
@@ -3355,8 +3336,8 @@
                 insideMiddle: 'insideMiddleTop',
                 insideEnd: 'insideEndTop'
             };
-            const markLine = annotationVerticalLineList.flatMap((annotationVerticalLine)=>{
-                const { selector: selectorPoint, yValue, text = '', textPosition = 'insideEnd', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'right', textBaseline = 'top', lineColor = '#212121', lineStyle = 'dashed', lineVisible = true, lineWidth = 1, textBackgroundVisible = true, textBackgroundColor = '#212121', textBackgroundBorderColor = '#212121', textBackgroundBorderRadius = 4, textBackgroundBorderWidth = 1, textBackgroundPadding = 2 } = annotationVerticalLine;
+            const markLine = annotationHorizontalLineList.flatMap((annotationHorizontalLine)=>{
+                const { selector: selectorPoint, yValue, text = '', textPosition = 'insideEnd', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'right', textBaseline = 'top', lineColor = '#212121', lineStyle = 'dashed', lineVisible = true, lineWidth = 1, textBackgroundVisible = true, textBackgroundColor = '#212121', textBackgroundBorderColor = '#212121', textBackgroundBorderRadius = 4, textBackgroundBorderWidth = 1, textBackgroundPadding = 2 } = annotationHorizontalLine;
                 const dataset = advancedVSeed.dataset.flat();
                 const generateOneMarkLine = (y)=>({
                         y,
@@ -3421,9 +3402,9 @@
                 }
                 const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
                 return selectedData.map((datum)=>{
-                    const y = unfoldInfo.encodingY;
-                    if (!y) return {};
-                    return generateOneMarkLine(datum[y]);
+                    if (datum[unfoldInfo.encodingY]) return generateOneMarkLine(datum[unfoldInfo.encodingY]);
+                    if (datum[foldInfo.measureValue]) return generateOneMarkLine(datum[foldInfo.measureValue]);
+                    return {};
                 });
             });
             const specMarkLine = spec.markLine || [];
@@ -3787,7 +3768,7 @@
             const { advancedVSeed } = context;
             const dimensions = advancedVSeed.dimensions;
             if (!dimensions) return result;
-            const rowDimensions = dimensions.filter((dim)=>'rowDimension' === dim.location || 'row' === dim.encoding);
+            const rowDimensions = dimensions.filter((dim)=>'row' === dim.encoding);
             const rows = rowDimensions.map((dim)=>({
                     dimensionKey: dim.id,
                     title: dim.alias || dim.id
@@ -3804,7 +3785,7 @@
             const { advancedVSeed } = context;
             const dimensions = advancedVSeed.dimensions;
             if (!dimensions) return result;
-            const columnDimensions = dimensions.filter((dim)=>'columnDimension' === dim.location || 'column' === dim.encoding);
+            const columnDimensions = dimensions.filter((dim)=>'column' === dim.encoding);
             const columns = columnDimensions.map((dim)=>({
                     dimensionKey: dim.id,
                     title: dim.alias || dim.id
@@ -4113,6 +4094,9 @@
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
         };
         const column_generateDefaultMeasureEncoding = (measures, encoding)=>{
             encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
@@ -4127,9 +4111,9 @@
         };
         const columnAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForColumn,
             buildMeasures,
             pivotAdapter([
@@ -4491,9 +4475,9 @@
         };
         const columnParallelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForColumn,
             buildMeasures,
             pivotAdapter([
@@ -4590,9 +4574,9 @@
         };
         const columnPercentAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForColumn,
             buildMeasures,
             pivotAdapter([
@@ -4686,10 +4670,6 @@
                 encoding
             };
         };
-        const bar_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
-            encoding.x = chunk_QJLMYOTX_i(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 = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
@@ -4701,13 +4681,6 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const bar_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
-            encoding.x = chunk_QJLMYOTX_i(measures.filter((item)=>'xAxis' === 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 bar_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.y = chunk_QJLMYOTX_i(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
             encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
@@ -4718,7 +4691,20 @@
             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);
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+        };
+        const bar_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
+            encoding.x = chunk_QJLMYOTX_i(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const bar_generateMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = measures.map((item)=>item.id);
+            encoding.x = chunk_QJLMYOTX_i(measures.filter((item)=>'xAxis' === 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 sortYBandAxis = (advancedVSeed, context)=>{
             const result = {
@@ -4738,9 +4724,9 @@
         };
         const barAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForBar,
             buildMeasures,
             pivotAdapter([
@@ -5093,9 +5079,9 @@
         };
         const barParallelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForBar,
             buildMeasures,
             pivotAdapter([
@@ -5191,9 +5177,9 @@
         };
         const barPercentAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForBar,
             buildMeasures,
             pivotAdapter([
@@ -5264,9 +5250,9 @@
         };
         const areaAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForLine,
             buildMeasures,
             pivotAdapter([
@@ -5424,9 +5410,9 @@
         };
         const areaPercentAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForLine,
             buildMeasures,
             pivotAdapter([
@@ -5517,10 +5503,6 @@
                 encoding
             };
         };
-        const scatter_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
-            encoding.y = chunk_QJLMYOTX_i(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 = chunk_QJLMYOTX_i(dimensionsWithoutMeasureName.map((d)=>d.id));
@@ -5531,19 +5513,27 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const scatter_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
-            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'xAxis' === item.encoding || '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 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 = [
                 MeasureName
             ];
-            if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+        };
+        const scatter_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
+            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const scatter_generateMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = measures.map((item)=>item.id);
+            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'xAxis' === item.encoding || '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[0]
+            ];
         };
         const buildMeasuresForScatter = (advancedVSeed, context)=>{
             const { vseed } = context;
@@ -5571,7 +5561,7 @@
                 const isXAxis = encoding.includes('xAxis');
                 if (isYAxis) yMeasures.push(item);
                 else if (isXAxis) xMeasures.push(item);
-                else if (0 === index) yMeasures.push(item);
+                else if (0 !== index) yMeasures.push(item);
                 else xMeasures.push(item);
             }
             return [
@@ -5639,7 +5629,7 @@
                 const isEmpty = !encoding.length;
                 if (isY) scatterChart.yMeasures.push(item);
                 else if (isX) scatterChart.xMeasures.push(item);
-                else if (isEmpty) 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);
@@ -5774,9 +5764,9 @@
         };
         const scatterAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForScatter,
             buildMeasuresForScatter,
             pivotAdapter([
@@ -5938,10 +5928,6 @@
                 encoding
             };
         };
-        const dualAxis_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
-            encoding.y = chunk_QJLMYOTX_i(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 = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
@@ -5953,13 +5939,6 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const dualAxis_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
-            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === 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 dualAxis_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));
@@ -5970,7 +5949,20 @@
             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);
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+        };
+        const dualAxis_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
+            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const dualAxis_generateMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = measures.map((item)=>item.id);
+            encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === 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 buildMeasuresForDualAxis = (advancedVSeed, context)=>{
             const { vseed } = context;
@@ -6224,9 +6216,9 @@
         };
         const dualAxisAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForDualAxis,
             buildMeasuresForDualAxis,
             pivotAdapter([
@@ -7076,10 +7068,6 @@
                 encoding
             };
         };
-        const pie_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
-            encoding.angle = chunk_QJLMYOTX_i(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
-        };
         const pie_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
             const uniqueDimIds = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
             encoding.color = uniqueDimIds.slice(0);
@@ -7089,25 +7077,31 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const pie_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
-            encoding.angle = chunk_QJLMYOTX_i(measures.filter((item)=>'angle' === 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 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 = [
                 MeasureName
             ];
-            if (0 === encoding.detail.length) encoding.detail = dimensions.map((item)=>item.id);
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+        };
+        const pie_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
+            encoding.angle = chunk_QJLMYOTX_i(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const pie_generateMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = measures.map((item)=>item.id);
+            encoding.angle = chunk_QJLMYOTX_i(measures.filter((item)=>'angle' === 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 pieAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForPie,
             buildMeasures,
             pivotAdapter([
@@ -7225,9 +7219,9 @@
         };
         const donutAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             buildMeasures,
             encodingForPie,
             pivotAdapter([
@@ -7320,10 +7314,6 @@
                 encoding
             };
         };
-        const rose_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
-            encoding.radius = chunk_QJLMYOTX_i(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 = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
@@ -7335,12 +7325,6 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const rose_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
-            encoding.radius = chunk_QJLMYOTX_i(measures.filter((item)=>'radius' === 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 rose_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.angle = chunk_QJLMYOTX_i(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
             encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
@@ -7351,13 +7335,25 @@
             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);
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+        };
+        const rose_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
+            encoding.radius = chunk_QJLMYOTX_i(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const rose_generateMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = measures.map((item)=>item.id);
+            encoding.radius = chunk_QJLMYOTX_i(measures.filter((item)=>'radius' === 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 roseAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForRose,
             buildMeasures,
             pivotAdapter([
@@ -7555,9 +7551,9 @@
         };
         const roseParallelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForRose,
             buildMeasures,
             pivotAdapter([
@@ -7680,10 +7676,6 @@
                 encoding
             };
         };
-        const radar_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
-            encoding.radius = chunk_QJLMYOTX_i(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
-        };
         const radar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
             const uniqueDimIds = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
             encoding.angle = uniqueDimIds.slice(0, 1);
@@ -7694,12 +7686,6 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const radar_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
-            encoding.radius = chunk_QJLMYOTX_i(measures.filter((item)=>'radius' === 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 radar_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.angle = chunk_QJLMYOTX_i(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
             encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
@@ -7710,12 +7696,25 @@
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+        };
+        const radar_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
+            encoding.radius = chunk_QJLMYOTX_i(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const radar_generateMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = measures.map((item)=>item.id);
+            encoding.radius = chunk_QJLMYOTX_i(measures.filter((item)=>'radius' === 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 radarAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForRadar,
             buildMeasures,
             pivotAdapter([
@@ -7866,10 +7865,6 @@
                 encoding
             };
         };
-        const funnel_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
-            encoding.size = chunk_QJLMYOTX_i(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
-        };
         const funnel_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
             const uniqueDimIds = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
             encoding.color = uniqueDimIds.slice(0);
@@ -7879,25 +7874,33 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const funnel_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
-            encoding.size = chunk_QJLMYOTX_i(measures.filter((item)=>'size' === 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 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 = [
                 MeasureName
             ];
-            if (0 === encoding.detail.length) encoding.detail = dimensions.map((item)=>item.id);
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+        };
+        const funnel_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
+            encoding.size = chunk_QJLMYOTX_i(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const funnel_generateMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = measures.map((item)=>item.id);
+            encoding.size = chunk_QJLMYOTX_i(measures.filter((item)=>'size' === 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[0]
+            ];
         };
         const funnelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForFunnel,
             buildMeasures,
             pivotAdapter([
@@ -8027,10 +8030,6 @@
                 encoding
             };
         };
-        const heatmap_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
-            encoding.color = chunk_QJLMYOTX_i(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 = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
@@ -8043,12 +8042,6 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const heatmap_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.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 heatmap_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.x = chunk_QJLMYOTX_i(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
             encoding.y = chunk_QJLMYOTX_i(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
@@ -8062,13 +8055,30 @@
             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);
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+        };
+        const heatmap_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
+            const colorDims = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding || !item.encoding).map((item)=>item.id));
+            if (colorDims.length > 0) encoding.color = [
+                colorDims[0]
+            ];
+        };
+        const heatmap_generateMeasureEncoding = (measures, encoding)=>{
+            encoding.tooltip = measures.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[0]
+            ];
+            return encoding;
         };
         const heatmapAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
             encodingForHeatmap,
             buildMeasures,
             pivotAdapter([
@@ -8864,6 +8874,15 @@
         const updateSpec = (chartType, specPipe)=>{
             Builder._customSpecPipe[chartType] = specPipe;
         };
+        const findAllDimensions = (dimensions = [])=>{
+            if (!dimensions) return [];
+            const result = [];
+            preorderTraverse(dimensions, (node)=>{
+                if (!('children' in node)) result.push(node);
+                return false;
+            });
+            return result;
+        };
         Object.freeze({
             status: "aborted"
         });
@@ -12190,11 +12209,6 @@
         const zDimension = schemas_object({
             id: schemas_string(),
             alias: schemas_string().optional(),
-            location: schemas_enum([
-                'dimension',
-                'rowDimension',
-                'columnDimension'
-            ]).default('dimension'),
             encoding: schemas_enum([
                 'xAxis',
                 'yAxis',