@visactor/vseed 0.1.6 → 0.1.8

package/dist/umd/index.js

@@ -62,7 +62,7 @@
             zYLinearAxis: ()=>zYLinearAxis,
             zMarkStyle: ()=>zMarkStyle,
             registerFunnel: ()=>registerFunnel,
-            Separator: ()=>Separator,
+            Separator: ()=>"-",
             columnAdvancedPipeline: ()=>columnAdvancedPipeline,
             zLabel: ()=>zLabel,
             registerColumn: ()=>registerColumn,
@@ -91,12 +91,13 @@
             FoldMeasureId: ()=>FoldMeasureId,
             zColumnParallelConfig: ()=>zColumnParallelConfig,
             donutSpecPipeline: ()=>donutSpecPipeline,
+            FoldXMeasureId: ()=>FoldXMeasureId,
             registerAreaPercent: ()=>registerAreaPercent,
-            zHeatmap: ()=>zHeatmap,
             zBarPercent: ()=>zBarPercent,
+            zHeatmap: ()=>zHeatmap,
             zScatterMeasure: ()=>zScatterMeasure,
-            zTheme: ()=>zTheme,
             zDatum: ()=>zDatum,
+            zTheme: ()=>zTheme,
             barAdvancedPipeline: ()=>barAdvancedPipeline,
             zCustomThemeConfig: ()=>zCustomThemeConfig,
             registerColumnPercent: ()=>registerColumnPercent,
@@ -186,6 +187,7 @@
             zTableConfig: ()=>zTableConfig,
             zXBandAxis: ()=>zXBandAxis,
             zColumnPercentConfig: ()=>zColumnPercentConfig,
+            FoldYMeasureId: ()=>FoldYMeasureId,
             findMeasureById: ()=>findMeasureById,
             zVSeed: ()=>zVSeed,
             AngleEncoding: ()=>AngleEncoding,
@@ -491,33 +493,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 +575,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 +758,8 @@
         };
         const tableAdvancedPipeline = [
             initAdvancedVSeed,
-            autoMeasures,
-            autoDimensions,
+            defaultMeasures_defaultMeasures,
+            defaultDimensions,
             records_records,
             tableConfig_tableConfig,
             theme_theme
@@ -980,9 +983,9 @@
                 borderColor: borderColor,
                 borderLineWidth: 1,
                 padding: [
-                    8.6,
+                    8,
                     12,
-                    8.6,
+                    8,
                     12
                 ],
                 textAlign: 'right',
@@ -1095,37 +1098,7 @@
             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__';
         const FoldMeasureId = '__MeaId__';
         const FoldMeasureValue = '__MeaValue__';
@@ -1134,94 +1107,70 @@
         const FoldSecondaryMeasureValue = '__MeaSecondaryValue__';
         const FoldXMeasureValue = '__MeaXValue__';
         const FoldYMeasureValue = '__MeaYValue__';
+        const FoldXMeasureId = '__MeaXId__';
+        const FoldYMeasureId = '__MeaYId__';
         const XEncoding = '__Dim_X__';
         const YEncoding = '__Dim_Y__';
         const AngleEncoding = '__Dim_Angle__';
         const DetailEncoding = '__Dim_Detail__';
         const ColorEncoding = '__Dim_Color__';
         const ColorIdEncoding = '__Dim_ColorId__';
-        const findAllDimensions = (dimensions = [])=>{
-            if (!dimensions) return [];
-            const result = [];
-            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 +1271,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 +1350,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 +1365,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 +1399,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 +1429,9 @@
                 borderColor: borderColor,
                 borderLineWidth: 1,
                 padding: [
-                    8.6,
+                    8,
                     12,
-                    8.6,
+                    8,
                     12
                 ],
                 textAlign: 'left',
@@ -1578,7 +1559,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 +1589,7 @@
                 measures: defaultMeasures
             };
         };
-        const defaultDimensions = (advancedVSeed, context)=>{
+        const defaultDimensions_defaultDimensions = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
             };
@@ -1639,7 +1620,7 @@
                 dimensions: newDimensions
             };
         };
-        const defaultMeasureName = (advancedVSeed)=>{
+        const defaultMeasureName_defaultMeasureName = (advancedVSeed)=>{
             const result = {
                 ...advancedVSeed
             };
@@ -1650,51 +1631,78 @@
             if (!result.dimensions?.some((dim)=>dim.id === MeasureName)) result.dimensions?.push(MeaName);
             return result;
         };
+        const encodingAdapter = (noEncodingPipeline, hasEncodingPipeline)=>(advancedVSeed, context)=>{
+                const { dimensions = [], measures = [] } = advancedVSeed;
+                const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+                const hasMeasureEncoding = measures.some((item)=>item.encoding);
+                const hasEncoding = hasDimensionEncoding || hasMeasureEncoding;
+                if (hasEncoding) return execPipeline(hasEncodingPipeline, context, advancedVSeed);
+                return execPipeline(noEncodingPipeline, context, advancedVSeed);
+            };
+        const defaultEncodingForLine = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            line_generateDefaultDimensionEncoding(dimensions, encoding);
+            line_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForLine = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            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);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.detail = [];
             encoding.label = [];
             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));
             if (0 === encoding.x.length) encoding.x = [
                 dimensions[0].id
             ];
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
         };
-        const generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
+        const line_generateDefaultMeasureEncoding = (measures, encoding)=>{
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
         };
-        const generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
+        const line_generateMeasureEncoding = (measures, encoding)=>{
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (color.length > 0) encoding.color = color;
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const isMeasureTreeWithChildren = (vseed)=>{
             const { measures } = vseed;
@@ -1706,6 +1714,37 @@
             if (!measures) return false;
             return measures.some((measure)=>'parentId' in measure);
         };
+        const normalizeMeasureTree = (measures)=>{
+            const createEmptyMeasureGroup = ()=>({
+                    id: 'group',
+                    alias: '',
+                    children: []
+                });
+            let currentGroup = createEmptyMeasureGroup();
+            const measureGroups = [];
+            for (const measure of measures)if ('children' in measure) {
+                if (currentGroup.children?.length) {
+                    currentGroup.id = [
+                        currentGroup.id,
+                        ...currentGroup.children.map((item)=>item.id)
+                    ].join('-');
+                    currentGroup.alias = currentGroup.children.map((item)=>item.alias).join('-');
+                    measureGroups.push(currentGroup);
+                    currentGroup = createEmptyMeasureGroup();
+                }
+                measureGroups.push(measure);
+            } else currentGroup.children?.push(measure);
+            if (currentGroup.children?.length) {
+                currentGroup.id = [
+                    currentGroup.id,
+                    ...currentGroup.children.map((item)=>item.id)
+                ].join('-');
+                currentGroup.alias = currentGroup.children.map((item)=>item.alias).join('-');
+                measureGroups.push(currentGroup);
+                currentGroup = createEmptyMeasureGroup();
+            }
+            return measureGroups;
+        };
         const measureDepth = (measures = [])=>{
             if (!measures) return 0;
             let depth = 1;
@@ -1730,7 +1769,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,14 +1789,14 @@
                 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;
         };
         const buildMeasures = (advancedVSeed, context)=>{
             const { vseed } = context;
             if (isMeasureTreeWithChildren(vseed)) {
-                advancedVSeed.measures = vseed.measures;
+                advancedVSeed.measures = normalizeMeasureTree(vseed.measures);
                 return advancedVSeed;
             }
             if (isMeasureTreeWithParentId(vseed)) {
@@ -1873,7 +1912,7 @@
             });
             const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, dimensions, encoding, {
                 foldMeasureId,
-                separator: Separator,
+                separator: "-",
                 colorItemAsId
             });
             return {
@@ -2168,11 +2207,16 @@
         };
         const lineAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForLine,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForLine,
+                buildMeasures
+            ], [
+                encodingForLine,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -2447,10 +2491,6 @@
             ];
             return result;
         };
-        const ANNOTATION_Z_INDEX = 1000;
-        const LINEAR_AXIS_INNER_OFFSET_TOP = 7;
-        const DUAL_AXIS_CHART_COLUMN_Z_INDEX = 1000;
-        const DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX = 1001;
         const yLinear = (spec, context)=>{
             const result = {
                 ...spec
@@ -2524,7 +2564,7 @@
                     }
                 },
                 innerOffset: {
-                    top: LINEAR_AXIS_INNER_OFFSET_TOP
+                    top: 7
                 }
             };
             result.axes = [
@@ -3096,83 +3136,138 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { measures, datasetReshapeInfo, chartType, locale, dimensions } = advancedVSeed;
+            const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
                 enable: true
             } } = baseConfig;
             const { enable } = tooltip;
-            const { measureId, measureValue, measureName } = datasetReshapeInfo[0].foldInfo;
-            const { encodingColor: colorName } = datasetReshapeInfo[0].unfoldInfo;
+            const { foldInfo, unfoldInfo } = datasetReshapeInfo[0];
             result.tooltip = {
                 visible: enable,
                 mark: {
                     title: {
-                        visible: true
+                        visible: false
                     },
-                    content: [
-                        ...dimensions.map((item)=>({
-                                visible: true,
-                                hasShape: true,
-                                shapeType: 'rectRound',
-                                key: (datum)=>{
-                                    if (item.alias || item.id) return item.alias || item.id;
-                                    return datum && datum[item.id];
-                                },
-                                value: (datum)=>datum && datum[item.id]
-                            })),
-                        {
-                            visible: true,
-                            hasShape: true,
-                            key: (datum)=>datum && datum[measureName || colorName] || '',
-                            value: (datum)=>{
-                                if (!datum) return '';
-                                const value = datum[measureValue];
-                                const id = datum[measureId];
-                                const measure = findMeasureById(measures, id);
-                                if (!measure) return String(value);
-                                const { format = {}, autoFormat = true } = measure;
-                                if (!chunk_VCYTMP4D_n(format)) {
-                                    const formatter = createFormatter(format);
-                                    return formatter(value);
-                                }
-                                if (autoFormat) return autoFormatter(value, locale);
-                                return String(value);
-                            }
-                        }
-                    ]
+                    content: createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfo, unfoldInfo)
                 },
                 dimension: {
-                    content: [
-                        {
-                            visible: true,
-                            key: (datum)=>datum && datum[colorName] || '',
-                            value: (datum)=>{
-                                if (!datum) return '';
-                                const value = datum[measureValue];
-                                const id = datum[measureId];
-                                const measure = findMeasureById(measures, id);
-                                if (!measure) return String(value);
-                                const { format = {}, autoFormat = true } = measure;
-                                if (!chunk_VCYTMP4D_n(format)) {
-                                    const formatter = createFormatter(format);
-                                    return formatter(value);
-                                }
-                                if (autoFormat) return autoFormatter(value, locale);
-                                return String(value);
-                            },
-                            shapeType: 'rectRound'
-                        }
-                    ]
+                    title: {
+                        visible: true
+                    },
+                    content: createDimensionContent(measures, foldInfo, unfoldInfo, locale)
                 }
             };
             return result;
         };
