Skip to content

Commit 3e9201b

Browse files
zhurczhurc
committed
fix 图层信息设置服务更新失败问题
1 parent 9c234ae commit 3e9201b

11 files changed

Lines changed: 54 additions & 44 deletions

‎dist/iclient9-leaflet.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33039,9 +33039,6 @@ var LayerInfoService = exports.LayerInfoService = _ServiceBase.ServiceBase.exten
3303933039
if (!resourceID || !layersInfo) {
3304033040
return;
3304133041
}
33042-
var layersInfoParam = {};
33043-
layersInfoParam.subLayers = {};
33044-
layersInfoParam.subLayers.layers = layersInfo;
3304533042
var setLayersInfoService = new _SetLayersInfoService2["default"](me.url, {
3304633043
serverType: me.options.serverType,
3304733044
eventListeners: {
@@ -33052,7 +33049,7 @@ var LayerInfoService = exports.LayerInfoService = _ServiceBase.ServiceBase.exten
3305233049
isTempLayers: isTempLayers
3305333050
});
3305433051

33055-
setLayersInfoService.processAsync(layersInfoParam);
33052+
setLayersInfoService.processAsync(layersInfo);
3305633053
},
3305733054

3305833055
/**
@@ -54761,7 +54758,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
5476154758
* @param options -{Object} 可选参数。如：<br>
5476254759
* isTempLayers -{boolean} 是否是临时图层。<br>
5476354760
* resourceID -{string} 临时图层资源ID。<br>
54764-
* layerInfo -{string} 要更新的图层信息。
54761+
* layersInfo -{string} 要更新的图层信息。
5476554762
*/
5476654763
var SetLayersInfoParameters = function () {
5476754764
/**
@@ -54773,7 +54770,7 @@ var SetLayersInfoParameters = function () {
5477354770

5477454771
this.isTempLayers = null;
5477554772
this.resourceID = null;
54776-
this.layerInfo = null;
54773+
this.layersInfo = null;
5477754774
this.CLASS_NAME = "SuperMap.SetLayersInfoParameters";
5477854775

5477954776
options = options || {};
@@ -54787,7 +54784,7 @@ var SetLayersInfoParameters = function () {
5478754784

5478854785

5478954786
/**
54790-
* @member SuperMap.SetLayersInfoParameters.prototype.layerInfo -{Object}
54787+
* @member SuperMap.SetLayersInfoParameters.prototype.layersInfo -{Object}
5479154788
* @description 要更新的图层信息。(包含修改和未修改的所有字段)。该参数可以通过图层信息服务获取，然后对返回值中subLayers.layers[i]图层信息属性进行修改。
5479254789
*/
5479354790

@@ -54804,7 +54801,7 @@ var SetLayersInfoParameters = function () {
5480454801
var me = this;
5480554802
me.isTempLayers = null;
5480654803
me.resourceID = null;
54807-
me.layerInfo = null;
54804+
me.layersInfo = null;
5480854805
}
5480954806
}]);
5481054807

