@visactor/vseed 0.1.7 → 0.1.9

package/dist/umd/index.js

@@ -5,7 +5,44 @@
     else root["VSeed"] = factory();
 })(globalThis, ()=>(()=>{
         "use strict";
-        var __webpack_require__ = {};
+        var __webpack_modules__ = {};
+        var __webpack_module_cache__ = {};
+        function __webpack_require__(moduleId) {
+            var cachedModule = __webpack_module_cache__[moduleId];
+            if (void 0 !== cachedModule) return cachedModule.exports;
+            var module1 = __webpack_module_cache__[moduleId] = {
+                exports: {}
+            };
+            __webpack_modules__[moduleId](module1, module1.exports, __webpack_require__);
+            return module1.exports;
+        }
+        (()=>{
+            var getProto = Object.getPrototypeOf ? (obj)=>Object.getPrototypeOf(obj) : (obj)=>obj.__proto__;
+            var leafPrototypes;
+            __webpack_require__.t = function(value, mode) {
+                if (1 & mode) value = this(value);
+                if (8 & mode) return value;
+                if ('object' == typeof value && value) {
+                    if (4 & mode && value.__esModule) return value;
+                    if (16 & mode && 'function' == typeof value.then) return value;
+                }
+                var ns = Object.create(null);
+                __webpack_require__.r(ns);
+                var def = {};
+                leafPrototypes = leafPrototypes || [
+                    null,
+                    getProto({}),
+                    getProto([]),
+                    getProto(getProto)
+                ];
+                for(var current = 2 & mode && value; 'object' == typeof current && !~leafPrototypes.indexOf(current); current = getProto(current))Object.getOwnPropertyNames(current).forEach((key)=>{
+                    def[key] = ()=>value[key];
+                });
+                def['default'] = ()=>value;
+                __webpack_require__.d(ns, def);
+                return ns;
+            };
+        })();
         (()=>{
             __webpack_require__.d = (exports1, definition)=>{
                 for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
@@ -62,7 +99,7 @@
             zYLinearAxis: ()=>zYLinearAxis,
             zMarkStyle: ()=>zMarkStyle,
             registerFunnel: ()=>registerFunnel,
-            Separator: ()=>Separator,
+            Separator: ()=>"-",
             columnAdvancedPipeline: ()=>columnAdvancedPipeline,
             zLabel: ()=>zLabel,
             registerColumn: ()=>registerColumn,
@@ -91,12 +128,13 @@
             FoldMeasureId: ()=>FoldMeasureId,
             zColumnParallelConfig: ()=>zColumnParallelConfig,
             donutSpecPipeline: ()=>donutSpecPipeline,
+            FoldXMeasureId: ()=>FoldXMeasureId,
             registerAreaPercent: ()=>registerAreaPercent,
-            zHeatmap: ()=>zHeatmap,
             zBarPercent: ()=>zBarPercent,
+            zHeatmap: ()=>zHeatmap,
             zScatterMeasure: ()=>zScatterMeasure,
-            zTheme: ()=>zTheme,
             zDatum: ()=>zDatum,
+            zTheme: ()=>zTheme,
             barAdvancedPipeline: ()=>barAdvancedPipeline,
             zCustomThemeConfig: ()=>zCustomThemeConfig,
             registerColumnPercent: ()=>registerColumnPercent,
@@ -166,7 +204,6 @@
             DetailEncoding: ()=>DetailEncoding,
             zRose: ()=>zRose,
             columnParallelSpecPipeline: ()=>columnParallelSpecPipeline,
-            i18n: ()=>i18n,
             zPointStyle: ()=>zPointStyle,
             zAnnotationPoint: ()=>zAnnotationPoint,
             lightTheme: ()=>lightTheme,
@@ -186,6 +223,7 @@
             zTableConfig: ()=>zTableConfig,
             zXBandAxis: ()=>zXBandAxis,
             zColumnPercentConfig: ()=>zColumnPercentConfig,
+            FoldYMeasureId: ()=>FoldYMeasureId,
             findMeasureById: ()=>findMeasureById,
             zVSeed: ()=>zVSeed,
             AngleEncoding: ()=>AngleEncoding,
@@ -244,6 +282,35 @@
             const result = pipeline.reduce((prev, cur)=>cur(prev, context), initialValue);
             return result;
         };
+        function chunk_JK3VNB42_n(e) {
+            return null == e;
+        }
+        var i18nData_namespaceObject = JSON.parse('{"指标名称":{"en-US":"MeasureName","zh-CN":"指标名称"},"指标Id":{"en-US":"MeasureId","zh-CN":"指标Id"},"指标值":{"en-US":"MeasureValue","zh-CN":"指标值"}}');
+        var i18n_i18nData_namespaceObject = /*#__PURE__*/ __webpack_require__.t(i18nData_namespaceObject, 2);
+        class i18n_Intl {
+            static instance;
+            translateMap = i18n_i18nData_namespaceObject;
+            locale = 'zh-CN';
+            canTranslate = (value)=>!!this.translateMap[value];
+            i18n = (segments, ...values)=>{
+                const text = segments.map((segment, index)=>segment + (values[index] || '')).join('');
+                const translatedText = this.translateMap?.[text]?.[this.locale];
+                if (chunk_JK3VNB42_n(translatedText)) {
+                    console.warn(`i18n ${this.locale} no translate: ${text}`);
+                    return text;
+                }
+                return translatedText;
+            };
+            setLocale = (locale)=>{
+                this.locale = locale;
+            };
+            getLocale = ()=>this.locale;
+            static getInstance() {
+                if (!i18n_Intl.instance) i18n_Intl.instance = new i18n_Intl();
+                return i18n_Intl.instance;
+            }
+        }
+        const intl = i18n_Intl.getInstance();
         const buildAdvanced = (builder)=>{
             const start = 'undefined' != typeof performance ? performance.now() : Date.now();
             const { chartType } = builder.vseed;
@@ -254,6 +321,7 @@
                 vseed: builder.vseed,
                 customTheme: Builder.getThemeMap()
             };
+            if (builder.vseed.locale) intl.setLocale(builder.vseed.locale);
             try {
                 return execPipeline(pipeline, context);
             } catch (e) {
@@ -274,6 +342,7 @@
                 vseed: builder.vseed,
                 advancedVSeed
             };
+            if (builder.vseed.locale) intl.setLocale(builder.vseed.locale);
             try {
                 return execPipeline(pipeline, context);
             } catch (e) {
@@ -292,35 +361,6 @@
             builder.spec = spec;
             return spec;
         };
-        function chunk_JK3VNB42_n(e) {
-            return null == e;
-        }
-        var i18n_namespaceObject = JSON.parse('{"指标名称":{"en-US":"MeasureName","zh-CN":"指标名称"},"指标Id":{"en-US":"MeasureId","zh-CN":"指标Id"},"指标值":{"en-US":"MeasureValue","zh-CN":"指标值"}}');
-        class i18n_Intl {
-            static instance;
-            translateMap = i18n_namespaceObject;
-            locale = 'zh-CN';
-            canTranslate = (value)=>!!this.translateMap[value];
-            i18n = (segments, ...values)=>{
-                const text = segments.map((segment, index)=>segment + (values[index] || '')).join('');
-                const translatedText = this.translateMap?.[text]?.[this.locale];
-                if (chunk_JK3VNB42_n(translatedText)) {
-                    console.warn(`i18n ${this.locale} no translate: ${text}`);
-                    return text;
-                }
-                return translatedText;
-            };
-            setLocale = (locale)=>{
-                this.locale = locale;
-            };
-            getLocale = ()=>this.locale;
-            static getInstance() {
-                if (!i18n_Intl.instance) i18n_Intl.instance = new i18n_Intl();
-                return i18n_Intl.instance;
-            }
-        }
-        const intl = i18n_Intl.getInstance();
-        const i18n = intl.i18n;
         var chunk_ANXBDSUI_s = {
             done: !1,
             hasNext: !1
@@ -1097,7 +1137,6 @@
             Builder._specPipelineMap.table = tableSpecPipeline;
         };
         const ORIGINAL_DATA = '__OriginalData__';
-        const Separator = '-';
         const FoldMeasureName = '__MeaName__';
         const FoldMeasureId = '__MeaId__';
         const FoldMeasureValue = '__MeaValue__';
@@ -1106,6 +1145,8 @@
         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__';
@@ -1628,6 +1669,25 @@
             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);
@@ -1647,7 +1707,7 @@
             const uniqueDimIds = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
             encoding.x = uniqueDimIds.slice(0, 1);
             encoding.color = uniqueDimIds.slice(1);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.detail = [];
             encoding.label = [];
             encoding.row = [];
@@ -1655,27 +1715,32 @@
         };
         const line_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.x = chunk_QJLMYOTX_i(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.x.length) encoding.x = [
                 dimensions[0].id
             ];
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
             ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
         };
         const line_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
         };
         const line_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (color.length > 0) encoding.color = color;
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const isMeasureTreeWithChildren = (vseed)=>{
             const { measures } = vseed;
@@ -1687,6 +1752,37 @@
             if (!measures) return false;
             return measures.some((measure)=>'parentId' in measure);
         };
+        const normalizeMeasureTree = (measures)=>{
+            const createEmptyMeasureGroup = ()=>({
+                    id: 'group',
+                    alias: '',
+                    children: []
+                });
+            let currentGroup = createEmptyMeasureGroup();
+            const measureGroups = [];
+            for (const measure of measures)if ('children' in measure) {
+                if (currentGroup.children?.length) {
+                    currentGroup.id = [
+                        currentGroup.id,
+                        ...currentGroup.children.map((item)=>item.id)
+                    ].join('-');
+                    currentGroup.alias = currentGroup.children.map((item)=>item.alias).join('-');
+                    measureGroups.push(currentGroup);
+                    currentGroup = createEmptyMeasureGroup();
+                }
+                measureGroups.push(measure);
+            } else currentGroup.children?.push(measure);
+            if (currentGroup.children?.length) {
+                currentGroup.id = [
+                    currentGroup.id,
+                    ...currentGroup.children.map((item)=>item.id)
+                ].join('-');
+                currentGroup.alias = currentGroup.children.map((item)=>item.alias).join('-');
+                measureGroups.push(currentGroup);
+                currentGroup = createEmptyMeasureGroup();
+            }
+            return measureGroups;
+        };
         const measureDepth = (measures = [])=>{
             if (!measures) return 0;
             let depth = 1;
@@ -1738,7 +1834,7 @@
         const buildMeasures = (advancedVSeed, context)=>{
             const { vseed } = context;
             if (isMeasureTreeWithChildren(vseed)) {
-                advancedVSeed.measures = vseed.measures;
+                advancedVSeed.measures = normalizeMeasureTree(vseed.measures);
                 return advancedVSeed;
             }
             if (isMeasureTreeWithParentId(vseed)) {
@@ -1854,7 +1950,7 @@
             });
             const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, dimensions, encoding, {
                 foldMeasureId,
-                separator: Separator,
+                separator: "-",
                 colorItemAsId
             });
             return {
@@ -2152,8 +2248,13 @@
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForLine,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForLine,
+                buildMeasures
+            ], [
+                encodingForLine,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -2428,10 +2529,6 @@
             ];
             return result;
         };
