@@ -16317,7 +16317,7 @@ function (_mapboxgl$Evented) {
16317
16317
sceneUrl = sceneUrl.slice(0, sceneUrl.indexOf('/rest/realspace') + 15);
16318
16318
var promise = this.scene.open(sceneUrl);
16319
16319
this.scene.fxaa = true;
16320
- this.scene.skyAtmosphere.show = false ;
16320
+ this.scene.skyAtmosphere.show = true ;
16321
16321
this.Cesium.when.all(promise, function () {
16322
16322
var sc = _this4.scene.camera;
16323
16323
@@ -18220,7 +18220,9 @@ function (_mapboxgl$Evented) {
18220
18220
value: function _queryByRestMap(restMapParameter) {
18221
18221
var _this2 = this;
18222
18222
18223
- var options = {};
18223
+ var options = {
18224
+ withCredentials: restMapParameter.withCredentials || false
18225
+ };
18224
18226
18225
18227
if (restMapParameter.proxy) {
18226
18228
options.proxy = restMapParameter.proxy;
@@ -18262,7 +18264,9 @@ function (_mapboxgl$Evented) {
18262
18264
18263
18265
var maxFeatures = restDataParameter.maxFeatures || this.maxFeatures;
18264
18266
var toIndex = maxFeatures === 1 ? 0 : maxFeatures - 1;
18265
- var options = {};
18267
+ var options = {
18268
+ withCredentials: restDataParameter.withCredentials || false
18269
+ };
18266
18270
18267
18271
if (restDataParameter.proxy) {
18268
18272
options.proxy = restDataParameter.proxy;
@@ -18511,15 +18515,15 @@ function (_mapboxgl$Evented) {
18511
18515
var sourceName, datasetName; // 请求获取数据源名
18512
18516
18513
18517
SuperMap.FetchRequest.get(url, null, {
18514
- withCredentials: false
18518
+ withCredentials: iportalDataParameter.withCredentials
18515
18519
}).then(function (response) {
18516
18520
return response.json();
18517
18521
}).then(function (data) {
18518
18522
sourceName = data.datasourceNames[0];
18519
18523
url = "".concat(address, "/data/datasources/").concat(sourceName, "/datasets"); // 请求获取数据集名
18520
18524
18521
18525
SuperMap.FetchRequest.get(url, null, {
18522
- withCredentials: false
18526
+ withCredentials: iportalDataParameter.withCredentials
18523
18527
}).then(function (response) {
18524
18528
return response.json();
18525
18529
}).then(function (data) {
@@ -18531,7 +18535,8 @@ function (_mapboxgl$Evented) {
18531
18535
name: iportalDataParameter.name,
18532
18536
attributeFilter: iportalDataParameter.attributeFilter,
18533
18537
maxFeatures: iportalDataParameter.maxFeatures,
18534
- epsgCode: iportalDataParameter.epsgCode
18538
+ epsgCode: iportalDataParameter.epsgCode,
18539
+ withCredentials: iportalDataParameter.withCredentials
18535
18540
});
18536
18541
}).catch(function (error) {
18537
18542
_this5.fire('queryfailed', {
@@ -18554,7 +18559,7 @@ function (_mapboxgl$Evented) {
18554
18559
var mapName, layerName, path; // 请求获取地图名
18555
18560
18556
18561
SuperMap.FetchRequest.get(_url, null, {
18557
- withCredentials: false
18562
+ withCredentials: iportalDataParameter.withCredentials
18558
18563
}).then(function (response) {
18559
18564
return response.json();
18560
18565
}).then(function (data) {
@@ -18563,7 +18568,7 @@ function (_mapboxgl$Evented) {
18563
18568
_url = _url = "".concat(address, "/maps/").concat(mapName, "/layers"); // 请求获取图层名
18564
18569
18565
18570
SuperMap.FetchRequest.get(_url, null, {
18566
- withCredentials: false
18571
+ withCredentials: iportalDataParameter.withCredentials
18567
18572
}).then(function (response) {
18568
18573
return response.json();
18569
18574
}).then(function (data) {
@@ -18575,7 +18580,8 @@ function (_mapboxgl$Evented) {
18575
18580
name: iportalDataParameter.name,
18576
18581
attributeFilter: iportalDataParameter.attributeFilter,
18577
18582
maxFeatures: iportalDataParameter.maxFeatures,
18578
- epsgCode: iportalDataParameter.epsgCode
18583
+ epsgCode: iportalDataParameter.epsgCode,
18584
+ withCredentials: iportalDataParameter.withCredentials
18579
18585
});
18580
18586
18581
18587
return layerName;
@@ -54842,15 +54848,15 @@ function (_Events) {
54842
54848
var datasetName; // 请求获取数据源名
54843
54849
54844
54850
SuperMap.FetchRequest.get(url, null, {
54845
- withCredentials: (0, _util.handleWithCredentials)(url, this.iportalServiceProxyUrl, false )
54851
+ withCredentials: (0, _util.handleWithCredentials)(url, this.iportalServiceProxyUrl, this.withCredentials )
54846
54852
}).then(function (response) {
54847
54853
return response.json();
54848
54854
}).then(function (data) {
54849
54855
dataSourceName = data.datasourceNames[0];
54850
54856
url = "".concat(address, "/data/datasources/").concat(dataSourceName, "/datasets"); // 请求获取数据集名
54851
54857
54852
54858
SuperMap.FetchRequest.get(url, null, {
54853
- withCredentials: (0, _util.handleWithCredentials)(url, _this4.iportalServiceProxyUrl, false )
54859
+ withCredentials: (0, _util.handleWithCredentials)(url, _this4.iportalServiceProxyUrl, _this4.withCredentials )
54854
54860
}).then(function (response) {
54855
54861
return response.json();
54856
54862
}).then(function (data) {
@@ -54861,7 +54867,7 @@ function (_Events) {
54861
54867
dataSourceName: dataSourceName,
54862
54868
dataUrl: url.split('/datasources')[0]
54863
54869
}, Object.assign({}, queryInfo, {
54864
- withCredentials: (0, _util.handleWithCredentials)(url, _this4.iportalServiceProxyUrl, false )
54870
+ withCredentials: (0, _util.handleWithCredentials)(url, _this4.iportalServiceProxyUrl, _this4.withCredentials )
54865
54871
}));
54866
54872
}).catch(function (error) {
54867
54873
console.log(error);
@@ -54880,7 +54886,7 @@ function (_Events) {
54880
54886
var path; // 请求获取地图名
54881
54887
54882
54888
SuperMap.FetchRequest.get(_url, null, {
54883
- withCredentials: (0, _util.handleWithCredentials)(_url, this.iportalServiceProxyUrl, false )
54889
+ withCredentials: (0, _util.handleWithCredentials)(_url, this.iportalServiceProxyUrl, this.withCredentials )
54884
54890
}).then(function (response) {
54885
54891
return response.json();
54886
54892
}).then(function (data) {
@@ -54889,7 +54895,7 @@ function (_Events) {
54889
54895
_url = _url = "".concat(address, "/maps/").concat(mapName, "/layers"); // 请求获取图层名
54890
54896
54891
54897
SuperMap.FetchRequest.get(_url, null, {
54892
- withCredentials: (0, _util.handleWithCredentials)(_url, _this4.iportalServiceProxyUrl, false )
54898
+ withCredentials: (0, _util.handleWithCredentials)(_url, _this4.iportalServiceProxyUrl, _this4.withCredentials )
54893
54899
}).then(function (response) {
54894
54900
return response.json();
54895
54901
}).then(function (data) {
@@ -54899,7 +54905,7 @@ function (_Events) {
54899
54905
mapName: layerName,
54900
54906
dataUrl: path
54901
54907
}, Object.assign({}, queryInfo, {
54902
- withCredentials: (0, _util.handleWithCredentials)(_url, _this4.iportalServiceProxyUrl, false )
54908
+ withCredentials: (0, _util.handleWithCredentials)(_url, _this4.iportalServiceProxyUrl, _this4.withCredentials )
54903
54909
}));
54904
54910
54905
54911
return layerName;
@@ -56079,7 +56085,7 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
56079
56085
return c > 3 && r && Object.defineProperty(target, key, r), r;
56080
56086
};
56081
56087
56082
- var MAP_EVENT_NAMES = ['resize', 'webglcontextlost', 'webglcontextrestored', 'remove', 'movestart', ' contextmenu', 'dblclick', 'click', 'touchcancel', 'touchmove', 'touchend', 'touchstart', 'dataloading', 'mousemove', 'mouseup', 'mousedown', 'sourcedataloading', 'error', 'data', 'styledata', 'sourcedata', 'mouseout ', 'styledataloading ', 'moveend', 'move', 'render', 'zoom', 'zoomstart', 'zoomend', 'boxzoomstart', 'boxzoomcancel', 'boxzoomend', 'rotate', 'rotatestart', 'rotateend', 'dragend', 'drag', 'dragstart', 'pitch', 'idle'];
56088
+ var MAP_EVENT_NAMES = ['resize', 'webglcontextlost', 'webglcontextrestored', 'remove', 'contextmenu', 'dblclick', 'click', 'touchcancel', 'touchmove', 'touchend', 'touchstart', 'dataloading', 'mousemove', 'mouseup', 'mousedown', 'mouseenter', 'mouseleave', 'mouseover', 'mouseout', ' sourcedataloading', 'error', 'data', 'styledata', 'sourcedata', 'styledataloading ', 'styleimagemissing ', 'movestart', ' moveend', 'move', 'render', 'zoom', 'zoomstart', 'zoomend', 'boxzoomstart', 'boxzoomcancel', 'boxzoomend', 'rotate', 'rotatestart', 'rotateend', 'dragend', 'drag', 'dragstart', 'pitch', 'pitchend', 'pitchstart', ' idle', 'wheel '];
56083
56089
56084
56090
var MapEvents =
56085
56091
/*#__PURE__*/
@@ -70541,7 +70547,7 @@ function (_Events) {
70541
70547
queryInfo.attributeFilter = _this2._getAttributeFilterByKeywords(fields, queryInfo.keyWord);
70542
70548
70543
70549
_this2._getMapFeatureBySql(dataUrl, queryInfo);
70544
- });
70550
+ }, queryInfo.withCredentials );
70545
70551
} else {
70546
70552
this._getMapFeatureBySql(dataUrl, queryInfo);
70547
70553
}
@@ -70780,6 +70786,7 @@ function (_Events) {
70780
70786
value: function _getRestMapFields(url, layerName, callBack) {
70781
70787
var _this6 = this;
70782
70788
70789
+ var withCredentials = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
70783
70790
var param = new SuperMap.QueryBySQLParameters({
70784
70791
queryParams: [new SuperMap.FilterParameter({
70785
70792
name: layerName,
@@ -70788,6 +70795,7 @@ function (_Events) {
70788
70795
});
70789
70796
var queryBySQLSerice = new SuperMap.QueryBySQLService(url, {
70790
70797
proxy: this.options.proxy,
70798
+ withCredentials: withCredentials,
70791
70799
eventListeners: {
70792
70800
processCompleted: function processCompleted(serviceResult) {
70793
70801
var fields;
0 commit comments