@vtx/map 1.1.2 → 1.1.6

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.
@@ -0,0 +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;
122
+ }
@@ -1,62 +0,0 @@
1
- .vtx-ui-modal-normal .ant-modal .ant-modal-content {
2
- height: 100%;
3
- }
4
- .vtx-ui-modal-normal .ant-modal .ant-modal-content .ant-modal-body {
5
- max-height: calc(100% - 108px);
6
- overflow: auto;
7
- background-color: #fbfbfb;
8
- }
9
- .vtx-ui-modal-normal .vtx-ui-modal-title {
10
- position: relative;
11
- width: 100%;
12
- }
13
- .vtx-ui-modal-normal .vtx-ui-modal-title .vtx-ui-modal-title_name {
14
- width: 100%;
15
- color: #108EE2;
16
- }
17
- .vtx-ui-modal-normal .vtx-ui-modal-title .vtx-ui-modal-close,
18
- .vtx-ui-modal-normal .vtx-ui-modal-title .vtx-ui-modal-maximizeIcon {
19
- position: absolute;
20
- top: -13px;
21
- right: -16px;
22
- }
23
- .vtx-ui-modal-normal .vtx-ui-modal-title .vtx-ui-modal-close p,
24
- .vtx-ui-modal-normal .vtx-ui-modal-title .vtx-ui-modal-maximizeIcon p {
25
- width: 36px;
26
- height: 48px;
27
- text-align: center;
28
- line-height: 48px;
29
- cursor: pointer;
30
- border: 0;
31
- background: transparent;
32
- position: absolute;
33
- right: 0;
34
- top: 0;
35
- z-index: 10;
36
- font-weight: 700;
37
- text-decoration: none;
38
- -webkit-transition: color 0.3s ease;
39
- transition: color 0.3s ease;
40
- color: rgba(0, 0, 0, 0.43);
41
- outline: 0;
42
- display: inline-block;
43
- }
44
- .vtx-ui-modal-normal .vtx-ui-modal-title .vtx-ui-modal-close p:hover,
45
- .vtx-ui-modal-normal .vtx-ui-modal-title .vtx-ui-modal-maximizeIcon p:hover {
46
- color: #444;
47
- text-decoration: none;
48
- }
49
- .vtx-ui-modal-normal .vtx-ui-modal-title .vtx-ui-modal-maximizeIcon {
50
- right: 20px;
51
- }
52
- .vtx-ui-modal-maxClass .ant-modal {
53
- top: 0 !important;
54
- left: 0 !important;
55
- width: 100% !important;
56
- height: 100% !important;
57
- padding-bottom: 0 !important;
58
- overflow: hidden;
59
- }
60
- .vtx-ui-modal-maxClass .ant-modal-body {
61
- height: calc(100% - 108px) !important;
62
- }
@@ -12,19 +12,17 @@ var _react = require('react');
12
12
 
13
13
  var _react2 = _interopRequireDefault(_react);
14
14
 
15
- require('./VtxModal.css');
15
+ require('./VtxModal.less');
16
16
 
17
17
  var _modal = require('antd/lib/modal');
18
18
 
19
19
  var _modal2 = _interopRequireDefault(_modal);
20
20
 
21
- require('antd/lib/modal/style/css');
21
+ require('antd/lib/modal/style');
22
22
 
23
- var _icon = require('antd/lib/icon');
23
+ require('antd/lib/icon/style');
24
24
 
25
- var _icon2 = _interopRequireDefault(_icon);
26
-
27
- require('antd/lib/icon/style/css');
25
+ var _default = require('../default');
28
26
 
29
27
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
30
28
 
@@ -197,7 +195,7 @@ var VtxModal = function (_React$Component) {
197
195
  });
198
196
  }
199
197
  },
200
- maximizable ? _react2.default.createElement(_icon2.default, { type: 'shrink' }) : _react2.default.createElement(_icon2.default, { type: 'arrows-alt' })
198
+ maximizable ? _react2.default.createElement(_default.VtxMapIcon, { type: 'icon-shrink' }) : _react2.default.createElement(_default.VtxMapIcon, { type: 'icon-arrawsalt' })
201
199
  )
202
200
  ) : null,
203
201
  closable ? _react2.default.createElement(
@@ -206,9 +204,9 @@ var VtxModal = function (_React$Component) {
206
204
  _react2.default.createElement(
207
205
  'p',
208
206
  { onClick: t.props.onCancel },
209
- _react2.default.createElement(_icon2.default, { type: 'close' })
207
+ _react2.default.createElement(_default.VtxMapIcon, { type: 'icon-close' })
210
208
  )
211
- ) : ''
209
+ ) : null
212
210
  );
