@antv/l7-component 2.19.6 → 2.19.8
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/control/layerSwitch.d.ts +6 -1
- package/es/control/layerSwitch.js +34 -1
- package/es/marker.js +1 -1
- package/es/popup/layerPopup.d.ts +1 -1
- package/es/popup/layerPopup.js +9 -3
- package/es/popup/popup.js +1 -1
- package/lib/control/layerSwitch.js +34 -1
- package/lib/popup/layerPopup.js +9 -3
- package/lib/popup/popup.js +1 -1
- package/package.json +6 -6
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
import { ILayer } from '@antv/l7-core';
|
|
2
2
|
import SelectControl, { ControlOptionItem, ISelectControlOption } from './baseControl/selectControl';
|
|
3
|
+
export type LayerSwitchItem = {
|
|
4
|
+
layer: ILayer;
|
|
5
|
+
name?: string;
|
|
6
|
+
img?: string;
|
|
7
|
+
};
|
|
3
8
|
export interface ILayerSwitchOption extends ISelectControlOption {
|
|
4
|
-
layers: Array<ILayer | string>;
|
|
9
|
+
layers: Array<ILayer | string | LayerSwitchItem>;
|
|
5
10
|
}
|
|
6
11
|
export { LayerSwitch };
|
|
7
12
|
export default class LayerSwitch extends SelectControl<ILayerSwitchOption> {
|
|
@@ -12,6 +12,9 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
|
|
|
12
12
|
import { createL7Icon } from "../utils/icon";
|
|
13
13
|
import SelectControl from "./baseControl/selectControl";
|
|
14
14
|
export { LayerSwitch };
|
|
15
|
+
function isLayerSwitchItem(obj) {
|
|
16
|
+
return obj && obj.layer;
|
|
17
|
+
}
|
|
15
18
|
var LayerSwitch = /*#__PURE__*/function (_SelectControl) {
|
|
16
19
|
_inherits(LayerSwitch, _SelectControl);
|
|
17
20
|
var _super = _createSuper(LayerSwitch);
|
|
@@ -58,7 +61,11 @@ var LayerSwitch = /*#__PURE__*/function (_SelectControl) {
|
|
|
58
61
|
var layerInstances = [];
|
|
59
62
|
layers.forEach(function (layer) {
|
|
60
63
|
if (layer instanceof Object) {
|
|
61
|
-
|
|
64
|
+
if (isLayerSwitchItem(layer)) {
|
|
65
|
+
layerInstances.push(layer.layer);
|
|
66
|
+
} else {
|
|
67
|
+
layerInstances.push(layer);
|
|
68
|
+
}
|
|
62
69
|
}
|
|
63
70
|
if (typeof layer === 'string') {
|
|
64
71
|
var targetLayer = layerService.getLayer(layer) || layerService.getLayerByName(layer);
|
|
@@ -92,6 +99,32 @@ var LayerSwitch = /*#__PURE__*/function (_SelectControl) {
|
|
|
92
99
|
}, {
|
|
93
100
|
key: "getLayerOptions",
|
|
94
101
|
value: function getLayerOptions() {
|
|
102
|
+
var _this2 = this;
|
|
103
|
+
var layers = this.controlOption.layers;
|
|
104
|
+
var isAllImg = layers === null || layers === void 0 ? void 0 : layers.every(function (item) {
|
|
105
|
+
return item.img;
|
|
106
|
+
});
|
|
107
|
+
if (layers) {
|
|
108
|
+
return layers === null || layers === void 0 ? void 0 : layers.map(function (layer) {
|
|
109
|
+
if (isLayerSwitchItem(layer)) {
|
|
110
|
+
return {
|
|
111
|
+
text: layer.name || layer.layer.name,
|
|
112
|
+
value: layer.layer.name,
|
|
113
|
+
img: isAllImg ? layer.img : undefined
|
|
114
|
+
};
|
|
115
|
+
} else if (typeof layer === 'string') {
|
|
116
|
+
var targetLayer = _this2.layerService.getLayer(layer) || _this2.layerService.getLayerByName(layer);
|
|
117
|
+
return {
|
|
118
|
+
text: targetLayer === null || targetLayer === void 0 ? void 0 : targetLayer.name,
|
|
119
|
+
value: targetLayer === null || targetLayer === void 0 ? void 0 : targetLayer.name
|
|
120
|
+
};
|
|
121
|
+
}
|
|
122
|
+
return {
|
|
123
|
+
text: layer.name,
|
|
124
|
+
value: layer.name
|
|
125
|
+
};
|
|
126
|
+
});
|
|
127
|
+
}
|
|
95
128
|
return this.layers.map(function (layer) {
|
|
96
129
|
return {
|
|
97
130
|
text: layer.name,
|
package/es/marker.js
CHANGED
|
@@ -9,7 +9,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
|
9
9
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
10
10
|
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; } }
|
|
11
11
|
import { TYPES } from '@antv/l7-core';
|
|
12
|
-
import { anchorTranslate, anchorType, applyAnchorClass, bindAll,
|
|
12
|
+
import { DOM, anchorTranslate, anchorType, applyAnchorClass, bindAll, isPC } from '@antv/l7-utils';
|
|
13
13
|
import { EventEmitter } from 'eventemitter3';
|
|
14
14
|
// marker 支持 dragger 未完成
|
|
15
15
|
var Marker = /*#__PURE__*/function (_EventEmitter) {
|
package/es/popup/layerPopup.d.ts
CHANGED
|
@@ -64,7 +64,7 @@ export default class LayerPopup extends Popup<ILayerPopupOption> {
|
|
|
64
64
|
protected onLayerMouseOut(layer: ILayer, e: any): void;
|
|
65
65
|
protected onLayerClick: (layer: ILayer, e: any) => void;
|
|
66
66
|
protected onSceneClick: () => void;
|
|
67
|
-
protected onSourceUpdate(
|
|
67
|
+
protected onSourceUpdate(): void;
|
|
68
68
|
/**
|
|
69
69
|
* 通过当前图层和对应选中的元素获取气泡展示的 HTML 内容
|
|
70
70
|
* @param layer
|
package/es/popup/layerPopup.js
CHANGED
|
@@ -102,8 +102,14 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
|
102
102
|
}, {
|
|
103
103
|
key: "setOptions",
|
|
104
104
|
value: function setOptions(option) {
|
|
105
|
+
var _newOption$items;
|
|
105
106
|
this.unbindLayerEvent();
|
|
106
|
-
|
|
107
|
+
var newOption = _objectSpread({}, option);
|
|
108
|
+
var trigger = option.trigger || this.popupOption.trigger;
|
|
109
|
+
if (((_newOption$items = newOption.items) === null || _newOption$items === void 0 ? void 0 : _newOption$items.length) === 0 && trigger === 'hover') {
|
|
110
|
+
newOption.followCursor = false;
|
|
111
|
+
}
|
|
112
|
+
_get(_getPrototypeOf(LayerPopup.prototype), "setOptions", this).call(this, newOption);
|
|
107
113
|
this.bindLayerEvent();
|
|
108
114
|
return this;
|
|
109
115
|
}
|
|
@@ -162,7 +168,7 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
|
162
168
|
}
|
|
163
169
|
}
|
|
164
170
|
var source = layer === null || layer === void 0 ? void 0 : (_layer$getSource = layer.getSource) === null || _layer$getSource === void 0 ? void 0 : _layer$getSource.call(layer);
|
|
165
|
-
var onSourceUpdate = _this2.onSourceUpdate.bind(_this2
|
|
171
|
+
var onSourceUpdate = _this2.onSourceUpdate.bind(_this2);
|
|
166
172
|
source === null || source === void 0 ? void 0 : source.on('update', onSourceUpdate);
|
|
167
173
|
layerInfo.onSourceUpdate = onSourceUpdate;
|
|
168
174
|
_this2.layerConfigMap.set(layer, layerInfo);
|
|
@@ -235,7 +241,7 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
|
235
241
|
}
|
|
236
242
|
}, {
|
|
237
243
|
key: "onSourceUpdate",
|
|
238
|
-
value: function onSourceUpdate(
|
|
244
|
+
value: function onSourceUpdate() {
|
|
239
245
|
this.hide();
|
|
240
246
|
this.displayFeatureInfo = undefined;
|
|
241
247
|
}
|
package/es/popup/popup.js
CHANGED
|
@@ -522,7 +522,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
|
|
|
522
522
|
|
|
523
523
|
// this.closeButton.type = 'button';
|
|
524
524
|
closeButton.setAttribute('aria-label', 'Close popup');
|
|
525
|
-
closeButton.addEventListener('click', function (
|
|
525
|
+
closeButton.addEventListener('click', function () {
|
|
526
526
|
_this4.hide();
|
|
527
527
|
});
|
|
528
528
|
|
|
@@ -18,6 +18,9 @@ var _icon = require("../utils/icon");
|
|
|
18
18
|
var _selectControl = _interopRequireDefault(require("./baseControl/selectControl"));
|
|
19
19
|
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); }; }
|
|
20
20
|
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; } }
|
|
21
|
+
function isLayerSwitchItem(obj) {
|
|
22
|
+
return obj && obj.layer;
|
|
23
|
+
}
|
|
21
24
|
var LayerSwitch = /*#__PURE__*/function (_SelectControl) {
|
|
22
25
|
(0, _inherits2.default)(LayerSwitch, _SelectControl);
|
|
23
26
|
var _super = _createSuper(LayerSwitch);
|
|
@@ -64,7 +67,11 @@ var LayerSwitch = /*#__PURE__*/function (_SelectControl) {
|
|
|
64
67
|
var layerInstances = [];
|
|
65
68
|
layers.forEach(function (layer) {
|
|
66
69
|
if (layer instanceof Object) {
|
|
67
|
-
|
|
70
|
+
if (isLayerSwitchItem(layer)) {
|
|
71
|
+
layerInstances.push(layer.layer);
|
|
72
|
+
} else {
|
|
73
|
+
layerInstances.push(layer);
|
|
74
|
+
}
|
|
68
75
|
}
|
|
69
76
|
if (typeof layer === 'string') {
|
|
70
77
|
var targetLayer = layerService.getLayer(layer) || layerService.getLayerByName(layer);
|
|
@@ -98,6 +105,32 @@ var LayerSwitch = /*#__PURE__*/function (_SelectControl) {
|
|
|
98
105
|
}, {
|
|
99
106
|
key: "getLayerOptions",
|
|
100
107
|
value: function getLayerOptions() {
|
|
108
|
+
var _this2 = this;
|
|
109
|
+
var layers = this.controlOption.layers;
|
|
110
|
+
var isAllImg = layers === null || layers === void 0 ? void 0 : layers.every(function (item) {
|
|
111
|
+
return item.img;
|
|
112
|
+
});
|
|
113
|
+
if (layers) {
|
|
114
|
+
return layers === null || layers === void 0 ? void 0 : layers.map(function (layer) {
|
|
115
|
+
if (isLayerSwitchItem(layer)) {
|
|
116
|
+
return {
|
|
117
|
+
text: layer.name || layer.layer.name,
|
|
118
|
+
value: layer.layer.name,
|
|
119
|
+
img: isAllImg ? layer.img : undefined
|
|
120
|
+
};
|
|
121
|
+
} else if (typeof layer === 'string') {
|
|
122
|
+
var targetLayer = _this2.layerService.getLayer(layer) || _this2.layerService.getLayerByName(layer);
|
|
123
|
+
return {
|
|
124
|
+
text: targetLayer === null || targetLayer === void 0 ? void 0 : targetLayer.name,
|
|
125
|
+
value: targetLayer === null || targetLayer === void 0 ? void 0 : targetLayer.name
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
return {
|
|
129
|
+
text: layer.name,
|
|
130
|
+
value: layer.name
|
|
131
|
+
};
|
|
132
|
+
});
|
|
133
|
+
}
|
|
101
134
|
return this.layers.map(function (layer) {
|
|
102
135
|
return {
|
|
103
136
|
text: layer.name,
|
package/lib/popup/layerPopup.js
CHANGED
|
@@ -108,8 +108,14 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
|
108
108
|
}, {
|
|
109
109
|
key: "setOptions",
|
|
110
110
|
value: function setOptions(option) {
|
|
111
|
+
var _newOption$items;
|
|
111
112
|
this.unbindLayerEvent();
|
|
112
|
-
|
|
113
|
+
var newOption = (0, _objectSpread2.default)({}, option);
|
|
114
|
+
var trigger = option.trigger || this.popupOption.trigger;
|
|
115
|
+
if (((_newOption$items = newOption.items) === null || _newOption$items === void 0 ? void 0 : _newOption$items.length) === 0 && trigger === 'hover') {
|
|
116
|
+
newOption.followCursor = false;
|
|
117
|
+
}
|
|
118
|
+
(0, _get2.default)((0, _getPrototypeOf2.default)(LayerPopup.prototype), "setOptions", this).call(this, newOption);
|
|
113
119
|
this.bindLayerEvent();
|
|
114
120
|
return this;
|
|
115
121
|
}
|
|
@@ -168,7 +174,7 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
|
168
174
|
}
|
|
169
175
|
}
|
|
170
176
|
var source = layer === null || layer === void 0 ? void 0 : (_layer$getSource = layer.getSource) === null || _layer$getSource === void 0 ? void 0 : _layer$getSource.call(layer);
|
|
171
|
-
var onSourceUpdate = _this2.onSourceUpdate.bind(_this2
|
|
177
|
+
var onSourceUpdate = _this2.onSourceUpdate.bind(_this2);
|
|
172
178
|
source === null || source === void 0 ? void 0 : source.on('update', onSourceUpdate);
|
|
173
179
|
layerInfo.onSourceUpdate = onSourceUpdate;
|
|
174
180
|
_this2.layerConfigMap.set(layer, layerInfo);
|
|
@@ -241,7 +247,7 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
|
|
|
241
247
|
}
|
|
242
248
|
}, {
|
|
243
249
|
key: "onSourceUpdate",
|
|
244
|
-
value: function onSourceUpdate(
|
|
250
|
+
value: function onSourceUpdate() {
|
|
245
251
|
this.hide();
|
|
246
252
|
this.displayFeatureInfo = undefined;
|
|
247
253
|
}
|
package/lib/popup/popup.js
CHANGED
|
@@ -528,7 +528,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
|
|
|
528
528
|
|
|
529
529
|
// this.closeButton.type = 'button';
|
|
530
530
|
closeButton.setAttribute('aria-label', 'Close popup');
|
|
531
|
-
closeButton.addEventListener('click', function (
|
|
531
|
+
closeButton.addEventListener('click', function () {
|
|
532
532
|
_this4.hide();
|
|
533
533
|
});
|
|
534
534
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antv/l7-component",
|
|
3
|
-
"version": "2.19.
|
|
3
|
+
"version": "2.19.8",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "es/index.js",
|
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
"author": "lzxue",
|
|
27
27
|
"license": "ISC",
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@antv/l7-core": "2.19.
|
|
30
|
-
"@antv/l7-utils": "2.19.
|
|
29
|
+
"@antv/l7-core": "2.19.8",
|
|
30
|
+
"@antv/l7-utils": "2.19.8",
|
|
31
31
|
"@babel/runtime": "^7.7.7",
|
|
32
32
|
"eventemitter3": "^4.0.0",
|
|
33
33
|
"inversify": "^5.0.1",
|
|
@@ -35,12 +35,12 @@
|
|
|
35
35
|
"supercluster": "^7.0.0"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@antv/l7-layers": "2.19.
|
|
39
|
-
"@antv/l7-test-utils": "2.19.
|
|
38
|
+
"@antv/l7-layers": "2.19.8",
|
|
39
|
+
"@antv/l7-test-utils": "2.19.8",
|
|
40
40
|
"gcoord": "^0.3.2",
|
|
41
41
|
"less": "^4.1.3"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "9111d4c9dcbeca5df641a994215c062e5b209311",
|
|
44
44
|
"publishConfig": {
|
|
45
45
|
"access": "public"
|
|
46
46
|
}
|