@antv/l7-component 2.15.2 → 2.15.4
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.
- package/es/assets/iconfont/iconfont.js +10 -17
- package/es/control/baseControl/buttonControl.js +9 -42
- package/es/control/baseControl/control.js +24 -53
- package/es/control/baseControl/popperControl.js +10 -24
- package/es/control/baseControl/selectControl.js +6 -45
- package/es/control/exportImage.js +76 -116
- package/es/control/fullscreen.js +20 -53
- package/es/control/geoLocate.js +36 -66
- package/es/control/layerSwitch.js +0 -31
- package/es/control/logo.js +2 -14
- package/es/control/mapTheme.js +7 -32
- package/es/control/mouseLocation.js +2 -23
- package/es/control/scale.js +6 -29
- package/es/control/zoom.js +0 -23
- package/es/index.js +2 -12
- package/es/marker-layer.js +41 -75
- package/es/marker.js +31 -85
- package/es/popup/layerPopup.js +31 -82
- package/es/popup/popup.js +48 -127
- package/es/utils/anchor.js +3 -7
- package/es/utils/popper.js +15 -64
- package/es/utils/screenfull.js +23 -52
- package/lib/assets/iconfont/iconfont.js +10 -17
- package/lib/control/baseControl/buttonControl.js +9 -52
- package/lib/control/baseControl/control.js +24 -68
- package/lib/control/baseControl/index.js +0 -8
- package/lib/control/baseControl/popperControl.js +10 -29
- package/lib/control/baseControl/selectControl.js +6 -60
- package/lib/control/exportImage.js +76 -125
- package/lib/control/fullscreen.js +20 -60
- package/lib/control/geoLocate.js +36 -75
- package/lib/control/layerSwitch.js +0 -36
- package/lib/control/logo.js +2 -26
- package/lib/control/mapTheme.js +7 -42
- package/lib/control/mouseLocation.js +2 -33
- package/lib/control/scale.js +6 -40
- package/lib/control/zoom.js +0 -33
- package/lib/index.js +0 -41
- package/lib/marker-layer.js +39 -86
- package/lib/marker.js +30 -92
- package/lib/popup/layerPopup.js +29 -94
- package/lib/popup/popup.js +48 -139
- package/lib/utils/anchor.js +4 -9
- package/lib/utils/icon.js +0 -2
- package/lib/utils/popper.js +14 -71
- package/lib/utils/screenfull.js +23 -54
- package/package.json +6 -6
package/lib/popup/layerPopup.js
CHANGED
|
@@ -1,67 +1,44 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.default = exports.LayerPopup = void 0;
|
|
9
|
-
|
|
10
8
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
11
|
-
|
|
12
9
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
13
|
-
|
|
14
10
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
15
|
-
|
|
16
11
|
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
17
|
-
|
|
18
12
|
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
19
|
-
|
|
20
13
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
21
|
-
|
|
22
14
|
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
23
|
-
|
|
24
15
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
25
|
-
|
|
26
16
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
27
|
-
|
|
28
17
|
var _l7Utils = require("@antv/l7-utils");
|
|
29
|
-
|
|
30
18
|
var _lodash = require("lodash");
|
|
31
|
-
|
|
32
19
|
var _popup = _interopRequireDefault(require("./popup"));
|
|
33
|
-
|
|
34
20
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
35
|
-
|
|
36
21
|
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
37
|
-
|
|
38
22
|
var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
39
23
|
(0, _inherits2.default)(LayerPopup, _Popup);
|
|
40
|
-
|
|
41
24
|
var _super = _createSuper(LayerPopup);
|
|
42
|
-
|
|
43
25
|
function LayerPopup() {
|
|
44
26
|
var _this;
|
|
45
|
-
|
|
46
27
|
(0, _classCallCheck2.default)(this, LayerPopup);
|
|
47
|
-
|
|
48
28
|
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
49
29
|
args[_key] = arguments[_key];
|
|
50
30
|
}
|
|
51
|
-
|
|
52
31
|
_this = _super.call.apply(_super, [this].concat(args));
|
|
53
32
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "layerConfigMap", new WeakMap());
|
|
54
33
|
return _this;
|
|
55
34
|
}
|
|
56
|
-
|
|
57
35
|
(0, _createClass2.default)(LayerPopup, [{
|
|
58
36
|
key: "layerConfigItems",
|
|
59
37
|
get: function get() {
|
|
60
38
|
var _ref;
|
|
61
|
-
|
|
62
39
|
var _this$popupOption = this.popupOption,
|
|
63
|
-
|
|
64
|
-
|
|
40
|
+
config = _this$popupOption.config,
|
|
41
|
+
items = _this$popupOption.items;
|
|
65
42
|
return (_ref = config !== null && config !== void 0 ? config : items) !== null && _ref !== void 0 ? _ref : [];
|
|
66
43
|
}
|
|
67
44
|
}, {
|
|
@@ -105,93 +82,72 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
|
105
82
|
closeOnEsc: false
|
|
106
83
|
});
|
|
107
84
|
}
|
|
85
|
+
|
|
108
86
|
/**
|
|
109
87
|
* 绑定对应的图层事件
|
|
110
88
|
* @protected
|
|
111
89
|
*/
|
|
112
|
-
|
|
113
90
|
}, {
|
|
114
91
|
key: "bindLayerEvent",
|
|
115
92
|
value: function bindLayerEvent() {
|
|
116
93
|
var _this2 = this;
|
|
117
|
-
|
|
118
94
|
var trigger = this.popupOption.trigger;
|
|
119
95
|
this.layerConfigItems.forEach(function (configItem) {
|
|
120
96
|
var _layer$getSource;
|
|
121
|
-
|
|
122
97
|
var layer = _this2.getLayerByConfig(configItem);
|
|
123
|
-
|
|
124
98
|
if (!layer) {
|
|
125
99
|
return;
|
|
126
100
|
}
|
|
127
|
-
|
|
128
101
|
var layerInfo = (0, _objectSpread2.default)({}, configItem);
|
|
129
|
-
|
|
130
102
|
if (trigger === 'hover') {
|
|
131
103
|
var onMouseMove = _this2.onLayerMouseMove.bind(_this2, layer);
|
|
132
|
-
|
|
133
104
|
var onMouseOut = _this2.onLayerMouseOut.bind(_this2, layer);
|
|
134
|
-
|
|
135
105
|
layerInfo.onMouseMove = onMouseMove;
|
|
136
106
|
layerInfo.onMouseOut = onMouseOut;
|
|
137
107
|
layer === null || layer === void 0 ? void 0 : layer.on('mousemove', onMouseMove);
|
|
138
108
|
layer === null || layer === void 0 ? void 0 : layer.on('mouseout', onMouseOut);
|
|
139
109
|
} else {
|
|
140
110
|
var onClick = _this2.onLayerClick.bind(_this2, layer);
|
|
141
|
-
|
|
142
111
|
layerInfo.onClick = onClick;
|
|
143
112
|
layer === null || layer === void 0 ? void 0 : layer.on('click', onClick);
|
|
144
113
|
}
|
|
145
|
-
|
|
146
114
|
var source = layer === null || layer === void 0 ? void 0 : (_layer$getSource = layer.getSource) === null || _layer$getSource === void 0 ? void 0 : _layer$getSource.call(layer);
|
|
147
|
-
|
|
148
115
|
var onSourceUpdate = _this2.onSourceUpdate.bind(_this2, layer);
|
|
149
|
-
|
|
150
116
|
source === null || source === void 0 ? void 0 : source.on('update', onSourceUpdate);
|
|
151
117
|
layerInfo.onSourceUpdate = onSourceUpdate;
|
|
152
|
-
|
|
153
118
|
_this2.layerConfigMap.set(layer, layerInfo);
|
|
154
119
|
});
|
|
155
120
|
}
|
|
121
|
+
|
|
156
122
|
/**
|
|
157
123
|
* 解绑对应的图层事件
|
|
158
124
|
* @protected
|
|
159
125
|
*/
|
|
160
|
-
|
|
161
126
|
}, {
|
|
162
127
|
key: "unbindLayerEvent",
|
|
163
128
|
value: function unbindLayerEvent() {
|
|
164
129
|
var _this3 = this;
|
|
165
|
-
|
|
166
130
|
this.layerConfigItems.forEach(function (configItem) {
|
|
167
131
|
var layer = _this3.getLayerByConfig(configItem);
|
|
168
|
-
|
|
169
132
|
var layerInfo = layer && _this3.layerConfigMap.get(layer);
|
|
170
|
-
|
|
171
133
|
if (!layerInfo) {
|
|
172
134
|
return;
|
|
173
135
|
}
|
|
174
|
-
|
|
175
136
|
var onMouseMove = layerInfo.onMouseMove,
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
137
|
+
onMouseOut = layerInfo.onMouseOut,
|
|
138
|
+
onClick = layerInfo.onClick,
|
|
139
|
+
onSourceUpdate = layerInfo.onSourceUpdate;
|
|
180
140
|
if (onMouseMove) {
|
|
181
141
|
layer.off('mousemove', onMouseMove);
|
|
182
142
|
}
|
|
183
|
-
|
|
184
143
|
if (onMouseOut) {
|
|
185
144
|
layer.off('mouseout', onMouseOut);
|
|
186
145
|
}
|
|
187
|
-
|
|
188
146
|
if (onClick) {
|
|
189
147
|
layer.off('click', onClick);
|
|
190
148
|
}
|
|
191
|
-
|
|
192
149
|
if (onSourceUpdate) {
|
|
193
150
|
var _layer$getSource2;
|
|
194
|
-
|
|
195
151
|
layer === null || layer === void 0 ? void 0 : (_layer$getSource2 = layer.getSource()) === null || _layer$getSource2 === void 0 ? void 0 : _layer$getSource2.off('update', onSourceUpdate);
|
|
196
152
|
}
|
|
197
153
|
});
|
|
@@ -201,9 +157,8 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
|
201
157
|
value: function onLayerMouseMove(layer, e) {
|
|
202
158
|
if (!this.isSameFeature(layer, e.featureId)) {
|
|
203
159
|
var _this$getLayerInfoFra = this.getLayerInfoFrag(layer, e),
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
160
|
+
title = _this$getLayerInfoFra.title,
|
|
161
|
+
content = _this$getLayerInfoFra.content;
|
|
207
162
|
this.setDOMContent(content);
|
|
208
163
|
this.setTitle(title);
|
|
209
164
|
this.displayFeatureInfo = {
|
|
@@ -212,13 +167,13 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
|
212
167
|
};
|
|
213
168
|
this.show();
|
|
214
169
|
}
|
|
215
|
-
}
|
|
170
|
+
}
|
|
216
171
|
|
|
172
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
217
173
|
}, {
|
|
218
174
|
key: "onLayerMouseOut",
|
|
219
175
|
value: function onLayerMouseOut(layer, e) {
|
|
220
176
|
this.displayFeatureInfo = undefined;
|
|
221
|
-
|
|
222
177
|
if (this.isShow) {
|
|
223
178
|
this.hide();
|
|
224
179
|
}
|
|
@@ -230,9 +185,8 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
|
230
185
|
this.hide();
|
|
231
186
|
} else {
|
|
232
187
|
var _this$getLayerInfoFra2 = this.getLayerInfoFrag(layer, e),
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
188
|
+
title = _this$getLayerInfoFra2.title,
|
|
189
|
+
content = _this$getLayerInfoFra2.content;
|
|
236
190
|
this.setDOMContent(content);
|
|
237
191
|
this.setLnglat(e.lngLat);
|
|
238
192
|
this.setTitle(title);
|
|
@@ -249,70 +203,57 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
|
249
203
|
this.hide();
|
|
250
204
|
this.displayFeatureInfo = undefined;
|
|
251
205
|
}
|
|
206
|
+
|
|
252
207
|
/**
|
|
253
208
|
* 通过当前图层和对应选中的元素获取气泡展示的 HTML 内容
|
|
254
209
|
* @param layer
|
|
255
210
|
* @param e
|
|
256
211
|
* @protected
|
|
257
212
|
*/
|
|
258
|
-
|
|
259
213
|
}, {
|
|
260
214
|
key: "getLayerInfoFrag",
|
|
261
215
|
value: function getLayerInfoFrag(layer, e) {
|
|
262
216
|
var layerInfo = this.layerConfigMap.get(layer);
|
|
263
217
|
var titleFrag;
|
|
264
218
|
var contentFrag = document.createDocumentFragment();
|
|
265
|
-
|
|
266
219
|
if (layerInfo) {
|
|
267
220
|
var _feature = e.feature;
|
|
268
|
-
|
|
269
221
|
if (_feature.type === 'Feature' && 'properties' in _feature && 'geometry' in _feature) {
|
|
270
222
|
_feature = _feature.properties;
|
|
271
223
|
}
|
|
272
|
-
|
|
273
224
|
var title = layerInfo.title,
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
225
|
+
fields = layerInfo.fields,
|
|
226
|
+
customContent = layerInfo.customContent;
|
|
277
227
|
if (title) {
|
|
278
228
|
titleFrag = document.createDocumentFragment();
|
|
279
229
|
var titleElement = title instanceof Function ? title(_feature) : title;
|
|
280
|
-
|
|
281
230
|
_l7Utils.DOM.appendElementType(titleFrag, titleElement);
|
|
282
231
|
}
|
|
283
|
-
|
|
284
232
|
if (customContent) {
|
|
285
233
|
var content = customContent instanceof Function ? customContent(_feature) : customContent;
|
|
286
|
-
|
|
287
234
|
_l7Utils.DOM.appendElementType(contentFrag, content);
|
|
288
235
|
} else if (fields !== null && fields !== void 0 && fields.length) {
|
|
289
236
|
fields === null || fields === void 0 ? void 0 : fields.forEach(function (fieldConfig) {
|
|
290
237
|
var _ref3, _ref4;
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
238
|
+
var _ref2 = typeof fieldConfig === 'string' ?
|
|
239
|
+
// tslint:disable-next-line:no-object-literal-type-assertion
|
|
240
|
+
{
|
|
241
|
+
field: fieldConfig
|
|
242
|
+
} : fieldConfig,
|
|
243
|
+
field = _ref2.field,
|
|
244
|
+
formatField = _ref2.formatField,
|
|
245
|
+
formatValue = _ref2.formatValue,
|
|
246
|
+
getValue = _ref2.getValue;
|
|
301
247
|
var row = _l7Utils.DOM.create('div', 'l7-layer-popup__row');
|
|
302
|
-
|
|
303
248
|
var value = getValue ? getValue(e.feature) : (0, _lodash.get)(_feature, field);
|
|
304
249
|
var fieldElement = (_ref3 = formatField instanceof Function ? formatField(field, _feature) : formatField) !== null && _ref3 !== void 0 ? _ref3 : field;
|
|
305
250
|
var valueElement = (_ref4 = formatValue instanceof Function ? formatValue(value, _feature) : formatValue) !== null && _ref4 !== void 0 ? _ref4 : value;
|
|
306
|
-
|
|
307
251
|
var fieldSpan = _l7Utils.DOM.create('span', 'l7-layer-popup__key', row);
|
|
308
|
-
|
|
309
252
|
_l7Utils.DOM.appendElementType(fieldSpan, fieldElement);
|
|
310
|
-
|
|
311
253
|
_l7Utils.DOM.appendElementType(fieldSpan, document.createTextNode(':'));
|
|
254
|
+
var valueSpan = _l7Utils.DOM.create('span', 'l7-layer-popup__value', row);
|
|
312
255
|
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
256
|
+
// 当 value 中每项元素均为基础数据类型时,用逗号隔开
|
|
316
257
|
if (Array.isArray(valueElement) && valueElement.every(function (item) {
|
|
317
258
|
return !(item instanceof Object);
|
|
318
259
|
})) {
|
|
@@ -320,45 +261,40 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
|
320
261
|
return String(item);
|
|
321
262
|
}).join(',');
|
|
322
263
|
}
|
|
323
|
-
|
|
324
264
|
_l7Utils.DOM.appendElementType(valueSpan, valueElement);
|
|
325
|
-
|
|
326
265
|
contentFrag.appendChild(row);
|
|
327
266
|
});
|
|
328
267
|
}
|
|
329
268
|
}
|
|
330
|
-
|
|
331
269
|
return {
|
|
332
270
|
title: titleFrag,
|
|
333
271
|
content: contentFrag
|
|
334
272
|
};
|
|
335
273
|
}
|
|
274
|
+
|
|
336
275
|
/**
|
|
337
276
|
* 通过 Layer 配置访问到真实的 Layer 实例
|
|
338
277
|
* @param configItem
|
|
339
278
|
* @protected
|
|
340
279
|
*/
|
|
341
|
-
|
|
342
280
|
}, {
|
|
343
281
|
key: "getLayerByConfig",
|
|
344
282
|
value: function getLayerByConfig(configItem) {
|
|
345
283
|
var layer = configItem.layer;
|
|
346
|
-
|
|
347
284
|
if (layer instanceof Object) {
|
|
348
285
|
return layer;
|
|
349
286
|
}
|
|
350
|
-
|
|
351
287
|
if (typeof layer === 'string') {
|
|
352
288
|
return this.layerService.getLayer(layer) || this.layerService.getLayerByName(layer);
|
|
353
289
|
}
|
|
354
290
|
}
|
|
291
|
+
|
|
355
292
|
/**
|
|
356
293
|
* 判断当前展示的 Feature 是否和上一次查看的一致
|
|
357
294
|
* @param layer
|
|
358
295
|
* @param featureId
|
|
359
296
|
* @protected
|
|
360
297
|
*/
|
|
361
|
-
|
|
362
298
|
}, {
|
|
363
299
|
key: "isSameFeature",
|
|
364
300
|
value: function isSameFeature(layer, featureId) {
|
|
@@ -368,5 +304,4 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
|
368
304
|
}]);
|
|
369
305
|
return LayerPopup;
|
|
370
306
|
}(_popup.default);
|
|
371
|
-
|
|
372
307
|
exports.default = exports.LayerPopup = LayerPopup;
|