213
211
  }();
214
212
  var bodyStyle = _extends({}, this.props.bodyStyle);
@@ -1,3 +1,5 @@
1
+ @import (reference) '~antd/lib/style/themes/index.less';
2
+
1
3
  .vtx-ui-modal-normal{
2
4
  .ant-modal{
3
5
  .ant-modal-content{
@@ -5,7 +7,7 @@
5
7
  .ant-modal-body{
6
8
  max-height: e('calc(100% - 108px)');
7
9
  overflow: auto;
8
- background-color: #fbfbfb;
10
+ background-color: @table-expanded-row-bg;
9
11
  }
10
12
  }
11
13
  }
@@ -14,7 +16,7 @@
14
16
  width: 100%;
15
17
  .vtx-ui-modal-title_name{
16
18
  width: 100%;
17
- color: #108EE2;
19
+ color: @primary-color;
18
20
  }
19
21
  .vtx-ui-modal-close,.vtx-ui-modal-maximizeIcon{
20
22
  position: absolute;
@@ -36,11 +38,11 @@
36
38
  text-decoration: none;
37
39
  -webkit-transition: color .3s ease;
38
40
  transition: color .3s ease;
39
- color: rgba(0, 0, 0, 0.43);
41
+ color: @text-color;
40
42
  outline: 0;
41
43
  display: inline-block;
42
44
  &:hover{
43
- color: #444;
45
+ color: @text-color-secondary;
44
46
  text-decoration: none;
45
47
  }
46
48
  }
@@ -20,7 +20,7 @@ var _modal = require('antd/lib/modal');
20
20
 
21
21
  var _modal2 = _interopRequireDefault(_modal);
22
22
 
23
- require('antd/lib/modal/style/css');
23
+ require('antd/lib/modal/style');
24
24
 
25
25
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
26
26
 
@@ -1,170 +0,0 @@
1
- .vtx-ui-searchmap-searchmodal {
2
- z-index: 1001;
3
- }
4
- .vtx-ui-searchmap-searchmodal .ant-modal {
5
- width: calc(100% - 200px) !important;
6
- min-width: 800px;
7
- height: 70vh;
8
- }
9
- .vtx-ui-searchmap-searchmodal .ant-modal .ant-modal-title {
10
- color: #108EE9;
11
- }
12
- .vtx-ui-searchmap-searchmodal .ant-modal .ant-modal-content {
13
- width: 100%;
14
- height: 100%;
15
- }
16
- .vtx-ui-searchmap-searchmodal .ant-modal .ant-modal-content .ant-modal-body {
17
- width: 100%;
18
- height: calc(100% - 108px) !important;
19
- padding: 0px;
20
- background-color: white;
21
- }
22
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap {
23
- width: 100%;
24
- height: 100%;
25
- padding-top: 48px;
26
- box-sizing: border-box;
27
- position: relative;
28
- overflow: hidden;
29
- }
30
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-top,
31
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-bottom {
32
- width: 100%;
33
- height: 48px;
34
- position: absolute;
35
- left: 0px;
36
- padding: 10px 15px;
37
- }
38
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-top button,
39
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-bottom button {
40
- margin-left: 10px;
41
- }
42
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-top {
43
- top: 0px;
44
- border-bottom: 1px solid #e1e1e1;
45
- }
46
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-top .vtx-ui-searchmap-othermodal {
47
- position: absolute;
48
- right: 25px;
49
- line-height: 28px;
50
- display: inline-block;
51
- }
52
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-bottom {
53
- bottom: 0px;
54
- border-top: 1px solid #e1e1e1;
55
- text-align: right;
56
- }
57
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content {
58
- width: 100%;
59
- height: 100%;
60
- position: relative;
61
- padding-left: 25px;
62
- }
63
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-show {
64
- display: inline-block;
65
- width: 100%;
66
- height: 100%;
67
- }
68
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-hidden {
69
- display: none;
70
- }
71
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-w_l {
72
- width: 300px !important;
73
- }
74
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left {
75
- width: 25px;
76
- height: 100%;
77
- display: inline-block;
78
- -webkit-transition-duration: 0.3s;
79
- -o-transition-duration: 0.3s;
80
- transition-duration: 0.3s;
81
- transition-property: width;
82
- vertical-align: top;
83
- border-right: 1px solid #e1e1e1;
84
- position: absolute;
85
- top: 0px;
86
- left: 0px;
87
- z-index: 10;
88
- background-color: #FFF;
89
- }
90
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-listtitle {
91
- width: 100%;
92
- height: 30px;
93
- line-height: 30px;
94
- border-bottom: 1px solid #e1e1e1;
95
- }
96
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-listtitle .vtx-ui-searchmap-title {
97
- width: calc(100% - 30px);
98
- display: inline-block;
99
- padding-left: 15px;
100
- font-size: 15px;
101
- }
102
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-listtitle .vtx-ui-searchmap-btn {
103
- display: inline-block;
104
- width: 30px;
105
- text-align: center;
106
- color: #0c88e8;
107
- height: 30px;
108
- line-height: 30px;
109
- cursor: pointer;
110
- }
111
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-lists {
112
- width: 100%;
113
- line-height: 35px;
114
- border-bottom: 1px solid #e1e1e1;
115
- font-size: 12px;
116
- overflow: hidden;
117
- text-overflow: ellipsis;
118
- white-space: nowrap;
119
- padding: 0px 15px;
120
- cursor: pointer;
121
- color: #999;
122
- }
123
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-lists:hover {
124
- background-color: #ECF6FD;
125
- color: #108EE9;
126
- }
127
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-lists.vtx-ui-searchmap-select {
128
- background-color: #ECF6FD;
129
- color: #108EE9;
130
- }
131
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-scrollauto {
132
- height: calc(100% - 30px);
133
- overflow-y: auto;
134
- }
135
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_right {
136
- width: 100%;
137
- height: 100%;
138
- display: inline-block;
139
- -webkit-transition-duration: 0.3s;
140
- -o-transition-duration: 0.3s;
141
- transition-duration: 0.3s;
142
- transition-property: width;
143
- }
144
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-btn {
145
- text-align: center;
146
- color: #0c88e8;
147
- height: 30px;
148
- line-height: 30px;
149
- cursor: pointer;
150
- }
151
- .vtx-ui-searchmap-showlabel {
152
- margin-left: 0;
153
- width: 100px;
154
- line-height: 25px;
155
- text-align: center;
156
- position: relative;
157
- left: -38px;
158
- background-color: #222020;
159
- opacity: 0.6;
160
- border-radius: 5px;
161
- color: #FFF;
162
- padding: 2px 8px;
163
- text-overflow: ellipsis;
164
- white-space: nowrap;
165
- word-break: normal;
166
- overflow: hidden;
167
- }
168
- .vtx-ui-searchmap-hiddenlabel {
169
- display: none;
170
- }
@@ -12,31 +12,31 @@ var _react = require('react');
12
12
 
13
13
  var _react2 = _interopRequireDefault(_react);
14
14
 
15
- require('./VtxSearchMap.css');
15
+ require('./VtxSearchMap.less');
16
16
 
17
17
  var _button = require('antd/lib/button');
18
18
 
19
19
  var _button2 = _interopRequireDefault(_button);
20
20
 
21
- require('antd/lib/button/style/css');
21
+ require('antd/lib/button/style');
22
22
 
23
23
  var _input = require('antd/lib/input');
24
24
 
25
25
  var _input2 = _interopRequireDefault(_input);
26
26
 
27
- require('antd/lib/input/style/css');
27
+ require('antd/lib/input/style');
28
28
 
29
29
  var _message = require('antd/lib/message');
30
30
 
31
31
  var _message2 = _interopRequireDefault(_message);
32
32
 
33
- require('antd/lib/message/style/css');
33
+ require('antd/lib/message/style');
34
34
 
35
35
  var _checkbox = require('antd/lib/checkbox');
36
36
 
37
37
  var _checkbox2 = _interopRequireDefault(_checkbox);
38
38
 
39
- require('antd/lib/checkbox/style/css');
39
+ require('antd/lib/checkbox/style');
40
40
 
41
41
  var _VtxModal = require('../VtxModal');
42
42
 
@@ -161,7 +161,9 @@ var VtxSearchMap = function (_React$Component) {
161
161
  modal1Visible: props.modal1Visible || false,
162
162
  isShowOther: props.isShowOther || false,
163
163
  otherText: props.otherText || '显示服务区域',
164
- isShowOtherGraph: props.isShowOther || false
164
+ isShowOtherGraph: props.isShowOther || false,
165
+ // openlayer
166
+ olProps: props.olProps
165
167
  };
166
168
  return _this;
167
169
  }
