From 21af196e17ce499766f84747d6f40c1912dc2499 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 27 Aug 2021 18:21:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E9=A2=9C=E8=89=B2=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E5=8E=BB=E6=8E=89=E6=B8=85=E7=A9=BA=EF=BC=9B=E7=9F=A9?=
 =?UTF-8?q?=E5=BD=A2=E6=A0=91=E5=9B=BE=E6=A0=87=E7=AD=BE=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=EF=BC=9Bdoris=20=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/provider/doris/DorisQueryProvider.java   | 2 ++
 frontend/src/styles/index.scss                                | 4 ++++
 frontend/src/views/chart/chart/treemap/treemap.js             | 1 +
 3 files changed, 7 insertions(+)

diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
index f7638fe8c9..8fe11624f3 100644
--- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
@@ -121,6 +121,8 @@ public class DorisQueryProvider extends QueryProvider {
                         fieldName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
                     } else if (f.getDeType() == 2) {
                         fieldName = String.format(DorisConstants.CAST, originField, DorisConstants.DEFAULT_INT_FORMAT);
+                    } else if (f.getDeType() == 3) {
+                        fieldName = String.format(DorisConstants.CAST, originField, DorisConstants.DEFAULT_FLOAT_FORMAT);
                     } else {
                         fieldName = originField;
                     }
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 701346fe3d..5b939fd1e4 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -349,3 +349,7 @@ div:focus {
   width: 5px;
   height: 5px;
 }
+
+.el-color-dropdown__link-btn {
+  display: none!important;
+}
diff --git a/frontend/src/views/chart/chart/treemap/treemap.js b/frontend/src/views/chart/chart/treemap/treemap.js
index c4b7dc719f..4db4572bea 100644
--- a/frontend/src/views/chart/chart/treemap/treemap.js
+++ b/frontend/src/views/chart/chart/treemap/treemap.js
@@ -54,6 +54,7 @@ export function baseTreemapOption(chart_option, chart) {
         // y.type = 'treemap'
         chart_option.series[0].data.push(y)
       }
+      chart_option.series[0].name = chart.data.series[0].name
     }
   }
   // console.log(chart_option);

From b23f2f3456c09f5fd6923aca1d5f3147055217ae Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 27 Aug 2021 16:36:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=A1=B6=E7=BA=A7=E5=9C=B0=E5=90=8D?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/map/utils/MapUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/map/utils/MapUtils.java b/backend/src/main/java/io/dataease/map/utils/MapUtils.java
index 15d64ce2e7..523c6fd447 100644
--- a/backend/src/main/java/io/dataease/map/utils/MapUtils.java
+++ b/backend/src/main/java/io/dataease/map/utils/MapUtils.java
@@ -121,7 +121,7 @@ public class MapUtils {
     }
 
     private static AreaEntity root() {
-        return AreaEntity.builder().code("100000").name("中华人名共和国").build();
+        return AreaEntity.builder().code("100000").name("中华人民共和国").build();
     }
 
     public static void recursionWrite(List<AreaEntity> areaEntityList) {