Skip to content

Commit 28c0e1d

Browse files
committed
【update】更新vue-iclient
1 parent 5bac10e commit 28c0e1d

File tree

2 files changed

+28
-20
lines changed

2 files changed

+28
-20
lines changed

dist/mapboxgl/iclient-mapboxgl-vue.js

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16317,7 +16317,7 @@ function (_mapboxgl$Evented) {
1631716317
sceneUrl = sceneUrl.slice(0, sceneUrl.indexOf('/rest/realspace') + 15);
1631816318
var promise = this.scene.open(sceneUrl);
1631916319
this.scene.fxaa = true;
16320-
this.scene.skyAtmosphere.show = false;
16320+
this.scene.skyAtmosphere.show = true;
1632116321
this.Cesium.when.all(promise, function () {
1632216322
var sc = _this4.scene.camera;
1632316323

@@ -18220,7 +18220,9 @@ function (_mapboxgl$Evented) {
1822018220
value: function _queryByRestMap(restMapParameter) {
1822118221
var _this2 = this;
1822218222

18223-
var options = {};
18223+
var options = {
18224+
withCredentials: restMapParameter.withCredentials || false
18225+
};
1822418226

1822518227
if (restMapParameter.proxy) {
1822618228
options.proxy = restMapParameter.proxy;
@@ -18262,7 +18264,9 @@ function (_mapboxgl$Evented) {
1826218264

1826318265
var maxFeatures = restDataParameter.maxFeatures || this.maxFeatures;
1826418266
var toIndex = maxFeatures === 1 ? 0 : maxFeatures - 1;
18265-
var options = {};
18267+
var options = {
18268+
withCredentials: restDataParameter.withCredentials || false
18269+
};
1826618270

1826718271
if (restDataParameter.proxy) {
1826818272
options.proxy = restDataParameter.proxy;
@@ -18511,15 +18515,15 @@ function (_mapboxgl$Evented) {
1851118515
var sourceName, datasetName; // 请求获取数据源名
1851218516

1851318517
SuperMap.FetchRequest.get(url, null, {
18514-
withCredentials: false
18518+
withCredentials: iportalDataParameter.withCredentials
1851518519
}).then(function (response) {
1851618520
return response.json();
1851718521
}).then(function (data) {
1851818522
sourceName = data.datasourceNames[0];
1851918523
url = "".concat(address, "/data/datasources/").concat(sourceName, "/datasets"); // 请求获取数据集名
1852018524

1852118525
SuperMap.FetchRequest.get(url, null, {
18522-
withCredentials: false
18526+
withCredentials: iportalDataParameter.withCredentials
1852318527
}).then(function (response) {
1852418528
return response.json();
1852518529
}).then(function (data) {
@@ -18531,7 +18535,8 @@ function (_mapboxgl$Evented) {
1853118535
name: iportalDataParameter.name,
1853218536
attributeFilter: iportalDataParameter.attributeFilter,
1853318537
maxFeatures: iportalDataParameter.maxFeatures,
18534-
epsgCode: iportalDataParameter.epsgCode
18538+
epsgCode: iportalDataParameter.epsgCode,
18539+
withCredentials: iportalDataParameter.withCredentials
1853518540
});
1853618541
}).catch(function (error) {
1853718542
_this5.fire('queryfailed', {
@@ -18554,7 +18559,7 @@ function (_mapboxgl$Evented) {
1855418559
var mapName, layerName, path; // 请求获取地图名
1855518560

1855618561
SuperMap.FetchRequest.get(_url, null, {
18557-
withCredentials: false
18562+
withCredentials: iportalDataParameter.withCredentials
1855818563
}).then(function (response) {
1855918564
return response.json();
1856018565
}).then(function (data) {
@@ -18563,7 +18568,7 @@ function (_mapboxgl$Evented) {
1856318568
_url = _url = "".concat(address, "/maps/").concat(mapName, "/layers"); // 请求获取图层名
1856418569

1856518570
SuperMap.FetchRequest.get(_url, null, {
18566-
withCredentials: false
18571+
withCredentials: iportalDataParameter.withCredentials
1856718572
}).then(function (response) {
1856818573
return response.json();
1856918574
}).then(function (data) {
@@ -18575,7 +18580,8 @@ function (_mapboxgl$Evented) {
1857518580
name: iportalDataParameter.name,
1857618581
attributeFilter: iportalDataParameter.attributeFilter,
1857718582
maxFeatures: iportalDataParameter.maxFeatures,
18578-
epsgCode: iportalDataParameter.epsgCode
18583+
epsgCode: iportalDataParameter.epsgCode,
18584+
withCredentials: iportalDataParameter.withCredentials
1857918585
});
1858018586

1858118587
return layerName;
@@ -54842,15 +54848,15 @@ function (_Events) {
5484254848
var datasetName; // 请求获取数据源名
5484354849

5484454850
SuperMap.FetchRequest.get(url, null, {
54845-
withCredentials: (0, _util.handleWithCredentials)(url, this.iportalServiceProxyUrl, false)
54851+
withCredentials: (0, _util.handleWithCredentials)(url, this.iportalServiceProxyUrl, this.withCredentials)
5484654852
}).then(function (response) {
5484754853
return response.json();
5484854854
}).then(function (data) {
5484954855
dataSourceName = data.datasourceNames[0];
5485054856
url = "".concat(address, "/data/datasources/").concat(dataSourceName, "/datasets"); // 请求获取数据集名
5485154857

5485254858
SuperMap.FetchRequest.get(url, null, {
54853-
withCredentials: (0, _util.handleWithCredentials)(url, _this4.iportalServiceProxyUrl, false)
54859+
withCredentials: (0, _util.handleWithCredentials)(url, _this4.iportalServiceProxyUrl, _this4.withCredentials)
5485454860
}).then(function (response) {
5485554861
return response.json();
5485654862
}).then(function (data) {
@@ -54861,7 +54867,7 @@ function (_Events) {
5486154867
dataSourceName: dataSourceName,
5486254868
dataUrl: url.split('/datasources')[0]
5486354869
}, Object.assign({}, queryInfo, {
54864-
withCredentials: (0, _util.handleWithCredentials)(url, _this4.iportalServiceProxyUrl, false)
54870+
withCredentials: (0, _util.handleWithCredentials)(url, _this4.iportalServiceProxyUrl, _this4.withCredentials)
5486554871
}));
5486654872
}).catch(function (error) {
5486754873
console.log(error);
@@ -54880,7 +54886,7 @@ function (_Events) {
5488054886
var path; // 请求获取地图名
5488154887

5488254888
SuperMap.FetchRequest.get(_url, null, {
54883-
withCredentials: (0, _util.handleWithCredentials)(_url, this.iportalServiceProxyUrl, false)
54889+
withCredentials: (0, _util.handleWithCredentials)(_url, this.iportalServiceProxyUrl, this.withCredentials)
5488454890
}).then(function (response) {
5488554891
return response.json();
5488654892
}).then(function (data) {
@@ -54889,7 +54895,7 @@ function (_Events) {
5488954895
_url = _url = "".concat(address, "/maps/").concat(mapName, "/layers"); // 请求获取图层名
5489054896

5489154897
SuperMap.FetchRequest.get(_url, null, {
54892-
withCredentials: (0, _util.handleWithCredentials)(_url, _this4.iportalServiceProxyUrl, false)
54898+
withCredentials: (0, _util.handleWithCredentials)(_url, _this4.iportalServiceProxyUrl, _this4.withCredentials)
5489354899
}).then(function (response) {
5489454900
return response.json();
5489554901
}).then(function (data) {
@@ -54899,7 +54905,7 @@ function (_Events) {
5489954905
mapName: layerName,
5490054906
dataUrl: path
5490154907
}, Object.assign({}, queryInfo, {
54902-
withCredentials: (0, _util.handleWithCredentials)(_url, _this4.iportalServiceProxyUrl, false)
54908+
withCredentials: (0, _util.handleWithCredentials)(_url, _this4.iportalServiceProxyUrl, _this4.withCredentials)
5490354909
}));
5490454910

5490554911
return layerName;
@@ -56079,7 +56085,7 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
5607956085
return c > 3 && r && Object.defineProperty(target, key, r), r;
5608056086
};
5608156087

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'];
5608356089

5608456090
var MapEvents =
5608556091
/*#__PURE__*/
@@ -70541,7 +70547,7 @@ function (_Events) {
7054170547
queryInfo.attributeFilter = _this2._getAttributeFilterByKeywords(fields, queryInfo.keyWord);
7054270548

7054370549
_this2._getMapFeatureBySql(dataUrl, queryInfo);
70544-
});
70550+
}, queryInfo.withCredentials);
7054570551
} else {
7054670552
this._getMapFeatureBySql(dataUrl, queryInfo);
7054770553
}
@@ -70780,6 +70786,7 @@ function (_Events) {
7078070786
value: function _getRestMapFields(url, layerName, callBack) {
7078170787
var _this6 = this;
7078270788

70789+
var withCredentials = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
7078370790
var param = new SuperMap.QueryBySQLParameters({
7078470791
queryParams: [new SuperMap.FilterParameter({
7078570792
name: layerName,
@@ -70788,6 +70795,7 @@ function (_Events) {
7078870795
});
7078970796
var queryBySQLSerice = new SuperMap.QueryBySQLService(url, {
7079070797
proxy: this.options.proxy,
70798+
withCredentials: withCredentials,
7079170799
eventListeners: {
7079270800
processCompleted: function processCompleted(serviceResult) {
7079370801
var fields;

dist/mapboxgl/iclient-mapboxgl-vue.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)