-        const ANNOTATION_Z_INDEX = 1000;
-        const LINEAR_AXIS_INNER_OFFSET_TOP = 7;
-        const DUAL_AXIS_CHART_COLUMN_Z_INDEX = 1000;
-        const DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX = 1001;
         const yLinear = (spec, context)=>{
             const result = {
                 ...spec
@@ -2505,7 +2602,7 @@
                     }
                 },
                 innerOffset: {
-                    top: LINEAR_AXIS_INNER_OFFSET_TOP
+                    top: 7
                 }
             };
             result.axes = [
@@ -3077,78 +3174,133 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { measures, datasetReshapeInfo, chartType, locale, dimensions } = advancedVSeed;
+            const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
                 enable: true
             } } = baseConfig;
             const { enable } = tooltip;
-            const { measureId, measureValue, measureName } = datasetReshapeInfo[0].foldInfo;
-            const { encodingColor: colorName } = datasetReshapeInfo[0].unfoldInfo;
+            const { foldInfo, unfoldInfo } = datasetReshapeInfo[0];
             result.tooltip = {
                 visible: enable,
                 mark: {
                     title: {
-                        visible: true
+                        visible: false
                     },
-                    content: [
-                        ...dimensions.map((item)=>({
-                                visible: true,
-                                hasShape: true,
-                                shapeType: 'rectRound',
-                                key: (datum)=>{
-                                    if (item.alias || item.id) return item.alias || item.id;
-                                    return datum && datum[item.id];
-                                },
-                                value: (datum)=>datum && datum[item.id]
-                            })),
-                        {
-                            visible: true,
-                            hasShape: true,
-                            key: (datum)=>datum && datum[measureName || colorName] || '',
-                            value: (datum)=>{
-                                if (!datum) return '';
-                                const value = datum[measureValue];
-                                const id = datum[measureId];
-                                const measure = findMeasureById(measures, id);
-                                if (!measure) return String(value);
-                                const { format = {}, autoFormat = true } = measure;
-                                if (!chunk_VCYTMP4D_n(format)) {
-                                    const formatter = createFormatter(format);
-                                    return formatter(value);
-                                }
-                                if (autoFormat) return autoFormatter(value, locale);
-                                return String(value);
-                            }
-                        }
-                    ]
+                    content: createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfo, unfoldInfo)
                 },
                 dimension: {
-                    content: [
-                        {
-                            visible: true,
-                            key: (datum)=>datum && datum[colorName] || '',
-                            value: (datum)=>{
-                                if (!datum) return '';
-                                const value = datum[measureValue];
-                                const id = datum[measureId];
-                                const measure = findMeasureById(measures, id);
-                                if (!measure) return String(value);
-                                const { format = {}, autoFormat = true } = measure;
-                                if (!chunk_VCYTMP4D_n(format)) {
-                                    const formatter = createFormatter(format);
-                                    return formatter(value);
-                                }
-                                if (autoFormat) return autoFormatter(value, locale);
-                                return String(value);
-                            },
-                            shapeType: 'rectRound'
-                        }
-                    ]
+                    title: {
+                        visible: true
+                    },
+                    content: createDimensionContent(measures, foldInfo, unfoldInfo, locale)
                 }
             };
             return result;
         };
+        const createDimensionContent = (measures, foldInfo, unfoldInfo, locale)=>{
+            const { measureId, measureValue } = foldInfo;
+            const { encodingColor } = unfoldInfo;
+            return [
+                {
+                    visible: true,
+                    shapeType: 'rectRound',
+                    hasShape: true,
+                    key: (v)=>{
+                        const datum = v;
+                        return datum && datum[encodingColor] || '';
+                    },
+                    value: (v)=>{
+                        const datum = v;
+                        if (!datum) return '';
+                        const value = datum[measureValue];
+                        const id = datum[measureId];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!chunk_VCYTMP4D_n(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    }
+                }
+            ];
+        };
+        const createMarkContent = (tooltip, dimensions, measures, locale, foldInfo, unfoldInfo)=>{
+            const dims = dimensions.filter((item)=>tooltip.includes(item.id));
+            const meas = measures.filter((item)=>tooltip.includes(item.id));
+            const dimContent = dims.map((item)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: (v)=>{
+                        const datum = v;
+                        if (item.alias || item.id) return item.alias || item.id;
+                        return datum && datum[item.id];
+                    },
+                    value: (v)=>{
+                        const datum = v;
+                        return datum && datum[item.id];
+                    }
+                }));
+            const meaContent = meas.map((item)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: item.alias || item.id,
+                    value: (v)=>{
+                        const datum = v;
+                        if (!datum) return '';
+                        const id = item.id;
+                        if (!datum || !datum[ORIGINAL_DATA] || !datum[ORIGINAL_DATA]) return '';
+                        const originalData = datum[ORIGINAL_DATA];
+                        const value = originalData[id];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!chunk_VCYTMP4D_n(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    }
+                }));
+            const defaultContent = {
+                visible: true,
+                hasShape: true,
+                shapeType: 'rectRound',
+                key: (v)=>{
+                    const { measureName } = foldInfo;
+                    const { encodingColor: colorName } = unfoldInfo;
+                    const datum = v;
+                    return datum && datum[measureName || colorName] || '';
+                },
+                value: (v)=>{
+                    const { measureId, measureValue } = foldInfo;
+                    const datum = v;
+                    if (!datum) return '';
+                    const value = datum[measureValue];
+                    const id = datum[measureId];
+                    const measure = findMeasureById(measures, id);
+                    if (!measure) return String(value);
+                    const { format = {}, autoFormat = true } = measure;
+                    if (!chunk_VCYTMP4D_n(format)) {
+                        const formatter = createFormatter(format);
+                        return formatter(value);
+                    }
+                    if (autoFormat) return autoFormatter(value, locale);
+                    return String(value);
+                }
+            };
+            return [
+                ...dimContent,
+                defaultContent,
+                ...meaContent
+            ];
+        };
         const isSubset = (sub, obj)=>Object.entries(sub).every(([key, value])=>{
                 if ('string' == typeof value) return obj[key] === value;
                 if ('number' == typeof value) return obj[key] === value;
@@ -3167,7 +3319,7 @@
                 const dataset = advancedVSeed.dataset.flat();
                 const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
                 return selectedData.map((datum)=>({
-                        zIndex: ANNOTATION_Z_INDEX,
+                        zIndex: 1000,
                         regionRelative: true,
                         position: (data, context)=>{
                             const targetDatum = data.find((item)=>isSubset(datum, item));
@@ -3243,7 +3395,7 @@
                 const dataset = advancedVSeed.dataset.flat();
                 const generateOneMarkLine = (x)=>({
                         x: x,
-                        zIndex: ANNOTATION_Z_INDEX,
+                        zIndex: 1000,
                         line: {
                             style: {
                                 visible: lineVisible,
@@ -3341,7 +3493,7 @@
                 const dataset = advancedVSeed.dataset.flat();
                 const generateOneMarkLine = (y)=>({
                         y,
-                        zIndex: ANNOTATION_Z_INDEX,
+                        zIndex: 1000,
                         line: {
                             style: {
                                 visible: lineVisible,
@@ -3442,7 +3594,7 @@
                 const labelPosition = positionMap[textPosition || 'top'];
                 const isBottom = labelPosition.toLocaleLowerCase().includes('bottom');
                 return {
-                    zIndex: ANNOTATION_Z_INDEX,
+                    zIndex: 1000,
                     regionRelative: true,
                     positions: (data, context)=>{
                         const positionData = data.filter((item)=>selectedData.some((datum)=>isSubset(datum, item)));
@@ -4058,6 +4210,17 @@
             Builder._advancedPipelineMap.line = lineAdvancedPipeline;
             Builder._specPipelineMap.line = lineSpecPipeline;
         };
+        const defaultEncodingForColumn = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            column_generateDefaultDimensionEncoding(dimensions, encoding);
+            column_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForColumn = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -4079,43 +4242,52 @@
             encoding.x = uniqueDimIds.slice(0, 1);
             encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
             encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.label = [];
             encoding.row = [];
             encoding.column = [];
         };
         const column_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.x = chunk_QJLMYOTX_i(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.x.length) encoding.x = [
                 dimensions[0].id
             ];
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
             ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
         };
         const column_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
         };
         const column_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (color.length > 0) encoding.color = color;
-            return encoding;
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const columnAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForColumn,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForColumn,
+                buildMeasures
+            ], [
+                encodingForColumn,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -4312,7 +4484,7 @@
                 const dataset = advancedVSeed.dataset.flat();
                 const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
                 return {
-                    zIndex: ANNOTATION_Z_INDEX,
+                    zIndex: 1000,
                     regionRelative: true,
                     positions: (data, context)=>{
                         const positionData = data.filter((item)=>selectedData.some((datum)=>isSubset(datum, item)));
@@ -4478,8 +4650,13 @@
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForColumn,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForColumn,
+                buildMeasures
+            ], [
+                encodingForColumn,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -4577,8 +4754,13 @@
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForColumn,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForColumn,
+                buildMeasures
+            ], [
+                encodingForColumn,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -4655,6 +4837,17 @@
             Builder._advancedPipelineMap.columnPercent = columnPercentAdvancedPipeline;
             Builder._specPipelineMap.columnPercent = columnPercentSpecPipeline;
         };
+        const defaultEncodingForBar = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            bar_generateDefaultDimensionEncoding(dimensions, encoding);
+            bar_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForBar = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -4676,35 +4869,39 @@
             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_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.y = chunk_QJLMYOTX_i(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
-            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.y.length) encoding.y = [
                 dimensions[0].id
             ];
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
             ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
         };
         const bar_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
             encoding.x = chunk_QJLMYOTX_i(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
         };
         const bar_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
             encoding.x = chunk_QJLMYOTX_i(measures.filter((item)=>'xAxis' === item.encoding || !item.encoding).map((item)=>item.id));
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (color.length > 0) encoding.color = color;
-            return encoding;
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const sortYBandAxis = (advancedVSeed, context)=>{
             const result = {
@@ -4727,8 +4924,13 @@
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForBar,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForBar,
+                buildMeasures
+            ], [
+                encodingForBar,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -4879,7 +5081,7 @@
                     }
                 },
                 innerOffset: {
-                    right: LINEAR_AXIS_INNER_OFFSET_TOP
+                    right: 7
                 }
             };
             result.axes = [
@@ -5082,8 +5284,13 @@
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForBar,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForBar,
+                buildMeasures
+            ], [
+                encodingForBar,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -5180,8 +5387,13 @@
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForBar,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForBar,
+                buildMeasures
+            ], [
+                encodingForBar,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -5253,8 +5465,13 @@
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForLine,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForLine,
+                buildMeasures
+            ], [
+                encodingForLine,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -5413,8 +5630,13 @@
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForLine,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForLine,
+                buildMeasures
+            ], [
+                encodingForLine,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -5488,6 +5710,17 @@
             Builder._advancedPipelineMap.areaPercent = areaPercentAdvancedPipeline;
             Builder._specPipelineMap.areaPercent = areaPercentSpecPipeline;
         };
+        const defaultEncodingForScatter = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            scatter_generateDefaultDimensionEncoding(dimensions, encoding);
+            scatter_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForScatter = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -5508,23 +5741,24 @@
             const uniqueDimIds = chunk_QJLMYOTX_i(dimensionsWithoutMeasureName.map((d)=>d.id));
             encoding.color = uniqueDimIds.slice(0);
             encoding.detail = uniqueDimIds.slice(0);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.label = [];
             encoding.row = [];
             encoding.column = [];
         };
         const scatter_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
             ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
         };
         const scatter_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
         };
         const scatter_generateMeasureEncoding = (measures, encoding)=>{
@@ -5534,6 +5768,11 @@
             if (color.length > 0) encoding.color = [
                 color[0]
             ];
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const buildMeasuresForScatter = (advancedVSeed, context)=>{
             const { vseed } = context;
@@ -5564,6 +5803,7 @@
                 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',
@@ -5652,6 +5892,7 @@
             if (xMeasures && xMeasures.children) {
                 const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (d)=>d.id), T(xMeasures.children, (d)=>d.id), encoding, {
                     foldMeasureValue: FoldXMeasureValue,
+                    foldMeasureId: FoldXMeasureId,
                     colorItemAsId: true,
                     colorMeasureId: getColorMeasureId(advancedVSeed)
                 });
@@ -5662,6 +5903,7 @@
             if (yMeasures && yMeasures.children) {
                 const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(datasets[0], T(dimensions, (d)=>d.id), T(yMeasures.children, (d)=>d.id), encoding, {
                     foldMeasureValue: FoldYMeasureValue,
+                    foldMeasureId: FoldYMeasureId,
                     colorItemAsId: true,
                     colorMeasureId: getColorMeasureId(advancedVSeed)
                 });
@@ -5767,8 +6009,13 @@
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForScatter,
-            buildMeasuresForScatter,
+            encodingAdapter([
+                defaultEncodingForScatter,
+                buildMeasuresForScatter
+            ], [
+                encodingForScatter,
+                buildMeasuresForScatter
+            ]),
             pivotAdapter([
                 reshapeWithScatterEncoding
             ], [
@@ -5814,6 +6061,105 @@
                 }
             };
         };
+        const tooltipScatter = (spec, context)=>{
+            const result = {
+                ...spec
+            };
+            const { advancedVSeed } = context;
+            const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
+            const baseConfig = advancedVSeed.config[chartType];
+            const { tooltip = {
+                enable: true
+            } } = baseConfig;
+            const { enable } = tooltip;
+            const { foldInfoList } = datasetReshapeInfo[0];
+            result.tooltip = {
+                visible: enable,
+                mark: {
+                    title: {
+                        visible: false
+                    },
+                    content: tooltipScatter_createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfoList)
+                },
+                dimension: {
+                    visible: false
+                }
+            };
+            return result;
+        };
+        const tooltipScatter_createMarkContent = (tooltip, dimensions, measures, locale, foldInfoList)=>{
+            const dims = dimensions.filter((item)=>tooltip.includes(item.id));
+            const meas = measures.filter((item)=>tooltip.includes(item.id));
+            const dimContent = dims.map((item)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: (v)=>{
+                        const datum = v;
+                        if (item.alias || item.id) return item.alias || item.id;
+                        return datum && datum[item.id];
+                    },
+                    value: (v)=>{
+                        const datum = v;
+                        return datum && datum[item.id];
+                    }
+                }));
+            const meaContent = meas.map((item)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: item.alias || item.id,
+                    value: (v)=>{
+                        const datum = v;
+                        if (!datum) return '';
+                        const id = item.id;
+                        if (!datum || !datum[ORIGINAL_DATA] || !datum[ORIGINAL_DATA]) return '';
+                        const originalData = datum[ORIGINAL_DATA];
+                        const value = originalData[id];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!chunk_VCYTMP4D_n(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    }
+                }));
+            const foldMeaContent = foldInfoList.map((foldInfo)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: (v)=>{
+                        const { measureId, foldMap } = foldInfo;
+                        const datum = v;
+                        const id = datum[measureId];
+                        return foldMap[id] || id;
+                    },
+                    value: (v)=>{
+                        const { measureId, measureValue } = foldInfo;
+                        const datum = v;
+                        if (!datum) return '';
+                        const value = datum[measureValue];
+                        const id = datum[measureId];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!chunk_VCYTMP4D_n(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    }
+                }));
+            return [
+                ...dimContent,
+                ...foldMeaContent,
+                ...meaContent
+            ];
+        };
         const horizontalCrosshairLine = (spec, context)=>{
             const result = {
                 ...spec
@@ -5867,7 +6213,7 @@
             xLinear,
             yLinear,
             label_label,
-            tooltip_tooltip,
+            tooltipScatter,
             colorAdapter(discreteLegend, colorLegend),
             verticalCrosshairLine,
             horizontalCrosshairLine,
@@ -5892,7 +6238,7 @@
                 xLinear,
                 yLinear,
                 label_label,
-                tooltip_tooltip,
+                tooltipScatter,
                 verticalCrosshairLine,
                 horizontalCrosshairLine,
                 colorPointStyleFill(pointStyle_pointStyle),
@@ -5913,6 +6259,17 @@
             Builder._advancedPipelineMap.scatter = scatterAdvancedPipeline;
             Builder._specPipelineMap.scatter = scatterSpecPipeline;
         };
+        const defaultEncodingForDualAxis = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            dualAxis_generateDefaultDimensionEncoding(dimensions, encoding);
+            dualAxis_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForDualAxis = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -5934,35 +6291,39 @@
             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_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.x = chunk_QJLMYOTX_i(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.x.length) encoding.x = [
                 dimensions[0].id
             ];
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
             ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
         };
         const dualAxis_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
         };
         const dualAxis_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'primaryYAxis' === item.encoding || 'secondaryYAxis' === item.encoding || !item.encoding).map((item)=>item.id));
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (color.length > 0) encoding.color = color;
-            return encoding;
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
             const { vseed } = context;
@@ -6219,8 +6580,13 @@
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForDualAxis,
-            buildMeasuresForDualAxis,
+            encodingAdapter([
+                defaultEncodingForDualAxis,
+                buildMeasuresForDualAxis
+            ], [
+                encodingForDualAxis,
+                buildMeasuresForDualAxis
+            ]),
             pivotAdapter([
                 reshapeWithDualEncoding
             ], [
@@ -6312,7 +6678,7 @@
         const dualChartTypePrimary = (spec, context)=>{
             const result = {
                 ...spec,
-                zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX
+                zIndex: 1001
             };
             const { advancedVSeed, vseed } = context;
             const { chartType } = vseed;
@@ -6332,7 +6698,7 @@
                     break;
                 case 'column':
                     result.type = 'bar';
-                    result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+                    result.zIndex = 1000;
                     break;
                 case 'columnParallel':
                     {
@@ -6343,7 +6709,7 @@
                             datasetReshapeInfo[0].unfoldInfo.encodingDetail
                         ];
                         columnSpec.type = 'bar';
-                        result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+                        result.zIndex = 1000;
                         break;
                     }
                 case 'columnPercent':
@@ -6368,7 +6734,7 @@
         const dualChartTypeSecondary = (spec, context)=>{
             const result = {
                 ...spec,
-                zIndex: DUAL_AXIS_CHART_NON_COLUMN_Z_INDEX
+                zIndex: 1001
             };
             const { advancedVSeed, vseed } = context;
             const { chartType } = vseed;
@@ -6388,7 +6754,7 @@
                     break;
                 case 'column':
                     result.type = 'bar';
-                    result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+                    result.zIndex = 1000;
                     break;
                 case 'columnParallel':
                     {
@@ -6399,7 +6765,7 @@
                             datasetReshapeInfo[0].unfoldInfo.encodingDetail
                         ];
                         columnSpec.type = 'bar';
-                        result.zIndex = DUAL_AXIS_CHART_COLUMN_Z_INDEX;
+                        result.zIndex = 1000;
                         break;
                     }
                 case 'columnPercent':
@@ -6577,7 +6943,7 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { measures, datasetReshapeInfo, chartType, locale, dimensions } = advancedVSeed;
+            const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
                 enable: true
@@ -6585,68 +6951,19 @@
             const { enable } = tooltip;
             const foldInfoList = datasetReshapeInfo[0].foldInfoList;
             const unfoldInfo = datasetReshapeInfo[0].unfoldInfo;
-            const { measureId, measureValue, measureName } = foldInfoList[0];
-            const { encodingColor: colorName } = unfoldInfo;
             result.tooltip = {
                 visible: enable,
                 mark: {
                     title: {
-                        visible: true
+                        visible: false
                     },
-                    content: [
-                        ...dimensions.map((item)=>({
-                                visible: true,
-                                hasShape: true,
-                                shapeType: 'rectRound',
-                                key: (datum)=>{
-                                    if (item.alias || item.id) return item.alias || item.id;
-                                    return datum && datum[item.id];
-                                },
-                                value: (datum)=>datum && datum[item.id]
-                            })),
-                        {
-                            visible: true,
-                            hasShape: true,
-                            key: (datum)=>datum && datum[measureName || colorName] || '',
-                            value: (datum)=>{
-                                if (!datum) return '';
-                                const value = datum[measureValue];
-                                const id = datum[measureId];
-                                const measure = findMeasureById(measures, id);
-                                if (!measure) return String(value);
-                                const { format = {}, autoFormat = true } = measure;
-                                if (!chunk_VCYTMP4D_n(format)) {
-                                    const formatter = createFormatter(format);
-                                    return formatter(value);
-                                }
-                                if (autoFormat) return autoFormatter(value, locale);
-                                return String(value);
-                            }
-                        }
-                    ]
+                    content: createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfoList[0], unfoldInfo)
                 },
                 dimension: {
-                    content: [
-                        {
-                            visible: true,
-                            key: (datum)=>datum && datum[colorName] || '',
-                            value: (datum)=>{
-                                if (!datum) return '';
-                                const value = datum[measureValue];
-                                const id = datum[measureId];
-                                const measure = findMeasureById(measures, id);
-                                if (!measure) return String(value);
-                                const { format = {}, autoFormat = true } = measure;
-                                if (!chunk_VCYTMP4D_n(format)) {
-                                    const formatter = createFormatter(format);
-                                    return formatter(value);
-                                }
-                                if (autoFormat) return autoFormatter(value, locale);
-                                return String(value);
-                            },
-                            shapeType: 'rectRound'
-                        }
-                    ]
+                    title: {
+                        visible: true
+                    },
+                    content: createDimensionContent(measures, foldInfoList[0], unfoldInfo, locale)
                 }
             };
             return result;
@@ -6656,7 +6973,7 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { measures, datasetReshapeInfo, chartType, locale, dimensions } = advancedVSeed;
+            const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
                 enable: true
@@ -6665,68 +6982,19 @@
             if (chunk_JK3VNB42_n(datasetReshapeInfo[0].foldInfoList?.[1])) return result;
             const foldInfoList = datasetReshapeInfo[0].foldInfoList;
             const unfoldInfo = datasetReshapeInfo[0].unfoldInfo;
-            const { measureId, measureValue, measureName } = foldInfoList[1];
-            const { encodingColorId } = unfoldInfo;
             result.tooltip = {
                 visible: enable,
                 mark: {
                     title: {
-                        visible: true
+                        visible: false
                     },
-                    content: [
-                        ...dimensions.map((item)=>({
-                                visible: true,
-                                hasShape: true,
-                                shapeType: 'rectRound',
-                                key: (datum)=>{
-                                    if (item.alias || item.id) return item.alias || item.id;
-                                    return datum && datum[item.id];
-                                },
-                                value: (datum)=>datum && datum[item.id]
-                            })),
-                        {
-                            visible: true,
-                            hasShape: true,
-                            key: (datum)=>datum && datum[measureName || encodingColorId] || '',
-                            value: (datum)=>{
-                                if (!datum) return '';
-                                const value = datum[measureValue];
-                                const id = datum[measureId];
-                                const measure = findMeasureById(measures, id);
-                                if (!measure) return String(value);
-                                const { format = {}, autoFormat = true } = measure;
-                                if (!chunk_VCYTMP4D_n(format)) {
-                                    const formatter = createFormatter(format);
-                                    return formatter(value);
-                                }
-                                if (autoFormat) return autoFormatter(value, locale);
-                                return String(value);
-                            }
-                        }
-                    ]
+                    content: createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfoList[1], unfoldInfo)
                 },
                 dimension: {
-                    content: [
-                        {
-                            visible: true,
-                            key: (datum)=>datum && datum[encodingColorId] || '',
-                            value: (datum)=>{
-                                if (!datum) return '';
-                                const value = datum[measureValue];
-                                const id = datum[measureId];
-                                const measure = findMeasureById(measures, id);
-                                if (!measure) return String(value);
-                                const { format = {}, autoFormat = true } = measure;
-                                if (!chunk_VCYTMP4D_n(format)) {
-                                    const formatter = createFormatter(format);
-                                    return formatter(value);
-                                }
-                                if (autoFormat) return autoFormatter(value, locale);
-                                return String(value);
-                            },
-                            shapeType: 'rectRound'
-                        }
-                    ]
+                    title: {
+                        visible: true
+                    },
+                    content: createDimensionContent(measures, foldInfoList[1], unfoldInfo, locale)
                 }
             };
             return result;
@@ -6743,7 +7011,8 @@
             const yAxisConfig = Array.isArray(primaryYAxis) ? primaryYAxis[index] || primaryYAxis[0] : primaryYAxis;
             const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
             const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
-            if (foldInfoList?.[0] && chunk_VCYTMP4D_n(foldInfoList[0].foldMap)) return result;
+            if (chunk_JK3VNB42_n(foldInfoList?.[0])) return result;
+            const isEmptySecondary = chunk_VCYTMP4D_n(foldInfoList?.[0].foldMap);
             const id = `${reshapeInfoId}-primary-axis`;
             const seriesIds = [
                 `${reshapeInfoId}-primary-series`,
@@ -6766,7 +7035,7 @@
             }
             const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10 } = yAxisConfig;
             const linearAxis = {
-                visible,
+                visible: isEmptySecondary ? false : visible,
                 id,
                 seriesId,
                 type: log ? 'log' : 'linear',
@@ -6819,7 +7088,7 @@
                     }
                 },
                 innerOffset: {
-                    top: LINEAR_AXIS_INNER_OFFSET_TOP
+                    top: 7
                 }
             };
             result.axes = [
@@ -6841,6 +7110,8 @@
             const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
             const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
             if (chunk_JK3VNB42_n(foldInfoList?.[1])) return result;
+            const isEmptySecondary = chunk_VCYTMP4D_n(foldInfoList?.[1].foldMap);
+            const onlySecondary = chunk_VCYTMP4D_n(foldInfoList?.[0].foldMap) && !isEmptySecondary;
             const sync = {
                 axisId: `${reshapeInfoId}-primary-axis`,
                 zeroAlign: true
@@ -6868,7 +7139,7 @@
             }
             const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10 } = yAxisConfig;
             const linearAxis = {
-                visible,
+                visible: isEmptySecondary ? false : visible,
                 id,
                 seriesId,
                 sync,
@@ -6908,7 +7179,7 @@
                     }
                 },
                 grid: {
-                    visible: grid?.visible,
+                    visible: onlySecondary ? true : grid?.visible,
                     style: {
                         lineWidth: grid?.gridWidth,
                         stroke: grid?.gridColor
@@ -6922,7 +7193,7 @@
                     }
                 },
                 innerOffset: {
-                    top: LINEAR_AXIS_INNER_OFFSET_TOP
+                    top: 7
                 }
             };
             result.axes = [
@@ -7053,6 +7324,17 @@
             Builder._advancedPipelineMap.dualAxis = dualAxisAdvancedPipeline;
             Builder._specPipelineMap.dualAxis = dualAxisSpecPipeline;
         };
+        const defaultEncodingForPie = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            pie_generateDefaultDimensionEncoding(dimensions, encoding);
+            pie_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForPie = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -7072,38 +7354,48 @@
             const uniqueDimIds = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
             encoding.color = uniqueDimIds.slice(0);
             encoding.detail = uniqueDimIds.slice(0);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.label = [];
             encoding.row = [];
             encoding.column = [];
         };
         const pie_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
             ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
         };
         const pie_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
             encoding.angle = chunk_QJLMYOTX_i(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
         };
         const pie_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
             encoding.angle = chunk_QJLMYOTX_i(measures.filter((item)=>'angle' === item.encoding || !item.encoding).map((item)=>item.id));
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (color.length > 0) encoding.color = color;
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const pieAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForPie,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForPie,
+                buildMeasures
+            ], [
+                encodingForPie,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7222,8 +7514,13 @@
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            buildMeasures,
-            encodingForPie,
+            encodingAdapter([
+                defaultEncodingForPie,
+                buildMeasures
+            ], [
+                encodingForPie,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7299,6 +7596,17 @@
             Builder._advancedPipelineMap.donut = donutAdvancedPipeline;
             Builder._specPipelineMap.donut = donutSpecPipeline;
         };
+        const defaultEncodingForRose = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            rose_generateDefaultDimensionEncoding(dimensions, encoding);
+            rose_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForRose = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -7320,42 +7628,52 @@
             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_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.angle = chunk_QJLMYOTX_i(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
-            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.angle.length) encoding.angle = [
                 dimensions[0].id
             ];
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
             ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
         };
         const rose_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
             encoding.radius = chunk_QJLMYOTX_i(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
         };
         const rose_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
             encoding.radius = chunk_QJLMYOTX_i(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (color.length > 0) encoding.color = color;
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const roseAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForRose,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForRose,
+                buildMeasures
+            ], [
+                encodingForRose,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7554,8 +7872,13 @@
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForRose,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForRose,
+                buildMeasures
+            ], [
+                encodingForRose,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7661,6 +7984,17 @@
             Builder._advancedPipelineMap.roseParallel = roseParallelAdvancedPipeline;
             Builder._specPipelineMap.roseParallel = roseParallelSpecPipeline;
         };
+        const defaultEncodingForRadar = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            radar_generateDefaultDimensionEncoding(dimensions, encoding);
+            radar_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForRadar = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -7680,7 +8014,7 @@
             const uniqueDimIds = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
             encoding.angle = uniqueDimIds.slice(0, 1);
             encoding.color = uniqueDimIds.slice(1);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.detail = [];
             encoding.label = [];
             encoding.row = [];
@@ -7688,35 +8022,45 @@
         };
         const radar_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.angle = chunk_QJLMYOTX_i(dimensions.filter((item)=>'angle' === item.encoding).map((item)=>item.id));
