@vtx/map 1.1.7-beta.1 → 1.1.7-beta.3

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.
@@ -301,8 +301,8 @@ var Map = function (_React$Component) {
301
301
  }
302
302
  });
303
303
  /*=================================start========================================*/
304
- /*
305
- draw对象声明, 绘制返回方法实现
304
+ /*
305
+ draw对象声明, 绘制返回方法实现
306
306
  */
307
307
  if (!t._drawmanager) {
308
308
  t._drawmanager = new google.maps.drawing.DrawingManager({
@@ -316,9 +316,9 @@ var Map = function (_React$Component) {
316
316
  t._cluster = new OMapLib.MarkerClusterer(map, [], { maxZoom: options.maxZoom });
317
317
  }
318
318
  /*=================================start========================================*/
319
- /*
320
- 声明OverlayView 类
321
- 用于切换lnglat和 pixel
319
+ /*
320
+ 声明OverlayView 类
321
+ 用于切换lnglat和 pixel
322
322
  */
323
323
  function CanvasProjectionOverlay() {}
324
324
  CanvasProjectionOverlay.prototype = new google.maps.OverlayView();
@@ -329,9 +329,9 @@ var Map = function (_React$Component) {
329
329
  this.canvasProjectionOverlay = new CanvasProjectionOverlay();
330
330
  this.canvasProjectionOverlay.setMap(map);
331
331
  /*=================================start========================================*/
332
- /*
333
- 重写marker对象,支持html
334
- 要使用google对象,所以在creatMap中声明
332
+ /*
333
+ 重写marker对象,支持html
334
+ 要使用google对象,所以在creatMap中声明
335
335
  */
336
336
  var MyLabel = t.MyLabel = function (map) {
337
337
  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -725,7 +725,7 @@ var Map = function (_React$Component) {
725
725
  var position = new t.omap.LatLng({ lng: item.longitude, lat: item.latitude });
726
726
  var marker = null;
727
727
  if (item.markerContent) {
728
- /*自定义html加点
728
+ /*自定义html加点
729
729
  用Label来实现,无法再添加label(高德有判断,实现不同)*/
730
730
  //覆盖物参数
731
731
  marker = new t.MyLabel(t.state.gis, {
@@ -747,9 +747,9 @@ var Map = function (_React$Component) {
747
747
  isLabel: true,
748
748
  labelClass: labelClass,
749
749
  labelContent: cg.labelContent,
750
- /*
751
- 为和百度等地图相同的参数 加上g.markerContentY值
752
- label是使用OverlayView手动实现,与marker没有关联的原因
750
+ /*
751
+ 为和百度等地图相同的参数 加上g.markerContentY值
752
+ label是使用OverlayView手动实现,与marker没有关联的原因
753
753
  */
754
754
  labelOffset: { x: cg.labelPixelX, y: cg.labelPixelY + cg.markerContentY }
755
755
  });
@@ -904,9 +904,9 @@ var Map = function (_React$Component) {
904
904
  var oldPosition = gc.getPosition();
905
905
  //前后点位类型都是markerContent
906
906
  if (gc.isMarkerContent && gc.isMarkerContent() && item.markerContent) {
907
- /*
908
- 自定义html加点
909
- 用Label来实现,无法再添加label(高德有判断,实现不同)
907
+ /*
908
+ 自定义html加点
909
+ 用Label来实现,无法再添加label(高德有判断,实现不同)
910
910
  */
911
911
  //覆盖物参数
912
912
  gc.setOptions({
@@ -960,9 +960,9 @@ var Map = function (_React$Component) {
960
960
  gc_label.setOptions({
961
961
  labelClass: labelClass,
962
962
  labelContent: cg.labelContent,
963
- /*
964
- 为和百度等地图相同的参数 加上g.markerContentY值
965
- label是使用OverlayView手动实现,与marker没有关联的原因
963
+ /*
964
+ 为和百度等地图相同的参数 加上g.markerContentY值
965
+ label是使用OverlayView手动实现,与marker没有关联的原因
966
966
  */
967
967
  labelOffset: { x: cg.labelPixelX, y: cg.labelPixelY + cg.markerContentY }
968
968
  });
@@ -1072,9 +1072,9 @@ var Map = function (_React$Component) {
1072
1072
  gc_label.setOptions({
1073
1073
  labelClass: _labelClass,
1074
1074
  labelContent: cg.labelContent,
1075
- /*
1076
- 为和百度等地图相同的参数 加上g.markerContentY值
1077
- label是使用OverlayView手动实现,与marker没有关联的原因
1075
+ /*
1076
+ 为和百度等地图相同的参数 加上g.markerContentY值
1077
+ label是使用OverlayView手动实现,与marker没有关联的原因
1078
1078
  */
1079
1079
  labelOffset: { x: cg.labelPixelX, y: cg.labelPixelY + cg.markerContentY }
1080
1080
  });
@@ -2396,8 +2396,8 @@ var Map = function (_React$Component) {
2396
2396
  var t = this;
2397
2397
  t._drawmanager.setDrawingMode(null);
2398
2398
  }
2399
- /*
2400
- 事件处理
2399
+ /*
2400
+ 事件处理
2401
2401
  */
2402
2402
  //点击图元事件
2403
2403
 
@@ -2482,8 +2482,8 @@ var Map = function (_React$Component) {
2482
2482
  t.props.mouseOutGraphic(obj);
2483
2483
  }
2484
2484
  }
2485
- /*
2486
- 地图服务功能
2485
+ /*
2486
+ 地图服务功能
2487
2487
  */
2488
2488
  //开启路况
2489
2489
 
@@ -3319,9 +3319,9 @@ var Map = function (_React$Component) {
3319
3319
  }
3320
3320
  return deg;
3321
3321
  }
3322
- /*
3323
- 匹配控件位置方法
3324
- (谷歌地图有8个方位,为了统一,只使用左上,左下,右上,右下)
3322
+ /*
3323
+ 匹配控件位置方法
3324
+ (谷歌地图有8个方位,为了统一,只使用左上,左下,右上,右下)
3325
3325
  */
3326
3326
 
3327
3327
  }, {
@@ -3344,8 +3344,8 @@ var Map = function (_React$Component) {
3344
3344
  }
3345
3345
  return position;
3346
3346
  }
3347
- /*
3348
- 地图内部需要公共方法
3347
+ /*
3348
+ 地图内部需要公共方法
3349
3349
  */
3350
3350
 
3351
3351
  }, {
@@ -3560,10 +3560,10 @@ var Map = function (_React$Component) {
3560
3560
  if (typeof isclearAllPointCollection == 'boolean' && isclearAllPointCollection || isclearAllPointCollection && isclearAllPointCollection !== t.props.isclearAllPointCollection) {
3561
3561
  t.clearAllPointCollection();
3562
3562
  }
3563
- /*点数据处理
3564
- pointData[2]相同的点,执行刷新
3565
- pointData[1]的数据在idsForGraphicId中不存在的,执行新增
3566
- pointData[0]数据中多余的id,执行删除
3563
+ /*点数据处理
3564
+ pointData[2]相同的点,执行刷新
3565
+ pointData[1]的数据在idsForGraphicId中不存在的,执行新增
3566
+ pointData[0]数据中多余的id,执行删除
3567
3567
  */
3568
3568
  if (mapPoints instanceof Array && props.mapPoints instanceof Array && !t.deepEqual(mapPoints, props.mapPoints)) {
3569
3569
  var oldMapPoints = props.mapPoints;
@@ -3623,9 +3623,9 @@ var Map = function (_React$Component) {
3623
3623
  //更新
3624
3624
  t.updatePoint([].concat(_toConsumableArray(upds), _toConsumableArray(otherupds)));
3625
3625
  }
3626
- /*
3627
- 面数据处理
3628
- 先全删除,再新增
3626
+ /*
3627
+ 面数据处理
3628
+ 先全删除,再新增
3629
3629
  */
3630
3630
  if (mapPolygons instanceof Array && props.mapPolygons instanceof Array && !t.deepEqual(mapPolygons, props.mapPolygons)) {
3631
3631
  var oldMapPolygons = props.mapPolygons;
@@ -3684,9 +3684,9 @@ var Map = function (_React$Component) {
3684
3684
  //更新
3685
3685
  t.updatePolygon([].concat(_toConsumableArray(_upds), _toConsumableArray(_otherupds)));
3686
3686
  }
3687
- /*
3688
- 圆数据处理
3689
- 先全删除,再新增
3687
+ /*
3688
+ 圆数据处理
3689
+ 先全删除,再新增
3690
3690
  */
3691
3691
  if (mapCircles instanceof Array && props.mapCircles instanceof Array && !t.deepEqual(mapCircles, props.mapCircles)) {
3692
3692
  var oldMapCircles = props.mapCircles;
@@ -3745,9 +3745,9 @@ var Map = function (_React$Component) {
3745
3745
  //更新
3746
3746
  t.updateCircle([].concat(_toConsumableArray(_upds2), _toConsumableArray(_otherupds2)));
3747
3747
  }
3748
- /*
3749
- 线数据处理
3750
- 先全删除,再新增
3748
+ /*
3749
+ 线数据处理
3750
+ 先全删除,再新增
3751
3751
  */
3752
3752
  if (mapLines instanceof Array && props.mapLines instanceof Array && !t.deepEqual(mapLines, props.mapLines)) {
3753
3753
  var oldMapLines = props.mapLines;
@@ -1,70 +1,70 @@
1
- .label-content{
2
- display: inline-block;
3
- padding: 5px;
4
- line-height: 22px;
5
- text-align: center;
6
- border-radius: 5px;
7
- background-color: #fff;
8
- opacity: 1;
9
- color: #5DD0EE;
10
- transform: translate(-50%);
11
- -ms-transform: translate(-50%);
12
- }
13
- .noselect {
14
- -webkit-touch-callout: none; /* iOS Safari */
15
- -webkit-user-select: none; /* Chrome/Safari/Opera */
16
- -khtml-user-select: none; /* Konqueror */
17
- -moz-user-select: none; /* Firefox */
18
- -ms-user-select: none; /* Internet Explorer/Edge */
19
- user-select: none; /* Non-prefixed version, currently
20
- not supported by any browser */
21
- }
22
- .vtx_gmap_html_pointCollection_a{
23
- position: absolute;
24
- canvas{
25
- z-index: 111;
26
- }
27
- }
28
- .vtx-g-rangingPoint{
29
- width: 8px;
30
- height: 8px;
31
- background-color: #fff;
32
- border: 2px solid #108ee9;
33
- display: inline-block;
34
- border-radius: 8px;
35
- position: relative;
36
- top: 5px;
37
- left: 1px;
38
- }
39
- .vtx-g-rangingDistance{
40
- position: relative;
41
- top: -36px;
42
- left: 15px;
43
- height: 30px;
44
- line-height: 28px;
45
- background-color: #fff;
46
- border: 1px solid #108ee9;
47
- font-size: 12px;
48
- word-break: keep-all;
49
- padding: 0px 3px;
50
- color: #108ee9;
51
- }
52
- .vtx-g-rang-exit{
53
- width: 12px;
54
- height: 12px;
55
- background-color: #fff;
56
- border: 2px solid #108ee9;
57
- color: #108ee9;
58
- line-height: 7px;
59
- text-align: center;
60
- font-size: 12px;
61
- cursor: pointer;
62
- }
63
- .vtx-g-rang-showRangTool{
64
- line-height: 18px;
65
- font-size: 12px;
66
- border: 1px solid #108ee9;
67
- word-break: keep-all;
68
- background-color: #fff;
69
- padding: 0px 5px;
70
- }
1
+ .label-content{
2
+ display: inline-block;
3
+ padding: 5px;
4
+ line-height: 22px;
5
+ text-align: center;
6
+ border-radius: 5px;
7
+ background-color: #fff;
8
+ opacity: 1;
9
+ color: #5DD0EE;
10
+ transform: translate(-50%);
11
+ -ms-transform: translate(-50%);
12
+ }
13
+ .noselect {
14
+ -webkit-touch-callout: none; /* iOS Safari */
15
+ -webkit-user-select: none; /* Chrome/Safari/Opera */
16
+ -khtml-user-select: none; /* Konqueror */
17
+ -moz-user-select: none; /* Firefox */
18
+ -ms-user-select: none; /* Internet Explorer/Edge */
19
+ user-select: none; /* Non-prefixed version, currently
20
+ not supported by any browser */
21
+ }
22
+ .vtx_gmap_html_pointCollection_a{
23
+ position: absolute;
24
+ canvas{
25
+ z-index: 111;
26
+ }
27
+ }
28
+ .vtx-g-rangingPoint{
29
+ width: 8px;
30
+ height: 8px;
31
+ background-color: #fff;
32
+ border: 2px solid #108ee9;
33
+ display: inline-block;
34
+ border-radius: 8px;
35
+ position: relative;
36
+ top: 5px;
37
+ left: 1px;
38
+ }
39
+ .vtx-g-rangingDistance{
40
+ position: relative;
41
+ top: -36px;
42
+ left: 15px;
43
+ height: 30px;
44
+ line-height: 28px;
45
+ background-color: #fff;
46
+ border: 1px solid #108ee9;
47
+ font-size: 12px;
48
+ word-break: keep-all;
49
+ padding: 0px 3px;
50
+ color: #108ee9;
51
+ }
52
+ .vtx-g-rang-exit{
53
+ width: 12px;
54
+ height: 12px;
55
+ background-color: #fff;
56
+ border: 2px solid #108ee9;
57
+ color: #108ee9;
58
+ line-height: 7px;
59
+ text-align: center;
60
+ font-size: 12px;
61
+ cursor: pointer;
62
+ }
63
+ .vtx-g-rang-showRangTool{
64
+ line-height: 18px;
65
+ font-size: 12px;
66
+ border: 1px solid #108ee9;
67
+ word-break: keep-all;
68
+ background-color: #fff;
69
+ padding: 0px 5px;
70
+ }
@@ -1160,10 +1160,10 @@ var OlMap = function (_React$Component) {
1160
1160
  }
1161
1161
  }
1162
1162
  //将制定图元展示在视野内 (强制改变地图中心位置)
1163
- /*
1164
- 参数arg格式如下1,2
1165
- 1.string 格式如:'1,a,2,3,4'
1166
- 2.数组 ['1','2']
1163
+ /*
1164
+ 参数arg格式如下1,2
1165
+ 1.string 格式如:'1,a,2,3,4'
1166
+ 2.数组 ['1','2']
1167
1167
  */
1168
1168
 
1169
1169
  }, {
@@ -3004,10 +3004,10 @@ var OlMap = function (_React$Component) {
3004
3004
  // 等待地图加载
3005
3005
 
3006
3006
  if (!t.state.mapCreated) return;
3007
- /*点数据处理
3008
- pointData[2]相同的点,执行刷新
3009
- pointData[1]的数据在idsForGraphicId中不存在的,执行新增
3010
- pointData[0]数据中多余的id,执行删除
3007
+ /*点数据处理
3008
+ pointData[2]相同的点,执行刷新
3009
+ pointData[1]的数据在idsForGraphicId中不存在的,执行新增
3010
+ pointData[0]数据中多余的id,执行删除
3011
3011
  */
3012
3012
  console.log(mapPoints, t.props.mapPoints);
3013
3013
  console.log(!t.deepEqual(mapPoints, t.props.mapPoints));
@@ -3069,9 +3069,9 @@ var OlMap = function (_React$Component) {
3069
3069
  //更新
3070
3070
  t.updatePoint([].concat(_toConsumableArray(upds), _toConsumableArray(otherupds)));
3071
3071
  }
3072
- /*
3073
- 线数据处理
3074
- 先全删除,再新增
3072
+ /*
3073
+ 线数据处理
3074
+ 先全删除,再新增
3075
3075
  */
3076
3076
  if (mapLines instanceof Array && t.props.mapLines instanceof Array && !t.deepEqual(mapLines, t.props.mapLines)) {
3077
3077
  var oldMapLines = t.props.mapLines;
@@ -3130,9 +3130,9 @@ var OlMap = function (_React$Component) {
3130
3130
  //更新
3131
3131
  t.updateLine([].concat(_toConsumableArray(_upds), _toConsumableArray(_otherupds)));
3132
3132
  }
3133
- /*
3134
- 面数据处理
3135
- 先全删除,再新增
3133
+ /*
3134
+ 面数据处理
3135
+ 先全删除,再新增
3136
3136
  */
3137
3137
  if (mapPolygons instanceof Array && t.props.mapPolygons instanceof Array && !t.deepEqual(mapPolygons, t.props.mapPolygons)) {
3138
3138
  var oldMapPolygons = t.props.mapPolygons;
@@ -3191,9 +3191,9 @@ var OlMap = function (_React$Component) {
3191
3191
  //更新
3192
3192
  t.updatePolygon([].concat(_toConsumableArray(_upds2), _toConsumableArray(_otherupds2)));
3193
3193
  }
3194
- /*
3195
- 圆数据处理
3196
- 先全删除,再新增
3194
+ /*
3195
+ 圆数据处理
3196
+ 先全删除,再新增
3197
3197
  */
3198
3198
  if (mapCircles instanceof Array && t.props.mapCircles instanceof Array && !t.deepEqual(mapCircles, t.props.mapCircles)) {
3199
3199
  var oldMapCircles = t.props.mapCircles;
@@ -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
  }
@@ -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
@@ -18,15 +18,18 @@ if (antdMajorVersion === '3') {
18
18
  createFromIconfontCN = require('@ant-design/icons').createFromIconfontCN;
19
19
  }
20
20
 
21
+ var globalCfg = window.VtxPublicServiceAddress || {};
22
+
21
23
  var VtxMapIcon = exports.VtxMapIcon = createFromIconfontCN({
22
24
  scriptUrl: (globalCfg.mapServerURL || '//vortexplugin.cloudhw.cn/mapplugin') + '/icon_font_3x.js'
23
25
  });
24
-
25
- var globalCfg = window.VtxPublicServiceAddress || {};
26
-
26
+ window._BMapSecurityConfig = {
27
+ // 代理服务器地址
28
+ serviceHost: '/_BMapService/'
29
+ };
27
30
  exports.default = {
28
31
  // 百度地图资源请求地址
29
- bmapScriptUrl: globalCfg.bmapScriptUrl ? globalCfg.bmapScriptUrl : '//api.map.baidu.com/getscript?v=3.0&ak=42IughV5lDxAt0wI8AhDVuGR',
32
+ bmapScriptUrl: globalCfg.bmapScriptUrl ? globalCfg.bmapScriptUrl : '/_BMapService/getscript?v=3.0',
30
33
  //地图服务地址ip
31
34
  mapServerURL: globalCfg.mapServerURL ? globalCfg.mapServerURL : '//vortexplugin.cloudhw.cn/mapplugin',
32
35
  //arcgis地图服务ip
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vtx/map",
3
- "version": "1.1.7-beta.1",
3
+ "version": "1.1.7-beta.3",
4
4
  "description": "@vtx/map,基于antd3x版本,注意慎用",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {