8000 Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript · SuperMap/iClient-JavaScript@0a8682a · GitHub
[go: up one dir, main page]
Skip to content

Commit 0a8682a

Browse files
songyumengsongyumeng
committed
2 parents 1151fb7 + 50e50fc commit 0a8682a

File tree

14 files changed

+20
-16
lines changed

14 files changed

+20
-16
lines changed

‎src/common/iServer/DatasourceService.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ export class DatasourceService extends CommonServiceBase {
4343
/**
4444
* @function DatasourceService.prototype.getDatasourceService
4545
* @description 获取指定数据源信息。
46+
* @param {string} datasourceName - 数据源名称。
47+
* @param {RequestCallback} [callback] - 回调函数，该参数未传时可通过返回的 promise 获取结果。
48+
* @returns {Promise} Promise 对象。
4649
*/
4750
getDatasourceService(datasourceName, callback) {
4851
let url = Util.urlPathAppend(this.url,`datasources/name/${datasourceName}`);
@@ -52,6 +55,8 @@ export class DatasourceService extends CommonServiceBase {
5255
/**
5356
* @function DatasourceService.prototype.getDatasourcesService
5457
* @description 获取所有数据源信息。
58+
* @param {RequestCallback} [callback] - 回调函数，该参数未传时可通过返回的 promise 获取结果。
59+
* @returns {Promise} Promise 对象。
5560
*/
5661
getDatasourcesService(callback) {
5762
let url = Util.urlPathAppend(this.url,`datasources`);
@@ -60,6 +65,9 @@ export class DatasourceService extends CommonServiceBase {
6065
/**
6166
* @function DatasourceService.prototype.setDatasourceService
6267
* @description 更新数据源信息。
68+
* @param {Object} params 请求参数信息。
69+
* @param {RequestCallback} [callback] - 回调函数，该参数未传时可通过返回的 promise 获取结果。
70+
* @returns {Promise} Promise 对象。
6371
*/
6472
setDatasourceService(params, callback) {
6573
if (!params) {

‎src/common/overlay/knowledge-graph/format.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ function getNodeLabel(entity, captionField) {
159159
const { name, entityTypes, entityIds } = data[i];
160160
const ids = JSON.parse(entityIds || '[]');
161161
const types = JSON.parse(entityTypes || '[]');
162-
if (ids.includes(id) || types.includes(labels[0])) {
162+
const labelStr = labels && labels.join('&');
163+
if (ids.includes(id) || types.includes(labelStr)) {
163164
return properties[name] || '';
164165
}
165166
}

‎src/leaflet/services/ProcessingService.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ export var ProcessingService = ServiceBase.extend({
7777
* @description 获取密度分析的状态。
7878
* @param {string} id - 密度分析 ID。
7979
* @returns {Object} 密度分析的状态。
80-
* @returns {Promise} Promise 对象。
8180
*/
8281
getKernelDensityJobState: function(id) {
8382
return this._processingService.getKernelDensityJobState(id);

‎src/mapboxgl/services/MapService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class MapService extends ServiceBase {
3535
* @function MapService.prototype.getMapInfo
3636
* @description 地图信息查询服务。
3737
* @param {RequestCallback} [callback] - 回调函数，该参数未传时可通过返回的 promise 获取结果。
38-
* @returns {MapService} 获取服务信息。
38+
* @returns {Promise} Promise 对象。
3939
*/
4040
getMapInfo(callback) {
4141
var me = this;
@@ -72,7 +72,7 @@ export class MapService extends ServiceBase {
7272
* @function MapService.prototype.getTilesets
7373
* @description 切片列表信息查询服务。
7474
* @param {RequestCallback} [callback] - 回调函数，该参数未传时可通过返回的 promise 获取结果。
75-
* @returns {MapService} 获取服务信息。
75+
* @returns {Promise} Promise 对象。
7676
*/
7777
getTilesets(callback) {
7878
var me = this;

‎src/maplibregl/services/MapService.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export class MapService extends ServiceBase {
3535
* @function MapService.prototype.getMapInfo
3636
* @description 地图信息查询服务。
3737
* @param {RequestCallback} [callback] 回调函数，该参数未传时可通过返回的promise 获取结果。
38-
* @returns {MapService} 获取服务信息。
3938
* @returns {Promise} Promise 对象。
4039
*/
4140
getMapInfo(callback) {
@@ -74,7 +73,6 @@ export class MapService extends ServiceBase {
7473
* @function MapService.prototype.getTilesets
7574
* @description 切片列表信息查询服务。
7675
* @param {RequestCallback} [callback] 回调函数，该参数未传时可通过返回的promise 获取结果。
77-
* @returns {MapService} 获取服务信息。
7876
* @returns {Promise} Promise 对象。
7977
*/
8078
getTilesets(callback) {

‎src/maplibregl/services/ProcessingService.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ export class ProcessingService extends ServiceBase {
7474
* @description 获取密度分析的状态。
7575
* @param {string} id - 密度分析的id。
7676
* @returns {Object} 密度分析的状态。
77-
* @returns {Promise} Promise 对象。
7877
*/
7978
getKernelDensityJobState(id) {
8079
return this._processingService.getKernelDensityJobState(id);

‎src/openlayers/services/MapService.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export class MapService extends ServiceBase {
3131
* @function MapService.prototype.getMapInfo
3232
* @description 地图信息查询服务。
3333
* @param {RequestCallback} [callback] 回调函数，该参数未传时可通过返回的promise 获取结果。
34-
* @returns {MapService} 获取服务信息。
3534
* @returns {Promise} Promise 对象。
3635
*/
3736
getMapInfo(callback) {

‎src/openlayers/services/ProcessingService.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ export class ProcessingService extends ServiceBase {
436436
* @param {RequestCallback} [callback] 回调函数，该参数未传时可通过返回的promise 获取结果。
437437
* @param {number} [seconds=1000] - 获取创建成功结果的时间间隔。
438438
* @param {DataFormat} [resultFormat=DataFormat.GEOJSON] - 返回结果类型。
439-
* @returns {Promise} Promise 对象。* @returns {Promise} Promise 对象。
439+
* @returns {Promise} Promise 对象。
440440
*/
441441
addSummaryAttributesJob(params, callback, seconds, resultFormat) {
442442
params = this._processParams(params);

‎test/common/iServer/KnowledgeGraphServiceSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ describe('KnowledgeGraphService', () => {
4949
expect(res).not.toBeNull();
5050
expect(res.type).toBe('processCompleted');
5151
expect(res.result).not.toBeNull();
52-
expect(res.result.length).toEqual(5);
52+
expect(res.result.length).toEqual(6);
5353
knowledgeGraphService.destroy();
5454
done();
5555
} catch (exception) {

‎test/leaflet/services/KnowledgeGraphServiceSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('KnowledgeGraphService', () => {
4444
expect(res).not.toBeNull();
4545
expect(res.type).toBe('processCompleted');
4646
expect(res.result).not.toBeNull();
47-
expect(res.result.length).toEqual(5);
47+
expect(res.result.length).toEqual(6);
4848
done();
4949
} catch (exception) {
5050
console.log("'query'案例失败：" + exception.name + ':' + exception.message);

‎test/mapboxgl/services/KnowledgeGraphServiceSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
F987 @@ -44,7 +44,7 @@ describe('KnowledgeGraphService', () => {
4444
expect(res).not.toBeNull();
4545
expect(res.type).toBe('processCompleted');
4646
expect(res.result).not.toBeNull();
47-
expect(res.result.length).toEqual(5);
47+
expect(res.result.length).toEqual(6);
4848
done();
4949
} catch (exception) {
5050
console.log("'query'案例失败：" + exception.name + ':' + exception.message);

‎test/maplibregl/services/KnowledgeGraphServiceSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('KnowledgeGraphService', () => {
4545
expect(res).not.toBeNull();
4646
expect(res.type).toBe('processCompleted');
4747
expect(res.result).not.toBeNull();
48-
expect(res.result.length).toEqual(5);
48+
expect(res.result.length).toEqual(6);
4949
done();
5050
} catch (exception) {
5151
console.log("'query'案例失败：" + exception.name + ':' + exception.message);

‎test/openlayers/services/KnowledgeGraphServiceSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('KnowledgeGraphService', () => {
4545
expect(res).not.toBeNull();
4646
expect(res.type).toBe('processCompleted');
4747
expect(res.result).not.toBeNull();
48-
expect(res.result.length).toEqual(5);
48+
expect(res.result.length).toEqual(6);
4949
done();
5050
} catch (exception) {
5151
console.log("'query'案例失败：" + exception.name + ':' + exception.message);

‎test/resources/knowledgeGraphService.js

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

0 commit comments

Comments
 (0)
0