@vtx/map 1.1.6 → 1.1.7-beta.1
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/README.md +1 -1
- package/lib/VtxMap/BMap/Map.js +1 -1
- package/lib/VtxMap/OMap/Map.js +43 -43
- package/lib/VtxMap/OMap/Map.less +70 -70
- package/lib/VtxMap/OlMap/Map.js +398 -90
- package/lib/VtxMap/OlMap/Map.less +121 -121
- package/lib/VtxMap/TMap/TMap.js +18 -18
- package/lib/default.js +3 -1
- package/package.json +3 -3
|
@@ -1,122 +1,122 @@
|
|
|
1
|
-
.map{
|
|
2
|
-
width: 100%;
|
|
3
|
-
height: 100%;
|
|
4
|
-
background-color: #f1f1f1;
|
|
5
|
-
}
|
|
6
|
-
.vtx_gmap_html_points,.vtx_gmap_html_pointCollection{
|
|
7
|
-
position: absolute;
|
|
8
|
-
top: 0px;
|
|
9
|
-
left: 0px;
|
|
10
|
-
}
|
|
11
|
-
.esriSimpleSlider{
|
|
12
|
-
z-index: 10000000 !important;
|
|
13
|
-
}
|
|
14
|
-
.label-content{
|
|
15
|
-
/*margin-left: 0;
|
|
16
|
-
width: 100px;
|
|
17
|
-
line-height: 25px;
|
|
18
|
-
text-align: center;
|
|
19
|
-
position: relative;
|
|
20
|
-
left: -43px;
|
|
21
|
-
background-color: #fff;
|
|
22
|
-
opacity: 1;
|
|
23
|
-
border-radius: 5px;
|
|
24
|
-
color: #5DD0EE;
|
|
25
|
-
word-break: break-all;
|
|
26
|
-
white-space: normal;
|
|
27
|
-
padding: 2px 8px;*/
|
|
28
|
-
display: inline-block;
|
|
29
|
-
padding: 5px;
|
|
30
|
-
line-height: 22px;
|
|
31
|
-
text-align: center;
|
|
32
|
-
border-radius: 5px;
|
|
33
|
-
background-color: #fff;
|
|
34
|
-
opacity: 1;
|
|
35
|
-
color: #5DD0EE;
|
|
36
|
-
}
|
|
37
|
-
.vtx-g-rangingPoint{
|
|
38
|
-
width: 7px;
|
|
39
|
-
height: 7px;
|
|
40
|
-
background-color: #fff;
|
|
41
|
-
border: 2px solid #ff0000;
|
|
42
|
-
display: inline-block;
|
|
43
|
-
border-radius: 7px;
|
|
44
|
-
}
|
|
45
|
-
.vtx-g-rangingDistance{
|
|
46
|
-
position: relative;
|
|
47
|
-
top: -36px;
|
|
48
|
-
left: 15px;
|
|
49
|
-
height: 30px;
|
|
50
|
-
line-height: 28px;
|
|
51
|
-
background-color: #fff;
|
|
52
|
-
border: 1px solid #ff0000;
|
|
53
|
-
font-size: 12px;
|
|
54
|
-
word-break: keep-all;
|
|
55
|
-
padding: 0px 3px;
|
|
56
|
-
}
|
|
57
|
-
.vtx-g-rang-exit{
|
|
58
|
-
width: 9px;
|
|
59
|
-
height: 9px;
|
|
60
|
-
background-color: #fff;
|
|
61
|
-
border: 2px solid #ff0000;
|
|
62
|
-
color: #ff0000;
|
|
63
|
-
line-height: 7px;
|
|
64
|
-
text-align: center;
|
|
65
|
-
font-size: 12px;
|
|
66
|
-
cursor: pointer;
|
|
67
|
-
}
|
|
68
|
-
.vtx-g-rang-showRangTool{
|
|
69
|
-
line-height: 18px;
|
|
70
|
-
font-size: 12px;
|
|
71
|
-
border: 1px solid #ff0000;
|
|
72
|
-
word-break: keep-all;
|
|
73
|
-
background-color: #fff;
|
|
74
|
-
padding: 0px 5px;
|
|
75
|
-
}
|
|
76
|
-
.zoom_slider_show_scale{
|
|
77
|
-
padding: 1px 8px;
|
|
78
|
-
font-size: 12px;
|
|
79
|
-
text-align: center;
|
|
80
|
-
}
|
|
81
|
-
.zoom_slider_show_bottom{
|
|
82
|
-
width: 100%;
|
|
83
|
-
height: 3px;
|
|
84
|
-
border: 1px solid #000;
|
|
85
|
-
border-bottom: 3px solid #000;
|
|
86
|
-
border-top: 0px;
|
|
87
|
-
}
|
|
88
|
-
.ol-tooltip {
|
|
89
|
-
position: relative;
|
|
90
|
-
background: rgba(0, 0, 0, 0.5);
|
|
91
|
-
border-radius: 4px;
|
|
92
|
-
color: white;
|
|
93
|
-
padding: 4px 8px;
|
|
94
|
-
opacity: 0.7;
|
|
95
|
-
white-space: nowrap;
|
|
96
|
-
font-size: 12px;
|
|
97
|
-
cursor: default;
|
|
98
|
-
user-select: none;
|
|
99
|
-
}
|
|
100
|
-
.ol-tooltip-measure {
|
|
101
|
-
opacity: 1;
|
|
102
|
-
font-weight: bold;
|
|
103
|
-
}
|
|
104
|
-
.ol-tooltip-static {
|
|
105
|
-
background-color: #ffcc33;
|
|
106
|
-
color: black;
|
|
107
|
-
border: 1px solid white;
|
|
108
|
-
}
|
|
109
|
-
.ol-tooltip-measure:before,
|
|
110
|
-
.ol-tooltip-static:before {
|
|
111
|
-
border-top: 6px solid rgba(0, 0, 0, 0.5);
|
|
112
|
-
border-right: 6px solid transparent;
|
|
113
|
-
border-left: 6px solid transparent;
|
|
114
|
-
content: "";
|
|
115
|
-
position: absolute;
|
|
116
|
-
bottom: -6px;
|
|
117
|
-
margin-left: -7px;
|
|
118
|
-
left: 50%;
|
|
119
|
-
}
|
|
120
|
-
.ol-tooltip-static:before {
|
|
121
|
-
border-top-color: #ffcc33;
|
|
1
|
+
.map{
|
|
2
|
+
width: 100%;
|
|
3
|
+
height: 100%;
|
|
4
|
+
background-color: #f1f1f1;
|
|
5
|
+
}
|
|
6
|
+
.vtx_gmap_html_points,.vtx_gmap_html_pointCollection{
|
|
7
|
+
position: absolute;
|
|
8
|
+
top: 0px;
|
|
9
|
+
left: 0px;
|
|
10
|
+
}
|
|
11
|
+
.esriSimpleSlider{
|
|
12
|
+
z-index: 10000000 !important;
|
|
13
|
+
}
|
|
14
|
+
.label-content{
|
|
15
|
+
/*margin-left: 0;
|
|
16
|
+
width: 100px;
|
|
17
|
+
line-height: 25px;
|
|
18
|
+
text-align: center;
|
|
19
|
+
position: relative;
|
|
20
|
+
left: -43px;
|
|
21
|
+
background-color: #fff;
|
|
22
|
+
opacity: 1;
|
|
23
|
+
border-radius: 5px;
|
|
24
|
+
color: #5DD0EE;
|
|
25
|
+
word-break: break-all;
|
|
26
|
+
white-space: normal;
|
|
27
|
+
padding: 2px 8px;*/
|
|
28
|
+
display: inline-block;
|
|
29
|
+
padding: 5px;
|
|
30
|
+
line-height: 22px;
|
|
31
|
+
text-align: center;
|
|
32
|
+
border-radius: 5px;
|
|
33
|
+
background-color: #fff;
|
|
34
|
+
opacity: 1;
|
|
35
|
+
color: #5DD0EE;
|
|
36
|
+
}
|
|
37
|
+
.vtx-g-rangingPoint{
|
|
38
|
+
width: 7px;
|
|
39
|
+
height: 7px;
|
|
40
|
+
background-color: #fff;
|
|
41
|
+
border: 2px solid #ff0000;
|
|
42
|
+
display: inline-block;
|
|
43
|
+
border-radius: 7px;
|
|
44
|
+
}
|
|
45
|
+
.vtx-g-rangingDistance{
|
|
46
|
+
position: relative;
|
|
47
|
+
top: -36px;
|
|
48
|
+
left: 15px;
|
|
49
|
+
height: 30px;
|
|
50
|
+
line-height: 28px;
|
|
51
|
+
background-color: #fff;
|
|
52
|
+
border: 1px solid #ff0000;
|
|
53
|
+
font-size: 12px;
|
|
54
|
+
word-break: keep-all;
|
|
55
|
+
padding: 0px 3px;
|
|
56
|
+
}
|
|
57
|
+
.vtx-g-rang-exit{
|
|
58
|
+
width: 9px;
|
|
59
|
+
height: 9px;
|
|
60
|
+
background-color: #fff;
|
|
61
|
+
border: 2px solid #ff0000;
|
|
62
|
+
color: #ff0000;
|
|
63
|
+
line-height: 7px;
|
|
64
|
+
text-align: center;
|
|
65
|
+
font-size: 12px;
|
|
66
|
+
cursor: pointer;
|
|
67
|
+
}
|
|
68
|
+
.vtx-g-rang-showRangTool{
|
|
69
|
+
line-height: 18px;
|
|
70
|
+
font-size: 12px;
|
|
71
|
+
border: 1px solid #ff0000;
|
|
72
|
+
word-break: keep-all;
|
|
73
|
+
background-color: #fff;
|
|
74
|
+
padding: 0px 5px;
|
|
75
|
+
}
|
|
76
|
+
.zoom_slider_show_scale{
|
|
77
|
+
padding: 1px 8px;
|
|
78
|
+
font-size: 12px;
|
|
79
|
+
text-align: center;
|
|
80
|
+
}
|
|
81
|
+
.zoom_slider_show_bottom{
|
|
82
|
+
width: 100%;
|
|
83
|
+
height: 3px;
|
|
84
|
+
border: 1px solid #000;
|
|
85
|
+
border-bottom: 3px solid #000;
|
|
86
|
+
border-top: 0px;
|
|
87
|
+
}
|
|
88
|
+
.ol-tooltip {
|
|
89
|
+
position: relative;
|
|
90
|
+
background: rgba(0, 0, 0, 0.5);
|
|
91
|
+
border-radius: 4px;
|
|
92
|
+
color: white;
|
|
93
|
+
padding: 4px 8px;
|
|
94
|
+
opacity: 0.7;
|
|
95
|
+
white-space: nowrap;
|
|
96
|
+
font-size: 12px;
|
|
97
|
+
cursor: default;
|
|
98
|
+
user-select: none;
|
|
99
|
+
}
|
|
100
|
+
.ol-tooltip-measure {
|
|
101
|
+
opacity: 1;
|
|
102
|
+
font-weight: bold;
|
|
103
|
+
}
|
|
104
|
+
.ol-tooltip-static {
|
|
105
|
+
background-color: #ffcc33;
|
|
106
|
+
color: black;
|
|
107
|
+
border: 1px solid white;
|
|
108
|
+
}
|
|
109
|
+
.ol-tooltip-measure:before,
|
|
110
|
+
.ol-tooltip-static:before {
|
|
111
|
+
border-top: 6px solid rgba(0, 0, 0, 0.5);
|
|
112
|
+
border-right: 6px solid transparent;
|
|
113
|
+
border-left: 6px solid transparent;
|
|
114
|
+
content: "";
|
|
115
|
+
position: absolute;
|
|
116
|
+
bottom: -6px;
|
|
117
|
+
margin-left: -7px;
|
|
118
|
+
left: 50%;
|
|
119
|
+
}
|
|
120
|
+
.ol-tooltip-static:before {
|
|
121
|
+
border-top-color: #ffcc33;
|
|
122
122
|
}
|
package/lib/VtxMap/TMap/TMap.js
CHANGED
|
@@ -1587,11 +1587,11 @@ var TMap = function (_React$Component) {
|
|
|
1587
1587
|
infowindow && t.state.gis.closeInfoWindow();
|
|
1588
1588
|
}
|
|
1589
1589
|
}
|
|
1590
|
-
/*
|
|
1591
|
-
参数
|
|
1592
|
-
geometryType:point/polyline/polygon/circle/rectangle 默认point
|
|
1593
|
-
parameter 样式 默认null 对象{}写入方式跟add方法一样(对应点线圆面)
|
|
1594
|
-
data //初始化数据 默认{id:'add'}
|
|
1590
|
+
/*
|
|
1591
|
+
参数
|
|
1592
|
+
geometryType:point/polyline/polygon/circle/rectangle 默认point
|
|
1593
|
+
parameter 样式 默认null 对象{}写入方式跟add方法一样(对应点线圆面)
|
|
1594
|
+
data //初始化数据 默认{id:'add'}
|
|
1595
1595
|
*/
|
|
1596
1596
|
|
|
1597
1597
|
}, {
|
|
@@ -2799,10 +2799,10 @@ var TMap = function (_React$Component) {
|
|
|
2799
2799
|
t.clearAllPointCollection();
|
|
2800
2800
|
}
|
|
2801
2801
|
|
|
2802
|
-
/*点数据处理
|
|
2803
|
-
pointData[2]相同的点,执行刷新
|
|
2804
|
-
pointData[1]的数据在idsForGraphicId中不存在的,执行新增
|
|
2805
|
-
pointData[0]数据中多余的id,执行删除
|
|
2802
|
+
/*点数据处理
|
|
2803
|
+
pointData[2]相同的点,执行刷新
|
|
2804
|
+
pointData[1]的数据在idsForGraphicId中不存在的,执行新增
|
|
2805
|
+
pointData[0]数据中多余的id,执行删除
|
|
2806
2806
|
*/
|
|
2807
2807
|
if (mapPoints instanceof Array && t.props.mapPoints instanceof Array && !t.deepEqual(mapPoints, t.props.mapPoints)) {
|
|
2808
2808
|
var oldMapPoints = t.props.mapPoints;
|
|
@@ -2862,9 +2862,9 @@ var TMap = function (_React$Component) {
|
|
|
2862
2862
|
//更新
|
|
2863
2863
|
t.updatePoint([].concat(_toConsumableArray(upds), _toConsumableArray(otherupds)));
|
|
2864
2864
|
}
|
|
2865
|
-
/*
|
|
2866
|
-
面数据处理
|
|
2867
|
-
先全删除,再新增
|
|
2865
|
+
/*
|
|
2866
|
+
面数据处理
|
|
2867
|
+
先全删除,再新增
|
|
2868
2868
|
*/
|
|
2869
2869
|
if (mapPolygons instanceof Array && t.props.mapPolygons instanceof Array && !t.deepEqual(mapPolygons, t.props.mapPolygons)) {
|
|
2870
2870
|
var oldMapPolygons = t.props.mapPolygons;
|
|
@@ -2923,9 +2923,9 @@ var TMap = function (_React$Component) {
|
|
|
2923
2923
|
//更新
|
|
2924
2924
|
t.updatePolygon([].concat(_toConsumableArray(_upds), _toConsumableArray(_otherupds)));
|
|
2925
2925
|
}
|
|
2926
|
-
/*
|
|
2927
|
-
圆数据处理
|
|
2928
|
-
先全删除,再新增
|
|
2926
|
+
/*
|
|
2927
|
+
圆数据处理
|
|
2928
|
+
先全删除,再新增
|
|
2929
2929
|
*/
|
|
2930
2930
|
if (mapCircles instanceof Array && t.props.mapCircles instanceof Array && !t.deepEqual(mapCircles, t.props.mapCircles)) {
|
|
2931
2931
|
var oldMapCircles = t.props.mapCircles;
|
|
@@ -2984,9 +2984,9 @@ var TMap = function (_React$Component) {
|
|
|
2984
2984
|
//更新
|
|
2985
2985
|
t.updateCircle([].concat(_toConsumableArray(_upds2), _toConsumableArray(_otherupds2)));
|
|
2986
2986
|
}
|
|
2987
|
-
/*
|
|
2988
|
-
线数据处理
|
|
2989
|
-
先全删除,再新增
|
|
2987
|
+
/*
|
|
2988
|
+
线数据处理
|
|
2989
|
+
先全删除,再新增
|
|
2990
2990
|
*/
|
|
2991
2991
|
if (mapLines instanceof Array && t.props.mapLines instanceof Array && !t.deepEqual(mapLines, t.props.mapLines)) {
|
|
2992
2992
|
var oldMapLines = t.props.mapLines;
|
package/lib/default.js
CHANGED
|
@@ -19,12 +19,14 @@ if (antdMajorVersion === '3') {
|
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
var VtxMapIcon = exports.VtxMapIcon = createFromIconfontCN({
|
|
22
|
-
scriptUrl: '//
|
|
22
|
+
scriptUrl: (globalCfg.mapServerURL || '//vortexplugin.cloudhw.cn/mapplugin') + '/icon_font_3x.js'
|
|
23
23
|
});
|
|
24
24
|
|
|
25
25
|
var globalCfg = window.VtxPublicServiceAddress || {};
|
|
26
26
|
|
|
27
27
|
exports.default = {
|
|
28
|
+
// 百度地图资源请求地址
|
|
29
|
+
bmapScriptUrl: globalCfg.bmapScriptUrl ? globalCfg.bmapScriptUrl : '//api.map.baidu.com/getscript?v=3.0&ak=42IughV5lDxAt0wI8AhDVuGR',
|
|
28
30
|
//地图服务地址ip
|
|
29
31
|
mapServerURL: globalCfg.mapServerURL ? globalCfg.mapServerURL : '//vortexplugin.cloudhw.cn/mapplugin',
|
|
30
32
|
//arcgis地图服务ip
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vtx/map",
|
|
3
|
-
"version": "1.1.
|
|
4
|
-
"description": "@vtx/map",
|
|
3
|
+
"version": "1.1.7-beta.1",
|
|
4
|
+
"description": "@vtx/map，基于antd3x版本，注意慎用",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"docs:dev": "dumi dev",
|
|
@@ -37,6 +37,6 @@
|
|
|
37
37
|
"react": "^16.12.0",
|
|
38
38
|
"react-dom": "^16.12.0"
|
|
39
39
|
},
|
|
40
|
-
"author": "
|
|
40
|
+
"author": "vortex",
|
|
41
41
|
"license": "MIT"
|
|
42
42
|
}
|