@@ -1268,7 +1268,7 @@ var ProcessingServiceBase = function (_CommonServiceBase) {
1268
1268
key : 'getJobs' ,
1269
1269
value : function getJobs ( url ) {
1270
1270
var me = this ;
1271
- return _FetchRequest . FetchRequest . get ( url ) . then ( function ( response ) {
1271
+ _FetchRequest . FetchRequest . get ( url ) . then ( function ( response ) {
1272
1272
return response . json ( ) ;
1273
1273
} ) . then ( function ( result ) {
1274
1274
me . events . triggerEvent ( "processCompleted" , { result : result } ) ;
@@ -1298,7 +1298,7 @@ var ProcessingServiceBase = function (_CommonServiceBase) {
1298
1298
var options = {
1299
1299
headers : { 'Content-Type' : 'application/x-www-form-urlencoded' }
1300
1300
} ;
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 ) {
1302
1302
return response . json ( ) ;
1303
1303
} ) . then ( function ( result ) {
1304
1304
if ( result . succeed ) {
@@ -1318,7 +1318,7 @@ var ProcessingServiceBase = function (_CommonServiceBase) {
1318
1318
var me = this ;
1319
1319
if ( result ) {
1320
1320
var id = setInterval ( function ( ) {
1321
- return _FetchRequest . FetchRequest . get ( result . newResourceLocation ) . then ( function ( response ) {
1321
+ _FetchRequest . FetchRequest . get ( result . newResourceLocation ) . then ( function ( response ) {
1322
1322
return response . json ( ) ;
1323
1323
} ) . then ( function ( job ) {
1324
1324
me . events . triggerEvent ( "processRunning" , { id : job . id , state : job . state } ) ;
@@ -5620,7 +5620,7 @@ var AddressMatchService = function (_CommonServiceBase) {
5620
5620
key : 'processAsync' ,
5621
5621
value : function processAsync ( url , params ) {
5622
5622
var me = this ;
5623
- return _FetchRequest . FetchRequest . get ( url , params ) . then ( function ( response ) {
5623
+ _FetchRequest . FetchRequest . get ( url , params ) . then ( function ( response ) {
5624
5624
return response . json ( ) ;
5625
5625
} ) . then ( function ( result ) {
5626
5626
if ( result ) {
@@ -5644,6 +5644,7 @@ var AddressMatchService = function (_CommonServiceBase) {
5644
5644
value : function serviceProcessCompleted ( result ) {
5645
5645
_get ( AddressMatchService . prototype . __proto__ || Object . getPrototypeOf ( AddressMatchService . prototype ) , 'serviceProcessCompleted' , this ) . call ( this , result ) ;
5646
5646
}
5647
+
5647
5648
/**
5648
5649
* @function SuperMap.AddressMatchService.prototype.serviceProcessCompleted
5649
5650
* @param result - {Object} 服务器返回的结果对象。
@@ -6148,13 +6149,12 @@ var KernelDensityJobsService = function (_ProcessingServiceBas) {
6148
6149
/**
6149
6150
* @function SuperMap.KernelDensityJobsService.prototype.getKernelDensityJobs
6150
6151
* @description 获取核密度分析任务
6151
- * @return {* }
6152
6152
*/
6153
6153
6154
6154
} , {
6155
6155
key : 'getKernelDensityJobs' ,
6156
6156
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 ) ;
6158
6158
}
6159
6159
6160
6160
/**
@@ -6166,7 +6166,7 @@ var KernelDensityJobsService = function (_ProcessingServiceBas) {
6166
6166
} , {
6167
6167
key : 'getKernelDensityJob' ,
6168
6168
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 ) ;
6170
6170
}
6171
6171
6172
6172
/**
@@ -6179,7 +6179,7 @@ var KernelDensityJobsService = function (_ProcessingServiceBas) {
6179
6179
} , {
6180
6180
key : 'addKernelDensityJob' ,
6181
6181
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 ) ;
6183
6183
}
6184
6184
} ] ) ;
6185
6185
@@ -6366,13 +6366,12 @@ var SingleObjectQueryJobsService = function (_ProcessingServiceBas) {
6366
6366
/**
6367
6367
* @function SuperMap.SingleObjectQueryJobsService.protitype.getQueryJobs
6368
6368
* @description 获取单对象空间查询分析所有任务
6369
- * @return {* }
6370
6369
*/
6371
6370
6372
6371
} , {
6373
6372
key : 'getQueryJobs' ,
6374
6373
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 ) ;
6376
6375
}
6377
6376
6378
6377
/**
@@ -6384,7 +6383,7 @@ var SingleObjectQueryJobsService = function (_ProcessingServiceBas) {
6384
6383
} , {
6385
6384
key : 'getQueryJob' ,
6386
6385
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 ) ;
6388
6387
}
6389
6388
6390
6389
/**
@@ -6397,7 +6396,7 @@ var SingleObjectQueryJobsService = function (_ProcessingServiceBas) {
6397
6396
} , {
6398
6397
key : 'addQueryJob' ,
6399
6398
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 ) ;
6401
6400
}
6402
6401
} ] ) ;
6403
6402
@@ -6657,7 +6656,7 @@ var SummaryMeshJobsService = function (_ProcessingServiceBas) {
6657
6656
} , {
6658
6657
key : 'getSummaryMeshJobs' ,
6659
6658
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 ) ;
6661
6660
}
6662
6661
6663
6662
/**
@@ -6669,7 +6668,7 @@ var SummaryMeshJobsService = function (_ProcessingServiceBas) {
6669
6668
} , {
6670
6669
key : 'getSummaryMeshJob' ,
6671
6670
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 ) ;
6673
6672
}
6674
6673
6675
6674
/**
@@ -6977,13 +6976,12 @@ var SummaryRegionJobsService = function (_ProcessingServiceBas) {
6977
6976
/**
6978
6977
* @function SuperMap.SummaryRegionJobsService.prototype.getSummaryRegionJobs
6979
6978
* @description 获取区域汇总分析任务集合。
6980
- * @return {* }
6981
6979
*/
6982
6980
6983
6981
} , {
6984
6982
key : 'getSummaryRegionJobs' ,
6985
6983
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 ) ;
6987
6985
}
6988
6986
6989
6987
/**
@@ -6995,7 +6993,7 @@ var SummaryRegionJobsService = function (_ProcessingServiceBas) {
6995
6993
} , {
6996
6994
key : 'getSummaryRegionJob' ,
6997
6995
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 ) ;
6999
6997
}
7000
6998
7001
6999
/**
@@ -7008,7 +7006,7 @@ var SummaryRegionJobsService = function (_ProcessingServiceBas) {
7008
7006
} , {
7009
7007
key : 'addSummaryRegionJob' ,
7010
7008
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 ) ;
7012
7010
}
7013
7011
} ] ) ;
7014
7012
@@ -7197,13 +7195,12 @@ var VectorClipJobsService = function (_ProcessingServiceBas) {
7197
7195
/**
7198
7196
* @function SuperMap.VectorClipJobsService.protitype.getVectorClipJobs
7199
7197
* @description 获取矢量裁剪分析所有任务
7200
- * @return {* }
7201
7198
*/
7202
7199
7203
7200
} , {
7204
7201
key : 'getVectorClipJobs' ,
7205
7202
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 ) ;
7207
7204
}
7208
7205
7209
7206
/**
@@ -7215,7 +7212,7 @@ var VectorClipJobsService = function (_ProcessingServiceBas) {
7215
7212
} , {
7216
7213
key : 'getVectorClipJob' ,
7217
7214
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 ) ;
7219
7216
}
7220
7217
7221
7218
/**
@@ -7228,7 +7225,7 @@ var VectorClipJobsService = function (_ProcessingServiceBas) {
7228
7225
} , {
7229
7226
key : 'addVectorClipJob' ,
7230
7227
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 ) ;
7232
7229
}
7233
7230
} ] ) ;
7234
7231
@@ -7358,6 +7355,7 @@ _SuperMap2.default.SecurityManager = {
7358
7355
* @description 从服务器获取一个token,在此之前要注册服务器信息
7359
7356
* @param url {string}-服务器域名+端口,如:http://localhost:8092
7360
7357
* @param tokenParam -{SuperMap.TokenServiceParameter} token申请参数
7358
+ * @return {Promise }
7361
7359
*/
7362
7360
generateToken : function generateToken ( url , tokenParam ) {
7363
7361
var serverInfo = this . servers [ url ] ;
@@ -7480,7 +7478,9 @@ _SuperMap2.default.SecurityManager = {
7480
7478
* @param loginInfoParams -{Object} iManager 登录参数<br>
7481
7479
* userName -{String} 用户名<br>
7482
7480
* password-{String} 密码
7483
- * @param isNewTab -{boolean} 不同域时是否在新窗口打开登录页面
7481
+ * @param options -{Object} <br>
7482
+ * isNewTab -{boolean} 不同域时是否在新窗口打开登录页面
7483
+ * @return {Promise }
7484
7484
*/
7485
7485
loginManager : function loginManager ( url , loginInfoParams , options ) {
7486
7486
if ( ! _SuperMap2 . default . Util . isInTheSameDomain ( url ) ) {
0 commit comments