cd-mapgis 1.1.19 → 1.1.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/OM.js +10 -13
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cd-mapgis",
3
- "version": "1.1.19",
3
+ "version": "1.1.21",
4
4
  "main": "./src/index.js",
5
5
  "types": "./src/index.d.ts",
6
6
  "type": "module",
package/src/OM.js CHANGED
@@ -50,8 +50,8 @@ export default class OM {
50
50
  * @param {*} key
51
51
  */
52
52
  static getDic(key) {
53
- console.log('window.location.hostname',window.location.hostname);
54
- console.log('window.location.href',window.location.href);
53
+ console.log('window.location.hostname', window.location.hostname);
54
+ console.log('window.location.href', window.location.href);
55
55
  const hostname = OM.getIp(window.location.href);
56
56
  return OM.post("/map/getDic", { dicKey: key, clientIp: hostname });
57
57
  }
@@ -254,16 +254,12 @@ export default class OM {
254
254
  }
255
255
  postRes = await OM.checkPushLayers({ layers: _layers });
256
256
  let pushLayers = postRes.data ? postRes.data : [];
257
- for (let k = 0; k < mapViews.length; k++) {
258
- let mapView = mapViews[k];
259
- let map = mapView.map;
260
- for (let i = 0; i < pushLayers.length; i++) {
261
- geoParam.name = pushLayers[i];
262
- let layer = LayerUtil.geoServerWmsLayer(geoParam);
263
- map.addLayer(layer);
264
- mapView.viewLayers.push({ type: 'geoLayer', name: layerNames[geoParam.name], layer: layer });
265
- mapView.geoServerLayers.push(geoParam.name);
266
- }
257
+ for (let i = 0; i < pushLayers.length; i++) {
258
+ geoParam.name = pushLayers[i];
259
+ let layer = LayerUtil.geoServerWmsLayer(geoParam);
260
+ map.addLayer(layer);
261
+ mapView.viewLayers.push({ type: 'geoLayer', name: layerNames[geoParam.name], layer: layer });
262
+ mapView.geoServerLayers.push(geoParam.name);
267
263
  }
268
264
  }
269
265
  //再加载geoServer接口图层
@@ -307,7 +303,8 @@ export default class OM {
307
303
  }
308
304
  //显示图层范围
309
305
  let geoServerLayers = mapView.geoServerLayers;
310
- if (geoServerLayers.length > 0) {
306
+ let zoomToLayer = p.zoomToLayer ? p.zoomToLayer : true;
307
+ if (geoServerLayers.length > 0 && zoomToLayer) {
311
308
  let res = await OM.getBound({ layers: geoServerLayers });
312
309
  if (res.data) {
313
310
  var bounds = [res.data.minX, res.data.minY, res.data.maxX, res.data.maxY];