-            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            encoding.detail = [];
             if (0 === encoding.angle.length) encoding.angle = [
                 dimensions[0].id
             ];
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            encoding.detail = [];
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
             ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
         };
         const radar_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
             encoding.radius = chunk_QJLMYOTX_i(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
         };
         const radar_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
             encoding.radius = chunk_QJLMYOTX_i(measures.filter((item)=>'radius' === item.encoding || !item.encoding).map((item)=>item.id));
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (color.length > 0) encoding.color = color;
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const radarAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForRadar,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForRadar,
+                buildMeasures
+            ], [
+                encodingForRadar,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -7850,6 +8194,17 @@
             Builder._advancedPipelineMap.radar = radarAdvancedPipeline;
             Builder._specPipelineMap.radar = radarSpecPipeline;
         };
+        const defaultEncodingForFunnel = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            funnel_generateDefaultDimensionEncoding(dimensions, encoding);
+            funnel_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForFunnel = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -7869,40 +8224,50 @@
             const uniqueDimIds = chunk_QJLMYOTX_i(dimensions.map((d)=>d.id));
             encoding.color = uniqueDimIds.slice(0);
             encoding.detail = uniqueDimIds.slice(0);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.label = [];
             encoding.row = [];
             encoding.column = [];
         };
         const funnel_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
             ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
         };
         const funnel_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
             encoding.size = chunk_QJLMYOTX_i(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
         };
         const funnel_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
             encoding.size = chunk_QJLMYOTX_i(measures.filter((item)=>'size' === item.encoding || !item.encoding).map((item)=>item.id));
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (color.length > 0) encoding.color = [
                 color[0]
             ];
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const funnelAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForFunnel,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForFunnel,
+                buildMeasures
+            ], [
+                encodingForFunnel,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -8015,6 +8380,17 @@
             Builder._advancedPipelineMap.funnel = funnelAdvancedPipeline;
             Builder._specPipelineMap.funnel = funnelSpecPipeline;
         };
