@visactor/vseed 0.1.9 → 0.1.11

package/dist/umd/index.js

@@ -67,6 +67,8 @@
         var __webpack_exports__ = {};
         __webpack_require__.r(__webpack_exports__);
         __webpack_require__.d(__webpack_exports__, {
+            zScatterConfig: ()=>zScatterConfig,
+            zTooltip: ()=>zTooltip,
             funnelAdvancedPipeline: ()=>funnelAdvancedPipeline,
             zHeatmapConfig: ()=>zHeatmapConfig,
             zBar: ()=>zBar,
@@ -132,8 +134,9 @@
             registerAreaPercent: ()=>registerAreaPercent,
             zBarPercent: ()=>zBarPercent,
             zHeatmap: ()=>zHeatmap,
-            zScatterMeasure: ()=>zScatterMeasure,
+            zMeasureEncoding: ()=>zMeasureEncoding,
             zDatum: ()=>zDatum,
+            zScatterMeasure: ()=>zScatterMeasure,
             zTheme: ()=>zTheme,
             barAdvancedPipeline: ()=>barAdvancedPipeline,
             zCustomThemeConfig: ()=>zCustomThemeConfig,
@@ -149,9 +152,9 @@
             isPartialDatumSelector: ()=>isPartialDatumSelector,
             registerPivotTable: ()=>registerPivotTable,
             tableAdvancedPipeline: ()=>tableAdvancedPipeline,
+            pieSpecPipeline: ()=>pieSpecPipeline,
             registerDarkTheme: ()=>registerDarkTheme,
             dualAxisSpecPipeline: ()=>dualAxisSpecPipeline,
-            pieSpecPipeline: ()=>pieSpecPipeline,
             zAnnotationVerticalLine: ()=>zAnnotationVerticalLine,
             barSpecPipeline: ()=>barSpecPipeline,
             zChartType: ()=>zChartType,
@@ -257,18 +260,18 @@
             registerPie: ()=>registerPie,
             foldMeasures: ()=>foldMeasures,
             isPivotTable: ()=>isPivotTable,
+            zDimensionEncoding: ()=>zDimensionEncoding,
             zFunnel: ()=>zFunnel,
             zScatter: ()=>zScatter,
-            zScatterConfig: ()=>zScatterConfig,
             zBarParallelConfig: ()=>zBarParallelConfig,
             barParallelAdvancedPipeline: ()=>barParallelAdvancedPipeline,
             FoldMeasureValue: ()=>FoldMeasureValue,
             barPercentSpecPipeline: ()=>barPercentSpecPipeline,
-            lineAdvancedPipeline: ()=>lineAdvancedPipeline,
+            deleteMeasureTreeByCallback: ()=>deleteMeasureTreeByCallback,
             dataReshapeByEncoding: ()=>dataReshapeByEncoding,
+            lineAdvancedPipeline: ()=>lineAdvancedPipeline,
             lineSpecPipeline: ()=>lineSpecPipeline,
             zBarPercentConfig: ()=>zBarPercentConfig,
-            zTooltip: ()=>zTooltip,
             createFormatter: ()=>createFormatter,
             zDimensionGroup: ()=>zDimensionGroup,
             isMeasureSelector: ()=>isMeasureSelector,
@@ -1602,7 +1605,7 @@
             const { measures, dataset } = vseed;
             if (measures && measures.length > 0) return {
                 ...advancedVSeed,
-                measures
+                measures: chunk_BCBB46UE_d(measures)
             };
             if (!dataset) throw new Error('dataset is required');
             if (0 === dataset.length) return {
@@ -1635,7 +1638,7 @@
             const { dimensions, dataset } = vseed;
             if (dimensions && dimensions.length > 0) return {
                 ...result,
-                dimensions
+                dimensions: chunk_BCBB46UE_d(dimensions)
             };
             if (!dataset) throw new Error('dataset is required');
             if (0 === dataset.length) return result;
@@ -1742,13 +1745,11 @@
                 ...tooltip
             ]);
         };
-        const isMeasureTreeWithChildren = (vseed)=>{
-            const { measures } = vseed;
+        const isMeasureTreeWithChildren = (measures)=>{
             if (!measures) return false;
             return measures.some((measure)=>'children' in measure);
         };
-        const isMeasureTreeWithParentId = (vseed)=>{
-            const { measures } = vseed;
+        const isMeasureTreeWithParentId = (measures)=>{
             if (!measures) return false;
             return measures.some((measure)=>'parentId' in measure);
         };
@@ -1792,6 +1793,7 @@
             });
             return depth;
         };
