Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Yuki-Zhao · Yuki-Zhao · commit ac9f5a1b57b6 · 2020-04-21T17:10:57.000+08:00
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -3203,7 +3203,9 @@ export class WebMap extends Observable {
             segmentCount = themeSetting.segmentCount || this.defaultParameters.themeSetting.segmentCount,
             customSettings = themeSetting.customSettings,
             minR = parameters.themeSetting.minRadius,
-            maxR = parameters.themeSetting.maxRadius;
+            maxR = parameters.themeSetting.maxRadius,
+            fillColor = style.fillColor,
+            colors = parameters.themeSetting.colors;
         features.forEach(feature => {
             let attributes = feature.get('attributes'),
                 value = attributes[themeField];
@@ -3235,19 +3237,22 @@ export class WebMap extends Observable {
             let len = segements.length,
                 incrementR = (maxR - minR) / (len - 1), // 半径增量
                 start, end, radius = Number(((maxR + minR) / 2).toFixed(2));
-            for (let i = 0; i < len - 1; i++) {
-                start = Number(segements[i].toFixed(2));
-                end =  Number(segements[i + 1].toFixed(2));
+            // 获取颜色
+            let rangeColors = colors ? ColorsPickerUtil.getGradientColors(colors, len, 'RANGE') : [];
+            for (let j = 0; j < len - 1; j++) {
+                start = Number(segements[j].toFixed(2));
+                end =  Number(segements[j + 1].toFixed(2));
                 // 这里特殊处理以下分段值相同的情况（即所有字段值相同）
-                radius = start === end ? radius : minR + Math.round(incrementR * i);
+                radius = start === end ? radius : minR + Math.round(incrementR * j);
                 // 最后一个分段时将end+0.01，避免取不到最大值
-                end = i === len - 2 ? end + 0.01 : end;
+                end = j === len - 2 ? end + 0.01 : end;
                 // 处理自定义 半径
-                radius = customSettings[i] && customSettings[i].radius ? customSettings[i].radius : radius;
+                radius = customSettings[j] && customSettings[j].radius ? customSettings[j].radius : radius;
                 // 转化成 ol 样式
                 style.radius = radius;
+                style.fillColor = customSettings[j] && customSettings[j].color ? customSettings[j].color : rangeColors[j] || fillColor;
                 let olStyle = StyleUtils.getOpenlayersStyle(style, featureType, true);
-                styleGroup.push({ olStyle: olStyle, radius, start, end });
+                styleGroup.push({ olStyle: olStyle, radius, start, end, fillColor: style.fillColor });
             }
             return styleGroup;
         } else {
diff --git a/test/leaflet/components/clientcomputation/ClientComputationViewSpec.js b/test/leaflet/components/clientcomputation/ClientComputationViewSpec.js
@@ -1,5 +1,5 @@
 
-import { ClientComputationLayer } from '../../../../src/leaflet/components/clientcomputation/clientComputationLayer';
+import { ClientComputationLayer } from '../../../../src/leaflet/components/clientcomputation/ClientComputationLayer';
 import { ClientComputationView } from '../../../../src/leaflet/components/clientcomputation/ClientComputationView'
 import { FetchRequest } from '../../../../src/common/util/FetchRequest';
 import { QueryBySQLService } from '../../../../src/common/iServer/QueryBySQLService';
diff --git a/test/leaflet/overlay/mapv/MapVRendererSpec.js b/test/leaflet/overlay/mapv/MapVRendererSpec.js
@@ -1,4 +1,4 @@
-import { MapVRenderer } from '../../../../src/leaflet/overlay/mapV/MapVRenderer';
+import { MapVRenderer } from '../../../../src/leaflet/overlay/mapv/MapVRenderer';
 import { mapVLayer } from '../../../../src/leaflet/overlay/MapVLayer';
 import { utilCityCenter, DataSet } from 'mapv';
 
diff --git a/test/test-main-classic.js b/test/test-main-classic.js
@@ -1,5 +1,5 @@
 /*classic -- overlay*/
-import './classic/overlay/mapVLayerSpec.js';
+import './classic/overlay/MapVLayerSpec.js';
 
 /**classic --services**/
 import './classic/services/AddressMatchServiceSpec.js';
diff --git a/test/test-main-leaflet.js b/test/test-main-leaflet.js
@@ -22,7 +22,7 @@ import './leaflet/overlay/graphic/CloverStyleSpec';
 import './leaflet/overlay/GraphThemeLayerSpec.js';
 import './leaflet/overlay/HeatMapLayerSpec.js';
 import './leaflet/overlay/LabelThemeLayerSpec.js';
-import './leaflet/overlay/mapVLayerSpec.js';
+import './leaflet/overlay/MapVLayerSpec.js';
 import './leaflet/overlay/RangeThemeLayerSpec.js';
 import './leaflet/overlay/RankSymbolThemeLayerSpec.js';
 import './leaflet/overlay/TileVectorLayerSpec.js';
@@ -75,5 +75,5 @@ import './leaflet/components/distributedanalysis/DistributedAnalysisViewSpec.js'
 import './leaflet/components/clientcomputation/ClientComputationViewSpec.js';
 import './leaflet/components/search/SearchViewSpec.js';
 import './leaflet/components/dataflow/DataFlowViewSpec.js';
-import './leaflet/overlay/DataFlowlayerSpec.js';
+import './leaflet/overlay/DataFlowLayerSpec.js';
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { MapVRenderer } from '../../../../src/leaflet/overlay/mapV/MapVRenderer';`
	`1`	`+import { MapVRenderer } from '../../../../src/leaflet/overlay/mapv/MapVRenderer';`
`2`	`2`	`import { mapVLayer } from '../../../../src/leaflet/overlay/MapVLayer';`
`3`	`3`	`import { utilCityCenter, DataSet } from 'mapv';`
`4`	`4`