-        const isSubset = (sub, obj)=>Object.entries(sub).every(([key, value])=>{
-                if ('string' == typeof value) return obj[key] === value;
-                if ('number' == typeof value) return obj[key] === value;
-                return true;
-            });
+        const createDimensionContent = (measures, foldInfo, unfoldInfo, locale)=>{
+            const { measureId, measureValue } = foldInfo;
+            const { encodingColor } = unfoldInfo;
+            return [
+                {
+                    visible: true,
+                    shapeType: 'rectRound',
+                    hasShape: true,
+                    key: (v)=>{
+                        const datum = v;
+                        return datum && datum[encodingColor] || '';
+                    },
+                    value: (v)=>{
+                        const datum = v;
+                        if (!datum) return '';
+                        const value = datum[measureValue];
+                        const id = datum[measureId];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!chunk_VCYTMP4D_n(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    }
+                }
+            ];
+        };
+        const createMarkContent = (tooltip, dimensions, measures, locale, foldInfo, unfoldInfo)=>{
+            const dims = dimensions.filter((item)=>tooltip.includes(item.id));
+            const meas = measures.filter((item)=>tooltip.includes(item.id));
+            const dimContent = dims.map((item)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: (v)=>{
+                        const datum = v;
+                        if (item.alias || item.id) return item.alias || item.id;
+                        return datum && datum[item.id];
+                    },
+                    value: (v)=>{
+                        const datum = v;
+                        return datum && datum[item.id];
+                    }
+                }));
+            const meaContent = meas.map((item)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: item.alias || item.id,
+                    value: (v)=>{
+                        const datum = v;
+                        if (!datum) return '';
+                        const id = item.id;
+                        if (!datum || !datum[ORIGINAL_DATA] || !datum[ORIGINAL_DATA]) return '';
+                        const originalData = datum[ORIGINAL_DATA];
+                        const value = originalData[id];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!chunk_VCYTMP4D_n(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    }
+                }));
+            const defaultContent = {
+                visible: true,
+                hasShape: true,
+                shapeType: 'rectRound',
+                key: (v)=>{
+                    const { measureName } = foldInfo;
+                    const { encodingColor: colorName } = unfoldInfo;
+                    const datum = v;
+                    return datum && datum[measureName || colorName] || '';
+                },
+                value: (v)=>{
+                    const { measureId, measureValue } = foldInfo;
+                    const datum = v;
+                    if (!datum) return '';
+                    const value = datum[measureValue];
+                    const id = datum[measureId];
+                    const measure = findMeasureById(measures, id);
+                    if (!measure) return String(value);
+                    const { format = {}, autoFormat = true } = measure;
+                    if (!chunk_VCYTMP4D_n(format)) {
+                        const formatter = createFormatter(format);
+                        return formatter(value);
+                    }
+                    if (autoFormat) return autoFormatter(value, locale);
+                    return String(value);
+                }
+            };
+            return [
+                ...dimContent,
+                defaultContent,
+                ...meaContent
+            ];
+        };
+        const isSubset = (sub, obj)=>Object.entries(sub).every(([key, value])=>{
+                if ('string' == typeof value) return obj[key] === value;
+                if ('number' == typeof value) return obj[key] === value;
+                return true;
+            });
         const annotationPoint_annotationPoint = (spec, context)=>{
             const { advancedVSeed } = context;
             const { annotation } = advancedVSeed;
@@ -3186,7 +3281,7 @@
                 const dataset = advancedVSeed.dataset.flat();
                 const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
                 return selectedData.map((datum)=>({
-                        zIndex: ANNOTATION_Z_INDEX,
+                        zIndex: 1000,
                         regionRelative: true,
                         position: (data, context)=>{
                             const targetDatum = data.find((item)=>isSubset(datum, item));
@@ -3243,7 +3338,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 : [
@@ -3262,7 +3357,7 @@
                 const dataset = advancedVSeed.dataset.flat();
                 const generateOneMarkLine = (x)=>({
                         x: x,
-                        zIndex: ANNOTATION_Z_INDEX,
+                        zIndex: 1000,
                         line: {
                             style: {
                                 visible: lineVisible,
@@ -3323,9 +3418,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 +3436,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,12 +3450,12 @@
                 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,
-                        zIndex: ANNOTATION_Z_INDEX,
+                        zIndex: 1000,
                         line: {
                             style: {
                                 visible: lineVisible,
@@ -3421,9 +3516,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 || [];
@@ -3461,7 +3556,7 @@
                 const labelPosition = positionMap[textPosition || 'top'];
                 const isBottom = labelPosition.toLocaleLowerCase().includes('bottom');
                 return {
-                    zIndex: ANNOTATION_Z_INDEX,
+                    zIndex: 1000,
                     regionRelative: true,
                     positions: (data, context)=>{
                         const positionData = data.filter((item)=>selectedData.some((datum)=>isSubset(datum, item)));
@@ -3787,7 +3882,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 +3899,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
@@ -4077,6 +4172,17 @@
             Builder._advancedPipelineMap.line = lineAdvancedPipeline;
             Builder._specPipelineMap.line = lineSpecPipeline;
         };
+        const defaultEncodingForColumn = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            column_generateDefaultDimensionEncoding(dimensions, encoding);
+            column_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForColumn = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -4098,40 +4204,52 @@
             encoding.x = uniqueDimIds.slice(0, 1);
             encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
             encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.label = [];
             encoding.row = [];
             encoding.column = [];
         };
         const column_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.x = chunk_QJLMYOTX_i(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.x.length) encoding.x = [
                 dimensions[0].id
             ];
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
         };
         const column_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
         };
         const column_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (color.length > 0) encoding.color = color;
-            return encoding;
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const columnAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForColumn,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForColumn,
+                buildMeasures
+            ], [
+                encodingForColumn,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -4328,7 +4446,7 @@
                 const dataset = advancedVSeed.dataset.flat();
                 const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
                 return {
-                    zIndex: ANNOTATION_Z_INDEX,
+                    zIndex: 1000,
                     regionRelative: true,
                     positions: (data, context)=>{
                         const positionData = data.filter((item)=>selectedData.some((datum)=>isSubset(datum, item)));
@@ -4491,11 +4609,16 @@
         };
         const columnParallelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForColumn,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForColumn,
+                buildMeasures
+            ], [
+                encodingForColumn,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -4590,11 +4713,16 @@
         };
         const columnPercentAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForColumn,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForColumn,
+                buildMeasures
+            ], [
+                encodingForColumn,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -4671,6 +4799,17 @@
             Builder._advancedPipelineMap.columnPercent = columnPercentAdvancedPipeline;
             Builder._specPipelineMap.columnPercent = columnPercentSpecPipeline;
         };
+        const defaultEncodingForBar = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            bar_generateDefaultDimensionEncoding(dimensions, encoding);
+            bar_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForBar = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -4686,39 +4825,45 @@
                 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));
             encoding.y = uniqueDimIds.slice(0, 1);
             encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
             encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.label = [];
             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));
-            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.y.length) encoding.y = [
                 dimensions[0].id
             ];
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === 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.y?.includes(item.id)).map((item)=>item.id);
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+        };
+        const bar_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.x = chunk_QJLMYOTX_i(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const bar_generateMeasureEncoding = (measures, encoding)=>{
+            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;
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const sortYBandAxis = (advancedVSeed, context)=>{
             const result = {
@@ -4738,11 +4883,16 @@
         };
         const barAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForBar,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForBar,
+                buildMeasures
+            ], [
+                encodingForBar,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -4893,7 +5043,7 @@
                     }
                 },
                 innerOffset: {
-                    right: LINEAR_AXIS_INNER_OFFSET_TOP
+                    right: 7
                 }
             };
             result.axes = [
@@ -5093,11 +5243,16 @@
         };
         const barParallelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForBar,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForBar,
+                buildMeasures
+            ], [
+                encodingForBar,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -5191,11 +5346,16 @@
         };
         const barPercentAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForBar,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForBar,
+                buildMeasures
+            ], [
+                encodingForBar,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -5264,11 +5424,16 @@
         };
         const areaAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForLine,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForLine,
