[fix]点选弹窗ms自定义符号不对

Author: luoxiao-supermap

src/common/mapping/WebMapV3.js

@@ -4,6 +4,7 @@
 import { FetchRequest } from '../util/FetchRequest';
 import { getLayerCatalogRenderLayers, getLayerInfosFromCatalogs, getMainLayerFromCatalog, isSameRasterLayer, mergeFeatures, transformUrl } from './utils/util';
 import { SourceListModelV3 } from './utils/SourceListModelV3';
+import cloneDeep from 'lodash.clonedeep';
 
 const LEGEND_RENDER_TYPE = {
   TEXT: 'TEXT',
@@ -348,25 +349,36 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa
     });
     return fieldCaptions;
   }
+  _getPopupInfoContent(data, msDatasetId) {
+    const popupInfo = cloneDeep(data);
+    const fieldCaptions = this._getFieldCaption(msDatasetId);
+    if (fieldCaptions) {
+      popupInfo.elements = popupInfo.elements ? popupInfo.elements.map(item => {
+        if (item.type === 'FIELD') {
+          item.fieldCaption = fieldCaptions[item.fieldName] || item.fieldName;
+        }
+        return item;
+      }) : [];
+    }
+    return popupInfo;
+  }
   _getPopupInfos() {
     const { catalogs = [] } = this._mapResourceInfo;
-    return catalogs.map((item) => {
-      const {id, popupInfo, msDatasetId} = item;
+    const res = [];
+    catalogs.forEach((item) => {
+      const {popupInfo, msDatasetId, layersContent=[]} = item;
       if (popupInfo) {
-        const fieldCaptions = this._getFieldCaption(msDatasetId);
-        if (fieldCaptions) {
-          popupInfo.elements = popupInfo.elements ? popupInfo.elements.map(item => {
-            if (item.type === 'FIELD') {
-              item.fieldCaption = fieldCaptions[item.fieldName] || item.fieldName;
-            }
-            return item;
-          }) : [];
-        }
-        popupInfo.layerId = id;
-        return popupInfo
+        const popupInfoVal = this._getPopupInfoContent(popupInfo, msDatasetId);
+        const infos = layersContent.map(layerId => {
+          return {
+            layerId,
+            ...cloneDeep(popupInfoVal)
+          }
+        })
+        res.push(...infos);
       }
-      return null
-    }).filter(item => item !== null);
+    })
+    return res;
   }
 
   /**

test/mapboxgl/mapping/WebMapV3Spec.js

@@ -1741,6 +1741,54 @@ 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'
         }
       ];
       expect(popupInfo).toEqual(Data);

test/resources/WebMapV3.js

@@ -3894,7 +3894,7 @@ const msPopupInfo = JSON.stringify({
         title: 'A面',
         layerSourceType: 'Data',
         zoomRange: [0, 24],
-        layersContent: ['A面']
+        layersContent: ['A面', 'A面1']
       }
     ],
     datas: [