Fixed tooltip and formatters on all gauge chart

Imiss-U1025 · Imiss-U1025 · commit 053119013b9d · 2024-12-30T09:31:58.000-05:00
diff --git a/client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartUtils.ts b/client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartUtils.ts
@@ -240,6 +240,7 @@ export function getEchartsConfig(
             ...styleWrapper(props?.axisLabelStyle, theme?.axisLabelStyle, 12, "#000000"),
           },
           'detail': {
+            formatter: props?.echartsOption?.data?.map(data => data.formatter)[0],
             ...styleWrapper(props?.legendStyle, theme?.legendStyle, 16, "#000000"),
           },
           "label": {
@@ -311,7 +312,6 @@ export function getEchartsConfig(
         ]
       }
 
-      console.log(props?.legendStyle)
     let gradeGaugeOpt = {
       ...basicStyle,
         series: [
@@ -360,9 +360,7 @@ export function getEchartsConfig(
             detail: {
               offsetCenter: [0, '25%'],
               valueAnimation: true,
-              formatter: function (value) {
-                return value;
-              },
+              formatter: props?.gradeGaugeOption?.data?.map(data => data.formatter)[0],
               ...styleWrapper(props?.legendStyle, theme?.legendStyle, 20, 'inherit'),
             },
             data: [
@@ -375,8 +373,6 @@ export function getEchartsConfig(
         ]
     }
 
-    console.log(props?.barometerGaugeOption?.data)
-
     let multiGaugeOpt = {
       ...basicStyle,
       series: [
@@ -583,7 +579,7 @@ export function getEchartsConfig(
           },
           detail: {
             ...styleWrapper(props?.legendStyle, theme?.legendStyle, 16, 'inherit', 1, ''),
-            formatter: props?.multiTitleGaugeOption?.data?.map(data => data.formatter)[0],
+            formatter: props?.ringGaugeOption?.data?.map(data => data.formatter)[0],
           }
         }
       ]
@@ -648,7 +644,8 @@ export function getEchartsConfig(
             valueAnimation: true,
             precision: 2,        // Increase precision or keep as is
             ...styleWrapper(props?.legendStyle, theme?.legendStyle, 16),
-            offsetCenter: [0, '40%'] // Adjust to fit within the smaller radius
+            offsetCenter: [0, '40%'],
+            formatter: props?.barometerGaugeOption?.data?.map(data => data.formatter)[0],
           },
           title: {
             offsetCenter: [0, '-40%'],  // Adjust title placement for smaller chart
diff --git a/client/packages/lowcoder-comps/src/i18n/comps/locales/en.ts b/client/packages/lowcoder-comps/src/i18n/comps/locales/en.ts
@@ -150,9 +150,9 @@ export const en = {
     defaultBarometerPointerIcon: 'path://M2090.36389,615.30999 L2090.36389,615.30999 C2091.48372,615.30999 2092.40383,616.194028 2092.44859,617.312956 L2096.90698,728.755929 C2097.05155,732.369577 2094.2393,735.416212 2090.62566,735.56078 C2090.53845,735.564269 2090.45117,735.566014 2090.36389,735.566014 L2090.36389,735.566014 C2086.74736,735.566014 2083.81557,732.63423 2083.81557,729.017692 C2083.81557,728.930412 2083.81732,728.84314 2083.82081,728.755929 L2088.2792,617.312956 C2088.32396,616.194028 2089.24407,615.30999 2090.36389,615.30999 Z',
     defaultMultiTitlePointerIcon: 'path://M2.9,0.7L2.9,0.7c1.4,0,2.6,1.2,2.6,2.6v115c0,1.4-1.2,2.6-2.6,2.6l0,0c-1.4,0-2.6-1.2-2.6-2.6V3.3C0.3,1.9,1.4,0.7,2.9,0.7z',
     pointer_Y: "Pointer-Y",
-    pointer_Y_Tooltip: "select vertical of pointer",
+    pointer_Y_Tooltip: "Select the Y-value of the pointer.",
     pointerIcon: "Pointer Icon",
-    pointerIconTooltip: "Select Pointer Icon",
+    pointerIconTooltip: "Select the Pointer Icon",
     defaultGradeGaugePointerLength: "25",
     defaultGradeGaugePointerWidth: "10",
     defaultGradeGaugePointer_Y: "45",
@@ -161,7 +161,6 @@ export const en = {
     axisLabelDistance: "Axis Label Distance",
     progressBarColor: "Progress Bar Color",
     gradeProgressBarString: "Progress Bar String",
-    defaultToolTip: "Default ToolTip",
     defaultAxisTickLength: "7",
     defaultAxisTickWidth: "2",
     defaultAxisTickColor: "#444444",
