Skip to content

Commit 5b79c1f

Browse files
update iclient-mapboxgl fix 图层管理组件全选相同投影图层报错
1 parent 5953000 commit 5b79c1f

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/mapboxgl/web-map/control/layer-manager/LayerManagerViewModel.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ class LayerManageViewModel extends mapboxgl.Evented {
3636
serverUrl,
3737
withCredentials,
3838
layerFilter,
39-
proxy
39+
proxy,
40+
mapOptions
4041
});
4142
}
4243
return;
@@ -71,7 +72,7 @@ class LayerManageViewModel extends mapboxgl.Evented {
7172
projectionnotmatch: (e) => {
7273
this.fire('projectionnotmatch', { nodeKey, e });
7374
this.handleNextMap();
74-
},
75+
}
7576
});
7677
// this.webMapViewModel.addWebMap(layerFilter);
7778
this.cacheMaps[nodeKey] = this.webMapViewModel;
@@ -80,8 +81,8 @@ class LayerManageViewModel extends mapboxgl.Evented {
8081
handleNextMap() {
8182
this.readyNext = true;
8283
if (this.mapQuene.length) {
83-
const { nodeKey, serverUrl, mapId, withCredentials, layerFilter } = this.mapQuene.shift();
84-
this.addLayer({ nodeKey, serverUrl, mapId, withCredentials, layerFilter });
84+
const { nodeKey, serverUrl, mapId, withCredentials, layerFilter, mapOptions } = this.mapQuene.shift();
85+
this.addLayer({ nodeKey, serverUrl, mapId, withCredentials, layerFilter, mapOptions });
8586
}
8687
}
8788

src/mapboxgl/web-map/control/layer-manager/__tests__/LayerManagerViewModel.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ describe('LayerManagerViewModel', () => {
108108

109109
it('addLayer and remove', () => {
110110
let nodeKey = 'key1';
111-
const data = { nodeKey, mapId: 123, serviceUrl: 'http://fakeservice' };
111+
const data = { nodeKey, mapId: 123, serviceUrl: 'http://fakeservice', mapOptions: { zoom: 10 } };
112112
expect(viewModel.cacheMaps[nodeKey]).toBeUndefined();
113113
viewModel.addLayer(data);
114114
expect(viewModel.cacheMaps[nodeKey]).not.toBeUndefined();
@@ -120,6 +120,7 @@ describe('LayerManagerViewModel', () => {
120120
viewModel.readyNext = false;
121121
viewModel.addLayer(data);
122122
expect(viewModel.mapQuene.length).toBe(1);
123+
expect(viewModel.mapQuene[0].mapOptions.zoom).toBe(10);
123124
expect(viewModel.mapQuene[0].nodeKey).toBe(nodeKey);
124125
data.nodeKey = nodeKey;
125126
viewModel.readyNext = false;

static/libs/iclient-mapboxgl/iclient-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.

0 commit comments

Comments
 (0)