[fix]webmap getpopupInfos返回layerId 数组

Author: luoxiao-supermap

src/common/mapping/WebMapV2.js

@@ -196,15 +196,15 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, crsMa
               return item;
             });
           }
-          return { ...popupInfo, layerId, elements };
+          return { ...popupInfo, layerId: [layerId], elements, title: name };
         }
         if (enableFields) {
           const elements = enableFields.map((fieldName) => ({
             type: 'FIELD',
             fieldName,
             fieldCaption: fieldCaptions ? (fieldCaptions[fieldName] || fieldName) : fieldName
           }));
-          return { elements, layerId, title: name };
+          return { elements, layerId: [layerId], title: name };
         }
         return null;
       }).filter(item => item !== null);

src/common/mapping/WebMapV3.js

@@ -371,16 +371,12 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa
       })
     }
     if (catalogType === 'layer') {
-      const { popupInfo, msDatasetId, layersContent = [] } = catalog;
+      const { popupInfo, msDatasetId, title, layersContent } = catalog;
       if (popupInfo) {
         const popupInfoVal = this._getPopupInfoContent(popupInfo, msDatasetId);
-        const infos = layersContent.map(layerId => {
-          return {
-            layerId,
-            ...cloneDeep(popupInfoVal)
-          }
-        })
-        res.push(...infos);
+        if (popupInfoVal) {
+          res.push({...popupInfoVal, layerId: layersContent, title});
+        }
       }
     }
   }

test/mapboxgl/mapping/WebMapV2Spec.js

@@ -4413,7 +4413,7 @@ it('add rangeLayer last end === fieldValue', (done) => {
             }
           ],
           title: '北京市(3)',
-          layerId: '北京市(3)'
+          layerId: ['北京市(3)']
         },
         {
           elements: [
@@ -4427,7 +4427,7 @@ it('add rangeLayer last end === fieldValue', (done) => {
             }
           ],
           title: '北京市轨道交通线路-打印(3)',
-          layerId: '北京市轨道交通线路-打印(3)'
+          layerId:[ '北京市轨道交通线路-打印(3)']
         }
       ];
       expect(popupInfo).toEqual(data);
@@ -4469,7 +4469,7 @@ it('add rangeLayer last end === fieldValue', (done) => {
             }
           ],
           title: '北京市轨道交通线路-打印(3)',
-          layerId: '北京市轨道交通线路-打印(3)'
+          layerId: ['北京市轨道交通线路-打印(3)']
         }
       ];
       expect(popupInfo).toEqual(data);
@@ -4550,7 +4550,7 @@ it('add rangeLayer last end === fieldValue', (done) => {
               fieldCaption: 'acroutes'
             }
           ],
-          layerId: '北京市(3)',
+          layerId:[ '北京市(3)'],
           title: '北京市(3)'
         },
         {
@@ -4565,7 +4565,7 @@ it('add rangeLayer last end === fieldValue', (done) => {
             }
           ],
           title: '北京市轨道交通线路-打印(3)',
-          layerId: '北京市轨道交通线路-打印(3)'
+          layerId: ['北京市轨道交通线路-打印(3)']
         }
       ];
       expect(popupInfo).toEqual(data);

test/mapboxgl/mapping/WebMapV3Spec.js

@@ -1762,7 +1762,7 @@ describe('mapboxgl-webmap3.0', () => {
             }
           ],
           title: 'A点',
-          layerId: 'A点'
+          layerId: ['A点']
         },
         {
           elements: [
@@ -1810,59 +1810,10 @@ describe('mapboxgl-webmap3.0', () => {
             }
           ],
           title: 'A面',
-          layerId: 'A面'
-        },
-        {
-          elements: [
-            {
-              fieldName: 'geometry',
-              type: 'FIELD',
-              fieldCaption: 'geometry'
-            },
-            {
-              type: 'DIVIDER'
-            },
-            {
-              type: 'TEXT',
-              infos: [
-                {
-                  insert: ['concat', '这是一段文本信息', ['get', 'smpid'], '\n']
-                }
-              ]
-            },
-            {
-              type: 'DIVIDER'
-            },
-            {
-              type: 'IMAGE',
-              title: ['concat', '无标题', ['get', 'adcode'], '-图片'],
-              value: ['concat', ['get', 'adcode']]
-            },
-            {
-              type: 'IMAGE',
-              title: '无标题',
-              value: ['concat', ['get', 'adcode']]
-            },
-            {
-              type: 'VIDEO',
-              title: '无标题-视频',
-              value: 'https://www.runoob.com/try/demo_source/mov_bbb.mp4'
-            },
-            {
-              type: 'DIVIDER'
-            },
-            {
-              type: 'IMAGE',
-              title: ['concat', '无标题图片', ['get', 'adcode']],
-              value: ['concat', ['get', 'name'], ['get', 'smpid']]
-            }
-          ],
-          title: 'A面',
-          layerId: 'A面1'
+          layerId:  ['A面', 'A面1']
         }
       ];
       expect(popupInfo).toEqual(Data);
-
       const popupInfo1 = mapstudioWebmap._handler._getPopupInfos({
         catalogs: [
           {
@@ -8424,7 +8375,7 @@ describe('mapboxgl-webmap3.0', () => {
         ]
       });
       const Data1 = {
-        layerId: 'Road_L@Jingjin#8(12_24)',
+        layerId: ['Road_L@Jingjin#8(12_24)'],
         elements: [
           {
             fieldName: 'KD',