+        const defaultEncodingForHeatmap = (advancedVSeed)=>{
+            const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
+            const measures = findAllMeasures(vseedMeasures);
+            const encoding = {};
+            heatmap_generateDefaultDimensionEncoding(dimensions, encoding);
+            heatmap_generateDefaultMeasureEncoding(measures, encoding);
+            return {
+                ...advancedVSeed,
+                encoding
+            };
+        };
         const encodingForHeatmap = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -8037,50 +8413,59 @@
             encoding.y = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
             encoding.color = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
             encoding.detail = uniqueDimIds.slice(onlyMeasureName ? 0 : 1);
-            encoding.tooltip = uniqueDimIds;
+            encoding.tooltip = uniqueDimIds.filter((d)=>d !== MeasureName);
             encoding.label = [];
             encoding.row = [];
             encoding.column = [];
         };
         const heatmap_generateDimensionEncoding = (dimensions, encoding)=>{
             encoding.x = chunk_QJLMYOTX_i(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
-            encoding.y = chunk_QJLMYOTX_i(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
-            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.x.length) encoding.x = [
                 dimensions[0].id
             ];
+            encoding.y = chunk_QJLMYOTX_i(dimensions.filter((item)=>'yAxis' === item.encoding).map((item)=>item.id));
             if (0 === encoding.y.length) if (dimensions.length > 1) encoding.y = dimensions.slice(1).map((item)=>item.id);
             else encoding.y = dimensions.slice(0).map((item)=>item.id);
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (0 === encoding.color.length) encoding.color = [
                 MeasureName
             ];
+            encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
             ];
+            encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
+            encoding.tooltip = encoding.tooltip.filter((d)=>d !== MeasureName);
         };
         const heatmap_generateDefaultMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = chunk_QJLMYOTX_i(measures.map((item)=>item.id));
             const colorDims = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding || !item.encoding).map((item)=>item.id));
             if (colorDims.length > 0) encoding.color = [
                 colorDims[0]
             ];
         };
         const heatmap_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (color.length > 0) encoding.color = [
                 color[0]
             ];
