[fix]修复ol webmap添加没有serverId的图层时，阻断了后面layer的添加的问题 review by luox

chenxianhuii · chenxianhuii · commit c2230ee2050c · 2025-01-23T14:48:57.000+08:00
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -1805,7 +1805,7 @@ export class WebMap extends Observable {
                       await that.addLayer(layer, null, layerIndex);
                       that.layerAdded++;
                       that.sendMapToUser(len);
-                      return;
+                      continue;
                   }
                   if ((layer.layerType === "MARKER") || (dataSource && (!dataSource.accessType || dataSource.accessType === 'DIRECT')) || isSampleData) {
                       //原来二进制文件
diff --git a/test/openlayers/mapping/WebMapSpec.js b/test/openlayers/mapping/WebMapSpec.js
@@ -1343,4 +1343,25 @@ describe('openlayers_WebMap', () => {
       console.log(error);
     }
   });
+
+  it('datavizWebMap_noServerIdMarker', (done) => {
+    let options = {
+      server: server,
+      webMap: defaultServeRequest,
+      successCallback,
+      errorCallback: function () { }
+    };
+    spyOn(FetchRequest, 'get').and.callFake((url) => {
+        if (url.indexOf('map.json') > -1) {
+            var mapJson = datavizWebMap_noServerIdMarker;
+            return Promise.resolve(new Response(mapJson));
+        }
+        return Promise.resolve();
+    });
+    var datavizWebmap = new WebMap(options);
+    function successCallback() {
+      expect(datavizWebmap.server).toBe(server);
+      done();
+    }
+  });
 });
diff --git a/test/resources/WebMapV5.js b/test/resources/WebMapV5.js

Original file line number	Diff line number	Diff line change
`@@ -1805,7 +1805,7 @@ export class WebMap extends Observable {`
`1805`	`1805`	`await that.addLayer(layer, null, layerIndex);`
`1806`	`1806`	`that.layerAdded++;`
`1807`	`1807`	`that.sendMapToUser(len);`
`1808`		`- return;`
	`1808`	`+ continue;`
`1809`	`1809`	`}`
`1810`	`1810`	`if ((layer.layerType === "MARKER") \|\| (dataSource && (!dataSource.accessType \|\| dataSource.accessType === 'DIRECT')) \|\| isSampleData) {`
`1811`	`1811`	`//原来二进制文件`