ISVJ-10976 支持dv非专题图层的图例 review by xiongjj

Author: chenxianhuii

src/common/mapping/WebMapV2.js

@@ -524,6 +524,8 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
       features = this.handleLayerFeatures(features, layerInfo);
 
       if (layerType === 'VECTOR') {
+        const styleGroups = this.getVectorStyleGroup(layerInfo);
+        this._initLegendConfigInfo(layerInfo, styleGroups);
         if (featureType === 'POINT') {
           if (style.type === 'SYMBOL_POINT') {
             this._createSymbolLayer(layerInfo, features);
@@ -2522,11 +2524,18 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
       this._addOverlayToMap({ type: 'LINE', source, layerID, parentLayerId, layerStyle: lineStyle, minzoom, maxzoom });
     }
 
+    _getThemeField(layerInfo) {
+      if (layerInfo.layerType === 'VECTOR') {
+        return ''
+      }
+      return layerInfo.layerType === 'HEAT' ? layerInfo.themeSetting.weight : layerInfo.themeSetting.themeField
+    }
+
     _initLegendConfigInfo(layerInfo, style) {
       const legendItem = {
         layerId: layerInfo.layerID,
         layerTitle: layerInfo.layerID,
-        themeField: layerInfo.layerType === 'HEAT' ? layerInfo.themeSetting.weight : layerInfo.themeSetting.themeField,
+        themeField: this._getThemeField(layerInfo),
         styleGroup: style
       };
 
@@ -2543,6 +2552,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
 
       switch (layerInfo.layerType) {
         case 'UNIQUE':
+        case 'VECTOR':
           legendItem.styleGroup = legendItem.styleGroup.map((styleGroup) => {
             return {
               fieldValue: styleGroup.value,

src/common/mapping/WebMapV2Base.js

@@ -722,6 +722,16 @@ export function createWebMapV2BaseExtending(SuperClass = Events, fireField = 'tr
 
       return styleGroup;
     }
+
+    getVectorStyleGroup(layerInfo) {
+      const color = layerInfo.style.fillColor || layerInfo.style.strokeColor;
+      const styleGroup = [{ 
+        color: color,
+        style: layerInfo.style,
+        value: layerInfo.name
+      }]
+      return styleGroup;
+    }
 
     transformFeatures(features) {
       features &&

test/mapboxgl/mapping/WebMapV2Spec.js

@@ -519,6 +519,29 @@ describe('mapboxgl_WebMapV2', () => {
     datavizWebmap.on('mapcreatesucceeded', callback);
   });
 
+  it('vectorlayer should have legends', (done) => {
+    spyOn(FetchRequest, 'get').and.callFake((url) => {
+      if (url.indexOf('map.json') > -1) {
+        return Promise.resolve(new Response(JSON.stringify(vectorLayer_line)));
+      } else if (url.indexOf('1788054202/content.json?') > -1) {
+        return Promise.resolve(new Response(JSON.stringify(chart_content)));
+      } else if (url.indexOf('13136933/content.json?') > -1) {
+        return Promise.resolve(new Response(JSON.stringify(layerData_geojson['POINT_GEOJSON'])));
+      } else if (url.indexOf('portal.json') > -1) {
+        return Promise.resolve(new Response(JSON.stringify(iportal_serviceProxy)));
+      } else if (url.indexOf('web/datas/1920557079/content.json') > -1) {
+        return Promise.resolve(new Response(layerData_CSV));
+      }
+      return Promise.resolve(new Response(JSON.stringify({})));
+    });
+    datavizWebmap = new WebMap(id, { ...commonOption, map: commonMap }, { ...commonMapOptions });
+    const callback = function (data) {
+      expect(datavizWebmap.getLegends().length).toBe(1);
+      done();
+    };
+    datavizWebmap.on('mapcreatesucceeded', callback);
+  });
+
   it('add heatLayer', (done) => {
     spyOn(FetchRequest, 'get').and.callFake((url) => {
       if (url.indexOf('web/datas/1920557079/content.json') > -1) {