Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Yuki-Zhao · Yuki-Zhao · commit 84e215143eb7 · 2025-04-11T09:56:31.000+08:00
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -5206,9 +5206,6 @@ export class WebMap extends Observable {
     let baseUrl = layerInfo.url;
     let paramUrl = baseUrl.split('?')[1];
     let spriteUrl = styles.sprite;
-    if (!CommonUtil.isAbsoluteURL(styles.sprite)) {
-      spriteUrl = CommonUtil.relative2absolute(styles.sprite, baseUrl);
-    }
     if (layerInfo.dataSource.type === 'ARCGIS_VECTORTILE') {
       Object.keys(styles.sources).forEach(function (key) {
         Object.keys(styles.sources[key]).forEach(function(fieldName) {
@@ -5221,7 +5218,12 @@ export class WebMap extends Observable {
         });
       });
     }
-    let withCredentials = this.isIportalProxyServiceUrl(spriteUrl);
+    let sourceName = Object.keys(styles.sources)[0];
+    let checkUrl = styles.sources[sourceName].url || styles.sources[sourceName].tiles[0];
+    if (checkUrl && !CommonUtil.isAbsoluteURL(checkUrl)) {
+      checkUrl = CommonUtil.relative2absolute(checkUrl, baseUrl);
+    }
+    let withCredentials = CommonUtil.isInTheSameDomain(checkUrl) || this.isIportalProxyServiceUrl(checkUrl);
     const requestParameters = this.tileRequestParameters && this.tileRequestParameters(spriteUrl);
     // 创建MapBoxStyle样式
     let mapboxStyles = new MapboxStyles({
diff --git a/src/openlayers/overlay/vectortile/MapboxStyles.js b/src/openlayers/overlay/vectortile/MapboxStyles.js
@@ -411,7 +411,7 @@
               })
           }
           if (fieldName === 'sprite' || fieldName === 'glyphs' || fieldName === 'url') {
-              if (typeof styles[fieldName] === 'string' && !CommonUtil.isAbsoluteURL(styles[fieldName])) {
+              if (styles[fieldName] && typeof styles[fieldName] === 'string' && !CommonUtil.isAbsoluteURL(styles[fieldName])) {
                   styles[fieldName] = CommonUtil.relative2absolute(styles[fieldName], baseUrl);
               }
               if (paramUrl && !styles[fieldName].includes(paramUrl)) {

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@`
`411`	`411`	`})`
`412`	`412`	`}`
`413`	`413`	`if (fieldName === 'sprite' \|\| fieldName === 'glyphs' \|\| fieldName === 'url') {`
`414`		`- if (typeof styles[fieldName] === 'string' && !CommonUtil.isAbsoluteURL(styles[fieldName])) {`
	`414`	`+ if (styles[fieldName] && typeof styles[fieldName] === 'string' && !CommonUtil.isAbsoluteURL(styles[fieldName])) {`
`415`	`415`	`styles[fieldName] = CommonUtil.relative2absolute(styles[fieldName], baseUrl);`
`416`	`416`	`}`
`417`	`417`	`if (paramUrl && !styles[fieldName].includes(paramUrl)) {`