@visactor/vseed 0.1.6 → 0.1.8

package/dist/index.js

@@ -167,33 +167,35 @@ const initAdvancedVSeed = (advancedVSeed, context)=>{
         locale: locale || 'zh-CN'
     };
 };
-const autoMeasures = (advancedVSeed, context)=>{
-    const result = {
-        ...advancedVSeed
-    };
+const defaultMeasures_defaultMeasures = (advancedVSeed, context)=>{
     const { vseed } = context;
     const { measures, dataset } = vseed;
+    if (measures && measures.length > 0) return {
+        ...advancedVSeed,
+        measures
+    };
     if (!dataset) throw new Error('dataset is required');
-    if (0 === dataset.length) return result;
-    if (measures) {
-        result.measures = measures;
-        return result;
-    }
+    if (0 === dataset.length) return {
+        ...advancedVSeed,
+        measures: []
+    };
     const top100dataset = dataset.slice(0, 100);
     const sample = top100dataset.reduce((prev, cur)=>({
             ...prev,
             ...cur
         }), {});
-    result.measures = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
+    const defaultMeasures = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
             '',
             null,
             void 0
         ].includes(key)).map((measure)=>({
             id: measure,
-            alias: measure,
-            encoding: 'column'
+            alias: measure
         }));
-    return result;
+    return {
+        ...advancedVSeed,
+        measures: defaultMeasures
+    };
 };
 const preorderTraverse = (tree, callback)=>{
     if (!tree || 0 === tree.length) return;
@@ -247,37 +249,36 @@ const findAllMeasures = (measures = [])=>{
     });
     return result;
 };
-const autoDimensions = (advancedVSeed, context)=>{
+const defaultDimensions = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
     };
     const { vseed } = context;
     const { dimensions, dataset } = vseed;
-    const measures = findAllMeasures(advancedVSeed.measures);
+    if (dimensions && dimensions.length > 0) return {
+        ...result,
+        dimensions
+    };
     if (!dataset) throw new Error('dataset is required');
     if (0 === dataset.length) return result;
-    if (dimensions) {
-        result.dimensions = dimensions.map((dim)=>({
-                location: 'dimension',
-                ...dim
-            }));
-        return result;
-    }
+    const measures = findAllMeasures(advancedVSeed.measures);
     const top100dataset = dataset.slice(0, 100);
     const sample = top100dataset.reduce((prev, cur)=>({
             ...prev,
             ...cur
         }), {});
-    result.dimensions = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'string' == typeof item[key]) && ![
+    const newDimensions = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'string' == typeof item[key]) && ![
             '',
             null,
             void 0
         ].includes(key) && !measures.some((measure)=>measure.id === key)).map((dim)=>({
             id: dim,
-            alias: dim,
-            encoding: 'column'
+            alias: dim
         }));
