@visactor/vseed 0.1.6 → 0.1.7

package/dist/index.js

@@ -167,33 +167,35 @@ const initAdvancedVSeed = (advancedVSeed, context)=>{
         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;
@@ -247,37 +249,36 @@ const findAllMeasures = (measures = [])=>{
     });
     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;
@@ -349,8 +350,8 @@ const mergeArray = (arr, themeItem)=>{
 };
 const tableAdvancedPipeline = [
     initAdvancedVSeed,
-    autoMeasures,
-    autoDimensions,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
     records_records,
     tableConfig_tableConfig,
     theme_theme
@@ -571,9 +572,9 @@ const bodyStyle = (spec, context)=>{
         borderColor: borderColor,
         borderLineWidth: 1,
         padding: [
-            8.6,
+            8,
             12,
-            8.6,
+            8,
             12
         ],
         textAlign: 'right',
@@ -686,35 +687,6 @@ const registerTable = ()=>{
     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__';
@@ -731,88 +703,62 @@ const AngleEncoding = '__Dim_Angle__';
 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 = pick(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 = unique(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 = unique(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 = unique(measures.map((item)=>item.id));
+    encoding.detail = unique(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 = unique(measures.filter((item)=>'detail' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const foldMeasures = (dataset, measures, options)=>{
     const { measureId, measureName, measureValue, colorMeasureId } = options || {};
@@ -892,10 +838,39 @@ const reshapePivotTable = (advancedVSeed, context)=>{
         measures
     };
 };
+const pivotTableConfig = (advancedVSeed, context)=>{
+    const { vseed } = context;
+    const { chartType } = vseed;
+    const result = {
+        ...advancedVSeed
+    };
+    const config = pick(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
@@ -942,8 +917,9 @@ const initPivotTable = (spec, context)=>{
 };
 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)=>({
@@ -956,7 +932,8 @@ const pivotColumns = (spec, context)=>{
 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)=>({
@@ -989,6 +966,7 @@ const pivotIndicators = (spec, context)=>{
 const pivotIndicators_fieldFormat = (measures, foldInfo, locale)=>(value, col, row, table)=>{
         if (!isNumber(col) || !isNumber(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);
@@ -1018,9 +996,9 @@ const rowHeaderStyle = (spec, context)=>{
         borderColor: borderColor,
         borderLineWidth: 1,
         padding: [
-            8.6,
+            8,
             12,
-            8.6,
+            8,
             12
         ],
         textAlign: 'left',
@@ -1148,7 +1126,7 @@ const initAdvancedVSeed_initAdvancedVSeed = (advancedVSeed, context)=>{
         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 {
@@ -1178,7 +1156,7 @@ const defaultMeasures_defaultMeasures = (advancedVSeed, context)=>{
         measures: defaultMeasures
     };
 };
-const defaultDimensions = (advancedVSeed, context)=>{
+const defaultDimensions_defaultDimensions = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
     };
@@ -1209,7 +1187,7 @@ const defaultDimensions = (advancedVSeed, context)=>{
         dimensions: newDimensions
     };
 };
-const defaultMeasureName = (advancedVSeed)=>{
+const defaultMeasureName_defaultMeasureName = (advancedVSeed)=>{
     const result = {
         ...advancedVSeed
     };
@@ -1226,16 +1204,16 @@ const encodingForLine = (advancedVSeed)=>{
     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 = unique(dimensions.map((d)=>d.id));
     encoding.x = uniqueDimIds.slice(0, 1);
     encoding.color = uniqueDimIds.slice(1);
@@ -1245,7 +1223,7 @@ const generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.row = [];
     encoding.column = [];
 };
-const generateDimensionEncoding = (dimensions, encoding)=>{
+const line_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
@@ -1255,12 +1233,15 @@ const generateDimensionEncoding = (dimensions, encoding)=>{
     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 = unique(measures.map((item)=>item.id));
     encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
 };
-const generateMeasureEncoding = (measures, encoding)=>{
+const line_generateMeasureEncoding = (measures, encoding)=>{
     encoding.tooltip = measures.map((item)=>item.id);
     encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
@@ -1300,7 +1281,7 @@ const isPivotChart = (vseed)=>{
     }
     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)) {
@@ -1320,7 +1301,7 @@ const isPivotChart = (vseed)=>{
         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;
 };
@@ -1715,9 +1696,9 @@ const annotation_annotation = (advancedVSeed, context)=>{
 };
 const lineAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForLine,
     buildMeasures,
     pivotAdapter([
@@ -2771,7 +2752,7 @@ const annotationPoint_annotationPoint = (spec, context)=>{
 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 : [
@@ -2851,9 +2832,9 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
         }
         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 || [];
@@ -2869,10 +2850,10 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
 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 = {
@@ -2883,8 +2864,8 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
         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,
@@ -2949,9 +2930,9 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
         }
         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 || [];
@@ -3315,7 +3296,7 @@ const pivotRowDimensions = (spec, context)=>{
     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
@@ -3332,7 +3313,7 @@ const pivotColumnDimensions = (spec, context)=>{
     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
@@ -3641,6 +3622,9 @@ const column_generateDimensionEncoding = (dimensions, encoding)=>{
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    if (0 === encoding.detail.length) encoding.detail = [
+        MeasureName
+    ];
 };
 const column_generateDefaultMeasureEncoding = (measures, encoding)=>{
     encoding.tooltip = unique(measures.map((item)=>item.id));
@@ -3655,9 +3639,9 @@ const column_generateMeasureEncoding = (measures, encoding)=>{
 };
 const columnAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForColumn,
     buildMeasures,
     pivotAdapter([
@@ -4019,9 +4003,9 @@ const registerColumn = ()=>{
 };
 const columnParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForColumn,
     buildMeasures,
     pivotAdapter([
@@ -4118,9 +4102,9 @@ const registerColumnParallel = ()=>{
 };
 const columnPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForColumn,
     buildMeasures,
     pivotAdapter([
@@ -4214,10 +4198,6 @@ const encodingForBar = (advancedVSeed)=>{
         encoding
     };
 };
-const bar_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.x = unique(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const bar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
@@ -4229,13 +4209,6 @@ const bar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.row = [];
     encoding.column = [];
 };
-const bar_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
-    encoding.x = unique(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-    return encoding;
-};
 const bar_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.y = unique(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
@@ -4246,7 +4219,20 @@ const bar_generateDimensionEncoding = (dimensions, encoding)=>{
     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 = unique(measures.map((item)=>item.id));
+    encoding.x = unique(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 = unique(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = color;
+    return encoding;
 };
 const sortYBandAxis = (advancedVSeed, context)=>{
     const result = {
@@ -4266,9 +4252,9 @@ const sortYBandAxis = (advancedVSeed, context)=>{
 };
 const barAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForBar,
     buildMeasures,
     pivotAdapter([
@@ -4621,9 +4607,9 @@ const registerBar = ()=>{
 };
 const barParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForBar,
     buildMeasures,
     pivotAdapter([
@@ -4719,9 +4705,9 @@ const registerBarParallel = ()=>{
 };
 const barPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForBar,
     buildMeasures,
     pivotAdapter([
@@ -4792,9 +4778,9 @@ const registerBarPercent = ()=>{
 };
 const areaAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForLine,
     buildMeasures,
     pivotAdapter([
@@ -4952,9 +4938,9 @@ const registerArea = ()=>{
 };
 const areaPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForLine,
     buildMeasures,
     pivotAdapter([
@@ -5045,10 +5031,6 @@ const encodingForScatter = (advancedVSeed)=>{
         encoding
     };
 };
-const scatter_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.y = unique(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const scatter_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const dimensionsWithoutMeasureName = dimensions.filter((item)=>item.id !== MeasureName);
     const uniqueDimIds = unique(dimensionsWithoutMeasureName.map((d)=>d.id));
@@ -5059,19 +5041,27 @@ const scatter_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.row = [];
     encoding.column = [];
 };
-const scatter_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
-    encoding.y = unique(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-};
 const scatter_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         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 = unique(measures.map((item)=>item.id));
+    encoding.y = unique(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const scatter_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.y = unique(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = [
+        color[0]
+    ];
 };
 const buildMeasuresForScatter = (advancedVSeed, context)=>{
     const { vseed } = context;
@@ -5099,7 +5089,7 @@ const basicMeasuresToScatterMeasures = (basicMeasures)=>{
         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 [
@@ -5167,7 +5157,7 @@ const buildMeasuresForScatter_generateMeasuresByParentId = (measures)=>{
         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);
@@ -5302,9 +5292,9 @@ const pivotReshapeWithScatterEncoding = (advancedVSeed, context)=>{
 };
 const scatterAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForScatter,
     buildMeasuresForScatter,
     pivotAdapter([
@@ -5466,10 +5456,6 @@ const encodingForDualAxis = (advancedVSeed)=>{
         encoding
     };
 };
-const dualAxis_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.y = unique(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const dualAxis_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
@@ -5481,13 +5467,6 @@ const dualAxis_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.row = [];
     encoding.column = [];
 };
-const dualAxis_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
-    encoding.y = unique(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-    return encoding;
-};
 const dualAxis_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
@@ -5498,7 +5477,20 @@ const dualAxis_generateDimensionEncoding = (dimensions, encoding)=>{
     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 = unique(measures.map((item)=>item.id));
+    encoding.y = unique(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const dualAxis_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.y = unique(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = color;
+    return encoding;
 };
 const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
     const { vseed } = context;
@@ -5752,9 +5744,9 @@ const dualAxisConfig = (advancedVSeed, context)=>{
 };
 const dualAxisAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForDualAxis,
     buildMeasuresForDualAxis,
     pivotAdapter([
@@ -6604,10 +6596,6 @@ const encodingForPie = (advancedVSeed)=>{
         encoding
     };
 };
-const pie_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.angle = unique(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const pie_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
     encoding.color = uniqueDimIds.slice(0);
@@ -6617,25 +6605,31 @@ const pie_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.row = [];
     encoding.column = [];
 };
-const pie_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
-    encoding.angle = unique(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-};
 const pie_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         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 = unique(measures.map((item)=>item.id));
+    encoding.angle = unique(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 = unique(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = color;
 };
 const pieAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForPie,
     buildMeasures,
     pivotAdapter([
@@ -6753,9 +6747,9 @@ const registerPie = ()=>{
 };
 const donutAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     buildMeasures,
     encodingForPie,
     pivotAdapter([
@@ -6848,10 +6842,6 @@ const encodingForRose = (advancedVSeed)=>{
         encoding
     };
 };
-const rose_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const rose_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
@@ -6863,12 +6853,6 @@ const rose_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.row = [];
     encoding.column = [];
 };
-const rose_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
-    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-};
 const rose_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.angle = unique(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
@@ -6879,13 +6863,25 @@ const rose_generateDimensionEncoding = (dimensions, encoding)=>{
     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 = unique(measures.map((item)=>item.id));
+    encoding.radius = unique(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 = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = color;
 };
 const roseAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForRose,
     buildMeasures,
     pivotAdapter([
@@ -7083,9 +7079,9 @@ const registerRose = ()=>{
 };
 const roseParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForRose,
     buildMeasures,
     pivotAdapter([
@@ -7208,10 +7204,6 @@ const encodingForRadar = (advancedVSeed)=>{
         encoding
     };
 };
-const radar_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const radar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
     encoding.angle = uniqueDimIds.slice(0, 1);
@@ -7222,12 +7214,6 @@ const radar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.row = [];
     encoding.column = [];
 };
-const radar_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
-    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-};
 const radar_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.angle = unique(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
@@ -7238,12 +7224,25 @@ const radar_generateDimensionEncoding = (dimensions, encoding)=>{
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    if (0 === encoding.detail.length) encoding.detail = [
+        MeasureName
+    ];
+};
+const radar_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = unique(measures.map((item)=>item.id));
+    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const radar_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = color;
 };
 const radarAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForRadar,
     buildMeasures,
     pivotAdapter([
@@ -7394,10 +7393,6 @@ const encodingForFunnel = (advancedVSeed)=>{
         encoding
     };
 };
-const funnel_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.size = unique(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const funnel_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
     encoding.color = uniqueDimIds.slice(0);
@@ -7407,25 +7402,33 @@ const funnel_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.row = [];
     encoding.column = [];
 };
-const funnel_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
-    encoding.size = unique(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-};
 const funnel_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         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 = unique(measures.map((item)=>item.id));
+    encoding.size = unique(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 = unique(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = [
+        color[0]
+    ];
 };
 const funnelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
     encodingForFunnel,
     buildMeasures,
     pivotAdapter([
@@ -7555,10 +7558,6 @@ const encodingForHeatmap = (advancedVSeed)=>{
         encoding
     };
 };
-const heatmap_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.color = unique(measures.filter((item)=>'color' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const heatmap_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
@@ -7571,12 +7570,6 @@ const heatmap_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     encoding.row = [];
     encoding.column = [];
 };
-const heatmap_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-    return encoding;
-};
 const heatmap_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
     encoding.y = unique(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
@@ -7590,13 +7583,30 @@ const heatmap_generateDimensionEncoding = (dimensions, encoding)=>{
     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 = unique(measures.map((item)=>item.id));
+    const colorDims = unique(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 = unique(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([
@@ -8392,6 +8402,15 @@ const updateAdvanced = (chartType, advancedPipe)=>{
 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;
+};
 const zChartType = z["enum"]([
     'table',
     'pivotTable',
@@ -8435,11 +8454,6 @@ const zDataset = z.array(zDatum);
 const zDimension = z.object({
     id: z.string(),
     alias: z.string().optional(),
-    location: z["enum"]([
-        'dimension',
-        'rowDimension',
-        'columnDimension'
-    ]).default('dimension'),
     encoding: z["enum"]([
         'xAxis',
         'yAxis',