合并分支 'feature/branch_wm' 到 'develop'

城市亮度图修改

查看合并请求 !19

src/views/chart/chart/cityBrightness/cityBrightness_antv.js

@@ -30,7 +30,7 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action
         pitch: size.mapPitch,
         // pitch: 64.88, // 地图倾角
         style: mapStyle
-        // style: 'dark',
+        // style: 'dark'
         // center: [116.41667, 39.91667], // 地图中心经纬度-北京
         // zoom: 10,
         // maxZoom: 20

src/views/chart/chart/util.js

@@ -1992,6 +1992,7 @@ export const TYPE_CONFIGS = [
       ]
     }
   },
+  // 3D柱图
   {
     render: 'antv',
     category: 'chart.chart_type_space',
@@ -2041,20 +2042,44 @@ export const TYPE_CONFIGS = [
     ],
     propertyInner: {
       'color-selector': [
-        'alpha',
-        'mapStyle',
-        'mapLineGradient',
-        'mapLineSourceColor',
-        'mapLineTargetColor'
+        'mapStyle'
       ],
       'size-selector-ant-v': [
-        'mapPitch',
-        'mapLineType',
-        'mapLineWidth',
-        'mapLineAnimate',
-        'mapLineAnimateDuration',
-        'mapLineAnimateInterval',
-        'mapLineAnimateTrailLength'
+        'mapPitch'
+      ],
+      'title-selector-ant-v': [
+        'show',
+        'title',
+        'fontSize',
+        'color',
+        'hPosition',
+        'isItalic',
+        'isBolder',
+        'remarkShow',
+        'fontFamily',
+        'letterSpace',
+        'fontShadow'
+      ]
+    }
+  },
+  // 热力图
+  {
+    render: 'antv',
+    category: 'chart.chart_type_distribute',
+    value: 'heat-map',
+    title: 'chart.chart_heat_map',
+    icon: 'heat-map',
+    properties: [
+      'color-selector',
+      'size-selector-ant-v',
+      'title-selector-ant-v'
+    ],
+    propertyInner: {
+      'color-selector': [
+        'mapStyle'
+      ],
+      'size-selector-ant-v': [
+        'mapPitch'
       ],
       'title-selector-ant-v': [
         'show',
@@ -3269,40 +3294,6 @@ export const TYPE_CONFIGS = [
     }
   },
   {
-    render: 'antv',
-    category: 'chart.chart_type_distribute',
-    value: 'heat-map',
-    title: 'chart.chart_heat_map',
-    icon: 'heat-map',
-    properties: [
-      'color-selector',
-      'size-selector-ant-v',
-      'title-selector-ant-v'
-    ],
-    propertyInner: {
-      'color-selector': [
-        'mapStyle'
-      ],
-      'size-selector-ant-v': [
-        'mapPitch'
-      ],
-      'title-selector-ant-v': [
-        'show',
-        'title',
-        'fontSize',
-        'color',
-        'hPosition',
-        'isItalic',
-        'isBolder',
-        'remarkShow',
-        'fontFamily',
-        'letterSpace',
-        'fontShadow'
-      ]
-    }
-  },
-
-  {
     render: 'echarts',
     category: 'chart.chart_type_relation',
     value: 'scatter',