+                buildMeasures
+            ], [
+                encodingForLine,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -5424,11 +5589,16 @@
         };
         const areaPercentAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForLine,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForLine,
+                buildMeasures
+            ], [
+                encodingForLine,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -5502,6 +5672,17 @@
             Builder._advancedPipelineMap.areaPercent = areaPercentAdvancedPipeline;
             Builder._specPipelineMap.areaPercent = areaPercentSpecPipeline;
         };
+        const defaultEncodingForScatter = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            scatter_generateDefaultDimensionEncoding(dimensions, encoding);
+            scatter_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForScatter = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -5517,33 +5698,43 @@
                 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));
             encoding.color = uniqueDimIds.slice(0);
             encoding.detail = uniqueDimIds.slice(0);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.label = [];
             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);
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+        };
+        const scatter_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            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 tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const buildMeasuresForScatter = (advancedVSeed, context)=>{
             const { vseed } = context;
@@ -5571,9 +5762,10 @@
                 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);
             }
+            if (0 === yMeasures.length && xMeasures.length > 0) yMeasures.push(xMeasures[0]);
             return [
                 {
                     id: 'scatterMeasures',
@@ -5639,7 +5831,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);
@@ -5662,6 +5854,7 @@
             if (xMeasures && xMeasures.children) {
                 const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (d)=>d.id), T(xMeasures.children, (d)=>d.id), encoding, {
                     foldMeasureValue: FoldXMeasureValue,
+                    foldMeasureId: FoldXMeasureId,
                     colorItemAsId: true,
                     colorMeasureId: getColorMeasureId(advancedVSeed)
                 });
@@ -5672,6 +5865,7 @@
             if (yMeasures && yMeasures.children) {
                 const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(datasets[0], T(dimensions, (d)=>d.id), T(yMeasures.children, (d)=>d.id), encoding, {
                     foldMeasureValue: FoldYMeasureValue,
+                    foldMeasureId: FoldYMeasureId,
                     colorItemAsId: true,
                     colorMeasureId: getColorMeasureId(advancedVSeed)
                 });
@@ -5774,11 +5968,16 @@
         };
         const scatterAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForScatter,
-            buildMeasuresForScatter,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForScatter,
+                buildMeasuresForScatter
+            ], [
+                encodingForScatter,
+                buildMeasuresForScatter
+            ]),
             pivotAdapter([
                 reshapeWithScatterEncoding
             ], [
@@ -5824,6 +6023,105 @@
                 }
             };
         };
