[fix]isvj-5215兼容就的customSetings review by qiw

luoxiao-supermap · luoxiao-supermap · commit 1727af853064 · 2023-01-29T11:54:50.000+08:00
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -3167,7 +3167,7 @@ export class WebMap extends Observable {
 
         //生成styleGroup
         let styleGroup = [];
-        const usedColors = this.getCustomSettingColors(customSettings, names, featureType).map(item => item.toLowerCase());
+        const usedColors = this.getCustomSettingColors(customSettings, featureType).map(item => item.toLowerCase());
         const curentColors = this.getUniqueColors(themeSetting.colors || this.defaultParameters.themeSetting.colors, names.length + Object.keys(customSettings).length).map(item => item.toLowerCase());
         const newColors = difference(curentColors, usedColors);
         for(let index = 0; index < names.length; index++) {
@@ -3225,6 +3225,11 @@ export class WebMap extends Observable {
       const keys = Object.keys(customSettings);
       const colors = [];
       keys.forEach(key => {
+        //兼容之前自定义只存储一个color
+        if (Util.isString(customSettings[key])) {
+          colors.push(customSettings[key]);
+          return;
+        }
         if (featureType === "LINE") {
           colors.push(customSettings[key].strokeColor);
         } else {
diff --git a/test/openlayers/mapping/WebMapSpec.js b/test/openlayers/mapping/WebMapSpec.js
@@ -338,7 +338,7 @@ describe('openlayers_WebMap', () => {
           ]
         }
         const res = await datavizWebmap.getUniqueStyleGroup(parameters, [{ get: () => ({ 'UserID': 30, 'UserID': 0 }) }]);
-        expect(res.length).toBe(2);
+        expect(res.length).toBe(1);
         done();
       }
     });

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ describe('openlayers_WebMap', () => {`
`338`	`338`	`]`
`339`	`339`	`}`
`340`	`340`	`const res = await datavizWebmap.getUniqueStyleGroup(parameters, [{ get: () => ({ 'UserID': 30, 'UserID': 0 }) }]);`
`341`		`- expect(res.length).toBe(2);`
	`341`	`+ expect(res.length).toBe(1);`
`342`	`342`	`done();`
`343`	`343`	`}`
`344`	`344`	`});`