+        const DEFAULT_PARENT_ID = '__DefaultParentId__';
         const isTable = (vseed)=>'table' === vseed.chartType;
         const isPivotTable = (vseed)=>'pivotTable' === vseed.chartType;
         const isVTable = (vseed)=>[
@@ -1801,8 +1803,8 @@
         const isVChart = (vseed)=>!isVTable(vseed);
         const isPivotChart = (vseed)=>{
             if (isVTable(vseed)) return false;
-            if (isMeasureTreeWithParentId(vseed)) {
-                const parentIds = vseed.measures?.map((measure)=>measure.parentId);
+            if (isMeasureTreeWithParentId(vseed.measures)) {
+                const parentIds = vseed.measures?.map((measure)=>measure.parentId || DEFAULT_PARENT_ID);
                 return parentIds && chunk_QJLMYOTX_i(parentIds).length > 1;
             }
             if ('dualAxis' === vseed.chartType || 'scatter' === vseed.chartType) {
@@ -1810,7 +1812,7 @@
                 const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'row' === dimension.encoding || 'column' === dimension.encoding);
                 if (hasRowOrColumnDimension) return true;
                 if ('scatter' === vseed.chartType) {
-                    if (isMeasureTreeWithChildren(vseed)) {
+                    if (isMeasureTreeWithChildren(vseed.measures)) {
                         const depth = measureDepth(vseed.measures);
                         return 3 === depth;
                     }
@@ -1818,7 +1820,7 @@
                     return false;
                 }
                 if ('dualAxis' === vseed.chartType) {
-                    if (isMeasureTreeWithChildren(vseed)) {
+                    if (isMeasureTreeWithChildren(vseed.measures)) {
                         const depth = measureDepth(vseed.measures);
                         return 3 === depth;
                     }
@@ -1831,33 +1833,37 @@
             const hasMeasureGroup = measures && measures.some((measure)=>measure && measure.children);
             return hasRowOrColumnDimension || hasMeasureGroup;
         };
-        const buildMeasures = (advancedVSeed, context)=>{
-            const { vseed } = context;
-            if (isMeasureTreeWithChildren(vseed)) {
-                advancedVSeed.measures = normalizeMeasureTree(vseed.measures);
+        const buildMeasures = (advancedVSeed)=>{
+            if (isMeasureTreeWithChildren(advancedVSeed.measures)) {
+                advancedVSeed.measures = normalizeMeasureTree(advancedVSeed.measures);
                 return advancedVSeed;
             }
-            if (isMeasureTreeWithParentId(vseed)) {
-                advancedVSeed.measures = generateMeasuresByParentId(vseed.measures);
+            if (isMeasureTreeWithParentId(advancedVSeed.measures)) {
+                advancedVSeed.measures = generateMeasuresByParentId(advancedVSeed.measures);
                 return advancedVSeed;
             }
-            if (isPivotChart(vseed)) advancedVSeed.measures = basicMeasuresToMeasureTree(advancedVSeed.measures);
+            if (isPivotChart(advancedVSeed)) advancedVSeed.measures = basicMeasuresToMeasureTree(advancedVSeed.measures);
             return advancedVSeed;
         };
         const generateMeasuresByParentId = (measures)=>{
             const measureTree = [];
             measures.forEach((measure)=>{
-                if (!measure.parentId) return;
                 const parent = measureTree.find((item)=>item.id === measure.parentId);
                 if (parent && 'children' in parent) {
                     parent.children = parent.children || [];
                     parent.children.push(measure);
-                } else measureTree.push({
+                } else if (measure.parentId) measureTree.push({
                     id: measure.parentId,
                     children: [
                         measure
                     ]
                 });
+                else measureTree.push({
+                    id: DEFAULT_PARENT_ID,
+                    children: [
+                        measure
+                    ]
+                });
             });
             return measureTree;
         };
@@ -1872,6 +1878,50 @@
                 }
             ];
         };
+        const deleteMeasureTreeByCallback = (measureTree, callback)=>{
+            if (!measureTree) return measureTree;
+            const stack = [
+                ...measureTree
+            ].reverse();
+            const parents = new Map();
+            measureTree.forEach((node)=>{
+                parents.set(node, measureTree);
+            });
+            const nodesToProcess = [];
+            const visited = new Set();
+            while(stack.length > 0){
+                const node = stack[stack.length - 1];
+                if (isMeasureGroup(node) && node.children && !visited.has(node)) {
+                    visited.add(node);
+                    const children = node.children.slice().reverse();
+                    for (const child of children){
+                        parents.set(child, node.children);
+                        stack.push(child);
+                    }
+                } else {
+                    stack.pop();
+                    nodesToProcess.push(node);
+                }
+            }
+            for (const node of nodesToProcess){
+                const parentList = parents.get(node);
+                if (parentList) {
+                    const index = parentList.indexOf(node);
+                    if (isMeasure(node)) {
+                        if (callback?.(node, index, parentList)) parentList.splice(index, 1);
+                    }
+                }
+            }
+            return measureTree;
+        };
+        const deleteTooltipMeasure = (advancedVSeed)=>{
+            const deleteBy = (measure)=>'tooltip' === measure.encoding;
+            const measureTree = deleteMeasureTreeByCallback(advancedVSeed.measures, deleteBy);
+            return {
+                ...advancedVSeed,
+                measures: measureTree
+            };
+        };
         const pivotAdapter = (pipeline, pivotPipeline)=>(advancedVSeed, context)=>{
                 const { vseed } = context;
                 const usePivotChart = isPivotChart(vseed);
@@ -2253,7 +2303,8 @@
                 buildMeasures
             ], [
                 encodingForLine,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -2946,7 +2997,7 @@
                     style: {}
                 }
             };
-            if (!pointStyle) return result;
+            if (chunk_JK3VNB42_n(pointStyle) || chunk_VCYTMP4D_n(pointStyle)) return result;
             const pointStyles = Array.isArray(pointStyle) ? pointStyle : [
                 pointStyle
             ];
@@ -3084,7 +3135,7 @@
                     style: {}
                 }
             };
-            if (!lineStyle) return result;
+            if (chunk_JK3VNB42_n(lineStyle) || chunk_VCYTMP4D_n(lineStyle)) return result;
             const lineStyles = Array.isArray(lineStyle) ? lineStyle : [
                 lineStyle
             ];
@@ -3173,7 +3224,7 @@
             const result = {
                 ...spec
             };
-            const { advancedVSeed } = context;
+            const { advancedVSeed, vseed } = context;
             const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
@@ -3187,7 +3238,7 @@
                     title: {
                         visible: false
                     },
-                    content: createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfo, unfoldInfo)
+                    content: createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), locale, foldInfo, unfoldInfo)
                 },
                 dimension: {
                     title: {
@@ -3229,8 +3280,8 @@
             ];
         };
         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 dims = C(dimensions.filter((item)=>tooltip.includes(item.id)), T((item)=>item.id), T((item)=>item.alias));
+            const meas = C(measures.filter((item)=>tooltip.includes(item.id)), T((item)=>item.id), T((item)=>item.alias));
             const dimContent = dims.map((item)=>({
                     visible: true,
                     hasShape: true,
@@ -4286,7 +4337,8 @@
                 buildMeasures
             ], [
                 encodingForColumn,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -4413,7 +4465,7 @@
                     }
                 }
             };
-            if (!barStyle) return result;
+            if (chunk_JK3VNB42_n(barStyle) || chunk_VCYTMP4D_n(barStyle)) return result;
             const barStyles = Array.isArray(barStyle) ? barStyle : [
                 barStyle
             ];
@@ -4655,7 +4707,8 @@
                 buildMeasures
             ], [
                 encodingForColumn,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -4759,7 +4812,8 @@
                 buildMeasures
             ], [
                 encodingForColumn,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -4929,7 +4983,8 @@
                 buildMeasures
             ], [
                 encodingForBar,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -5289,7 +5344,8 @@
                 buildMeasures
             ], [
                 encodingForBar,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -5392,7 +5448,8 @@
                 buildMeasures
             ], [
                 encodingForBar,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -5470,7 +5527,8 @@
                 buildMeasures
             ], [
                 encodingForLine,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -5530,7 +5588,7 @@
                     style: {}
                 }
             };
-            if (!areaStyle) return result;
+            if (chunk_JK3VNB42_n(areaStyle) || chunk_VCYTMP4D_n(areaStyle)) return result;
             const areaStyles = Array.isArray(areaStyle) ? areaStyle : [
                 areaStyle
             ];