+        const tooltipScatter = (spec, context)=>{
+            const result = {
+                ...spec
+            };
+            const { advancedVSeed } = context;
+            const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
+            const baseConfig = advancedVSeed.config[chartType];
+            const { tooltip = {
+                enable: true
+            } } = baseConfig;
+            const { enable } = tooltip;
+            const { foldInfoList } = datasetReshapeInfo[0];
+            result.tooltip = {
+                visible: enable,
+                mark: {
+                    title: {
+                        visible: false
+                    },
+                    content: tooltipScatter_createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfoList)
+                },
+                dimension: {
+                    visible: false
+                }
+            };
+            return result;
+        };
+        const tooltipScatter_createMarkContent = (tooltip, dimensions, measures, locale, foldInfoList)=>{
+            const dims = dimensions.filter((item)=>tooltip.includes(item.id));
+            const meas = measures.filter((item)=>tooltip.includes(item.id));
+            const dimContent = dims.map((item)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: (v)=>{
+                        const datum = v;
+                        if (item.alias || item.id) return item.alias || item.id;
+                        return datum && datum[item.id];
+                    },
+                    value: (v)=>{
+                        const datum = v;
+                        return datum && datum[item.id];
+                    }
+                }));
+            const meaContent = meas.map((item)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: item.alias || item.id,
+                    value: (v)=>{
+                        const datum = v;
+                        if (!datum) return '';
+                        const id = item.id;
+                        if (!datum || !datum[ORIGINAL_DATA] || !datum[ORIGINAL_DATA]) return '';
+                        const originalData = datum[ORIGINAL_DATA];
+                        const value = originalData[id];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!chunk_VCYTMP4D_n(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    }
+                }));
+            const foldMeaContent = foldInfoList.map((foldInfo)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: (v)=>{
+                        const { measureId, foldMap } = foldInfo;
+                        const datum = v;
+                        const id = datum[measureId];
+                        return foldMap[id] || id;
+                    },
+                    value: (v)=>{
+                        const { measureId, measureValue } = foldInfo;
+                        const datum = v;
+                        if (!datum) return '';
+                        const value = datum[measureValue];
+                        const id = datum[measureId];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!chunk_VCYTMP4D_n(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    }
+                }));
+            return [
+                ...dimContent,
+                ...foldMeaContent,
+                ...meaContent
+            ];
+        };
         const horizontalCrosshairLine = (spec, context)=>{
             const result = {
                 ...spec
@@ -5877,7 +6175,7 @@
             xLinear,
             yLinear,
             label_label,
-            tooltip_tooltip,
+            tooltipScatter,
             colorAdapter(discreteLegend, colorLegend),
             verticalCrosshairLine,
             horizontalCrosshairLine,
@@ -5902,7 +6200,7 @@
                 xLinear,
                 yLinear,
                 label_label,
-                tooltip_tooltip,
+                tooltipScatter,
                 verticalCrosshairLine,
                 horizontalCrosshairLine,
                 colorPointStyleFill(pointStyle_pointStyle),
@@ -5923,6 +6221,17 @@
             Builder._advancedPipelineMap.scatter = scatterAdvancedPipeline;
             Builder._specPipelineMap.scatter = scatterSpecPipeline;
         };
+        const defaultEncodingForDualAxis = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            dualAxis_generateDefaultDimensionEncoding(dimensions, encoding);
+            dualAxis_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForDualAxis = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -5938,39 +6247,45 @@
                 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));
             encoding.x = uniqueDimIds.slice(0, 1);
             encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
             encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.label = [];
             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));
-            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.x.length) encoding.x = [
                 dimensions[0].id
             ];
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === 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);
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+        };
+        const dualAxis_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            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.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;
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
             const { vseed } = context;
@@ -6224,11 +6539,16 @@
         };
         const dualAxisAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForDualAxis,