@@ -54926,6 +54923,7 @@ var SetLayersInfoService = function (_CommonServiceBase) {
5492654923
if (!params) {
5492754924
return;
5492854925
}
54926+
5492954927
end = me.url.substr(me.url.length - 1, 1);
5493054928
me.url += end === "/" ? '' : '/';
5493154929
//创建临时图层和设置修改临时图层信息对应不同的资源URL
@@ -54937,6 +54935,12 @@ var SetLayersInfoService = function (_CommonServiceBase) {
5493754935
method = "POST";
5493854936
}
5493954937
me.url += ".json?";
54938+
if (!params.subLayers) {
54939+
params.subLayers = { layers: [] };
54940+
}
54941+
if (!params.subLayers.layers) {
54942+
params.subLayers.layers = [];
54943+
}
5494054944
var layers = params.subLayers.layers,
5494154945
len = layers.length;
5494254946
for (var i in layers) {

‎dist/iclient9-leaflet.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.

‎dist/iclient9-mapboxgl.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26329,9 +26329,6 @@ var LayerInfoService = function (_ServiceBase) {
2632926329
if (!resourceID || !layersInfo) {
2633026330
return;
2633126331
}
26332-
var layersInfoParam = {};
26333-
layersInfoParam.subLayers = {};
26334-
layersInfoParam.subLayers.layers = layersInfo;
2633526332
var setLayersInfoService = new _SetLayersInfoService2.default(me.url, {
2633626333
serverType: me.options.serverType,
2633726334
eventListeners: {
@@ -26341,7 +26338,7 @@ var LayerInfoService = function (_ServiceBase) {
2634126338
resourceID: resourceID,
2634226339
isTempLayers: isTempLayers
2634326340
});
26344-
setLayersInfoService.processAsync(layersInfoParam);
26341+
setLayersInfoService.processAsync(layersInfo);
2634526342
}
2634626343

2634726344
/**
@@ -48109,7 +48106,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
4810948106
* @param options -{Object} 可选参数。如：<br>
4811048107
* isTempLayers -{boolean} 是否是临时图层。<br>
4811148108
* resourceID -{string} 临时图层资源ID。<br>
48112-
* layerInfo -{string} 要更新的图层信息。
48109+
* layersInfo -{string} 要更新的图层信息。
4811348110
*/
4811448111
var SetLayersInfoParameters = function () {
4811548112
/**
@@ -48121,7 +48118,7 @@ var SetLayersInfoParameters = function () {
4812148118

4812248119
this.isTempLayers = null;
4812348120
this.resourceID = null;
48124-
this.layerInfo = null;
48121+
this.layersInfo = null;
4812548122
this.CLASS_NAME = "SuperMap.SetLayersInfoParameters";
4812648123

4812748124
options = options || {};
@@ -48135,7 +48132,7 @@ var SetLayersInfoParameters = function () {
4813548132

4813648133

4813748134
/**
48138-
* @member SuperMap.SetLayersInfoParameters.prototype.layerInfo -{Object}
48135+
* @member SuperMap.SetLayersInfoParameters.prototype.layersInfo -{Object}
4813948136
* @description 要更新的图层信息。(包含修改和未修改的所有字段)。该参数可以通过图层信息服务获取，然后对返回值中subLayers.layers[i]图层信息属性进行修改。
4814048137
*/
4814148138

@@ -48152,7 +48149,7 @@ var SetLayersInfoParameters = function () {
4815248149
var me = this;
4815348150
me.isTempLayers = null;
4815448151
me.resourceID = null;
48155-
me.layerInfo = null;
48152+
me.layersInfo = null;
4815648153
}
4815748154
}]);
4815848155

@@ -48274,6 +48271,7 @@ var SetLayersInfoService = function (_CommonServiceBase) {
4827448271
if (!params) {
4827548272
return;
4827648273
}
48274+
4827748275
end = me.url.substr(me.url.length - 1, 1);
4827848276
me.url += end === "/" ? '' : '/';
4827948277
//创建临时图层和设置修改临时图层信息对应不同的资源URL
@@ -48285,6 +48283,12 @@ var SetLayersInfoService = function (_CommonServiceBase) {
4828548283
method = "POST";
4828648284
}
4828748285
me.url += ".json?";
48286+
if (!params.subLayers) {
48287+
params.subLayers = { layers: [] };
48288+
}
48289+
if (!params.subLayers.layers) {
48290+
params.subLayers.layers = [];
48291+
}
4828848292
var layers = params.subLayers.layers,
4828948293
len = layers.length;
4829048294
for (var i in layers) {

‎dist/iclient9-mapboxgl.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.

‎dist/iclient9-openlayers.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30363,9 +30363,6 @@ var LayerInfoService = function (_ServiceBase) {
3036330363
if (!resourceID || !layersInfo) {
3036430364
return;
3036530365
}
30366-
var layersInfoParam = {};
30367-
layersInfoParam.subLayers = {};
30368-
layersInfoParam.subLayers.layers = layersInfo;
3036930366
var setLayersInfoService = new _SetLayersInfoService2.default(me.url, {
3037030367
serverType: me.options.serverType,
3037130368
eventListeners: {
@@ -30375,7 +30372,7 @@ var LayerInfoService = function (_ServiceBase) {
3037530372
resourceID: resourceID,
3037630373
isTempLayers: isTempLayers
3037730374
});
30378-
setLayersInfoService.processAsync(layersInfoParam);
30375+
setLayersInfoService.processAsync(layersInfo);
3037930376
}
3038030377

3038130378
/**
@@ -52527,7 +52524,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
5252752524
* @param options -{Object} 可选参数。如：<br>
5252852525
* isTempLayers -{boolean} 是否是临时图层。<br>
5252952526
* resourceID -{string} 临时图层资源ID。<br>
52530-
* layerInfo -{string} 要更新的图层信息。
52527+
* layersInfo -{string} 要更新的图层信息。
5253152528
*/
5253252529
var SetLayersInfoParameters = function () {
5253352530
/**
@@ -52539,7 +52536,7 @@ var SetLayersInfoParameters = function () {
5253952536

5254052537
this.isTempLayers = null;
5254152538
this.resourceID = null;
52542-
this.layerInfo = null;
52539+
this.layersInfo = null;
5254352540
this.CLASS_NAME = "SuperMap.SetLayersInfoParameters";
5254452541

5254552542
options = options || {};
@@ -52553,7 +52550,7 @@ var SetLayersInfoParameters = function () {
5255352550

5255452551

5255552552
/**
52556-
* @member SuperMap.SetLayersInfoParameters.prototype.layerInfo -{Object}
52553+
* @member SuperMap.SetLayersInfoParameters.prototype.layersInfo -{Object}
5255752554
* @description 要更新的图层信息。(包含修改和未修改的所有字段)。该参数可以通过图层信息服务获取，然后对返回值中subLayers.layers[i]图层信息属性进行修改。
5255852555
*/
5255952556

@@ -52570,7 +52567,7 @@ var SetLayersInfoParameters = function () {
5257052567
var me = this;
5257152568
me.isTempLayers = null;
5257252569
me.resourceID = null;
52573-
me.layerInfo = null;
52570+
me.layersInfo = null;
5257452571
}
5257552572
}]);
5257652573

@@ -52692,6 +52689,7 @@ var SetLayersInfoService = function (_CommonServiceBase) {
5269252689
if (!params) {
5269352690
return;
5269452691
}
52692+
5269552693
end = me.url.substr(me.url.length - 1, 1);
5269652694
me.url += end === "/" ? '' : '/';
5269752695
//创建临时图层和设置修改临时图层信息对应不同的资源URL
@@ -52703,6 +52701,12 @@ var SetLayersInfoService = function (_CommonServiceBase) {
5270352701
method = "POST";
5270452702
}
5270552703
me.url += ".json?";
52704+
if (!params.subLayers) {
52705+
params.subLayers = { layers: [] };
52706+
}
52707+
if (!params.subLayers.layers) {
52708+
params.subLayers.layers = [];
52709+
}
5270652710
var layers = params.subLayers.layers,
5270752711
len = layers.length;
5270852712
for (var i in layers) {

‎dist/iclient9-openlayers.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.

‎src/common/iServer/SetLayersInfoParameters.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import SuperMap from '../SuperMap';
66
* @param options -{Object} 可选参数。如：<br>
77
* isTempLayers -{boolean} 是否是临时图层。<br>
88
* resourceID -{string} 临时图层资源ID。<br>
9-
* layerInfo -{string} 要更新的图层信息。
9+
* layersInfo -{string} 要更新的图层信息。
1010
*/
1111
export default class SetLayersInfoParameters {
1212

@@ -22,10 +22,10 @@ export default class SetLayersInfoParameters {
2222
resourceID = null;
2323

2424
/**
25-
* @member SuperMap.SetLayersInfoParameters.prototype.layerInfo -{Object}
25+
* @member SuperMap.SetLayersInfoParameters.prototype.layersInfo -{Object}
2626
* @description 要更新的图层信息。(包含修改和未修改的所有字段)。该参数可以通过图层信息服务获取，然后对返回值中subLayers.layers[i]图层信息属性进行修改。
2727
*/
28-
layerInfo = null;
28+
layersInfo = null;
2929

3030
constructor(options) {
3131
options = options || {};
@@ -41,7 +41,7 @@ export default class SetLayersInfoParameters {
4141
var me = this;
4242
me.isTempLayers = null;
4343
me.resourceID = null;
44-
me.layerInfo = null;
44+
me.layersInfo = null;
4545
}
4646

4747

‎src/common/iServer/SetLayersInfoService.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import SetLayersInfoParameters from './SetLayersInfoParameters';
1717
* serverType - {SuperMap.ServerType} 服务器类型，iServer|iPortal|Online。<br>
1818
* format -{SuperMap.DataFormat} 查询结果返回格式，目前支持iServerJSON 和GeoJSON两种格式。参数格式为"ISERVER","GEOJSON"。<br>
1919
*/
20-
export default class SetLayersInfoService extends CommonServiceBase {
20+
export default class SetLayersInfoService extends CommonServiceBase {
2121

2222
/**
2323
* @member SuperMap.SetLayersInfoService.prototype.resourceID - {string}
@@ -63,6 +63,7 @@ export default class SetLayersInfoService extends CommonServiceBase {
6363
if (!params) {
6464
return;
6565
}
66+
6667
end = me.url.substr(me.url.length - 1, 1);
6768
me.url += (end === "/") ? '' : '/';
6869
//创建临时图层和设置修改临时图层信息对应不同的资源URL
@@ -74,6 +75,12 @@ export default class SetLayersInfoService extends CommonServiceBase {
7475
method = "POST";
7576
}
7677
me.url += ".json?";
78+
if (!params.subLayers) {
79+
params.subLayers = {layers: []}
80+
}
81+
if (!params.subLayers.layers) {
82+
params.subLayers.layers = [];
83+
}
7784
var layers = params.subLayers.layers,
7885
len = layers.length;
7986
for (let i in layers) {

‎src/leaflet/services/LayerInfoService.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ export var LayerInfoService = ServiceBase.extend({
9191
if (!resourceID || !layersInfo) {
9292
return;
9393
}
94-
var layersInfoParam = {};
95-
layersInfoParam.subLayers = {};
96-
layersInfoParam.subLayers.layers = layersInfo;
9794
var setLayersInfoService = new SetLayersInfoService(me.url, {
9895
serverType: me.options.serverType,
9996
eventListeners: {
@@ -104,7 +101,7 @@ export var LayerInfoService = ServiceBase.extend({
104101
isTempLayers: isTempLayers
105102
});
106103

107-
setLayersInfoService.processAsync(layersInfoParam);
104+
setLayersInfoService.processAsync(layersInfo);
108105
},
109106

110107

‎src/mapboxgl/services/LayerInfoService.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ export default class LayerInfoService extends ServiceBase {
8888
if (!resourceID || !layersInfo) {
8989
return;
9090
}
91-
var layersInfoParam = {};
92-
layersInfoParam.subLayers = {};
93-
layersInfoParam.subLayers.layers = layersInfo;
9491
var setLayersInfoService = new SetLayersInfoService(me.url, {
9592
serverType: me.options.serverType,
9693
eventListeners: {
@@ -100,7 +97,7 @@ export default class LayerInfoService extends ServiceBase {
10097
resourceID: resourceID,
10198
isTempLayers: isTempLayers
10299
});
103-
setLayersInfoService.processAsync(layersInfoParam);
100+
setLayersInfoService.processAsync(layersInfo);
104101
}
105102

106103
/**

0 commit comments

Comments
 (0)