Skip to content

Commit cf6d90f

Browse files
zhurczhurc
committed
增加部分接口的返回值类型注释为Promise
1 parent d89d6a0 commit cf6d90f

27 files changed

+11477
-11285
lines changed

‎dist/iclient-classic.js‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,7 @@ var ProcessingServiceBase = function (_CommonServiceBase) {
12681268
key: 'getJobs',
12691269
value: function getJobs(url) {
12701270
var me = this;
1271-
return _FetchRequest.FetchRequest.get(url).then(function (response) {
1271+
_FetchRequest.FetchRequest.get(url).then(function (response) {
12721272
return response.json();
12731273
}).then(function (result) {
12741274
me.events.triggerEvent("processCompleted", { result: result });
@@ -1298,7 +1298,7 @@ var ProcessingServiceBase = function (_CommonServiceBase) {
12981298
var options = {
12991299
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
13001300
};
1301-
return _FetchRequest.FetchRequest.post(me._processUrl(url), JSON.stringify(parameterObject), options).then(function (response) {
1301+
_FetchRequest.FetchRequest.post(me._processUrl(url), JSON.stringify(parameterObject), options).then(function (response) {
13021302
return response.json();
13031303
}).then(function (result) {
13041304
if (result.succeed) {
@@ -1318,7 +1318,7 @@ var ProcessingServiceBase = function (_CommonServiceBase) {
13181318
var me = this;
13191319
if (result) {
13201320
var id = setInterval(function () {
1321-
return _FetchRequest.FetchRequest.get(result.newResourceLocation).then(function (response) {
1321+
_FetchRequest.FetchRequest.get(result.newResourceLocation).then(function (response) {
13221322
return response.json();
13231323
}).then(function (job) {
13241324
me.events.triggerEvent("processRunning", { id: job.id, state: job.state });
@@ -5620,7 +5620,7 @@ var AddressMatchService = function (_CommonServiceBase) {
56205620
key: 'processAsync',
56215621
value: function processAsync(url, params) {
56225622
var me = this;
5623-
return _FetchRequest.FetchRequest.get(url, params).then(function (response) {
5623+
_FetchRequest.FetchRequest.get(url, params).then(function (response) {
56245624
return response.json();
56255625
}).then(function (result) {
56265626
if (result) {
@@ -5644,6 +5644,7 @@ var AddressMatchService = function (_CommonServiceBase) {
56445644
value: function serviceProcessCompleted(result) {
56455645
_get(AddressMatchService.prototype.__proto__ || Object.getPrototypeOf(AddressMatchService.prototype), 'serviceProcessCompleted', this).call(this, result);
56465646
}
5647+
56475648
/**
56485649
* @function SuperMap.AddressMatchService.prototype.serviceProcessCompleted
56495650
* @param result - {Object} 服务器返回的结果对象。
@@ -6148,13 +6149,12 @@ var KernelDensityJobsService = function (_ProcessingServiceBas) {
61486149
/**
61496150
* @function SuperMap.KernelDensityJobsService.prototype.getKernelDensityJobs
61506151
* @description 获取核密度分析任务
6151-
* @return {*}
61526152
*/
61536153

61546154
}, {
61556155
key: 'getKernelDensityJobs',
61566156
value: function getKernelDensityJobs() {
6157-
return _get(KernelDensityJobsService.prototype.__proto__ || Object.getPrototypeOf(KernelDensityJobsService.prototype), 'getJobs', this).call(this, this.url);
6157+
_get(KernelDensityJobsService.prototype.__proto__ || Object.getPrototypeOf(KernelDensityJobsService.prototype), 'getJobs', this).call(this, this.url);
61586158
}
61596159

61606160
/**
@@ -6166,7 +6166,7 @@ var KernelDensityJobsService = function (_ProcessingServiceBas) {
61666166
}, {
61676167
key: 'getKernelDensityJob',
61686168
value: function getKernelDensityJob(id) {
6169-
return _get(KernelDensityJobsService.prototype.__proto__ || Object.getPrototypeOf(KernelDensityJobsService.prototype), 'getJobs', this).call(this, this.url + '/' + id);
6169+
_get(KernelDensityJobsService.prototype.__proto__ || Object.getPrototypeOf(KernelDensityJobsService.prototype), 'getJobs', this).call(this, this.url + '/' + id);
61706170
}
61716171

61726172
/**
@@ -6179,7 +6179,7 @@ var KernelDensityJobsService = function (_ProcessingServiceBas) {
61796179
}, {
61806180
key: 'addKernelDensityJob',
61816181
value: function addKernelDensityJob(params, seconds) {
6182-
return _get(KernelDensityJobsService.prototype.__proto__ || Object.getPrototypeOf(KernelDensityJobsService.prototype), 'addJob', this).call(this, this.url, params, _KernelDensityJobParameter2.default, seconds);
6182+
_get(KernelDensityJobsService.prototype.__proto__ || Object.getPrototypeOf(KernelDensityJobsService.prototype), 'addJob', this).call(this, this.url, params, _KernelDensityJobParameter2.default, seconds);
61836183
}
61846184
}]);
61856185

@@ -6366,13 +6366,12 @@ var SingleObjectQueryJobsService = function (_ProcessingServiceBas) {
63666366
/**
63676367
* @function SuperMap.SingleObjectQueryJobsService.protitype.getQueryJobs
63686368
* @description 获取单对象空间查询分析所有任务
6369-
* @return {*}
63706369
*/
63716370

63726371
}, {
63736372
key: 'getQueryJobs',
63746373
value: function getQueryJobs() {
6375-
return _get(SingleObjectQueryJobsService.prototype.__proto__ || Object.getPrototypeOf(SingleObjectQueryJobsService.prototype), 'getJobs', this).call(this, this.url);
6374+
_get(SingleObjectQueryJobsService.prototype.__proto__ || Object.getPrototypeOf(SingleObjectQueryJobsService.prototype), 'getJobs', this).call(this, this.url);
63766375
}
63776376

63786377
/**
@@ -6384,7 +6383,7 @@ var SingleObjectQueryJobsService = function (_ProcessingServiceBas) {
63846383
}, {
63856384
key: 'getQueryJob',
63866385
value: function getQueryJob(id) {
6387-
return _get(SingleObjectQueryJobsService.prototype.__proto__ || Object.getPrototypeOf(SingleObjectQueryJobsService.prototype), 'getJobs', this).call(this, this.url + '/' + id);
6386+
_get(SingleObjectQueryJobsService.prototype.__proto__ || Object.getPrototypeOf(SingleObjectQueryJobsService.prototype), 'getJobs', this).call(this, this.url + '/' + id);
63886387
}
63896388

63906389
/**
@@ -6397,7 +6396,7 @@ var SingleObjectQueryJobsService = function (_ProcessingServiceBas) {
63976396
}, {
63986397
key: 'addQueryJob',
63996398
value: function addQueryJob(params, seconds) {
6400-
return _get(SingleObjectQueryJobsService.prototype.__proto__ || Object.getPrototypeOf(SingleObjectQueryJobsService.prototype), 'addJob', this).call(this, this.url, params, _SingleObjectQueryJobsParameter2.default, seconds);
6399+
_get(SingleObjectQueryJobsService.prototype.__proto__ || Object.getPrototypeOf(SingleObjectQueryJobsService.prototype), 'addJob', this).call(this, this.url, params, _SingleObjectQueryJobsParameter2.default, seconds);
64016400
}
64026401
}]);
64036402

@@ -6657,7 +6656,7 @@ var SummaryMeshJobsService = function (_ProcessingServiceBas) {
66576656
}, {
66586657
key: 'getSummaryMeshJobs',
66596658
value: function getSummaryMeshJobs() {
6660-
return _get(SummaryMeshJobsService.prototype.__proto__ || Object.getPrototypeOf(SummaryMeshJobsService.prototype), 'getJobs', this).call(this, this.url);
6659+
_get(SummaryMeshJobsService.prototype.__proto__ || Object.getPrototypeOf(SummaryMeshJobsService.prototype), 'getJobs', this).call(this, this.url);
66616660
}
66626661

66636662
/**
@@ -6669,7 +6668,7 @@ var SummaryMeshJobsService = function (_ProcessingServiceBas) {
66696668
}, {
66706669
key: 'getSummaryMeshJob',
66716670
value: function getSummaryMeshJob(id) {
6672-
return _get(SummaryMeshJobsService.prototype.__proto__ || Object.getPrototypeOf(SummaryMeshJobsService.prototype), 'getJobs', this).call(this, this.url + '/' + id);
6671+
_get(SummaryMeshJobsService.prototype.__proto__ || Object.getPrototypeOf(SummaryMeshJobsService.prototype), 'getJobs', this).call(this, this.url + '/' + id);
66736672
}
66746673

66756674
/**
@@ -6977,13 +6976,12 @@ var SummaryRegionJobsService = function (_ProcessingServiceBas) {
69776976
/**
69786977
* @function SuperMap.SummaryRegionJobsService.prototype.getSummaryRegionJobs
69796978
* @description 获取区域汇总分析任务集合。
6980-
* @return {*}
69816979
*/
69826980

69836981
}, {
69846982
key: 'getSummaryRegionJobs',
69856983
value: function getSummaryRegionJobs() {
6986-
return _get(SummaryRegionJobsService.prototype.__proto__ || Object.getPrototypeOf(SummaryRegionJobsService.prototype), 'getJobs', this).call(this, this.url);
6984+
_get(SummaryRegionJobsService.prototype.__proto__ || Object.getPrototypeOf(SummaryRegionJobsService.prototype), 'getJobs', this).call(this, this.url);
69876985
}
69886986

69896987
/**
@@ -6995,7 +6993,7 @@ var SummaryRegionJobsService = function (_ProcessingServiceBas) {
69956993
}, {
69966994
key: 'getSummaryRegionJob',
69976995
value: function getSummaryRegionJob(id) {
6998-
return _get(SummaryRegionJobsService.prototype.__proto__ || Object.getPrototypeOf(SummaryRegionJobsService.prototype), 'getJobs', this).call(this, this.url + '/' + id);
6996+
_get(SummaryRegionJobsService.prototype.__proto__ || Object.getPrototypeOf(SummaryRegionJobsService.prototype), 'getJobs', this).call(this, this.url + '/' + id);
69996997
}
70006998

70016999
/**
@@ -7008,7 +7006,7 @@ var SummaryRegionJobsService = function (_ProcessingServiceBas) {
70087006
}, {
70097007
key: 'addSummaryRegionJob',
70107008
value: function addSummaryRegionJob(params, seconds) {
7011-
return _get(SummaryRegionJobsService.prototype.__proto__ || Object.getPrototypeOf(SummaryRegionJobsService.prototype), 'addJob', this).call(this, this.url, params, _SummaryRegionJobParameter2.default, seconds);
7009+
_get(SummaryRegionJobsService.prototype.__proto__ || Object.getPrototypeOf(SummaryRegionJobsService.prototype), 'addJob', this).call(this, this.url, params, _SummaryRegionJobParameter2.default, seconds);
70127010
}
70137011
}]);
70147012

@@ -7197,13 +7195,12 @@ var VectorClipJobsService = function (_ProcessingServiceBas) {
71977195
/**
71987196
* @function SuperMap.VectorClipJobsService.protitype.getVectorClipJobs
71997197
* @description 获取矢量裁剪分析所有任务
7200-
* @return {*}
72017198
*/
72027199

72037200
}, {
72047201
key: 'getVectorClipJobs',
72057202
value: function getVectorClipJobs() {
7206-
return _get(VectorClipJobsService.prototype.__proto__ || Object.getPrototypeOf(VectorClipJobsService.prototype), 'getJobs', this).call(this, this.url);
7203+
_get(VectorClipJobsService.prototype.__proto__ || Object.getPrototypeOf(VectorClipJobsService.prototype), 'getJobs', this).call(this, this.url);
72077204
}
72087205

72097206
/**
@@ -7215,7 +7212,7 @@ var VectorClipJobsService = function (_ProcessingServiceBas) {
72157212
}, {
72167213
key: 'getVectorClipJob',
72177214
value: function getVectorClipJob(id) {
7218-
return _get(VectorClipJobsService.prototype.__proto__ || Object.getPrototypeOf(VectorClipJobsService.prototype), 'getJobs', this).call(this, this.url + '/' + id);
7215+
_get(VectorClipJobsService.prototype.__proto__ || Object.getPrototypeOf(VectorClipJobsService.prototype), 'getJobs', this).call(this, this.url + '/' + id);
72197216
}
72207217

72217218
/**
@@ -7228,7 +7225,7 @@ var VectorClipJobsService = function (_ProcessingServiceBas) {
72287225
}, {
72297226
key: 'addVectorClipJob',
72307227
value: function addVectorClipJob(params, seconds) {
7231-
return _get(VectorClipJobsService.prototype.__proto__ || Object.getPrototypeOf(VectorClipJobsService.prototype), 'addJob', this).call(this, this.url, params, _VectorClipJobsParameter2.default, seconds);
7228+
_get(VectorClipJobsService.prototype.__proto__ || Object.getPrototypeOf(VectorClipJobsService.prototype), 'addJob', this).call(this, this.url, params, _VectorClipJobsParameter2.default, seconds);
72327229
}
72337230
}]);
72347231

@@ -7358,6 +7355,7 @@ _SuperMap2.default.SecurityManager = {
73587355
* @description 从服务器获取一个token,在此之前要注册服务器信息
73597356
* @param url {string}-服务器域名+端口，如：http://localhost:8092
73607357
* @param tokenParam -{SuperMap.TokenServiceParameter} token申请参数
7358+
* @return {Promise}
73617359
*/
73627360
generateToken: function generateToken(url, tokenParam) {
73637361
var serverInfo = this.servers[url];
@@ -7480,7 +7478,9 @@ _SuperMap2.default.SecurityManager = {
74807478
* @param loginInfoParams -{Object} iManager 登录参数<br>
74817479
* userName -{String} 用户名<br>
74827480
* password-{String} 密码
7483-
* @param isNewTab -{boolean} 不同域时是否在新窗口打开登录页面
7481+
* @param options -{Object} <br>
7482+
* isNewTab -{boolean} 不同域时是否在新窗口打开登录页面
7483+
* @return {Promise}
74847484
*/
74857485
loginManager: function loginManager(url, loginInfoParams, options) {
74867486
if (!_SuperMap2.default.Util.isInTheSameDomain(url)) {

‎dist/iclient-classic.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)