@@ -503,7 +505,8 @@ var VtxSearchMap = function (_React$Component) {
503
505
  otherText = _state2.otherText,
504
506
  isShowOtherGraph = _state2.isShowOtherGraph,
505
507
  editGraphic = _state2.editGraphic,
506
- graphicType = _state2.graphicType;
508
+ graphicType = _state2.graphicType,
509
+ olProps = _state2.olProps;
507
510
 
508
511
  var InputProps = {
509
512
  style: { 'width': '200px' },
@@ -632,7 +635,7 @@ var VtxSearchMap = function (_React$Component) {
632
635
  _react2.default.createElement(
633
636
  'div',
634
637
  { className: styles.top },
635
- mapType == 'gmap' ? '' : [_react2.default.createElement(_input2.default, _extends({ key: '1' }, InputProps)), _react2.default.createElement(
638
+ mapType == 'gmap' || mapType == 'olmap' ? '' : [_react2.default.createElement(_input2.default, _extends({ key: '1' }, InputProps)), _react2.default.createElement(
636
639
  _button2.default,
637
640
  { key: '2', type: 'primary', onClick: this.searchList.bind(this), icon: getIcon('search') },
638
641
  '\u67E5\u8BE2'
@@ -665,7 +668,7 @@ var VtxSearchMap = function (_React$Component) {
665
668
  }, icon: getIcon('edit') },
666
669
  '\u91CD\u65B0\u7ED8\u5236'
667
670
  ) : null,
668
- mapType == 'gmap' ? '' : _react2.default.createElement(
671
+ mapType == 'gmap' || mapType == 'olmap' ? '' : _react2.default.createElement(
669
672
  _button2.default,
670
673
  { onClick: this.setFitView.bind(this), icon: getIcon('sync') },
671
674
  '\u8FD4\u56DE\u5168\u5C40\u5730\u56FE'
@@ -684,8 +687,8 @@ var VtxSearchMap = function (_React$Component) {
684
687
  ),
685
688
  _react2.default.createElement(
686
689
  'div',
687
- { className: styles.content, style: { paddingLeft: mapType == 'gmap' ? '0px' : '25px' } },
688
- mapType == 'gmap' ? '' : _react2.default.createElement(
690
+ { className: styles.content, style: { paddingLeft: mapType == 'gmap' || mapType == 'olmap' ? '0px' : '25px' } },
691
+ mapType == 'gmap' || mapType == 'olmap' ? '' : _react2.default.createElement(
689
692
  'div',
690
693
  { className: styles.content_left + ' ' + (isShowList ? styles.w_l : '') },
691
694
  _react2.default.createElement(
@@ -763,7 +766,8 @@ var VtxSearchMap = function (_React$Component) {
763
766
  clickGraphic: this.clickGraphic.bind(this),
764
767
  clickMap: function clickMap() {
765
768
  t.isClickMap = true;
766
- }
769
+ },
770
+ olProps: olProps
767
771
  }, drawProps))
768
772
  )
769
773
  )
@@ -859,6 +863,8 @@ var VtxSearchMap = function (_React$Component) {
859
863
  _this6.map.getGraphic('locationPoint').mapLayer.geometry.setLatitude(nextProps.mapCenter[1]);
860
864
  _this6.map.getGraphic('locationPoint').mapLayer.geometry.setLongitude(nextProps.mapCenter[0]);
861
865
  _this6.map.state.gis.graphics.refresh();
866
+ case 'olMap':
867
+ _this6.map.getGraphic('locationPoint').mapLayer.setGeometry(new ol.geom.Point(nextProps.mapCenter));
862
868
  break;
863
869
  }
864
870
  }
@@ -1,3 +1,5 @@
1
+ @import (reference) '~antd/lib/style/themes/index.less';
2
+
1
3
  .vtx-ui-searchmap-searchmodal{
2
4
  z-index: 1001;
3
5
  .ant-modal{
@@ -5,7 +7,7 @@
5
7
  min-width: 800px;
6
8
  height: 70vh;
7
9
  .ant-modal-title{
8
- color: #108EE9;
10
+ color: @primary-color;
9
11
  }
10
12
  .ant-modal-content{
11
13
  width: 100%;
@@ -14,7 +16,7 @@
14
16
  width: 100%;
15
17
  height: e('calc(100% - 108px)') !important;
16
18
  padding: 0px;
17
- background-color: white;
19
+ background-color: @body-background;
18
20
  }
19
21
  }
20
22
  }
@@ -38,7 +40,7 @@
38
40
  }
39
41
  .vtx-ui-searchmap-top{
40
42
  top: 0px;
41
- border-bottom: 1px solid #e1e1e1;
43
+ border-bottom: 1px solid @border-color-base;
42
44
  .vtx-ui-searchmap-othermodal{
43
45
  position: absolute;
44
46
  right: 25px;
@@ -48,7 +50,7 @@
48
50
  }
49
51
  .vtx-ui-searchmap-bottom{
50
52
  bottom: 0px;
51
- border-top: 1px solid #e1e1e1;
53
+ border-top: 1px solid @border-color-base;
52
54
  text-align: right;
53
55
  }
54
56
  .vtx-ui-searchmap-content{
@@ -76,17 +78,17 @@
76
78
  transition-duration: 0.3s;
77
79
  transition-property: width;
78
80
  vertical-align: top;
79
- border-right: 1px solid #e1e1e1;
81
+ border-right: 1px solid @border-color-base;
80
82
  position: absolute;
81
83
  top: 0px;
82
84
  left: 0px;
83
85
  z-index: 10;
84
- background-color: #FFF;
86
+ background-color: @body-background;
85
87
  .vtx-ui-searchmap-listtitle{
86
88
  width: 100%;
87
89
  height: 30px;
88
90
  line-height: 30px;
89
- border-bottom: 1px solid #e1e1e1;
91
+ border-bottom: 1px solid @border-color-base;;
90
92
  .vtx-ui-searchmap-title{
91
93
  width: e('calc(100% - 30px)');
92
94
  display: inline-block;
@@ -97,7 +99,7 @@
97
99
  display: inline-block;
98
100
  width: 30px;
99
101
  text-align: center;
100
- color: #0c88e8;
102
+ color: @primary-color;
101
103
  height: 30px;
102
104
  line-height: 30px;
103
105
  cursor: pointer;
@@ -106,7 +108,7 @@
106
108
  .vtx-ui-searchmap-lists{
107
109
  width: 100%;
108
110
  line-height: 35px;
109
- border-bottom: 1px solid #e1e1e1;
111
+ border-bottom: 1px solid @border-color-base;;
110
112
  font-size: 12px;
111
113
  overflow: hidden;
112
114
  text-overflow: ellipsis;
@@ -116,12 +118,12 @@
116
118
  color: #999;
117
119
  &:hover{
118
120
  background-color: #ECF6FD;
119
- color: #108EE9;
121
+ color: @primary-color;
120
122
  }
121
123
  }
122
124
  .vtx-ui-searchmap-lists.vtx-ui-searchmap-select{
123
125
  background-color: #ECF6FD;
124
- color: #108EE9;
126
+ color: @primary-color;
125
127
  }
126
128
  .vtx-ui-searchmap-scrollauto{
127
129
  height: e('calc(100% - 30px)');
@@ -139,7 +141,7 @@
139
141
  }
140
142
  .vtx-ui-searchmap-btn{
141
143
  text-align: center;
142
- color: #0c88e8;
144
+ color: @primary-color;
143
145
  height: 30px;
144
146
  line-height: 30px;
145
147
  cursor: pointer;
package/lib/default.js CHANGED
@@ -19,7 +19,7 @@ if (antdMajorVersion === '3') {
19
19
  }
20
20
 
21
21
  var VtxMapIcon = exports.VtxMapIcon = createFromIconfontCN({
22
- scriptUrl: '//at.alicdn.com/t/font_2865072_ecuwrji9qwq.js'
22
+ scriptUrl: '//at.alicdn.com/t/font_2865072_vy1sa1whz3l.js'
23
23
  });
24
24
 
25
25
  var globalCfg = window.VtxPublicServiceAddress || {};
@@ -28,7 +28,9 @@ exports.default = {
28
28
  //地图服务地址ip
29
29
  mapServerURL: globalCfg.mapServerURL ? globalCfg.mapServerURL : '//vortexplugin.cloudhw.cn/mapplugin',
30
30
  //arcgis地图服务ip
31
- arcgisServerURL: globalCfg.arcgisServerURL ? globalCfg.arcgisServerURL : '//vortexplugin.cloudhw.cn/gis'
31
+ arcgisServerURL: globalCfg.arcgisServerURL ? globalCfg.arcgisServerURL : '//vortexplugin.cloudhw.cn/gis',
32
+ //openlayer地图服务ip
33
+ openlayerServerURL: globalCfg.openlayerServerURL ? globalCfg.openlayerServerURL : '//vortexplugin.cloudhw.cn/openlayer'
32
34
  };
33
35
  function getTMapTK() {
34
36
  if (window.TMapTK) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vtx/map",
3
- "version": "1.1.2",
3
+ "version": "1.1.6",
4
4
  "description": "@vtx/map",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {