From 94e0b99de23b4c036a0c4f7cf3aaba4ec3b2fd40 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Thu, 21 Sep 2023 17:33:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E6=BC=8F=E6=96=97?=
 =?UTF-8?q?=E5=9B=BE=E7=9A=84=E8=BD=AC=E5=8C=96=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/G2Plots/漏斗图/分面漏斗图.js     |  6 ++++--
 .../packages/G2Plots/漏斗图/基础漏斗图.js     | 11 +++++++----
 .../packages/G2Plots/漏斗图/对比漏斗图.js     |  6 ++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js b/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js
index b9f23c18..1c7ede39 100644
--- a/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js
+++ b/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js
@@ -229,7 +229,8 @@ const data = [
 const optionHandler = `option.legend = option.legendEnable ? {position: option.legendPosition}: false;
 window.conversionTagName = option.conversionTagName
 option.conversionTag.formatter = (datum) => {
-  return window.conversionTagName + datum.$$percentage$$.toFixed(2) * 100 + '%'
+  const percentage = parseFloat(datum.$$percentage$$)
+  return window.conversionTagName +  (percentage * 100).toFixed(2) + '%'
 }
 if (option.legendEnable) {
    option.legend.itemName = option.legendItemName
@@ -277,7 +278,8 @@ const option = {
       fontSize: 12
     },
     formatter: (datum) => {
-      return option.conversionTagName + datum.$$percentage$$.toFixed(2) * 100 + '%'
+      const percentage = parseFloat(datum.$$percentage$$)
+      return '转化率' + (percentage * 100).toFixed(2) + '%'
     }
   }
 }
diff --git a/data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js b/data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js
index eb216830..78803cf8 100644
--- a/data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js
+++ b/data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js
@@ -1,6 +1,7 @@
+import { Funnel } from '@antv/g2plot'
 
 // 配置版本号
-const version = '2023071001'
+const version = '2023071002'
 // 分类
 const category = 'Funnel'
 // 标题
@@ -211,7 +212,7 @@ const setting = [
     value: '#595959',
     tabName: 'custom',
     groupName: 'legend'
-  },
+  }
   // 边距 padding
 ]
 
@@ -228,7 +229,8 @@ const data = [
 const optionHandler = `option.legend = option.legendEnable ? {position: option.legendPosition}: false;
 window.conversionTagName = option.conversionTagName
 option.conversionTag.formatter = (datum) => {
-  return window.conversionTagName + datum.$$percentage$$.toFixed(2) * 100 + '%'
+  const percentage = parseFloat(datum.$$percentage$$)
+  return window.conversionTagName +  (percentage * 100).toFixed(2) + '%'
 }
 if (option.legendEnable) {
    option.legend.itemName = option.legendItemName
@@ -275,7 +277,8 @@ const option = {
       fontSize: 12
     },
     formatter: (datum) => {
-      return '转化率' + datum.$$percentage$$.toFixed(2) * 100 + '%'
+      const percentage = parseFloat(datum.$$percentage$$)
+      return '转化率' + (percentage * 100).toFixed(2) + '%'
     }
   }
 }
diff --git a/data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js b/data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js
index c8ecafd8..46f59cda 100644
--- a/data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js
+++ b/data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js
@@ -229,7 +229,8 @@ const data = [
 const optionHandler = `option.legend = option.legendEnable ? {position: option.legendPosition}: false;
 window.conversionTagName = option.conversionTagName
 option.conversionTag.formatter = (datum) => {
-  return window.conversionTagName + datum.$$percentage$$.toFixed(2) * 100 + '%'
+  const percentage = parseFloat(datum.$$percentage$$)
+  return window.conversionTagName +  (percentage * 100).toFixed(2) + '%'
 }
 if (option.legendEnable) {
    option.legend.itemName = option.legendItemName
@@ -277,7 +278,8 @@ const option = {
       fontSize: 12
     },
     formatter: (datum) => {
-      return option.conversionTagName + datum.$$percentage$$.toFixed(2) * 100 + '%'
+      const percentage = parseFloat(datum.$$percentage$$)
+      return '转化率' + (percentage * 100).toFixed(2) + '%'
     }
   }
 }