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

Feature/branch wm

查看合并请求 !23

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

@@ -29,11 +29,13 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action
         lang: lang,
         lang: lang,
         pitch: size.mapPitch,
         pitch: size.mapPitch,
         // pitch: 64.88, // 地图倾角
         // pitch: 64.88, // 地图倾角
-        style: mapStyle
+        style: mapStyle,
         // style: 'dark'
         // style: 'dark'
         // center: [116.41667, 39.91667], // 地图中心经纬度-北京
         // center: [116.41667, 39.91667], // 地图中心经纬度-北京
-        // zoom: 10,
+        zoom: 12,
         // maxZoom: 20
         // maxZoom: 20
+        center: [114.060288, 22.53684] // 数据集是深圳市区的点，中心先设为深圳
+        // center: [104.58631, 30.71882] // 成阿中心经纬度
       }),
       }),
       logoVisible: false
       logoVisible: false
     })
     })
@@ -44,7 +46,7 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action
       chartDom.setMapStyle(mapStyle)
       chartDom.setMapStyle(mapStyle)
     }
     }
   }
   }
-  if (xAxis?.length < 1 || yAxis?.lang < 1) {
+  if (xAxis?.length < 2 || yAxis?.lang < 1) {
     chartDom.removeAllLayer()
     chartDom.removeAllLayer()
     return chartDom
     return chartDom
   }
   }
@@ -70,18 +72,19 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action
       const pointLayer = new PointLayer({})
       const pointLayer = new PointLayer({})
         .source(mapData)
         .source(mapData)
         .size(2)
         .size(2)
-        .color('h8', [
-          '#0A3663',
-          '#1558AC',
-          '#3771D9',
-          '#4D89E5',
-          '#64A5D3',
-          '#72BED6',
-          '#83CED6',
-          '#A6E1E0',
-          '#B8EFE2',
-          '#D7F9F0'
-        ])
+        .color('h8', color?.colors)
+        // .color('h8', [
+        //   '#0A3663',
+        //   '#1558AC',
+        //   '#3771D9',
+        //   '#4D89E5',
+        //   '#64A5D3',
+        //   '#72BED6',
+        //   '#83CED6',
+        //   '#A6E1E0',
+        //   '#B8EFE2',
+        //   '#D7F9F0'
+        // ])
       if (!init) {
       if (!init) {
         chartDom.addLayer(pointLayer)
         chartDom.addLayer(pointLayer)
       }
       }

src/views/chart/chart/util.js

@@ -2091,7 +2091,9 @@ export const TYPE_CONFIGS = [
     ],
     ],
     propertyInner: {
     propertyInner: {
       'color-selector': [
       'color-selector': [
-        'mapStyle'
+        'mapStyle',
+        'value',
+        'gradient-color'
       ],
       ],
       'size-selector-ant-v': [
       'size-selector-ant-v': [
         'mapPitch'
         'mapPitch'