【fix】UT

Author: luoxiao-supermap

src/common/mapping/WebMapV2.js

@@ -185,7 +185,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, crsMa
     _getPopupInfos() {
       const { layers = [] } = this._mapInfo;
       return layers.map((layer) => {
-        const { popupInfo, enableFields, name, layerID: id, captions: fieldCaptions } = layer;
+        const { popupInfo, enableFields, name, layerID: layerId, captions: fieldCaptions } = layer;
         if (popupInfo){ 
           let elements = popupInfo.elements || [];
           if (fieldCaptions) {
@@ -196,15 +196,15 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, crsMa
               return item;
             });
           }
-          return { ...popupInfo, id, elements };
+          return { ...popupInfo, layerId, elements };
         }
         if (enableFields) {
           const elements = enableFields.map((fieldName) => ({
             type: 'FIELD',
             fieldName,
             fieldCaption: fieldCaptions[fieldName] || fieldName
           }));
-          return { elements, id, title: name };
+          return { elements, layerId, title: name };
         }
         return null;
       }).filter(item => item !== null);

src/common/mapping/WebMapV3.js

@@ -362,7 +362,7 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa
             return item;
           }) : [];
         }
-        popupInfo.id = id;
+        popupInfo.layerId = id;
         return popupInfo
       }
       return null

test/mapboxgl/mapping/WebMapV2Spec.js

@@ -4146,7 +4146,6 @@ describe('mapboxgl_WebMapV2', () => {
       server: server
     });
     const callback = function () {
-      console.log(datavizWebmap);
       const popupInfo = datavizWebmap.getPopupInfos();
       const data = [
         {
@@ -4264,7 +4263,7 @@ describe('mapboxgl_WebMapV2', () => {
             }
           ],
           title: '北京市(3)',
-          id: '北京市(3)'
+          layerId: '北京市(3)'
         },
         {
           elements: [
@@ -4278,7 +4277,103 @@ describe('mapboxgl_WebMapV2', () => {
             }
           ],
           title: '北京市轨道交通线路-打印(3)',
-          id: '北京市轨道交通线路-打印(3)'
+          layerId: '北京市轨道交通线路-打印(3)'
+        }
+      ];
+      expect(popupInfo).toEqual(data);
+      done();
+    };
+    datavizWebmap.on('mapcreatesucceeded', callback);
+    datavizWebmap.on('map');
+  });
+  it('webmap2.0 popupinfo 没有配置弹窗', (done) => {
+    spyOn(FetchRequest, 'get').and.callFake((url) => {
+      if (url.indexOf('map.json') > -1) {
+        return Promise.resolve(new Response(JSON.stringify(Webmap2_popupInfo_no)));
+      } else if (url.indexOf('1168691327/content.json?') > -1) {
+        return Promise.resolve(new Response(JSON.stringify(chart_content)));
+      } else if (url.indexOf('1371715657/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)));
+      }
+      return Promise.resolve(new Response(JSON.stringify({})));
+    });
+    datavizWebmap = new WebMap('123', {
+      server: server
+    });
+    const callback = function () {
+      const popupInfo = datavizWebmap.getPopupInfos();
+      const data = [
+        {
+          elements: [
+            {
+              type: 'FIELD',
+              fieldName: 'parent',
+              fieldCaption: 'parent3121'
+            },
+            {
+              type: 'FIELD',
+              fieldName: 'adcode',
+              fieldCaption: 'adcode'
+            },
+            {
+              type: 'FIELD',
+              fieldName: 'level',
+              fieldCaption: 'level'
+            },
+            {
+              type: 'FIELD',
+              fieldName: 'childrenNum',
+              fieldCaption: 'childrenNum'
+            },
+            {
+              type: 'FIELD',
+              fieldName: 'smpid',
+              fieldCaption: 'smpid'
+            },
+            {
+              type: 'FIELD',
+              fieldName: 'centroid',
+              fieldCaption: 'centroid'
+            },
+            {
+              type: 'FIELD',
+              fieldName: 'center',
+              fieldCaption: 'center'
+            },
+            {
+              type: 'FIELD',
+              fieldName: 'subFeatureIndex',
+              fieldCaption: 'subFeatureIndex'
+            },
+            {
+              type: 'FIELD',
+              fieldName: 'name',
+              fieldCaption: 'name'
+            },
+            {
+              type: 'FIELD',
+              fieldName: 'acroutes',
+              fieldCaption: 'acroutes'
+            }
+          ],
+          layerId: '北京市(3)',
+          title: '北京市(3)'
+        },
+        {
+          elements: [
+            {
+              fieldName: 'SmID',
+              type: 'FIELD'
+            },
+            {
+              fieldName: '标准名称',
+              type: 'FIELD'
+            }
+          ],
+          title: '北京市轨道交通线路-打印(3)',
+          layerId: '北京市轨道交通线路-打印(3)'
         }
       ];
       expect(popupInfo).toEqual(data);

test/mapboxgl/mapping/WebMapV3Spec.js

@@ -1692,7 +1692,7 @@ describe('mapboxgl-webmap3.0', () => {
             }
           ],
           title: 'A点',
-          id: 'A点'
+          layerId: 'A点'
         },
         {
           elements: [
@@ -1740,7 +1740,7 @@ describe('mapboxgl-webmap3.0', () => {
             }
           ],
           title: 'A面',
-          id: 'A面'
+          layerId: 'A面'
         }
       ];
       expect(popupInfo).toEqual(Data);