Merge branch 'dev' of github.com:dataease/dataease into dev

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) {

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;
                     }

frontend/src/styles/index.scss

@@ -349,3 +349,7 @@ div:focus {
   width: 5px;
   height: 5px;
 }
+
+.el-color-dropdown__link-btn {
+  display: none!important;
+}

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);