【feature】online 地图 withcredentials 优化

Author: xiongjiaojiao

src/common/_utils/WebMapService.ts

@@ -1010,7 +1010,10 @@ export default class WebMapService extends Events {
     return proxy;
   }
 
-  public handleWithCredentials(proxyUrl?: string, serviceUrl?: string, defaultValue = this.withCredentials): boolean {
+  public handleWithCredentials(proxyUrl?: string, serviceUrl?: string, defaultValue = this.withCredentials): boolean | string {
+    if (serviceUrl?.includes('https://www.supermapol.com')) {
+      return '';
+    }
     if (proxyUrl && proxyUrl.startsWith(this.serverUrl) && (!serviceUrl || serviceUrl.startsWith(proxyUrl))) {
       return true;
     }

src/common/_utils/__tests__/WebMapService.spec.js

@@ -749,4 +749,17 @@ describe('WebMapService.spec', () => {
     const service = new WebMapService(mapId, options);
     expect(service.getDatasourceType(layer)).toBe('user_data');
   });
+
+  it('handleWithCredentials', () => {
+    const mapId = uniqueLayer_polygon;
+    const service = new WebMapService(mapId, { ...options, iportalServiceProxyUrlPrefix: 'https://fakeiportal.supermap.io/portalproxy' });
+    expect(service.handleWithCredentials(null, 'https://www.supermapol.com/url', true)).toBe('');
+    const url = 'http://fakeurl';
+    expect(service.handleWithCredentials('https://fakeiportal.supermap.io/iportal/proxy', null, false)).toBeTruthy();
+    expect(service.handleWithCredentials('https://fakeiportal.supermap.io/iportal/proxy', 'https://fakeiportal.supermap.io/iportal/proxy/url', false)).toBeTruthy();
+    expect(service.handleWithCredentials('https://fakeiportal/proxy', null, true)).toBeTruthy();
+    expect(service.handleWithCredentials(null, 'https://fakeiportal.supermap.io/portalproxy/url', false)).toBeTruthy();
+    expect(service.handleWithCredentials(null, url, true)).toBeTruthy();
+    expect(service.handleWithCredentials(null, url)).toBeFalsy();
+  });
 });