Merge remote-tracking branch 'origin/develop' into feature/branch_wm

src/views/chart/chart/bubble/bubble_antv.js

 import { Scene, PointLayer } from '@antv/l7'
 import { Scene, PointLayer } from '@antv/l7'
 import { GaodeMap } from '@antv/l7-maps'
 import { GaodeMap } from '@antv/l7-maps'
 import { getLanguage } from '@/lang'
 import { getLanguage } from '@/lang'
-import axios from 'axios'
 
 
-const location = [[
-  121.473701,
-  31.230416
-], [
-  102.710002,
-  25.045806
-], [
-  111.765617,
-  40.817498
-], [
-  116.407526,
-  39.90403
-], [
-  125.32599,
-  43.896536
-], [
-  104.075931,
-  30.651651
-], [
-  117.200983,
-  39.084158
-], [
-  106.258754,
-  38.471317
-], [
-  117.284922,
-  31.861184
-], [
-  117.020359,
-  36.66853
-], [
-  112.562398,
-  37.873531
-], [
-  113.26653,
-  23.132191
-], [
-  108.327546,
-  22.815478
-], [
-  87.627704,
-  43.793026
-], [
-  118.763232,
-  32.061707
-], [
-  115.909228,
-  28.675696
-], [
-  114.468664,
-  38.037057
-], [
-  113.753602,
-  34.765515
-], [
-  120.152791,
-  30.267446
-], [
-  110.349228,
-  20.017377
-], [
-  114.341861,
-  30.546498
-], [
-  112.98381,
-  28.112444
-], [
-  103.826308,
-  36.059421
-], [
-  119.295144,
-  26.100779
-], [
-  91.117212,
-  29.646922
-], [
-  106.70741,
-  26.598194
-], [
-  123.42944,
-  41.835441
-], [
-  106.551556,
-  29.563009
-], [
-  108.954239,
-  34.265472
-], [
-  101.780199,
-  36.620901
-], [
-  126.661669,
-  45.742347
-]]
-
-// export async function baseBubbleMapOption(chartDom, chartId, chart, action) {
 export function baseBubbleMapOption(chartDom, chartId, chart, action) {
 export function baseBubbleMapOption(chartDom, chartId, chart, action) {
   const xAxis = JSON.parse(chart.xaxis)
   const xAxis = JSON.parse(chart.xaxis)
   const yAxis = JSON.parse(chart.yaxis)
   const yAxis = JSON.parse(chart.yaxis)
-  console.log('xAxis,yAxis', xAxis, yAxis)
   let customAttr
   let customAttr
   if (chart.customAttr) {
   if (chart.customAttr) {
     customAttr = JSON.parse(chart.customAttr)
     customAttr = JSON.parse(chart.customAttr)
@@ -125,7 +27,7 @@ export function baseBubbleMapOption(chartDom, chartId, chart, action) {
         // pitch: size.mapPitch,
         // pitch: size.mapPitch,
         style: mapStyle,
         style: mapStyle,
         // style: 'dark',
         // style: 'dark',
-        center: [96.99215001469588, 29.281597225674773],
+        center: [104.58631, 30.71882], // 成阿中心经纬度
         zoom: 2.194613775109773,
         zoom: 2.194613775109773,
         maxZoom: 10
         maxZoom: 10
       }),
       }),
@@ -138,28 +40,17 @@ export function baseBubbleMapOption(chartDom, chartId, chart, action) {
       chartDom.setMapStyle(mapStyle)
       chartDom.setMapStyle(mapStyle)
     }
     }
   }
   }
-  // if (xAxis?.length < 2 || xAxisExt?.length < 2) {
-  if (xAxis?.length < 1 || yAxis?.lang < 1) {
+  if (xAxis?.length < 2 || yAxis?.lang < 1) {
     chartDom.removeAllLayer()
     chartDom.removeAllLayer()
     return chartDom
     return chartDom
   }
   }
 
 
-  // const newTableRow = await Promise.all(chart.data.tableRow.map(async(item) => {
   const newTableRow = chart.data.tableRow.map((item, index) => {
   const newTableRow = chart.data.tableRow.map((item, index) => {
-    // const mapInfo = await axios
-    //   .get(
-    //     `https://restapi.amap.com/v3/geocode/geo?key=${'76cd4f09c916ab5edc529185e5d38c38'}&address=${
-    //       item[xAxis[0].dataeaseName]
-    //     }`
-    //   )
-    // console.log('mapInfo==', mapInfo)
-    // const location = mapInfo?.data?.geocodes?.length > 0 ? mapInfo.data.geocodes[0].location : ''
-    // const location = '111,222'
     return {
     return {
       type: 'Feature',
       type: 'Feature',
       geometry: {
       geometry: {
         type: 'Point',
         type: 'Point',
-        coordinates: location[index]
+        coordinates: [item[xAxis[0].dataeaseName], item[xAxis[1].dataeaseName]]
       },
       },
       properties: {
       properties: {
         capacity: item[yAxis[0].dataeaseName]
         capacity: item[yAxis[0].dataeaseName]
@@ -167,28 +58,13 @@ export function baseBubbleMapOption(chartDom, chartId, chart, action) {
     }
     }
   })
   })
   const mapData = { type: 'FeatureCollection', features: newTableRow }
   const mapData = { type: 'FeatureCollection', features: newTableRow }
-  console.log('mapData===', mapData)
   chartDom.removeAllLayer()
   chartDom.removeAllLayer()
     .then(() => {
     .then(() => {
       const pointLayer = new PointLayer({})
       const pointLayer = new PointLayer({})
         .source(mapData)
         .source(mapData)
         .shape('circle')
         .shape('circle')
         .size('capacity', [0, 16])
         .size('capacity', [0, 16])
-        .color('capacity', [
-          // '#34B6B7',
-          // '#4AC5AF',
-          // '#5FD3A6',
-          // '#7BE39E',
-          // '#A1EDB8',
-          // '#CEF8D6'
-          '#FFB7DD',
-          '#FF88C2',
-          '#FF44AA',
-          '#FF0088',
-          '#C10066',
-          '#A20055'
-
-        ])
+        .color('capacity', color?.colors)
         .active(true)
         .active(true)
         .style({
         .style({
           opacity: 0.5,
           opacity: 0.5,

src/views/chart/chart/util.js

@@ -2014,11 +2014,8 @@ export const TYPE_CONFIGS = [
     ],
     ],
     propertyInner: {
     propertyInner: {
       'color-selector': [
       'color-selector': [
-        'alpha',
         'mapStyle',
         'mapStyle',
-        'mapLineGradient',
-        'mapLineSourceColor',
-        'mapLineTargetColor'
+        'value'
       ],
       ],
       'size-selector-ant-v': [
       'size-selector-ant-v': [
         'mapPitch',
         'mapPitch',