-            buildMeasuresForDualAxis,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForDualAxis,
+                buildMeasuresForDualAxis
+            ], [
+                encodingForDualAxis,
+                buildMeasuresForDualAxis
+            ]),
             pivotAdapter([
                 reshapeWithDualEncoding
             ], [
@@ -6320,7 +6640,7 @@
         const dualChartTypePrimary = (spec, context)=>{
             const result = {
                 ...spec,
-                zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX
+                zIndex: 1001
             };
             const { advancedVSeed, vseed } = context;
             const { chartType } = vseed;
@@ -6340,7 +6660,7 @@
                     break;
                 case 'column':
                     result.type = 'bar';
-                    result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+                    result.zIndex = 1000;
                     break;
                 case 'columnParallel':
                     {
@@ -6351,7 +6671,7 @@
                             datasetReshapeInfo[0].unfoldInfo.encodingDetail
                         ];
                         columnSpec.type = 'bar';
-                        result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+                        result.zIndex = 1000;
                         break;
                     }
                 case 'columnPercent':
@@ -6376,7 +6696,7 @@
         const dualChartTypeSecondary = (spec, context)=>{
             const result = {
                 ...spec,
-                zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX
+                zIndex: 1001
             };
             const { advancedVSeed, vseed } = context;
             const { chartType } = vseed;
@@ -6396,7 +6716,7 @@
                     break;
                 case 'column':
                     result.type = 'bar';
-                    result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+                    result.zIndex = 1000;
                     break;
                 case 'columnParallel':
                     {
@@ -6407,7 +6727,7 @@
                             datasetReshapeInfo[0].unfoldInfo.encodingDetail
                         ];
                         columnSpec.type = 'bar';
-                        result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+                        result.zIndex = 1000;
                         break;
                     }
                 case 'columnPercent':
@@ -6585,7 +6905,7 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { measures, datasetReshapeInfo, chartType, locale, dimensions } = advancedVSeed;
+            const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
                 enable: true
@@ -6593,68 +6913,19 @@
             const { enable } = tooltip;
             const foldInfoList = datasetReshapeInfo[0].foldInfoList;
             const unfoldInfo = datasetReshapeInfo[0].unfoldInfo;
-            const { measureId, measureValue, measureName } = foldInfoList[0];
-            const { encodingColor: colorName } = unfoldInfo;
             result.tooltip = {
                 visible: enable,
                 mark: {
                     title: {
-                        visible: true
+                        visible: false
                     },
-                    content: [
-                        ...dimensions.map((item)=>({
-                                visible: true,
-                                hasShape: true,
-                                shapeType: 'rectRound',
-                                key: (datum)=>{
-                                    if (item.alias || item.id) return item.alias || item.id;
-                                    return datum && datum[item.id];
-                                },
-                                value: (datum)=>datum && datum[item.id]
-                            })),
-                        {
-                            visible: true,
-                            hasShape: true,
-                            key: (datum)=>datum && datum[measureName || colorName] || '',
-                            value: (datum)=>{
-                                if (!datum) return '';
-                                const value = datum[measureValue];
-                                const id = datum[measureId];
-                                const measure = findMeasureById(measures, id);
-                                if (!measure) return String(value);
-                                const { format = {}, autoFormat = true } = measure;
-                                if (!chunk_VCYTMP4D_n(format)) {
-                                    const formatter = createFormatter(format);
-                                    return formatter(value);
-                                }
-                                if (autoFormat) return autoFormatter(value, locale);
-                                return String(value);
-                            }
-                        }
-                    ]
+                    content: createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfoList[0], unfoldInfo)
                 },
                 dimension: {
-                    content: [
-                        {
-                            visible: true,
-                            key: (datum)=>datum && datum[colorName] || '',
-                            value: (datum)=>{
-                                if (!datum) return '';
-                                const value = datum[measureValue];
-                                const id = datum[measureId];
-                                const measure = findMeasureById(measures, id);
-                                if (!measure) return String(value);
-                                const { format = {}, autoFormat = true } = measure;
-                                if (!chunk_VCYTMP4D_n(format)) {
-                                    const formatter = createFormatter(format);
-                                    return formatter(value);
-                                }
-                                if (autoFormat) return autoFormatter(value, locale);
-                                return String(value);
-                            },
-                            shapeType: 'rectRound'
-                        }
-                    ]
+                    title: {
+                        visible: true
+                    },
+                    content: createDimensionContent(measures, foldInfoList[0], unfoldInfo, locale)
                 }
             };
             return result;
@@ -6664,7 +6935,7 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { measures, datasetReshapeInfo, chartType, locale, dimensions } = advancedVSeed;
+            const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
                 enable: true
@@ -6673,68 +6944,19 @@
             if (chunk_JK3VNB42_n(datasetReshapeInfo[0].foldInfoList?.[1])) return result;
             const foldInfoList = datasetReshapeInfo[0].foldInfoList;
             const unfoldInfo = datasetReshapeInfo[0].unfoldInfo;
-            const { measureId, measureValue, measureName } = foldInfoList[1];
-            const { encodingColorId } = unfoldInfo;
             result.tooltip = {
                 visible: enable,
                 mark: {
                     title: {
-                        visible: true
+                        visible: false
                     },
-                    content: [
-                        ...dimensions.map((item)=>({
-                                visible: true,
-                                hasShape: true,
-                                shapeType: 'rectRound',
-                                key: (datum)=>{
-                                    if (item.alias || item.id) return item.alias || item.id;
-                                    return datum && datum[item.id];
-                                },
-                                value: (datum)=>datum && datum[item.id]
-                            })),
-                        {
-                            visible: true,
-                            hasShape: true,
-                            key: (datum)=>datum && datum[measureName || encodingColorId] || '',
-                            value: (datum)=>{
-                                if (!datum) return '';
-                                const value = datum[measureValue];
-                                const id = datum[measureId];
-                                const measure = findMeasureById(measures, id);
-                                if (!measure) return String(value);
-                                const { format = {}, autoFormat = true } = measure;
-                                if (!chunk_VCYTMP4D_n(format)) {
-                                    const formatter = createFormatter(format);
-                                    return formatter(value);
-                                }
-                                if (autoFormat) return autoFormatter(value, locale);
-                                return String(value);
-                            }
-                        }
-                    ]
+                    content: createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfoList[1], unfoldInfo)
                 },
                 dimension: {
-                    content: [
-                        {
-                            visible: true,
-                            key: (datum)=>datum && datum[encodingColorId] || '',
-                            value: (datum)=>{
-                                if (!datum) return '';
-                                const value = datum[measureValue];
-                                const id = datum[measureId];
-                                const measure = findMeasureById(measures, id);
-                                if (!measure) return String(value);
-                                const { format = {}, autoFormat = true } = measure;
-                                if (!chunk_VCYTMP4D_n(format)) {
-                                    const formatter = createFormatter(format);
-                                    return formatter(value);
-                                }
-                                if (autoFormat) return autoFormatter(value, locale);
-                                return String(value);
-                            },
-                            shapeType: 'rectRound'
-                        }
-                    ]
+                    title: {
+                        visible: true
+                    },
+                    content: createDimensionContent(measures, foldInfoList[1], unfoldInfo, locale)
                 }
             };
             return result;
