Merge branch 'v11.3.x' of https://github.com/SuperMap/iClient-JavaScript into v11.3.x

xilanhuaweidapao · xilanhuaweidapao · commit f8947fcede03 · 2025-01-23T17:05:16.000+08:00
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -1945,7 +1945,7 @@ export class WebMap extends Observable {
             await that.addLayer(layer, null, layerIndex);
             that.layerAdded++;
             that.sendMapToUser(len);
-            return;
+            continue;
           }
           if (
             layer.layerType === 'MARKER' ||
diff --git a/test/openlayers/mapping/WebMapSpec.js b/test/openlayers/mapping/WebMapSpec.js
@@ -1919,5 +1919,25 @@ describe('openlayers_WebMap', () => {
             }, 500);
         }
     });
+      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
`@@ -1945,7 +1945,7 @@ export class WebMap extends Observable {`
`1945`	`1945`	`await that.addLayer(layer, null, layerIndex);`
`1946`	`1946`	`that.layerAdded++;`
`1947`	`1947`	`that.sendMapToUser(len);`
`1948`		`- return;`
	`1948`	`+ continue;`
`1949`	`1949`	`}`
`1950`	`1950`	`if (`
`1951`	`1951`	`layer.layerType === 'MARKER' \|\|`