@@ -5635,7 +5693,8 @@
                 buildMeasures
             ], [
                 encodingForLine,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -5762,7 +5821,6 @@
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
         };
         const scatter_generateMeasureEncoding = (measures, encoding)=>{
-            encoding.tooltip = measures.map((item)=>item.id);
             encoding.y = chunk_QJLMYOTX_i(measures.filter((item)=>'xAxis' === item.encoding || 'yAxis' === item.encoding || !item.encoding).map((item)=>item.id));
             const color = chunk_QJLMYOTX_i(measures.filter((item)=>'color' === item.encoding).map((item)=>item.id));
             if (color.length > 0) encoding.color = [
@@ -5776,15 +5834,12 @@
         };
         const buildMeasuresForScatter = (advancedVSeed, context)=>{
             const { vseed } = context;
-            if (isMeasureTreeWithChildren(vseed)) {
-                advancedVSeed.measures = vseed.measures;
-                return advancedVSeed;
-            }
-            if (isMeasureTreeWithParentId(vseed)) {
-                advancedVSeed.measures = buildMeasuresForScatter_generateMeasuresByParentId(vseed.measures);
+            if (isMeasureTreeWithChildren(advancedVSeed.measures)) return advancedVSeed;
+            if (isMeasureTreeWithParentId(advancedVSeed.measures)) {
+                advancedVSeed.measures = buildMeasuresForScatter_generateMeasuresByParentId(advancedVSeed.measures);
                 return advancedVSeed;
             }
-            const scatterMeasures = vseed.scatterMeasures ? vseed.scatterMeasures : basicMeasuresToScatterMeasures(advancedVSeed.measures || []);
+            const scatterMeasures = vseed.scatterMeasures ? chunk_BCBB46UE_d(vseed.scatterMeasures) : basicMeasuresToScatterMeasures(advancedVSeed.measures || []);
             advancedVSeed.measures = scatterMeasuresToMeasureTree(scatterMeasures);
             return advancedVSeed;
         };
@@ -5853,17 +5908,17 @@
         const buildMeasuresForScatter_generateMeasuresByParentId = (measures)=>{
             const scatterMeasures = [];
             measures.forEach((item)=>{
-                if (!item.parentId) return;
-                if (!scatterMeasures.find((d)=>d.id === item.parentId)) scatterMeasures.push({
-                    id: item.parentId,
+                const id = item.parentId || DEFAULT_PARENT_ID;
+                if (!scatterMeasures.find((d)=>d.id === id)) scatterMeasures.push({
+                    id,
                     yMeasures: [],
                     xMeasures: []
                 });
-                const scatterChart = scatterMeasures.find((d)=>d.id === item.parentId);
+                const scatterChart = scatterMeasures.find((d)=>d.id === id);
                 if (!scatterChart || !Array.isArray(scatterChart.yMeasures) || !Array.isArray(scatterChart.xMeasures)) return;
                 const encoding = Array.isArray(item.encoding) ? item.encoding : [
                     item.encoding
-                ];
+                ].filter(Boolean);
                 const isX = encoding.includes('xAxis');
                 const isY = encoding.includes('yAxis');
                 const isEmpty = !encoding.length;
@@ -6014,7 +6069,8 @@
                 buildMeasuresForScatter
             ], [
                 encodingForScatter,
-                buildMeasuresForScatter
+                buildMeasuresForScatter,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithScatterEncoding
@@ -6065,8 +6121,8 @@
             const result = {
                 ...spec
             };
-            const { advancedVSeed } = context;
-            const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
+            const { advancedVSeed, vseed } = context;
+            const { datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
                 enable: true
@@ -6079,7 +6135,7 @@
                     title: {
                         visible: false
                     },
-                    content: tooltipScatter_createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfoList)
+                    content: tooltipScatter_createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), locale, foldInfoList)
                 },
                 dimension: {
                     visible: false
@@ -6088,8 +6144,8 @@
             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 dims = T(dimensions.filter((item)=>tooltip.includes(item.id)), (item)=>item.id);
+            const meas = T(measures.filter((item)=>tooltip.includes(item.id)), (item)=>item.id);
             const dimContent = dims.map((item)=>({
                     visible: true,
                     hasShape: true,
@@ -6327,15 +6383,12 @@
         };
         const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
             const { vseed } = context;
-            if (isMeasureTreeWithChildren(vseed)) {
-                advancedVSeed.measures = vseed.measures;
-                return advancedVSeed;
-            }
-            if (isMeasureTreeWithParentId(vseed)) {
-                advancedVSeed.measures = buildMeasuresForDualAxis_generateMeasuresByParentId(vseed.measures);
+            if (isMeasureTreeWithChildren(advancedVSeed.measures)) return advancedVSeed;
+            if (isMeasureTreeWithParentId(advancedVSeed.measures)) {
+                advancedVSeed.measures = buildMeasuresForDualAxis_generateMeasuresByParentId(advancedVSeed.measures);
                 return advancedVSeed;
             }
-            const dualMeasures = vseed.dualMeasures ? vseed.dualMeasures : basicMeasuresToDualMeasures(advancedVSeed.measures || []);
+            const dualMeasures = vseed.dualMeasures ? chunk_BCBB46UE_d(vseed.dualMeasures) : basicMeasuresToDualMeasures(advancedVSeed.measures || []);
             advancedVSeed.measures = dualMeasuresToMeasureTree(dualMeasures);
             return advancedVSeed;
         };
@@ -6403,17 +6456,17 @@
         const buildMeasuresForDualAxis_generateMeasuresByParentId = (measures)=>{
             const dualMeasures = [];
             measures.forEach((item)=>{
-                if (!item.parentId) return;
-                if (!dualMeasures.find((d)=>d.id === item.parentId)) dualMeasures.push({
-                    id: item.parentId,
+                const id = item.parentId || DEFAULT_PARENT_ID;
+                if (!dualMeasures.find((d)=>d.id === id)) dualMeasures.push({
+                    id,
                     primaryMeasures: [],
                     secondaryMeasures: []
                 });
-                const dualChart = dualMeasures.find((d)=>d.id === item.parentId);
+                const dualChart = dualMeasures.find((d)=>d.id === id);
                 if (!dualChart || !Array.isArray(dualChart.primaryMeasures) || !Array.isArray(dualChart.secondaryMeasures)) return;
                 const encoding = Array.isArray(item.encoding) ? item.encoding : [
                     item.encoding
-                ];
+                ].filter(Boolean);
                 const isPrimary = encoding.includes('primaryYAxis');
                 const isSecondary = encoding.includes('secondaryYAxis');
                 const isEmpty = !item.encoding;
@@ -6441,7 +6494,7 @@
             const secondaryMeasures = measures[1] || [];
             const hasEncoding = (vseed.dimensions || []).some((item)=>item.encoding);
             if (primaryMeasures && primaryMeasures.children) {
-                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, primaryMeasures.children, encoding, {
+                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(primaryMeasures.children, (item)=>item.id), encoding, {
                     colorItemAsId: hasEncoding,
                     foldMeasureValue: FoldPrimaryMeasureValue,
                     colorMeasureId: getColorMeasureId(advancedVSeed)
@@ -6451,7 +6504,7 @@
                 unfoldInfoList.push(unfoldInfo);
             }
             if (secondaryMeasures && secondaryMeasures.children) {
-                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, secondaryMeasures.children, encoding, {
+                const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(secondaryMeasures.children, (item)=>item.id), encoding, {
                     foldMeasureValue: FoldSecondaryMeasureValue,
                     colorMeasureId: getColorMeasureId(advancedVSeed)
                 });
@@ -6507,7 +6560,7 @@
                 const primaryMeasures = measures[0];
                 const secondaryMeasures = measures[1] || [];
                 if (primaryMeasures && primaryMeasures.children) {
-                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, primaryMeasures.children, encoding, {
+                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(primaryMeasures.children, (item)=>item.id), encoding, {
                         colorItemAsId: hasEncoding,
                         foldMeasureValue: `${FoldPrimaryMeasureValue}${index}`,
                         colorMeasureId: getColorMeasureId(advancedVSeed)
@@ -6517,7 +6570,7 @@
                     unfoldInfoList.push(unfoldInfo);
                 }
                 if (secondaryMeasures && secondaryMeasures.children) {
-                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, dimensions, secondaryMeasures.children, encoding, {
+                    const { dataset: newDataset, foldInfo, unfoldInfo } = dataReshapeByEncoding(dataset, T(dimensions, (item)=>item.id), T(secondaryMeasures.children, (item)=>item.id), encoding, {
                         foldMeasureValue: `${FoldSecondaryMeasureValue}${index}`,
                         colorMeasureId: getColorMeasureId(advancedVSeed)
                     });
@@ -6585,7 +6638,8 @@
                 buildMeasuresForDualAxis
             ], [
                 encodingForDualAxis,
-                buildMeasuresForDualAxis
+                buildMeasuresForDualAxis,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithDualEncoding
@@ -6942,7 +6996,7 @@
             const result = {
                 ...spec
             };
-            const { advancedVSeed } = context;
+            const { advancedVSeed, vseed } = context;
             const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
@@ -6957,7 +7011,7 @@
                     title: {
                         visible: false
                     },
-                    content: createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfoList[0], unfoldInfo)
+                    content: createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), locale, foldInfoList[0], unfoldInfo)
                 },
                 dimension: {
                     title: {
@@ -6972,7 +7026,7 @@
             const result = {
                 ...spec
             };
-            const { advancedVSeed } = context;
+            const { advancedVSeed, vseed } = context;
             const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
@@ -6988,7 +7042,7 @@
                     title: {
                         visible: false
                     },
-                    content: createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfoList[1], unfoldInfo)
+                    content: createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), locale, foldInfoList[1], unfoldInfo)
                 },
                 dimension: {
                     title: {
@@ -7394,7 +7448,8 @@
                 buildMeasures
             ], [
                 encodingForPie,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -7519,7 +7574,8 @@
                 buildMeasures
             ], [
                 encodingForPie,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -7672,7 +7728,8 @@
                 buildMeasures
             ], [
                 encodingForRose,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -7877,7 +7934,8 @@
                 buildMeasures
             ], [
                 encodingForRose,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -8059,7 +8117,8 @@
                 buildMeasures
             ], [
                 encodingForRadar,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -8266,7 +8325,8 @@
                 buildMeasures
             ], [
                 encodingForFunnel,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -8464,7 +8524,8 @@
                 buildMeasures
             ], [
                 encodingForHeatmap,
-                buildMeasures
+                buildMeasures,
+                deleteTooltipMeasure
             ]),
             pivotAdapter([
                 reshapeWithEncoding
@@ -8522,8 +8583,8 @@
             const result = {
                 ...spec
             };
-            const { advancedVSeed } = context;
-            const { measures, datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
+            const { advancedVSeed, vseed } = context;
+            const { datasetReshapeInfo, chartType, locale, dimensions, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const { tooltip = {
                 enable: true
@@ -8536,7 +8597,7 @@
                     title: {
                         visible: false
                     },
-                    content: tooltipHeatmap_createMarkContent(encoding.tooltip || [], dimensions, measures, locale, foldInfo)
+                    content: tooltipHeatmap_createMarkContent(encoding.tooltip || [], dimensions, findAllMeasures(vseed.measures), locale, foldInfo)
                 },
                 dimension: {
                     visible: false
@@ -8545,8 +8606,8 @@
             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 dims = T(dimensions.filter((item)=>tooltip.includes(item.id)), (item)=>item.id);
+            const meas = T(measures.filter((item)=>tooltip.includes(item.id)), (item)=>item.id);
             const dimContent = dims.map((item)=>({
                     visible: true,
                     hasShape: true,
@@ -12827,6 +12888,31 @@
             column: schemas_array(schemas_string()).nullish(),
             group: schemas_array(schemas_string()).nullish().describe("\u5DF2\u5F03\u7528, \u8BF7\u4F7F\u7528\u989C\u8272\u66FF\u4EE3")
         });
+        const zDimensionEncoding = schemas_enum([
+            'xAxis',
+            'yAxis',
+            'angle',
+            'color',
+            'detail',
+            'tooltip',
+            'label',
+            'row',
+            'column'
+        ]);
+        const zMeasureEncoding = schemas_enum([
+            'primaryYAxis',
+            'secondaryYAxis',
+            'xAxis',
+            'yAxis',
+            'angle',
+            'radius',
+            'size',
+            'color',
+            'detail',
+            'column',
+            'label',
+            'tooltip'
+        ]);
         const zXBandAxis = schemas_object({
             visible: schemas_boolean().default(true).nullish(),
             labelAutoHide: schemas_boolean().default(true).nullish(),