@@ -6751,7 +6973,8 @@
             const yAxisConfig = Array.isArray(primaryYAxis) ? primaryYAxis[index] || primaryYAxis[0] : primaryYAxis;
             const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
             const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
-            if (foldInfoList?.[0] && chunk_VCYTMP4D_n(foldInfoList[0].foldMap)) return result;
+            if (chunk_JK3VNB42_n(foldInfoList?.[0])) return result;
+            const isEmptySecondary = chunk_VCYTMP4D_n(foldInfoList?.[0].foldMap);
             const id = `${reshapeInfoId}-primary-axis`;
             const seriesIds = [
                 `${reshapeInfoId}-primary-series`,
@@ -6774,7 +6997,7 @@
             }
             const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10 } = yAxisConfig;
             const linearAxis = {
-                visible,
+                visible: isEmptySecondary ? false : visible,
                 id,
                 seriesId,
                 type: log ? 'log' : 'linear',
@@ -6827,7 +7050,7 @@
                     }
                 },
                 innerOffset: {
-                    top: LINEAR_AXIS_INNER_OFFSET_TOP
+                    top: 7
                 }
             };
             result.axes = [
@@ -6849,6 +7072,8 @@
             const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
             const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
             if (chunk_JK3VNB42_n(foldInfoList?.[1])) return result;
+            const isEmptySecondary = chunk_VCYTMP4D_n(foldInfoList?.[1].foldMap);
+            const onlySecondary = chunk_VCYTMP4D_n(foldInfoList?.[0].foldMap) && !isEmptySecondary;
             const sync = {
                 axisId: `${reshapeInfoId}-primary-axis`,
                 zeroAlign: true
@@ -6876,7 +7101,7 @@
             }
             const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10 } = yAxisConfig;
             const linearAxis = {
-                visible,
+                visible: isEmptySecondary ? false : visible,
                 id,
                 seriesId,
                 sync,
@@ -6916,7 +7141,7 @@
                     }
                 },
                 grid: {
-                    visible: grid?.visible,
+                    visible: onlySecondary ? true : grid?.visible,
                     style: {
                         lineWidth: grid?.gridWidth,
                         stroke: grid?.gridColor
@@ -6930,7 +7155,7 @@
                     }
                 },
                 innerOffset: {
-                    top: LINEAR_AXIS_INNER_OFFSET_TOP
+                    top: 7
                 }
             };
             result.axes = [
@@ -7061,6 +7286,17 @@
             Builder._advancedPipelineMap.dualAxis = dualAxisAdvancedPipeline;
             Builder._specPipelineMap.dualAxis = dualAxisSpecPipeline;
         };
+        const defaultEncodingForPie = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            pie_generateDefaultDimensionEncoding(dimensions, encoding);
+            pie_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForPie = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -7076,40 +7312,52 @@
                 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);
             encoding.detail = uniqueDimIds.slice(0);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.label = [];
             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);
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+        };
+        const pie_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.angle = chunk_QJLMYOTX_i(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const pie_generateMeasureEncoding = (measures, encoding)=>{
+            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 tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const pieAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForPie,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForPie,
+                buildMeasures
+            ], [
+                encodingForPie,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7225,11 +7473,16 @@
         };
         const donutAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            buildMeasures,
-            encodingForPie,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForPie,
+                buildMeasures
+            ], [
+                encodingForPie,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7305,6 +7558,17 @@
             Builder._advancedPipelineMap.donut = donutAdvancedPipeline;
             Builder._specPipelineMap.donut = donutSpecPipeline;
         };
+        const defaultEncodingForRose = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            rose_generateDefaultDimensionEncoding(dimensions, encoding);
+            rose_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForRose = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -7320,46 +7584,58 @@
                 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));
             encoding.angle = uniqueDimIds.slice(0, 1);
             encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
             encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.label = [];
             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));
-            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.angle.length) encoding.angle = [
                 dimensions[0].id
             ];
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === 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.angle?.includes(item.id)).map((item)=>item.id);
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+        };
+        const rose_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.radius = chunk_QJLMYOTX_i(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const rose_generateMeasureEncoding = (measures, encoding)=>{
+            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 tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const roseAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForRose,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForRose,
+                buildMeasures
+            ], [
+                encodingForRose,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7555,11 +7831,16 @@
         };
         const roseParallelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForRose,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForRose,
+                buildMeasures
+            ], [
+                encodingForRose,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7665,6 +7946,17 @@
             Builder._advancedPipelineMap.roseParallel = roseParallelAdvancedPipeline;
             Builder._specPipelineMap.roseParallel = roseParallelSpecPipeline;
         };
+        const defaultEncodingForRadar = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            radar_generateDefaultDimensionEncoding(dimensions, encoding);
+            radar_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForRadar = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -7680,44 +7972,57 @@
                 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);
             encoding.color = uniqueDimIds.slice(1);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.detail = [];
             encoding.label = [];
             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));