-            return encoding;
+            const tooltip = chunk_QJLMYOTX_i(measures.filter((item)=>'tooltip' === item.encoding).map((item)=>item.id));
+            encoding.tooltip = chunk_QJLMYOTX_i([
+                ...encoding.tooltip || [],
+                ...tooltip
+            ]);
         };
         const heatmapAdvancedPipeline = [
             initAdvancedVSeed_initAdvancedVSeed,
             default_defaultMeasures_defaultMeasures,
             defaultDimensions_defaultDimensions,
             defaultMeasureName_defaultMeasureName,
-            encodingForHeatmap,
-            buildMeasures,
+            encodingAdapter([
+                defaultEncodingForHeatmap,
+                buildMeasures
+            ], [
+                encodingForHeatmap,
+                buildMeasures
+            ]),
             pivotAdapter([
                 reshapeWithEncoding
             ], [
@@ -8133,6 +8518,107 @@
                 }
             };
         };
+        const tooltipHeatmap = (spec, context)=>{
+            const result = {
+                ...spec
+            };
+            const { advancedVSeed } = context;
+            const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
+            const baseConfig = advancedVSeed.config[chartType];
+            const { tooltip = {
+                enable: true
+            } } = baseConfig;
+            const { enable } = tooltip;
+            const { foldInfo } = datasetReshapeInfo[0];
+            result.tooltip = {
+                visible: enable,
+                mark: {
+                    title: {
+                        visible: false
+                    },
+                    content: tooltipHeatmap_createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfo)
+                },
+                dimension: {
+                    visible: false
+                }
+            };
+            return result;
+        };
+        const tooltipHeatmap_createMarkContent = (tooltip, dimensions, measures, locale, foldInfo)=>{
+            const dims = dimensions.filter((item)=>tooltip.includes(item.id));
+            const meas = measures.filter((item)=>tooltip.includes(item.id));
+            const dimContent = dims.map((item)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: (v)=>{
+                        const datum = v;
+                        if (item.alias || item.id) return item.alias || item.id;
+                        return datum && datum[item.id];
+                    },
+                    value: (v)=>{
+                        const datum = v;
+                        return datum && datum[item.id];
+                    }
+                }));
+            const meaContent = meas.map((item)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: item.alias || item.id,
+                    value: (v)=>{
+                        const datum = v;
+                        if (!datum) return '';
+                        const id = item.id;
+                        if (!datum || !datum[ORIGINAL_DATA] || !datum[ORIGINAL_DATA]) return '';
+                        const originalData = datum[ORIGINAL_DATA];
+                        const value = originalData[id];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!chunk_VCYTMP4D_n(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    }
+                }));
+            const foldMeaContent = [
+                foldInfo
+            ].map((foldInfo)=>({
+                    visible: true,
+                    hasShape: true,
+                    shapeType: 'rectRound',
+                    key: (v)=>{
+                        const { measureId, foldMap } = foldInfo;
+                        const datum = v;
+                        const id = datum[measureId];
+                        return foldMap[id] || id;
+                    },
+                    value: (v)=>{
+                        const { measureId, measureValue } = foldInfo;
+                        const datum = v;
+                        if (!datum) return '';
+                        const value = datum[measureValue];
+                        const id = datum[measureId];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (!chunk_VCYTMP4D_n(format)) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        if (autoFormat) return autoFormatter(value, locale);
+                        return String(value);
+                    }
+                }));
+            return [
+                ...dimContent,
+                ...foldMeaContent,
+                ...meaContent
+            ];
+        };
         const initHeatmap = (spec, context)=>{
             const result = {
                 ...spec
@@ -8176,7 +8662,7 @@
             labelColorInversion,
             colorAdapter(discreteLegend, colorLegend),
             colorCellStyleFill(cellStyle),
-            tooltip_tooltip,
+            tooltipHeatmap,
             annotationPoint_annotationPoint,
             annotationVerticalLine_annotationVerticalLine,
             annotationHorizontalLine_annotationHorizontalLine,
@@ -8195,7 +8681,7 @@
                 label_label,
                 labelColorInversion,
                 discreteLegend,
-                tooltip_tooltip,
+                tooltipHeatmap,
                 colorCellStyleFill(cellStyle),
                 annotationPoint_annotationPoint,
                 annotationVerticalLine_annotationVerticalLine,