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

Feature/branch yx

查看合并请求 !18

src/views/chart/chart/threeDColumnChartMap/threeDColumn_antv.js

@@ -59,18 +59,7 @@ export function base3DColumnOptionAntV(chartDom, chartId, chart, action) {
         })
         })
         .animate(true)
         .animate(true)
         .active(true)
         .active(true)
-        .color(yAxis[0].dataeaseName, [
-          '#094D4A',
-          '#146968',
-          '#1D7F7E',
-          '#289899',
-          '#34B6B7',
-          '#4AC5AF',
-          '#5FD3A6',
-          '#7BE39E',
-          '#A1EDB8',
-          '#CEF8D6'
-        ])
+        .color(yAxis[0].dataeaseName, color?.colors)
       if (!init) {
       if (!init) {
         chartDom.addLayer(layer)
         chartDom.addLayer(layer)
       }
       }

src/views/chart/chart/util.js

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