@visactor/vseed 0.1.13 → 0.1.14

package/dist/umd/index.js

@@ -1776,6 +1776,14 @@
                 if (hasEncoding) return execPipeline(hasEncodingPipeline, context, advancedVSeed);
                 return execPipeline(noEncodingPipeline, context, advancedVSeed);
             };
+        const addColorToEncoding = (dimensions, encoding, isMultiMeasure)=>{
+            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
+            const measureName = dimensions.find((item)=>item.id === MeasureName);
+            if (isMultiMeasure && measureName && !measureName.encoding) encoding.color.push(MeasureName);
+            if (0 === encoding.color.length) encoding.color = [
+                MeasureName
+            ];
+        };
         const defaultEncodingForLine = (advancedVSeed)=>{
             const { measures: vseedMeasures = [], dimensions = [] } = advancedVSeed;
             const measures = findAllMeasures(vseedMeasures);
@@ -1793,7 +1801,7 @@
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            if (hasDimensionEncoding) line_generateDimensionEncoding(dimensions, encoding);
+            if (hasDimensionEncoding) line_generateDimensionEncoding(dimensions, encoding, measures.length > 1);
             else line_generateDefaultDimensionEncoding(dimensions, encoding);
             if (hasMeasureEncoding) line_generateMeasureEncoding(measures, encoding);
             else line_generateDefaultMeasureEncoding(measures, encoding);
@@ -1812,15 +1820,12 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const line_generateDimensionEncoding = (dimensions, encoding)=>{
+        const line_generateDimensionEncoding = (dimensions, encoding, isMultiMeasure)=>{
             encoding.x = chunk_QJLMYOTX_i(dimensions.filter((item)=>'xAxis' === 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
-            ];
+            addColorToEncoding(dimensions, encoding, isMultiMeasure);
             encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
@@ -2798,7 +2803,7 @@
             const baseConfig = advancedVSeed.config[chartType];
             if (!baseConfig || !baseConfig.legend) return result;
             const { legend } = baseConfig;
-            const { enable, position = 'bottom', labelFontColor, labelFontSize = 12, labelFontWeight, maxSize = 1, border, shapeType = 'rectRound' } = legend || {};
+            const { enable, position = 'bottom', labelFontColor, labelColor, labelFontSize = 12, labelFontWeight, maxSize = 1, border, shapeType = 'rectRound' } = legend || {};
             const orient = [
                 'bottom',
                 'bottomLeft',
@@ -2858,7 +2863,7 @@
                     maxWidth: '30%',
                     focusIconStyle: {
                         size: labelFontSize + 2,
-                        fill: labelFontColor,
+                        fill: labelColor || labelFontColor,
                         fontWeight: labelFontWeight
                     },
                     shape: {
@@ -2872,14 +2877,14 @@
                         formatMethod: (value)=>unfoldInfo.colorIdMap[String(value)] ?? value,
                         style: {
                             fontSize: labelFontSize,
-                            fill: labelFontColor,
+                            fill: labelColor || labelFontColor,
                             fontWeight: labelFontWeight
                         }
                     },
                     background: {
                         state: {
                             selectedHover: {
-                                fill: labelFontColor,
+                                fill: labelColor || labelFontColor,
                                 fillOpacity: 0.05
                             }
                         }
@@ -2899,7 +2904,7 @@
             const baseConfig = advancedVSeed.config[chartType];
             if (!baseConfig || !baseConfig.legend) return result;
             const { legend } = baseConfig;
-            const { enable, position = 'bottom', labelFontColor, labelFontSize = 12, labelFontWeight } = legend || {};
+            const { enable, position = 'bottom', labelFontColor, labelColor, labelFontSize = 12, labelFontWeight } = legend || {};
             const orient = [
                 'bottom',
                 'bottomLeft',
@@ -2949,7 +2954,7 @@
                 startText: {
                     visible: true,
                     style: {
-                        fill: labelFontColor,
+                        fill: labelColor || labelFontColor,
                         fontSize: labelFontSize,
                         fontWeight: labelFontWeight
                     }
@@ -2957,7 +2962,7 @@
                 endText: {
                     visible: true,
                     style: {
-                        fill: labelFontColor,
+                        fill: labelColor || labelFontColor,
                         fontSize: labelFontSize,
                         fontWeight: labelFontWeight
                     }
@@ -3276,38 +3281,51 @@
             const { measures, datasetReshapeInfo } = advancedVSeed;
             const { chartType, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
-            if (!baseConfig || !baseConfig.label) return result;
+            if (!baseConfig || chunk_VCYTMP4D_n(baseConfig.label)) return result;
             const { measureId, measureValue, statistics } = datasetReshapeInfo[0].foldInfo;
             const { label } = baseConfig;
-            const { enable, wrap, showValue, showValuePercent } = label;
+            const { enable, wrap, showValue, showValuePercent, labelOverlap, labelColorSmartInvert, labelColor, labelFontSize, labelFontWeight, labelBackgroundColor, labelPosition, autoFormat = true, numFormat = {} } = label;
             const labelDims = T((vseed.dimensions || []).filter((item)=>encoding.label?.includes(item.id)), (item)=>item.id);
             const labelMeas = T((vseed.measures || []).filter((item)=>encoding.label?.includes(item.id)), (item)=>item.id);
-            const format = {
+            const percentFormat = chunk_5S4PYKVY_t(numFormat, {
                 type: 'percent'
-            };
-            const formatter = createFormatter(format);
+            });
+            const percentFormatter = createFormatter(percentFormat);
             result.label = {
                 visible: enable,
                 formatMethod: (_, datum)=>{
                     const result = [];
-                    const measure = findMeasureById(measures, datum[measureId]);
                     const dimLabels = labelDims.map((item)=>item.alias || item.id);
-                    const meaLabels = labelMeas.map((item)=>generateMeasureValue(datum[item.id], item));
-                    const measureValueLabel = generateMeasureValue(datum[measureValue], measure);
-                    const measurePercentLabel = generateMeasurePercent(datum[measureValue], statistics.sum, formatter);
+                    const meaLabels = labelMeas.map((item)=>generateMeasureValue(datum[item.id], item, autoFormat, numFormat));
+                    const measure = findMeasureById(measures, datum[measureId]);
+                    const measureValueLabel = generateMeasureValue(datum[measureValue], measure, autoFormat, numFormat);
+                    const measurePercentLabel = generateMeasurePercent(datum[measureValue], statistics.sum, percentFormatter);
                     result.push(...dimLabels);
                     if (showValue) result.push(measureValueLabel);
                     if (showValuePercent) result.push(measurePercentLabel);
                     result.push(...meaLabels);
                     if (wrap) return result;
                     return result.join(' ');
-                }
+                },
+                position: labelPosition,
+                style: {
+                    fill: labelColor,
+                    fontSize: labelFontSize,
+                    fontWeight: labelFontWeight,
+                    background: labelBackgroundColor
+                },
+                smartInvert: labelColorSmartInvert
+            };
+            if (labelOverlap) result.label.overlap = {
+                hideOnHit: true,
+                clampForce: true
             };
             return result;
         };
-        const generateMeasureValue = (value, measure)=>{
+        const generateMeasureValue = (value, measure, labelAutoFormat = true, numFormat = {})=>{
             if (!measure) return value;
-            const { format = {}, autoFormat = true } = measure;
+            const format = chunk_5S4PYKVY_t(numFormat, measure.format);
+            const autoFormat = labelAutoFormat || measure.autoFormat;
             if (!chunk_VCYTMP4D_n(format)) {
                 const formatter = createFormatter(format);
                 return formatter(value);
@@ -4117,7 +4135,7 @@
             const { legend, color } = baseConfig;
             const { colorScheme, colorMapping } = color;
             const colorSpecified = createSpecifiedForColorMapping(colorMapping, colorIdMap, colorItems);
-            const { enable, position = 'bottom', labelFontColor, labelFontSize = 12, labelFontWeight = 400, maxSize = 1, border, shapeType = 'rectRound' } = legend || {};
+            const { enable, position = 'bottom', labelFontColor, labelColor, labelFontSize = 12, labelFontWeight = 400, maxSize = 1, border, shapeType = 'rectRound' } = legend || {};
             const orient = [
                 'bottom',
                 'bottomLeft',
@@ -4182,7 +4200,7 @@
                     maxWidth: '30%',
                     focusIconStyle: {
                         size: labelFontSize + 2,
-                        fill: labelFontColor,
+                        fill: labelColor || labelFontColor,
                         fontWeight: labelFontWeight
                     },
                     shape: {
@@ -4196,14 +4214,14 @@
                         formatMethod: (value)=>colorIdMap[value] ?? value,
                         style: {
                             fontSize: labelFontSize,
-                            fill: labelFontColor,
+                            fill: labelColor || labelFontColor,
                             fontWeight: labelFontWeight
                         }
                     },
                     background: {
                         state: {
                             selectedHover: {
-                                fill: labelFontColor,
+                                fill: labelColor || labelFontColor,
                                 fillOpacity: 0.05
                             }
                         }
@@ -4228,7 +4246,7 @@
             const min = Math.min(...datasetReshapeInfo.map((d)=>d.foldInfo.statistics.colorMax));
             const { legend, color } = baseConfig;
             const { colorScheme, linearColorScheme } = color;
-            const { enable, position = 'bottom', labelFontColor, labelFontSize = 12, labelFontWeight = 400 } = legend || {};
+            const { enable, position = 'bottom', labelFontColor, labelColor, labelFontSize = 12, labelFontWeight = 400 } = legend || {};
             const orient = [
                 'bottom',
                 'bottomLeft',
@@ -4283,7 +4301,7 @@
                 startText: {
                     visible: true,
                     style: {
-                        fill: labelFontColor,
+                        fill: labelColor || labelFontColor,
                         fontSize: labelFontSize,
                         fontWeight: labelFontWeight
                     }
@@ -4291,7 +4309,7 @@
                 endText: {
                     visible: true,
                     style: {
-                        fill: labelFontColor,
+                        fill: labelColor || labelFontColor,
                         fontSize: labelFontSize,
                         fontWeight: labelFontWeight
                     }
@@ -4380,7 +4398,7 @@
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            if (hasDimensionEncoding) column_generateDimensionEncoding(dimensions, encoding);
+            if (hasDimensionEncoding) column_generateDimensionEncoding(dimensions, encoding, measures.length > 1);
             else column_generateDefaultDimensionEncoding(dimensions, encoding);
             if (hasMeasureEncoding) column_generateMeasureEncoding(measures, encoding);
             else column_generateDefaultMeasureEncoding(measures, encoding);
@@ -4400,15 +4418,12 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const column_generateDimensionEncoding = (dimensions, encoding)=>{
+        const column_generateDimensionEncoding = (dimensions, encoding, isMultiMeasure)=>{
             encoding.x = chunk_QJLMYOTX_i(dimensions.filter((item)=>'xAxis' === 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
-            ];
+            addColorToEncoding(dimensions, encoding, isMultiMeasure);
             encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = encoding.color;
             encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
@@ -5019,7 +5034,7 @@
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            if (hasDimensionEncoding) bar_generateDimensionEncoding(dimensions, encoding);
+            if (hasDimensionEncoding) bar_generateDimensionEncoding(dimensions, encoding, measures.length > 1);
             else bar_generateDefaultDimensionEncoding(dimensions, encoding);
             if (hasMeasureEncoding) bar_generateMeasureEncoding(measures, encoding);
             else bar_generateDefaultMeasureEncoding(measures, encoding);
@@ -5039,15 +5054,12 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const bar_generateDimensionEncoding = (dimensions, encoding)=>{
+        const bar_generateDimensionEncoding = (dimensions, encoding, isMultiMeasure)=>{
             encoding.y = chunk_QJLMYOTX_i(dimensions.filter((item)=>'yAxis' === 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
-            ];
+            addColorToEncoding(dimensions, encoding, isMultiMeasure);
             encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = encoding.color;
             encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
@@ -5928,10 +5940,7 @@
             encoding.column = [];
         };
         const scatter_generateDimensionEncoding = (dimensions, encoding)=>{
-            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            if (0 === encoding.color.length) encoding.color = [
-                MeasureName
-            ];
+            addColorToEncoding(dimensions, encoding, false);
             encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
@@ -6463,7 +6472,7 @@
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            if (hasDimensionEncoding) dualAxis_generateDimensionEncoding(dimensions, encoding);
+            if (hasDimensionEncoding) dualAxis_generateDimensionEncoding(dimensions, encoding, measures.length > 1);
             else dualAxis_generateDefaultDimensionEncoding(dimensions, encoding);
             if (hasMeasureEncoding) dualAxis_generateMeasureEncoding(measures, encoding);
             else dualAxis_generateDefaultMeasureEncoding(measures, encoding);
@@ -6483,15 +6492,12 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const dualAxis_generateDimensionEncoding = (dimensions, encoding)=>{
+        const dualAxis_generateDimensionEncoding = (dimensions, encoding, isMultiMeasure)=>{
             encoding.x = chunk_QJLMYOTX_i(dimensions.filter((item)=>'xAxis' === 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
-            ];
+            addColorToEncoding(dimensions, encoding, isMultiMeasure);
             encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = encoding.color;
             encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
@@ -7538,7 +7544,7 @@
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            if (hasDimensionEncoding) pie_generateDimensionEncoding(dimensions, encoding);
+            if (hasDimensionEncoding) pie_generateDimensionEncoding(dimensions, encoding, measures.length > 1);
             else pie_generateDefaultDimensionEncoding(dimensions, encoding);
             if (hasMeasureEncoding) pie_generateMeasureEncoding(measures, encoding);
             else pie_generateDefaultMeasureEncoding(measures, encoding);
@@ -7556,11 +7562,8 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const pie_generateDimensionEncoding = (dimensions, encoding)=>{
-            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            if (0 === encoding.color.length) encoding.color = [
-                MeasureName
-            ];
+        const pie_generateDimensionEncoding = (dimensions, encoding, isMultiMeasure)=>{
+            addColorToEncoding(dimensions, encoding, isMultiMeasure);
             encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
@@ -7822,7 +7825,7 @@
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            if (hasDimensionEncoding) rose_generateDimensionEncoding(dimensions, encoding);
+            if (hasDimensionEncoding) rose_generateDimensionEncoding(dimensions, encoding, measures.length > 1);
             else rose_generateDefaultDimensionEncoding(dimensions, encoding);
             if (hasMeasureEncoding) rose_generateMeasureEncoding(measures, encoding);
             else rose_generateDefaultMeasureEncoding(measures, encoding);
@@ -7842,15 +7845,12 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const rose_generateDimensionEncoding = (dimensions, encoding)=>{
+        const rose_generateDimensionEncoding = (dimensions, encoding, isMultiMeasure)=>{
             encoding.angle = chunk_QJLMYOTX_i(dimensions.filter((item)=>'angle' === 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
-            ];
+            addColorToEncoding(dimensions, encoding, isMultiMeasure);
             encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = encoding.color;
             encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
@@ -7937,6 +7937,7 @@
             const showAxis = !(is0D || is1M1D);
             if (!result.axes) result.axes = [];
             result.axes.push({
+                type: 'band',
                 orient: 'angle',
                 visible: showAxis,
                 zero: true,
@@ -7979,6 +7980,7 @@
             const showAxis = !(is0D || is1M1D);
             if (!result.axes) result.axes = [];
             result.axes.push({
+                type: 'linear',
                 orient: 'radius',
                 visible: showAxis,
                 zero: true,
@@ -8220,7 +8222,7 @@
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            if (hasDimensionEncoding) radar_generateDimensionEncoding(dimensions, encoding);
+            if (hasDimensionEncoding) radar_generateDimensionEncoding(dimensions, encoding, measures.length > 1);
             else radar_generateDefaultDimensionEncoding(dimensions, encoding);
             if (hasMeasureEncoding) radar_generateMeasureEncoding(measures, encoding);
             else radar_generateDefaultMeasureEncoding(measures, encoding);
@@ -8239,15 +8241,12 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const radar_generateDimensionEncoding = (dimensions, encoding)=>{
+        const radar_generateDimensionEncoding = (dimensions, encoding, isMultiMeasure)=>{
             encoding.angle = chunk_QJLMYOTX_i(dimensions.filter((item)=>'angle' === 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
-            ];
+            addColorToEncoding(dimensions, encoding, isMultiMeasure);
             encoding.detail = [];
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
@@ -8440,7 +8439,7 @@
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            if (hasDimensionEncoding) funnel_generateDimensionEncoding(dimensions, encoding);
+            if (hasDimensionEncoding) funnel_generateDimensionEncoding(dimensions, encoding, measures.length > 1);
             else funnel_generateDefaultDimensionEncoding(dimensions, encoding);
             if (hasMeasureEncoding) funnel_generateMeasureEncoding(measures, encoding);
             else funnel_generateDefaultMeasureEncoding(measures, encoding);
@@ -8458,11 +8457,8 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const funnel_generateDimensionEncoding = (dimensions, encoding)=>{
-            encoding.color = chunk_QJLMYOTX_i(dimensions.filter((item)=>'color' === item.encoding).map((item)=>item.id));
-            if (0 === encoding.color.length) encoding.color = [
-                MeasureName
-            ];
+        const funnel_generateDimensionEncoding = (dimensions, encoding, isMultiMeasure)=>{
+            addColorToEncoding(dimensions, encoding, isMultiMeasure);
             encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = [
                 MeasureName
@@ -8636,7 +8632,7 @@
             const hasDimensionEncoding = dimensions.some((item)=>item.encoding);
             const hasMeasureEncoding = measures.some((item)=>item.encoding);
             const encoding = {};
-            if (hasDimensionEncoding) heatmap_generateDimensionEncoding(dimensions, encoding);
+            if (hasDimensionEncoding) heatmap_generateDimensionEncoding(dimensions, encoding, measures.length > 1);
             else heatmap_generateDefaultDimensionEncoding(dimensions, encoding);
             if (hasMeasureEncoding) heatmap_generateMeasureEncoding(measures, encoding);
             else heatmap_generateDefaultMeasureEncoding(measures, encoding);
@@ -8657,7 +8653,7 @@
             encoding.row = [];
             encoding.column = [];
         };
-        const heatmap_generateDimensionEncoding = (dimensions, encoding)=>{
+        const heatmap_generateDimensionEncoding = (dimensions, encoding, isMultiMeasure)=>{
             encoding.x = chunk_QJLMYOTX_i(dimensions.filter((item)=>'xAxis' === item.encoding).map((item)=>item.id));
             if (0 === encoding.x.length) encoding.x = [
                 dimensions[0].id
@@ -8665,10 +8661,7 @@
             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
-            ];
+            addColorToEncoding(dimensions, encoding, isMultiMeasure);
             encoding.detail = chunk_QJLMYOTX_i(dimensions.filter((item)=>'detail' === item.encoding).map((item)=>item.id));
             if (0 === encoding.detail.length) encoding.detail = encoding.color;
             encoding.tooltip = chunk_QJLMYOTX_i(dimensions.map((item)=>item.id));
@@ -9075,7 +9068,9 @@
                     enable: true,
                     wrap: true,
                     showValue: true,
-                    showValuePercent: false
+                    showValuePercent: false,
+                    labelColorSmartInvert: false,
+                    labelOverlap: true
                 },
                 tooltip: {
                     enable: true
@@ -9086,7 +9081,7 @@
                     maxSize: 1,
                     shapeType: 'rectRound',
                     position: 'rt',
-                    labelFontColor: '#646A73',
+                    labelColor: '#646A73',
                     labelFontSize: 12,
                     labelFontWeight: 400
                 }
@@ -9399,7 +9394,9 @@
                     enable: true,
                     wrap: true,
                     showValue: true,
-                    showValuePercent: false
+                    showValuePercent: false,
+                    labelColorSmartInvert: false,
+                    labelOverlap: true
                 },
                 tooltip: {
                     enable: true
@@ -9410,7 +9407,7 @@
                     maxSize: 1,
                     position: 'rt',
                     shapeType: 'rectRound',
-                    labelFontColor: '#FDFDFD',
+                    labelColor: '#FDFDFD',
                     labelFontSize: 12,
                     labelFontWeight: 400
                 }
@@ -13283,7 +13280,16 @@
             enable: schemas_boolean().nullish(),
             wrap: schemas_boolean().nullish(),
             showValue: schemas_boolean().nullish(),
-            showValuePercent: schemas_boolean().nullish()
+            showValuePercent: schemas_boolean().nullish(),
+            autoFormat: schemas_boolean().nullish(),
+            numFormat: zNumFormat.nullish(),
+            labelFontSize: schemas_number().nullish(),
+            labelFontWeight: schemas_number().or(schemas_string()).nullish(),
+            labelBackgroundColor: schemas_string().nullish(),
+            labelColor: schemas_string().nullish(),
+            labelColorSmartInvert: schemas_boolean().nullish(),
+            labelPosition: schemas_string().nullish(),
+            labelOverlap: schemas_boolean().nullish()
         });
         const zLegend = schemas_object({
             enable: schemas_boolean().default(true).nullish(),
@@ -13335,8 +13341,8 @@
                 'bl',
                 'br'
             ]).default('bottom').nullish(),
+            labelColor: schemas_string().default('#fff').nullish(),
             labelFontSize: schemas_number().default(12).nullish(),
-            labelFontColor: schemas_string().default('#fff').nullish(),
             labelFontWeight: schemas_number().or(schemas_string()).default(400).nullish()
         });
         const zColorLegend = schemas_object({