-    return result;
+    return {
+        ...result,
+        dimensions: newDimensions
+    };
 };
 const records_records = (advancedVSeed, context)=>{
     const { vseed } = context;
@@ -349,8 +350,8 @@ const mergeArray = (arr, themeItem)=>{
 };
 const tableAdvancedPipeline = [
     initAdvancedVSeed,
-    autoMeasures,
-    autoDimensions,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
     records_records,
     tableConfig_tableConfig,
     theme_theme
@@ -571,9 +572,9 @@ const bodyStyle = (spec, context)=>{
         borderColor: borderColor,
         borderLineWidth: 1,
         padding: [
-            8.6,
+            8,
             12,
-            8.6,
+            8,
             12
         ],
         textAlign: 'right',
@@ -686,37 +687,7 @@ const registerTable = ()=>{
     Builder._advancedPipelineMap.table = tableAdvancedPipeline;
     Builder._specPipelineMap.table = tableSpecPipeline;
 };
-const autoPivotMeasures = (advancedVSeed, context)=>{
-    const result = {
-        ...advancedVSeed
-    };
-    const { vseed } = context;
-    const { dataset } = vseed;
-    const measures = findAllMeasures(vseed.measures);
-    if (!dataset) throw new Error('dataset is required');
-    if (0 === dataset.length) return result;
-    if (vseed.measures) {
-        result.measures = findAllMeasures(measures);
-        return result;
-    }
-    const top100dataset = dataset.slice(0, 100);
-    const sample = top100dataset.reduce((prev, cur)=>({
-            ...prev,
-            ...cur
-        }), {});
-    result.measures = Object.keys(sample).filter((key)=>top100dataset.some((item)=>'number' == typeof item[key]) && ![
-            '',
-            null,
-            void 0
-        ].includes(key)).map((measure)=>({
-            id: measure,
-            alias: measure,
-            encoding: 'detail'
-        }));
-    return result;
-};
 const ORIGINAL_DATA = '__OriginalData__';
-const Separator = '-';
 const FoldMeasureName = '__MeaName__';
 const FoldMeasureId = '__MeaId__';
 const FoldMeasureValue = '__MeaValue__';
@@ -725,94 +696,70 @@ const FoldPrimaryMeasureValue = '__MeaPrimaryValue__';
 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 = pick(vseed, [
-        'backgroundColor',
-        'bodyFontSize',
-        'bodyFontColor',
-        'bodyBackgroundColor',
-        'headerFontSize',
-        'headerFontColor',
-        'headerBackgroundColor',
-        'hoverHeaderBackgroundColor',
-        'hoverHeaderInlineBackgroundColor',
-        'selectedBorderColor',
-        'selectedBackgroundColor'
-    ]);
-    result.config = {
-        ...result.config || {},
-        [chartType]: {
-            ...config
-        }
+const encodingForPivotTable = (advancedVSeed)=>{
+    const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+    const measures = findAllMeasures(vseedMeasures);
+    const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
+    const hasMeasureEncoding = measures.some((item)=>item.encoding);
+    const encoding = {};
+    if (hasDimensionEncoding) generateDimensionEncoding(dimensions, encoding);
+    else generateDefaultDimensionEncoding(dimensions, encoding);
+    if (hasMeasureEncoding) generateMeasureEncoding(measures, encoding);
+    else generateDefaultMeasureEncoding(measures, encoding);
+    return {
+        ...advancedVSeed,
+        encoding
     };
-    return result;
+};
+const generateDefaultDimensionEncoding = (dimensions, encoding)=>{
+    const uniqueDimIds = unique(dimensions.map((d)=>d.id));
+    encoding.tooltip = uniqueDimIds;
+    encoding.row = [];
+    encoding.column = [];
+    uniqueDimIds.forEach((item, index)=>{
+        if (index % 2 === 0) encoding.column.push(item);
+        else encoding.row.push(item);
+    });
+};
+const generateDimensionEncoding = (dimensions, encoding)=>{
+    const uniqueDimIds = unique(dimensions.map((d)=>d.id));
+    encoding.tooltip = uniqueDimIds;
+    encoding.row = [];
+    encoding.column = [];
+    dimensions.forEach((dim, index)=>{
+        const id = dim.id;
+        if ('row' === dim.encoding) encoding.row.push(id);
+        else if ('column' === dim.encoding) encoding.column.push(id);
+        else if (index % 2 === 0) encoding.column.push(id);
+        else encoding.row.push(id);
+    });
+};
+const generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = unique(measures.map((item)=>item.id));
+    encoding.detail = unique(measures.filter((item)=>'detail' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.detail = unique(measures.filter((item)=>'detail' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const foldMeasures = (dataset, measures, options)=>{
     const { measureId, measureName, measureValue, colorMeasureId } = options || {};
@@ -892,10 +839,39 @@ const reshapePivotTable = (advancedVSeed, context)=>{
         measures
     };
 };
+const pivotTableConfig = (advancedVSeed, context)=>{
+    const { vseed } = context;
+    const { chartType } = vseed;
+    const result = {
+        ...advancedVSeed
+    };
+    const config = pick(vseed, [
+        'backgroundColor',
+        'bodyFontSize',
+        'bodyFontColor',
+        'bodyBackgroundColor',
+        'headerFontSize',
+        'headerFontColor',
+        'headerBackgroundColor',
+        'hoverHeaderBackgroundColor',
+        'hoverHeaderInlineBackgroundColor',
+        'selectedBorderColor',
+        'selectedBackgroundColor'
+    ]);
+    result.config = {
+        ...result.config || {},
+        [chartType]: {
+            ...config
+        }
+    };
+    return result;
+};
 const pivotTableAdvancedPipeline = [
     initAdvancedVSeed,
-    autoPivotMeasures,
-    autoPivotDimensions,
+    defaultMeasures_defaultMeasures,
+    defaultDimensions,
+    defaultMeasureName,
+    encodingForPivotTable,
     reshapePivotTable,
     pivotTableConfig,
     theme_theme
@@ -942,8 +918,9 @@ const initPivotTable = (spec, context)=>{
 };
 const pivotColumns = (spec, context)=>{
     const { advancedVSeed } = context;
+    const { encoding } = advancedVSeed;
     const dimensions = advancedVSeed.dimensions;
-    const columns = dimensions.filter((item)=>'columnDimension' === item['location'] || 'column' === item['encoding']);
+    const columns = dimensions.filter((item)=>encoding.column?.includes(item.id));
     return {
         ...spec,
         columns: columns.map((item)=>({
@@ -956,7 +933,8 @@ const pivotColumns = (spec, context)=>{
 const pivotRows = (spec, context)=>{
     const { advancedVSeed } = context;
     const dimensions = advancedVSeed.dimensions;
-    const rows = dimensions.filter((item)=>'rowDimension' === item['location'] || 'row' === item['encoding']);
+    const { encoding } = advancedVSeed;
+    const rows = dimensions.filter((item)=>encoding.row?.includes(item.id));
     return {
         ...spec,
         rows: rows.map((item)=>({
@@ -989,6 +967,7 @@ const pivotIndicators = (spec, context)=>{
 const pivotIndicators_fieldFormat = (measures, foldInfo, locale)=>(value, col, row, table)=>{
         if (!isNumber(col) || !isNumber(row) || !table) return value;
         const datum = table.getCellOriginRecord(col, row);
+        if (!datum[0]) return value;
         const { measureId: foldMeasureId } = foldInfo;
         const measureId = datum[0][foldMeasureId];
         const node = findMeasureById(measures, measureId);
@@ -1018,9 +997,9 @@ const rowHeaderStyle = (spec, context)=>{
         borderColor: borderColor,
         borderLineWidth: 1,
         padding: [
-            8.6,
+            8,
             12,
-            8.6,
+            8,
             12
         ],
         textAlign: 'left',
@@ -1148,7 +1127,7 @@ const initAdvancedVSeed_initAdvancedVSeed = (advancedVSeed, context)=>{
         locale: locale || 'zh-CN'
     };
 };
-const defaultMeasures_defaultMeasures = (advancedVSeed, context)=>{
+const default_defaultMeasures_defaultMeasures = (advancedVSeed, context)=>{
     const { vseed } = context;
     const { measures, dataset } = vseed;
     if (measures && measures.length > 0) return {
@@ -1178,7 +1157,7 @@ const defaultMeasures_defaultMeasures = (advancedVSeed, context)=>{
         measures: defaultMeasures
     };
 };
-const defaultDimensions = (advancedVSeed, context)=>{
+const defaultDimensions_defaultDimensions = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
     };
@@ -1209,7 +1188,7 @@ const defaultDimensions = (advancedVSeed, context)=>{
         dimensions: newDimensions
     };
 };
-const defaultMeasureName = (advancedVSeed)=>{
+const defaultMeasureName_defaultMeasureName = (advancedVSeed)=>{
     const result = {
         ...advancedVSeed
     };
@@ -1220,51 +1199,78 @@ const defaultMeasureName = (advancedVSeed)=>{
     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 = unique(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 = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
+    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+    if (0 === encoding.detail.length) encoding.detail = [
+        MeasureName
+    ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
-const generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
+const line_generateDefaultMeasureEncoding = (measures, encoding)=>{
     encoding.y = unique(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 = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const isMeasureTreeWithChildren = (vseed)=>{
     const { measures } = vseed;
@@ -1276,6 +1282,37 @@ const isMeasureTreeWithParentId = (vseed)=>{
     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;
@@ -1300,7 +1337,7 @@ const isPivotChart = (vseed)=>{
     }
     if ('dualAxis' === vseed.chartType || 'scatter' === vseed.chartType) {
         const { dimensions = [] } = vseed;
-        const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'rowDimension' === dimension.location || 'columnDimension' === dimension.location);
+        const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'row' === dimension.encoding || 'column' === dimension.encoding);
         if (hasRowOrColumnDimension) return true;
         if ('scatter' === vseed.chartType) {
             if (isMeasureTreeWithChildren(vseed)) {
@@ -1320,14 +1357,14 @@ const isPivotChart = (vseed)=>{
         return false;
     }
     const { measures = [], dimensions = [] } = vseed;
-    const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'rowDimension' === dimension.location || 'columnDimension' === dimension.location);
+    const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'row' === dimension.encoding || 'column' === dimension.encoding);
     const hasMeasureGroup = measures && measures.some((measure)=>measure && measure.children);
     return hasRowOrColumnDimension || hasMeasureGroup;
 };
 const buildMeasures = (advancedVSeed, context)=>{
     const { vseed } = context;
     if (isMeasureTreeWithChildren(vseed)) {
-        advancedVSeed.measures = vseed.measures;
+        advancedVSeed.measures = normalizeMeasureTree(vseed.measures);
         return advancedVSeed;
     }
     if (isMeasureTreeWithParentId(vseed)) {
@@ -1429,7 +1466,7 @@ const dataReshapeByEncoding = (dataset, dimensions, measures, encoding, options)
     });
     const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, dimensions, encoding, {
         foldMeasureId,
-        separator: Separator,
+        separator: "-",
         colorItemAsId
     });
     return {
@@ -1715,11 +1752,16 @@ const annotation_annotation = (advancedVSeed, context)=>{
 };
 const lineAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
-    encodingForLine,
-    buildMeasures,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
+    encodingAdapter([
+        defaultEncodingForLine,
+        buildMeasures
+    ], [
+        encodingForLine,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -1994,10 +2036,6 @@ const xBand = (spec, context)=>{
     ];
     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
@@ -2071,7 +2109,7 @@ const yLinear = (spec, context)=>{
             }
         },
         innerOffset: {
-            top: LINEAR_AXIS_INNER_OFFSET_TOP
+            top: 7
         }
     };
     result.axes = [
@@ -2627,86 +2665,141 @@ const tooltip_tooltip = (spec, context)=>{
         ...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 (!external_remeda_isEmpty(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 (!external_remeda_isEmpty(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 annotationPoint_annotationPoint = (spec, context)=>{
-    const { advancedVSeed } = context;
-    const { annotation } = advancedVSeed;
+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 (!external_remeda_isEmpty(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 (!external_remeda_isEmpty(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 (!external_remeda_isEmpty(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;
     if (!annotation || !annotation.annotationPoint) return spec;
     const { annotationPoint } = annotation;
     const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [
@@ -2717,7 +2810,7 @@ const annotationPoint_annotationPoint = (spec, context)=>{
         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));
@@ -2771,7 +2864,7 @@ const annotationPoint_annotationPoint = (spec, context)=>{
 const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
     const { advancedVSeed } = context;
     const { annotation, datasetReshapeInfo } = advancedVSeed;
-    const { unfoldInfo } = datasetReshapeInfo[0];
+    const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
     if (!annotation || !annotation.annotationVerticalLine) return spec;
     const { annotationVerticalLine } = annotation;
     const annotationVerticalLineList = Array.isArray(annotationVerticalLine) ? annotationVerticalLine : [
@@ -2790,7 +2883,7 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
         const dataset = advancedVSeed.dataset.flat();
         const generateOneMarkLine = (x)=>({
                 x: x,
-                zIndex: ANNOTATION_Z_INDEX,
+                zIndex: 1000,
                 line: {
                     style: {
                         visible: lineVisible,
@@ -2851,9 +2944,9 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
         }
         const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
         return selectedData.map((datum)=>{
-            const x = unfoldInfo.encodingX;
-            if (!x) return {};
-            return generateOneMarkLine(datum[x]);
+            if (datum[unfoldInfo.encodingX]) return generateOneMarkLine(datum[unfoldInfo.encodingX]);
+            if (datum[foldInfo.measureValue]) return generateOneMarkLine(datum[foldInfo.measureValue]);
+            return {};
         });
     });
     const specMarkLine = spec.markLine || [];
@@ -2869,10 +2962,10 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
 const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
     const { advancedVSeed } = context;
     const { annotation, datasetReshapeInfo } = advancedVSeed;
-    const { unfoldInfo } = datasetReshapeInfo[0];
+    const { foldInfo, unfoldInfo } = datasetReshapeInfo[0];
     if (!annotation || !annotation.annotationHorizontalLine) return spec;
     const { annotationHorizontalLine } = annotation;
-    const annotationVerticalLineList = Array.isArray(annotationHorizontalLine) ? annotationHorizontalLine : [
+    const annotationHorizontalLineList = Array.isArray(annotationHorizontalLine) ? annotationHorizontalLine : [
         annotationHorizontalLine
     ];
     const positionMap = {
@@ -2883,12 +2976,12 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
         insideMiddle: 'insideMiddleTop',
         insideEnd: 'insideEndTop'
     };
-    const markLine = annotationVerticalLineList.flatMap((annotationVerticalLine)=>{
-        const { selector: selectorPoint, yValue, text = '', textPosition = 'insideEnd', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'right', textBaseline = 'top', lineColor = '#212121', lineStyle = 'dashed', lineVisible = true, lineWidth = 1, textBackgroundVisible = true, textBackgroundColor = '#212121', textBackgroundBorderColor = '#212121', textBackgroundBorderRadius = 4, textBackgroundBorderWidth = 1, textBackgroundPadding = 2 } = annotationVerticalLine;
+    const markLine = annotationHorizontalLineList.flatMap((annotationHorizontalLine)=>{
+        const { selector: selectorPoint, yValue, text = '', textPosition = 'insideEnd', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'right', textBaseline = 'top', lineColor = '#212121', lineStyle = 'dashed', lineVisible = true, lineWidth = 1, textBackgroundVisible = true, textBackgroundColor = '#212121', textBackgroundBorderColor = '#212121', textBackgroundBorderRadius = 4, textBackgroundBorderWidth = 1, textBackgroundPadding = 2 } = annotationHorizontalLine;
         const dataset = advancedVSeed.dataset.flat();
         const generateOneMarkLine = (y)=>({
                 y,
-                zIndex: ANNOTATION_Z_INDEX,
+                zIndex: 1000,
                 line: {
                     style: {
                         visible: lineVisible,
@@ -2949,9 +3042,9 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
         }
         const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
         return selectedData.map((datum)=>{
-            const y = unfoldInfo.encodingY;
-            if (!y) return {};
-            return generateOneMarkLine(datum[y]);
+            if (datum[unfoldInfo.encodingY]) return generateOneMarkLine(datum[unfoldInfo.encodingY]);
+            if (datum[foldInfo.measureValue]) return generateOneMarkLine(datum[foldInfo.measureValue]);
+            return {};
         });
     });
     const specMarkLine = spec.markLine || [];
@@ -2989,7 +3082,7 @@ const annotationArea_annotationArea = (spec, context)=>{
         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)));
@@ -3315,7 +3408,7 @@ const pivotRowDimensions = (spec, context)=>{
     const { advancedVSeed } = context;
     const dimensions = advancedVSeed.dimensions;
     if (!dimensions) return result;
-    const rowDimensions = dimensions.filter((dim)=>'rowDimension' === dim.location || 'row' === dim.encoding);
+    const rowDimensions = dimensions.filter((dim)=>'row' === dim.encoding);
     const rows = rowDimensions.map((dim)=>({
             dimensionKey: dim.id,
             title: dim.alias || dim.id
@@ -3332,7 +3425,7 @@ const pivotColumnDimensions = (spec, context)=>{
     const { advancedVSeed } = context;
     const dimensions = advancedVSeed.dimensions;
     if (!dimensions) return result;
-    const columnDimensions = dimensions.filter((dim)=>'columnDimension' === dim.location || 'column' === dim.encoding);
+    const columnDimensions = dimensions.filter((dim)=>'column' === dim.encoding);
     const columns = columnDimensions.map((dim)=>({
             dimensionKey: dim.id,
             title: dim.alias || dim.id
@@ -3605,6 +3698,17 @@ const registerLine = ()=>{
     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);
@@ -3626,40 +3730,52 @@ const column_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     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 = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
+    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+    if (0 === encoding.detail.length) encoding.detail = [
+        MeasureName
+    ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
 };
 const column_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
     encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
 };
 const column_generateMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = measures.map((item)=>item.id);
     encoding.y = unique(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
     const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
     if (color.length > 0) encoding.color = color;
-    return encoding;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...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
     ], [
@@ -3856,7 +3972,7 @@ const annotationAreaBand = (spec, context)=>{
         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)));
@@ -4019,11 +4135,16 @@ const registerColumn = ()=>{
 };
 const columnParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
-    encodingForColumn,
-    buildMeasures,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
+    encodingAdapter([
+        defaultEncodingForColumn,
+        buildMeasures
+    ], [
+        encodingForColumn,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4118,11 +4239,16 @@ const registerColumnParallel = ()=>{
 };
 const columnPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
-    encodingForColumn,
-    buildMeasures,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
+    encodingAdapter([
+        defaultEncodingForColumn,
+        buildMeasures
+    ], [
+        encodingForColumn,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4199,6 +4325,17 @@ const registerColumnPercent = ()=>{
     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);
@@ -4214,39 +4351,45 @@ const encodingForBar = (advancedVSeed)=>{
         encoding
     };
 };
-const bar_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.x = unique(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const bar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
     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 = unique(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-    return encoding;
-};
 const bar_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.y = unique(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.y.length) encoding.y = [
         dimensions[0].id
     ];
+    encoding.color = unique(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 = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+    if (0 === encoding.detail.length) encoding.detail = [
+        MeasureName
+    ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+};
+const bar_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.x = unique(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const bar_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.x = unique(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = color;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const sortYBandAxis = (advancedVSeed, context)=>{
     const result = {
@@ -4266,11 +4409,16 @@ const sortYBandAxis = (advancedVSeed, context)=>{
 };
 const barAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
-    encodingForBar,
-    buildMeasures,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
+    encodingAdapter([
+        defaultEncodingForBar,
+        buildMeasures
+    ], [
+        encodingForBar,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4421,7 +4569,7 @@ const xLinear = (spec, context)=>{
             }
         },
         innerOffset: {
-            right: LINEAR_AXIS_INNER_OFFSET_TOP
+            right: 7
         }
     };
     result.axes = [
@@ -4621,11 +4769,16 @@ const registerBar = ()=>{
 };
 const barParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
-    encodingForBar,
-    buildMeasures,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
+    encodingAdapter([
+        defaultEncodingForBar,
+        buildMeasures
+    ], [
+        encodingForBar,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4719,11 +4872,16 @@ const registerBarParallel = ()=>{
 };
 const barPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
-    encodingForBar,
-    buildMeasures,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
+    encodingAdapter([
+        defaultEncodingForBar,
+        buildMeasures
+    ], [
+        encodingForBar,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4792,11 +4950,16 @@ const registerBarPercent = ()=>{
 };
 const areaAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
-    encodingForLine,
-    buildMeasures,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
+    encodingAdapter([
+        defaultEncodingForLine,
+        buildMeasures
+    ], [
+        encodingForLine,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -4952,11 +5115,16 @@ const registerArea = ()=>{
 };
 const areaPercentAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
-    encodingForLine,
-    buildMeasures,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
+    encodingAdapter([
+        defaultEncodingForLine,
+        buildMeasures
+    ], [
+        encodingForLine,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -5030,6 +5198,17 @@ const registerAreaPercent = ()=>{
     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);
@@ -5045,33 +5224,43 @@ const encodingForScatter = (advancedVSeed)=>{
         encoding
     };
 };
-const scatter_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.y = unique(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const scatter_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const dimensionsWithoutMeasureName = dimensions.filter((item)=>item.id !== MeasureName);
     const uniqueDimIds = unique(dimensionsWithoutMeasureName.map((d)=>d.id));
     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 = unique(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-};
 const scatter_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
-    if (0 === encoding.detail.length) encoding.detail = dimensions.filter((item)=>!encoding.x?.includes(item.id)).map((item)=>item.id);
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+    if (0 === encoding.detail.length) encoding.detail = [
+        MeasureName
+    ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+};
+const scatter_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.y = unique(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const scatter_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.tooltip = measures.map((item)=>item.id);
+    encoding.y = unique(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = [
+        color[0]
+    ];
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const buildMeasuresForScatter = (advancedVSeed, context)=>{
     const { vseed } = context;
@@ -5099,9 +5288,10 @@ const basicMeasuresToScatterMeasures = (basicMeasures)=>{
         const isXAxis = encoding.includes('xAxis');
         if (isYAxis) yMeasures.push(item);
         else if (isXAxis) xMeasures.push(item);
-        else if (0 === index) yMeasures.push(item);
+        else if (0 !== index) yMeasures.push(item);
         else xMeasures.push(item);
     }
+    if (0 === yMeasures.length && xMeasures.length > 0) yMeasures.push(xMeasures[0]);
     return [
         {
             id: 'scatterMeasures',
@@ -5167,7 +5357,7 @@ const buildMeasuresForScatter_generateMeasuresByParentId = (measures)=>{
         const isEmpty = !encoding.length;
         if (isY) scatterChart.yMeasures.push(item);
         else if (isX) scatterChart.xMeasures.push(item);
-        else if (isEmpty) if (0 === scatterChart.yMeasures.length) scatterChart.yMeasures.push(item);
+        else if (isEmpty) if (0 !== scatterChart.yMeasures.length) scatterChart.yMeasures.push(item);
         else scatterChart.xMeasures.push(item);
     });
     return scatterMeasuresToMeasureTree(scatterMeasures);
@@ -5190,6 +5380,7 @@ const reshapeWithScatterEncoding = (advancedVSeed, context)=>{
     if (xMeasures && xMeasures.children) {
         const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, uniqueBy(dimensions, (d)=>d.id), uniqueBy(xMeasures.children, (d)=>d.id), encoding, {
             foldMeasureValue: FoldXMeasureValue,
+            foldMeasureId: FoldXMeasureId,
             colorItemAsId: true,
             colorMeasureId: getColorMeasureId(advancedVSeed)
         });
@@ -5200,6 +5391,7 @@ const reshapeWithScatterEncoding = (advancedVSeed, context)=>{
     if (yMeasures && yMeasures.children) {
         const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(datasets[0], uniqueBy(dimensions, (d)=>d.id), uniqueBy(yMeasures.children, (d)=>d.id), encoding, {
             foldMeasureValue: FoldYMeasureValue,
+            foldMeasureId: FoldYMeasureId,
             colorItemAsId: true,
             colorMeasureId: getColorMeasureId(advancedVSeed)
         });
@@ -5302,11 +5494,16 @@ const pivotReshapeWithScatterEncoding = (advancedVSeed, context)=>{
 };
 const scatterAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
-    encodingForScatter,
-    buildMeasuresForScatter,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
+    encodingAdapter([
+        defaultEncodingForScatter,
+        buildMeasuresForScatter
+    ], [
+        encodingForScatter,
+        buildMeasuresForScatter
+    ]),
     pivotAdapter([
         reshapeWithScatterEncoding
     ], [
@@ -5352,6 +5549,105 @@ const datasetScatter = (spec, context)=>{
         }
     };
 };
+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 (!external_remeda_isEmpty(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 (!external_remeda_isEmpty(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
@@ -5405,7 +5701,7 @@ const scatter = [
     xLinear,
     yLinear,
     label_label,
-    tooltip_tooltip,
+    tooltipScatter,
     colorAdapter(discreteLegend, colorLegend),
     verticalCrosshairLine,
     horizontalCrosshairLine,
@@ -5430,7 +5726,7 @@ const pivotScatter = [
         xLinear,
         yLinear,
         label_label,
-        tooltip_tooltip,
+        tooltipScatter,
         verticalCrosshairLine,
         horizontalCrosshairLine,
         colorPointStyleFill(pointStyle_pointStyle),
@@ -5451,6 +5747,17 @@ const registerScatter = ()=>{
     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);
@@ -5466,39 +5773,45 @@ const encodingForDualAxis = (advancedVSeed)=>{
         encoding
     };
 };
-const dualAxis_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.y = unique(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const dualAxis_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
     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 = unique(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-    return encoding;
-};
 const dualAxis_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
+    encoding.color = unique(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 = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+    if (0 === encoding.detail.length) encoding.detail = [
+        MeasureName
+    ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+};
+const dualAxis_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.y = unique(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const dualAxis_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.y = unique(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = color;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...encoding.tooltip || [],
+        ...tooltip
+    ]);
 };
 const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
     const { vseed } = context;
@@ -5752,11 +6065,16 @@ const dualAxisConfig = (advancedVSeed, context)=>{
 };
 const dualAxisAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
-    encodingForDualAxis,
-    buildMeasuresForDualAxis,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
+    encodingAdapter([
+        defaultEncodingForDualAxis,
+        buildMeasuresForDualAxis
+    ], [
+        encodingForDualAxis,
+        buildMeasuresForDualAxis
+    ]),
     pivotAdapter([
         reshapeWithDualEncoding
     ], [
@@ -5848,7 +6166,7 @@ const initDualAxisSecondary = (spec, context)=>{
 const dualChartTypePrimary = (spec, context)=>{
     const result = {
         ...spec,
-        zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX
+        zIndex: 1001
     };
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
@@ -5868,7 +6186,7 @@ const dualChartTypePrimary = (spec, context)=>{
             break;
         case 'column':
             result.type = 'bar';
-            result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+            result.zIndex = 1000;
             break;
         case 'columnParallel':
             {
@@ -5879,7 +6197,7 @@ const dualChartTypePrimary = (spec, context)=>{
                     datasetReshapeInfo[0].unfoldInfo.encodingDetail
                 ];
                 columnSpec.type = 'bar';
-                result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+                result.zIndex = 1000;
                 break;
             }
         case 'columnPercent':
@@ -5904,7 +6222,7 @@ const dualChartTypePrimary = (spec, context)=>{
 const dualChartTypeSecondary = (spec, context)=>{
     const result = {
         ...spec,
-        zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX
+        zIndex: 1001
     };
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
@@ -5924,7 +6242,7 @@ const dualChartTypeSecondary = (spec, context)=>{
             break;
         case 'column':
             result.type = 'bar';
-            result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+            result.zIndex = 1000;
             break;
         case 'columnParallel':
             {
@@ -5935,7 +6253,7 @@ const dualChartTypeSecondary = (spec, context)=>{
                     datasetReshapeInfo[0].unfoldInfo.encodingDetail
                 ];
                 columnSpec.type = 'bar';
-                result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+                result.zIndex = 1000;
                 break;
             }
         case 'columnPercent':
@@ -6113,7 +6431,7 @@ const tooltipPrimary = (spec, context)=>{
         ...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
@@ -6121,68 +6439,19 @@ const tooltipPrimary = (spec, context)=>{
     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 (!external_remeda_isEmpty(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 (!external_remeda_isEmpty(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;
@@ -6192,7 +6461,7 @@ const tooltipSecondary = (spec, context)=>{
         ...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
@@ -6201,68 +6470,19 @@ const tooltipSecondary = (spec, context)=>{
     if (isNullish(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 (!external_remeda_isEmpty(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 (!external_remeda_isEmpty(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;
@@ -6279,7 +6499,8 @@ const yLinearPrimary = (spec, context)=>{
     const yAxisConfig = Array.isArray(primaryYAxis) ? primaryYAxis[index] || primaryYAxis[0] : primaryYAxis;
     const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
     const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
-    if (foldInfoList?.[0] && external_remeda_isEmpty(foldInfoList[0].foldMap)) return result;
+    if (isNullish(foldInfoList?.[0])) return result;
+    const isEmptySecondary = external_remeda_isEmpty(foldInfoList?.[0].foldMap);
     const id = `${reshapeInfoId}-primary-axis`;
     const seriesIds = [
         `${reshapeInfoId}-primary-series`,
@@ -6302,7 +6523,7 @@ const yLinearPrimary = (spec, context)=>{
     }
     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',
@@ -6355,7 +6576,7 @@ const yLinearPrimary = (spec, context)=>{
             }
         },
         innerOffset: {
-            top: LINEAR_AXIS_INNER_OFFSET_TOP
+            top: 7
         }
     };
     result.axes = [
@@ -6377,6 +6598,8 @@ const yLinearSecondary = (spec, context)=>{
     const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
     const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
     if (isNullish(foldInfoList?.[1])) return result;
+    const isEmptySecondary = external_remeda_isEmpty(foldInfoList?.[1].foldMap);
+    const onlySecondary = external_remeda_isEmpty(foldInfoList?.[0].foldMap) && !isEmptySecondary;
     const sync = {
         axisId: `${reshapeInfoId}-primary-axis`,
         zeroAlign: true
@@ -6404,7 +6627,7 @@ const yLinearSecondary = (spec, context)=>{
     }
     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,
@@ -6444,7 +6667,7 @@ const yLinearSecondary = (spec, context)=>{
             }
         },
         grid: {
-            visible: grid?.visible,
+            visible: onlySecondary ? true : grid?.visible,
             style: {
                 lineWidth: grid?.gridWidth,
                 stroke: grid?.gridColor
@@ -6458,7 +6681,7 @@ const yLinearSecondary = (spec, context)=>{
             }
         },
         innerOffset: {
-            top: LINEAR_AXIS_INNER_OFFSET_TOP
+            top: 7
         }
     };
     result.axes = [
@@ -6589,6 +6812,17 @@ const registerDualAxis = ()=>{
     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);
@@ -6604,40 +6838,52 @@ const encodingForPie = (advancedVSeed)=>{
         encoding
     };
 };
-const pie_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.angle = unique(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const pie_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
     encoding.color = uniqueDimIds.slice(0);
     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 = unique(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-};
 const pie_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
-    if (0 === encoding.detail.length) encoding.detail = dimensions.map((item)=>item.id);
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+    if (0 === encoding.detail.length) encoding.detail = [
+        MeasureName
+    ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+};
+const pie_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.angle = unique(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const pie_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.angle = unique(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = color;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...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
     ], [
@@ -6753,11 +6999,16 @@ const registerPie = ()=>{
 };
 const donutAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
-    buildMeasures,
-    encodingForPie,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
+    encodingAdapter([
+        defaultEncodingForPie,
+        buildMeasures
+    ], [
+        encodingForPie,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -6833,6 +7084,17 @@ const registerDonut = ()=>{
     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);
@@ -6848,46 +7110,58 @@ const encodingForRose = (advancedVSeed)=>{
         encoding
     };
 };
-const rose_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const rose_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
     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 = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-};
 const rose_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.angle = unique(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
-    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.angle.length) encoding.angle = [
         dimensions[0].id
     ];
+    encoding.color = unique(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 = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+    if (0 === encoding.detail.length) encoding.detail = [
+        MeasureName
+    ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+};
+const rose_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const rose_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = color;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...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
     ], [
@@ -7083,11 +7357,16 @@ const registerRose = ()=>{
 };
 const roseParallelAdvancedPipeline = [
     initAdvancedVSeed_initAdvancedVSeed,
-    defaultMeasures_defaultMeasures,
-    defaultDimensions,
-    defaultMeasureName,
-    encodingForRose,
-    buildMeasures,
+    default_defaultMeasures_defaultMeasures,
+    defaultDimensions_defaultDimensions,
+    defaultMeasureName_defaultMeasureName,
+    encodingAdapter([
+        defaultEncodingForRose,
+        buildMeasures
+    ], [
+        encodingForRose,
+        buildMeasures
+    ]),
     pivotAdapter([
         reshapeWithEncoding
     ], [
@@ -7193,6 +7472,17 @@ const registerRoseParallel = ()=>{
     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);
@@ -7208,44 +7498,57 @@ const encodingForRadar = (advancedVSeed)=>{
         encoding
     };
 };
-const radar_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const radar_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
     encoding.angle = uniqueDimIds.slice(0, 1);
     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 = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-};
 const radar_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.angle = unique(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
-    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = [];
     if (0 === encoding.angle.length) encoding.angle = [
         dimensions[0].id
     ];
+    encoding.color = unique(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 = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+};
+const radar_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const radar_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.radius = unique(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = color;
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...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
     ], [
@@ -7379,6 +7682,17 @@ const registerRadar = ()=>{
     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);
@@ -7394,40 +7708,54 @@ const encodingForFunnel = (advancedVSeed)=>{
         encoding
     };
 };
-const funnel_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.size = unique(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const funnel_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
     encoding.color = uniqueDimIds.slice(0);
     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 = unique(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
-    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-};
 const funnel_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.color.length) encoding.color = [
         MeasureName
     ];
-    if (0 === encoding.detail.length) encoding.detail = dimensions.map((item)=>item.id);
+    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+    if (0 === encoding.detail.length) encoding.detail = [
+        MeasureName
+    ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+};
+const funnel_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    encoding.size = unique(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
+};
+const funnel_generateMeasureEncoding = (measures, encoding)=>{
+    encoding.size = unique(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = [
+        color[0]
+    ];
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...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
     ], [
@@ -7540,6 +7868,17 @@ const registerFunnel = ()=>{
     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);
@@ -7555,10 +7894,6 @@ const encodingForHeatmap = (advancedVSeed)=>{
         encoding
     };
 };
-const heatmap_generateDefaultMeasureEncoding = (measures, encoding)=>{
-    encoding.tooltip = unique(measures.map((item)=>item.id));
-    encoding.color = unique(measures.filter((item)=>'color' === item.encoding || !item.encoding).map((item)=>item.id));
-};
 const heatmap_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     const onlyMeasureName = 1 === dimensions.length && dimensions.find((item)=>item.id === MeasureName);
     const uniqueDimIds = unique(dimensions.map((d)=>d.id));
@@ -7566,39 +7901,59 @@ const heatmap_generateDefaultDimensionEncoding = (dimensions, encoding)=>{
     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 = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    if (color.length > 0) encoding.color = color;
-    return encoding;
-};
 const heatmap_generateDimensionEncoding = (dimensions, encoding)=>{
     encoding.x = unique(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-    encoding.y = unique(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
-    encoding.color = unique(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-    encoding.detail = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
     if (0 === encoding.x.length) encoding.x = [
         dimensions[0].id
     ];
+    encoding.y = unique(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 = unique(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 = unique(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
+    if (0 === encoding.detail.length) encoding.detail = [
+        MeasureName
+    ];
+    encoding.tooltip = unique(dimensions.map((item)=>item.id));
+    encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
+};
+const heatmap_generateDefaultMeasureEncoding = (measures, encoding)=>{
+    const colorDims = unique(measures.filter((item)=>'color' === item.encoding || !item.encoding).map((item)=>item.id));
+    if (colorDims.length > 0) encoding.color = [
+        colorDims[0]
+    ];
+};
+const heatmap_generateMeasureEncoding = (measures, encoding)=>{
+    const color = unique(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+    if (color.length > 0) encoding.color = [
+        color[0]
+    ];
+    const tooltip = unique(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+    encoding.tooltip = unique([
+        ...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
     ], [
@@ -7651,6 +8006,107 @@ const cellStyle = (spec)=>{
         }
     };
 };
+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 (!external_remeda_isEmpty(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 (!external_remeda_isEmpty(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
@@ -7694,7 +8150,7 @@ const heatmap = [
     labelColorInversion,
     colorAdapter(discreteLegend, colorLegend),
     colorCellStyleFill(cellStyle),
-    tooltip_tooltip,
+    tooltipHeatmap,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
@@ -7713,7 +8169,7 @@ const pivotHeatmap = [
         label_label,
         labelColorInversion,
         discreteLegend,
-        tooltip_tooltip,
+        tooltipHeatmap,
         colorCellStyleFill(cellStyle),
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
@@ -8392,6 +8848,15 @@ const updateAdvanced = (chartType, advancedPipe)=>{
 const updateSpec = (chartType, specPipe)=>{
     Builder._customSpecPipe[chartType] = specPipe;
 };
+const findAllDimensions = (dimensions = [])=>{
+    if (!dimensions) return [];
+    const result = [];
+    preorderTraverse(dimensions, (node)=>{
+        if (!('children' in node)) result.push(node);
+        return false;
+    });
+    return result;
+};
 const zChartType = z["enum"]([
     'table',
     'pivotTable',
@@ -8435,11 +8900,6 @@ const zDataset = z.array(zDatum);
 const zDimension = z.object({
     id: z.string(),
     alias: z.string().optional(),
-    location: z["enum"]([
-        'dimension',
-        'rowDimension',
-        'columnDimension'
-    ]).default('dimension'),
     encoding: z["enum"]([
         'xAxis',
         'yAxis',
@@ -9722,6 +10182,7 @@ const zAdvancedVSeed = z.object({
     annotation: zAnnotation,
     locale: zLocale
 });
-export { AngleEncoding, Builder, ColorEncoding, ColorIdEncoding, DetailEncoding, FoldMeasureId, FoldMeasureName, FoldMeasureValue, FoldPrimaryMeasureValue, FoldSecondaryMeasureValue, FoldXMeasureValue, FoldYMeasureValue, MeasureName, ORIGINAL_DATA, Separator, XEncoding, YEncoding, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaSpecPipeline, autoFormatter, autoNumFormatter, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, createFormatter, createNumFormatter, darkTheme, dataReshapeByEncoding, donutAdvancedPipeline, donutSpecPipeline, dualAxisAdvancedPipeline, dualAxisSpecPipeline, execPipeline, findAllDimensions, findAllMeasures, findFirstMeasure, findMeasureById, foldMeasures, funnelAdvancedPipeline, funnelSpecPipeline, heatmapAdvancedPipeline, heatmapSpecPipeline, i18n, intl, isDimensionSelector, isMeasure, isMeasureGroup, isMeasureSelector, isMeasures, isPartialDatumSelector, isPivotChart, isPivotTable, isTable, isVChart, isVTable, isValueSelector, lightTheme, lineAdvancedPipeline, lineSpecPipeline, measureDepth, pieAdvancedPipeline, pieSpecPipeline, pivotTableAdvancedPipeline, pivotTableSpecPipeline, preorderTraverse, radarAdvancedPipeline, radarSpecPipeline, registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerDonut, registerFunnel, registerHeatmap, registerLightTheme, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable, roseAdvancedPipeline, roseParallelAdvancedPipeline, roseParallelSpecPipeline, roseSpecPipeline, scatterAdvancedPipeline, scatterSpecPipeline, selector_selector as selector, tableAdvancedPipeline, tableSpecPipeline, unfoldDimensions, updateAdvanced, updateSpec, zAdvancedVSeed, zAnalysis, zAnnotation, zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zArea, zAreaConfig, zAreaPercent, zAreaPercentConfig, zAreaStyle, zAxis, zBackgroundColor, zBar, zBarConfig, zBarParallel, zBarParallelConfig, zBarPercent, zBarPercentConfig, zBarStyle, zChartType, zColor, zColorLegend, zColumn, zColumnConfig, zColumnParallel, zColumnParallelConfig, zColumnPercent, zColumnPercentConfig, zConfig, zCrosshairLine, zCrosshairRect, zCustomTheme, zCustomThemeConfig, zDataset, zDatasetReshapeInfo, zDatum, zDimension, zDimensionGroup, zDimensionTree, zDimensions, zDonut, zDonutConfig, zDualAxis, zDualAxisConfig, zDualChartType, zDualMeasure, zDualMeasures, zEncoding, zFoldInfo, zFunnel, zFunnelConfig, zHeatmap, zHeatmapConfig, zLabel, zLegend, zLine, zLineConfig, zLineStyle, zLinearColor, zLocale, zMarkStyle, zMeasure, zMeasureGroup, zMeasureTree, zMeasures, zNumFormat, zPie, zPieConfig, zPivotTable, zPivotTableConfig, zPointStyle, zRadar, zRadarConfig, zRose, zRoseConfig, zRoseParallel, zRoseParallelConfig, zScatter, zScatterConfig, zScatterMeasure, zScatterMeasures, zSort, zSortLegend, zStackCornerRadius, zTable, zTableConfig, zTheme, zTooltip, zUnfoldInfo, zVSeed, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis };
+var __webpack_exports__Separator = "-";
+export { AngleEncoding, Builder, ColorEncoding, ColorIdEncoding, DetailEncoding, FoldMeasureId, FoldMeasureName, FoldMeasureValue, FoldPrimaryMeasureValue, FoldSecondaryMeasureValue, FoldXMeasureId, FoldXMeasureValue, FoldYMeasureId, FoldYMeasureValue, MeasureName, ORIGINAL_DATA, XEncoding, YEncoding, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaSpecPipeline, autoFormatter, autoNumFormatter, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, createFormatter, createNumFormatter, darkTheme, dataReshapeByEncoding, donutAdvancedPipeline, donutSpecPipeline, dualAxisAdvancedPipeline, dualAxisSpecPipeline, execPipeline, findAllDimensions, findAllMeasures, findFirstMeasure, findMeasureById, foldMeasures, funnelAdvancedPipeline, funnelSpecPipeline, heatmapAdvancedPipeline, heatmapSpecPipeline, i18n, intl, isDimensionSelector, isMeasure, isMeasureGroup, isMeasureSelector, isMeasures, isPartialDatumSelector, isPivotChart, isPivotTable, isTable, isVChart, isVTable, isValueSelector, lightTheme, lineAdvancedPipeline, lineSpecPipeline, measureDepth, pieAdvancedPipeline, pieSpecPipeline, pivotTableAdvancedPipeline, pivotTableSpecPipeline, preorderTraverse, radarAdvancedPipeline, radarSpecPipeline, registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerDonut, registerFunnel, registerHeatmap, registerLightTheme, registerLine, registerPie, registerPivotTable, registerRadar, registerRose, registerRoseParallel, registerScatter, registerTable, roseAdvancedPipeline, roseParallelAdvancedPipeline, roseParallelSpecPipeline, roseSpecPipeline, scatterAdvancedPipeline, scatterSpecPipeline, selector_selector as selector, tableAdvancedPipeline, tableSpecPipeline, unfoldDimensions, updateAdvanced, updateSpec, zAdvancedVSeed, zAnalysis, zAnnotation, zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zArea, zAreaConfig, zAreaPercent, zAreaPercentConfig, zAreaStyle, zAxis, zBackgroundColor, zBar, zBarConfig, zBarParallel, zBarParallelConfig, zBarPercent, zBarPercentConfig, zBarStyle, zChartType, zColor, zColorLegend, zColumn, zColumnConfig, zColumnParallel, zColumnParallelConfig, zColumnPercent, zColumnPercentConfig, zConfig, zCrosshairLine, zCrosshairRect, zCustomTheme, zCustomThemeConfig, zDataset, zDatasetReshapeInfo, zDatum, zDimension, zDimensionGroup, zDimensionTree, zDimensions, zDonut, zDonutConfig, zDualAxis, zDualAxisConfig, zDualChartType, zDualMeasure, zDualMeasures, zEncoding, zFoldInfo, zFunnel, zFunnelConfig, zHeatmap, zHeatmapConfig, zLabel, zLegend, zLine, zLineConfig, zLineStyle, zLinearColor, zLocale, zMarkStyle, zMeasure, zMeasureGroup, zMeasureTree, zMeasures, zNumFormat, zPie, zPieConfig, zPivotTable, zPivotTableConfig, zPointStyle, zRadar, zRadarConfig, zRose, zRoseConfig, zRoseParallel, zRoseParallelConfig, zScatter, zScatterConfig, zScatterMeasure, zScatterMeasures, zSort, zSortLegend, zStackCornerRadius, zTable, zTableConfig, zTheme, zTooltip, zUnfoldInfo, zVSeed, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis, __webpack_exports__Separator as Separator };
 
 //# sourceMappingURL=index.js.map