-            encoding.detail = [];
             if (0 === encoding.angle.length) encoding.angle = [
                 dimensions[0].id
             ];
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            encoding.detail = [];
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+        };
+        const radar_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.radius = chunk_QJLMYOTX_i(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const radar_generateMeasureEncoding = (measures, encoding)=>{
+            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 tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const radarAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForRadar,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForRadar,
+                buildMeasures
+            ], [
+                encodingForRadar,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7851,6 +8156,17 @@
             Builder._advancedPipelineMap.radar = radarAdvancedPipeline;
             Builder._specPipelineMap.radar = radarSpecPipeline;
         };
+        const defaultEncodingForFunnel = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            funnel_generateDefaultDimensionEncoding(dimensions, encoding);
+            funnel_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForFunnel = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -7866,40 +8182,54 @@
                 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);
             encoding.detail = uniqueDimIds.slice(0);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.label = [];
             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);
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+        };
+        const funnel_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            encoding.size = chunk_QJLMYOTX_i(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
+        };
+        const funnel_generateMeasureEncoding = (measures, encoding)=>{
+            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 tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const funnelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForFunnel,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForFunnel,
+                buildMeasures
+            ], [
+                encodingForFunnel,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -8012,6 +8342,17 @@
             Builder._advancedPipelineMap.funnel = funnelAdvancedPipeline;
             Builder._specPipelineMap.funnel = funnelSpecPipeline;
         };
+        const defaultEncodingForHeatmap = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            heatmap_generateDefaultDimensionEncoding(dimensions, encoding);
+            heatmap_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForHeatmap = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -8027,10 +8368,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));
@@ -8038,39 +8375,59 @@
             encoding.y = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
             encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
             encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.label = [];
             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));
-            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.x.length) encoding.x = [
                 dimensions[0].id
             ];
+            encoding.y = chunk_QJLMYOTX_i(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
             if (0 === encoding.y.length) if (dimensions.length > 1) encoding.y = dimensions.slice(1).map((item)=>item.id);
             else encoding.y = dimensions.slice(0).map((item)=>item.id);
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === 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);
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+            if (0 === encoding.detail.length) encoding.detail = [
+                MeasureName
+            ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+        };
+        const heatmap_generateDefaultMeasureEncoding = (measures, encoding)=>{
+            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)=>{
+            const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+            if (color.length > 0) encoding.color = [
+                color[0]
+            ];
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const heatmapAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
-            defaultMeasures_defaultMeasures,
-            defaultDimensions,
-            defaultMeasureName,
-            encodingForHeatmap,
-            buildMeasures,
+            default_defaultMeasures_defaultMeasures,
+            defaultDimensions_defaultDimensions,
+            defaultMeasureName_defaultMeasureName,
+            encodingAdapter([
+                defaultEncodingForHeatmap,
+                buildMeasures
+            ], [
+                encodingForHeatmap,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -8123,6 +8480,107 @@
                 }
             };
         };
+        const tooltipHeatmap = (spec, context)=>{
+            const result = {
+                ...spec
+            };
+            const { advancedVSeed } = context;
+            const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
+            const baseConfig = advancedVSeed.config[chartType];
+            const { tooltip = {
+                enable: true
+            } } = baseConfig;
+            const { enable } = tooltip;
+            const { foldInfo } = datasetReshapeInfo[0];
+            result.tooltip = {
+                visible: enable,
+                mark: {
+                    title: {
+                        visible: false
+                    },
+                    content: tooltipHeatmap_createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfo)
+                },
+                dimension: {
+                    visible: false
+                }
+            };
+            return result;
+        };
+        const tooltipHeatmap_createMarkContent = (tooltip, dimensions, measures, locale, foldInfo)=>{
+            const dims = dimensions.filter((item)=>tooltip.includes(item.id));
+            const meas = measures.filter((item)=>tooltip.includes(item.id));
+            const dimContent = dims.map((item)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: (v)=>{
+                        const datum = v;
+                        if (item.alias || item.id) return item.alias || item.id;
+                        return datum && datum[item.id];
+                    },
+                    value: (v)=>{
+                        const datum = v;
+                        return datum && datum[item.id];
+                    }
+                }));
+            const meaContent = meas.map((item)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: item.alias || item.id,
+                    value: (v)=>{
+                        const datum = v;
+                        if (!datum) return '';
+                        const id = item.id;
+                        if (!datum || !datum[ORIGINAL_DATA] || !datum[ORIGINAL_DATA]) return '';
+                        const originalData = datum[ORIGINAL_DATA];
+                        const value = originalData[id];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!chunk_VCYTMP4D_n(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    }
+                }));
+            const foldMeaContent = [
+                foldInfo
+            ].map((foldInfo)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: (v)=>{
+                        const { measureId, foldMap } = foldInfo;
+                        const datum = v;
+                        const id = datum[measureId];
+                        return foldMap[id] || id;
+                    },
+                    value: (v)=>{
+                        const { measureId, measureValue } = foldInfo;
+                        const datum = v;
+                        if (!datum) return '';
+                        const value = datum[measureValue];
+                        const id = datum[measureId];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!chunk_VCYTMP4D_n(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    }
+                }));
+            return [
+                ...dimContent,
+                ...foldMeaContent,
+                ...meaContent
+            ];
+        };
         const initHeatmap = (spec, context)=>{
             const result = {
                 ...spec
@@ -8166,7 +8624,7 @@
             labelColorInversion,
             colorAdapter(discreteLegend, colorLegend),
             colorCellStyleFill(cellStyle),
-            tooltip_tooltip,
+            tooltipHeatmap,
             annotationPoint_annotationPoint,
             annotationVerticalLine_annotationVerticalLine,
             annotationHorizontalLine_annotationHorizontalLine,
@@ -8185,7 +8643,7 @@
                 label_label,
                 labelColorInversion,
                 discreteLegend,
-                tooltip_tooltip,
+                tooltipHeatmap,
                 colorCellStyleFill(cellStyle),
                 annotationPoint_annotationPoint,
                 annotationVerticalLine_annotationVerticalLine,
@@ -8864,6 +9322,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 +12657,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',