@vtx/map 1.2.38 → 2.0.0-beta.2

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.
Files changed (60) hide show
  1. package/README.md +44 -44
  2. package/lib/VtxMap/AMap/AMap.js +37 -35
  3. package/lib/VtxMap/AMap/AMap.js.map +1 -1
  4. package/lib/VtxMap/BMap/Map.js +60 -57
  5. package/lib/VtxMap/BMap/Map.js.map +1 -1
  6. package/lib/VtxMap/GMap/Map.js +38 -39
  7. package/lib/VtxMap/GMap/Map.js.map +1 -1
  8. package/lib/VtxMap/MapToolFunction.js +0 -9
  9. package/lib/VtxMap/MapToolFunction.js.map +1 -1
  10. package/lib/VtxMap/OMap/Map.js +65 -62
  11. package/lib/VtxMap/OMap/Map.js.map +1 -1
  12. package/lib/VtxMap/OMap/Map.less +70 -70
  13. package/lib/VtxMap/OlMap/Map.js +77 -101
  14. package/lib/VtxMap/OlMap/Map.js.map +1 -1
  15. package/lib/VtxMap/OlMap/Map.less +230 -230
  16. package/lib/VtxMap/TMap/TMap.js +58 -56
  17. package/lib/VtxMap/TMap/TMap.js.map +1 -1
  18. package/lib/VtxMap/index.js +0 -18
  19. package/lib/VtxMap/index.js.map +1 -1
  20. package/lib/VtxMap/optimizingPointMap.js +21 -23
  21. package/lib/VtxMap/optimizingPointMap.js.map +1 -1
  22. package/lib/VtxModal/VtxModal.css +76 -18
  23. package/lib/VtxModal/VtxModal.js +16 -13
  24. package/lib/VtxModal/VtxModal.js.map +1 -1
  25. package/lib/VtxModal/VtxModal.less +117 -50
  26. package/lib/VtxModal/style/css.js +1 -12
  27. package/lib/VtxModal/style/css.js.map +1 -1
  28. package/lib/VtxModal/style/index.js +1 -12
  29. package/lib/VtxModal/style/index.js.map +1 -1
  30. package/lib/VtxSearchCheckMap/VtxSearchCheckMap.css +45 -63
  31. package/lib/VtxSearchCheckMap/VtxSearchCheckMap.js +35 -36
  32. package/lib/VtxSearchCheckMap/VtxSearchCheckMap.js.map +1 -1
  33. package/lib/VtxSearchCheckMap/VtxSearchCheckMap.less +73 -68
  34. package/lib/VtxSearchCheckMap/index.js.map +1 -1
  35. package/lib/VtxSearchCheckMap/mapping.js.map +1 -1
  36. package/lib/VtxSearchCheckMap/style/css.js +2 -18
  37. package/lib/VtxSearchCheckMap/style/css.js.map +1 -1
  38. package/lib/VtxSearchCheckMap/style/index.js +2 -18
  39. package/lib/VtxSearchCheckMap/style/index.js.map +1 -1
  40. package/lib/VtxSearchMap/VtxSearchMap.css +44 -60
  41. package/lib/VtxSearchMap/VtxSearchMap.js +59 -68
  42. package/lib/VtxSearchMap/VtxSearchMap.js.map +1 -1
  43. package/lib/VtxSearchMap/VtxSearchMap.less +156 -174
  44. package/lib/VtxSearchMap/index.js.map +1 -1
  45. package/lib/VtxSearchMap/mapping.js.map +1 -1
  46. package/lib/VtxSearchMap/style/css.js +3 -25
  47. package/lib/VtxSearchMap/style/css.js.map +1 -1
  48. package/lib/VtxSearchMap/style/index.js +3 -25
  49. package/lib/VtxSearchMap/style/index.js.map +1 -1
  50. package/lib/default.js +37 -13
  51. package/lib/default.js.map +1 -1
  52. package/lib/utils/util.js +0 -53
  53. package/lib/utils/util.js.map +1 -1
  54. package/package.json +67 -65
  55. package/lib/VtxModal/VtxModalAntd3.css +0 -62
  56. package/lib/VtxModal/VtxModalAntd3.less +0 -67
  57. package/lib/VtxSearchCheckMap/VtxSearchCheckMapAntd3.css +0 -0
  58. package/lib/VtxSearchCheckMap/VtxSearchCheckMapAntd3.less +0 -1
  59. package/lib/VtxSearchMap/VtxSearchMapAntd3.css +0 -0
  60. package/lib/VtxSearchMap/VtxSearchMapAntd3.less +0 -1
package/lib/VtxModal/VtxModal.less CHANGED
@@ -1,59 +1,102 @@
1
- @import (reference) '~antd/lib/style/themes/default.less';
2
-
3
- .vtx-ui-modal-normal{
4
- .ant-modal{
5
- .ant-modal-content{
1
+ .vtx-ui-modal-normal {
2
+ z-index: 1001;
3
+ width: 100%;
4
+ height: 100%;
5
+ .ant-modal {
6
+ width: calc(100% - 200px) !important;
7
+ min-width: 800px;
8
+ min-height: 70vh;
9
+ .ant-modal-container{
6
10
  height: 100%;
7
- .ant-modal-body{
8
- max-height: e('calc(100% - 108px)');
9
- overflow: auto;
10
- background-color: @layout-body-background;
11
- }
12
- }
13
- }
14
- .vtx-ui-modal-title{
15
- position: relative;
16
- width: 100%;
17
- .vtx-ui-modal-title_name{
18
- width: 100%;
19
- color: @primary-color;
20
11
  }
21
- .vtx-ui-modal-close,.vtx-ui-modal-maximizeIcon{
22
- position: absolute;
23
- top: -13px;
24
- right: -16px;
25
- p{
26
- width: 36px;
27
- height: 48px;
28
- text-align: center;
29
- line-height: 48px;
30
- cursor: pointer;
31
- border: 0;
32
- background: transparent;
33
- position: absolute;
34
- right: 0;
35
- top: 0;
36
- z-index: 10;
37
- font-weight: 700;
38
- text-decoration: none;
39
- -webkit-transition: color .3s ease;
40
- transition: color .3s ease;
41
- color: @text-color;
42
- outline: 0;
43
- display: inline-block;
44
- &:hover{
45
- color: @text-color-secondary;
46
- text-decoration: none;
12
+ .ant-modal-header {
13
+ padding: 16px 20px;
14
+ border-bottom: 1px solid var(--antd-color-border);
15
+ margin-bottom: 0;
16
+ .vtx-ui-modal-title {
17
+ position: relative;
18
+ width: 100%;
19
+
20
+ .vtx-ui-modal-title_name {
21
+ width: 100%;
22
+ color: var(--ant-color-primary);
23
+ font-weight: normal;
24
+ }
25
+
26
+ .vtx-ui-modal-close,
27
+ .vtx-ui-modal-maximizeIcon {
28
+ position: absolute;
29
+ top: -13px;
30
+ right: -16px;
31
+
32
+ p {
33
+ width: 36px;
34
+ height: 48px;
35
+ text-align: center;
36
+ line-height: 48px;
37
+ cursor: pointer;
38
+ border: 0;
39
+ background: transparent;
40
+ position: absolute;
41
+ right: 0;
42
+ top: 0;
43
+ z-index: 10;
44
+ font-weight: 700;
45
+ text-decoration: none;
46
+ -webkit-transition: color .3s ease;
47
+ transition: color .3s ease;
48
+ color: var(--ant-color-icon);
49
+ outline: 0;
50
+ display: inline-block;
51
+ margin: 0;
52
+
53
+ &:hover {
54
+ color: var(--ant-color-icon-hover);
55
+ text-decoration: none;
56
+ }
57
+ }
58
+ }
59
+
60
+ .vtx-ui-modal-maximizeIcon {
61
+ right: 20px;
47
62
  }
48
63
  }
49
64
  }
50
- .vtx-ui-modal-maximizeIcon{
51
- right: 20px;
65
+
66
+ .ant-modal-footer {
67
+ padding: 10px 20px;
68
+ border-top: 1px solid var(--antd-color-border);
69
+ margin-top: 0;
70
+ }
71
+
72
+ .ant-modal-body {
73
+ max-height: calc(100% - 108px);
74
+ overflow: auto;
75
+ background-color: var(--ant-color-bg-container);
76
+
52
77
  }
78
+ .ant-modal-title {
79
+ color: var(--antd-color-primary);
80
+ }
81
+ .ant-modal-content {
82
+ width: 100%;
83
+ height: 100%;
84
+
85
+ .ant-modal-body {
86
+ width: 100%;
87
+ height: calc(100% - 108px) !important;
88
+ padding: 0px;
89
+ background-color: var(--antd-color-bg-container);
90
+ }
91
+ }
92
+
53
93
  }
54
94
  }
55
- .vtx-ui-modal-maxClass{
56
- .ant-modal{
95
+
96
+ .vtx-ui-modal-maxClass {
97
+ padding-top: 0;
98
+ .ant-modal {
99
+ width: 100% !important;
57
100
  top: 0 !important;
58
101
  left: 0 !important;
59
102
  width: 100% !important;
@@ -61,7 +104,31 @@
61
104
  padding-bottom: 0 !important;
62
105
  overflow: hidden;
63
106
  }
64
- .ant-modal-body{
65
- height: e('calc(100% - 108px)') !important;
107
+
108
+ .ant-modal-body {
109
+ height: calc(100vh - 108px) !important;
66
110
  }
111
+ }
112
+
113
+
114
+ .vtx-ui-searchmap-showlabel {
115
+ margin-left: 0;
116
+ width: 100px;
117
+ line-height: 25px;
118
+ text-align: center;
119
+ position: relative;
120
+ left: -38px;
121
+ background-color: #222020;
122
+ opacity: 0.6;
123
+ border-radius: 5px;
124
+ color: #FFF;
125
+ padding: 2px 8px;
126
+ text-overflow: ellipsis;
127
+ white-space: nowrap;
128
+ word-break: normal;
129
+ overflow: hidden;
130
+ }
131
+
132
+ .vtx-ui-searchmap-hiddenlabel {
133
+ display: none;
67
134
  }
package/lib/VtxModal/style/css.js CHANGED
@@ -1,15 +1,4 @@
1
1
  "use strict";
2
2
 
3
- require("antd/lib/modal/style/css");
4
- var _default = require("../../default");
5
- switch (_default.antdMajorVersion) {
6
- case '4':
7
- require('../VtxModal.css');
8
- break;
9
- case '3':
10
- require('../VtxModalAntd3.css');
11
- break;
12
- default:
13
- break;
14
- }
3
+ require("../VtxModal.css");
15
4
  //# sourceMappingURL=css.js.map
package/lib/VtxModal/style/css.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"css.js","names":["require","_default","antdMajorVersion"],"sources":["VtxModal/style/index.js"],"sourcesContent":["import 'antd/lib/modal/style';\r\n\r\nimport { antdMajorVersion } from '../../default';\r\nswitch (antdMajorVersion) {\r\n case '4':\r\n require('../VtxModal.less')\r\n break;\r\n case '3':\r\n require('../VtxModalAntd3.less');\r\n break;\r\n default:\r\n break;\r\n}\r\n\r\n"],"mappings":";;AAAAA,OAAA;AAEA,IAAAC,QAAA,GAAAD,OAAA;AACA,QAAQE,yBAAgB;EACpB,KAAK,GAAG;IACJF,OAAO,CAAC,kBAAkB,CAAC;IAC3B;EACJ,KAAK,GAAG;IACJA,OAAO,CAAC,uBAAuB,CAAC;IAChC;EACJ;IACI;AACR","ignoreList":[]}
1
+ {"version":3,"file":"css.js","names":["require"],"sources":["VtxModal/style/index.js"],"sourcesContent":["import '../VtxModal.less';"],"mappings":";;AAAAA,OAAA","ignoreList":[]}
package/lib/VtxModal/style/index.js CHANGED
@@ -1,15 +1,4 @@
1
1
  "use strict";
2
2
 
3
- require("antd/lib/modal/style");
4
- var _default = require("../../default");
5
- switch (_default.antdMajorVersion) {
6
- case '4':
7
- require('../VtxModal.less');
8
- break;
9
- case '3':
10
- require('../VtxModalAntd3.less');
11
- break;
12
- default:
13
- break;
14
- }
3
+ require("../VtxModal.less");
15
4
  //# sourceMappingURL=index.js.map
package/lib/VtxModal/style/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","names":["require","_default","antdMajorVersion"],"sources":["VtxModal/style/index.js"],"sourcesContent":["import 'antd/lib/modal/style';\r\n\r\nimport { antdMajorVersion } from '../../default';\r\nswitch (antdMajorVersion) {\r\n case '4':\r\n require('../VtxModal.less')\r\n break;\r\n case '3':\r\n require('../VtxModalAntd3.less');\r\n break;\r\n default:\r\n break;\r\n}\r\n\r\n"],"mappings":";;AAAAA,OAAA;AAEA,IAAAC,QAAA,GAAAD,OAAA;AACA,QAAQE,yBAAgB;EACpB,KAAK,GAAG;IACJF,OAAO,CAAC,kBAAkB,CAAC;IAC3B;EACJ,KAAK,GAAG;IACJA,OAAO,CAAC,uBAAuB,CAAC;IAChC;EACJ;IACI;AACR","ignoreList":[]}
1
+ {"version":3,"file":"index.js","names":["require"],"sources":["VtxModal/style/index.js"],"sourcesContent":["import '../VtxModal.less';"],"mappings":";;AAAAA,OAAA","ignoreList":[]}
package/lib/VtxSearchCheckMap/VtxSearchCheckMap.css CHANGED
@@ -1,25 +1,27 @@
1
- .vtx-ui-searchmap-searchmodal {
1
+ .vtx-ui-search-checkmap-searchmodal {
2
2
  z-index: 1001;
3
3
  }
4
- .vtx-ui-searchmap-searchmodal .ant-modal {
4
+ .vtx-ui-search-checkmap-searchmodal .ant-modal {
5
5
  width: calc(100% - 200px) !important;
6
6
  min-width: 800px;
7
7
  height: 70vh;
8
8
  }
9
- .vtx-ui-searchmap-searchmodal .ant-modal .ant-modal-title {
10
- color: #1890ff;
9
+ .vtx-ui-search-checkmap-searchmodal .ant-modal .ant-modal-title {
10
+ color: var(--ant-color-primary);
11
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 {
12
+ .vtx-ui-search-checkmap-searchmodal .ant-modal .ant-modal-body {
17
13
  width: 100%;
18
14
  height: calc(100% - 108px) !important;
19
15
  padding: 0px;
20
- background-color: #fff;
16
+ background-color: var(--ant-color-bg-container);
17
+ }
18
+ .vtx-ui-search-checkmap-searchmodal .ant-modal .ant-modal-footer .vtx-ui-searchmap-check-bottom {
19
+ width: 100%;
20
+ }
21
+ .vtx-ui-search-checkmap-searchmodal .ant-modal .ant-modal-footer .vtx-ui-searchmap-check-bottom button {
22
+ margin-left: 10px;
21
23
  }
22
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap {
24
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap {
23
25
  width: 100%;
24
26
  height: 100%;
25
27
  padding-top: 48px;
@@ -28,29 +30,29 @@
28
30
  position: relative;
29
31
  overflow: hidden;
30
32
  }
31
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-check-top,
32
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-bottom {
33
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-check-top,
34
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-check-bottom {
33
35
  width: 100%;
34
36
  height: 48px;
35
37
  position: absolute;
36
38
  left: 0px;
37
39
  padding: 10px 15px;
38
40
  }
39
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-check-top button,
40
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-bottom button {
41
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-check-top button,
42
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-check-bottom button {
41
43
  margin-left: 10px;
42
44
  }
43
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-check-top {
45
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-check-top {
44
46
  top: 0px;
45
- border-bottom: 1px solid #d9d9d9;
47
+ border-bottom: 1px solid var(--ant-color-border);
46
48
  }
47
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-check-top .vtx-ui-searchmap-othermodal {
49
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-check-top .vtx-ui-searchmap-othermodal {
48
50
  position: absolute;
49
51
  right: 25px;
50
52
  line-height: 28px;
51
53
  display: inline-block;
52
54
  }
53
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-check-top .vtx-ui-searchmap-mapTxt {
55
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-check-top .vtx-ui-searchmap-mapTxt {
54
56
  position: absolute;
55
57
  right: 25px;
56
58
  line-height: 28px;
@@ -61,29 +63,29 @@
61
63
  text-align: center;
62
64
  cursor: pointer;
63
65
  }
64
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-bottom {
66
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-check-bottom {
65
67
  bottom: 0px;
66
- border-top: 1px solid #d9d9d9;
68
+ border-top: 1px solid var(--ant-color-border);
67
69
  text-align: right;
68
70
  }
69
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content {
71
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content {
70
72
  width: 100%;
71
73
  height: 100%;
72
74
  position: relative;
73
75
  padding-left: 25px;
74
76
  }
75
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-show {
77
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-show {
76
78
  display: inline-block;
77
79
  width: 100%;
78
80
  height: 100%;
79
81
  }
80
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-hidden {
82
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-hidden {
81
83
  display: none;
82
84
  }
83
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-w_l {
85
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-w_l {
84
86
  width: 300px !important;
85
87
  }
86
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left {
88
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left {
87
89
  width: 25px;
88
90
  height: 100%;
89
91
  display: inline-block;
@@ -92,38 +94,38 @@
92
94
  -webkit-transition-property: width;
93
95
  transition-property: width;
94
96
  vertical-align: top;
95
- border-right: 1px solid #d9d9d9;
97
+ border-right: 1px solid var(--ant-color-border);
96
98
  position: absolute;
97
99
  top: 0px;
98
100
  left: 0px;
99
101
  z-index: 10;
100
- background-color: #fff;
102
+ background-color: var(--ant-color-bg-container);
101
103
  }
102
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-listtitle {
104
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-listtitle {
103
105
  width: 100%;
104
106
  height: 30px;
105
107
  line-height: 30px;
106
- border-bottom: 1px solid #d9d9d9;
108
+ border-bottom: 1px solid var(--ant-color-border);
107
109
  }
108
- .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 {
110
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-listtitle .vtx-ui-searchmap-title {
109
111
  width: calc(100% - 30px);
110
112
  display: inline-block;
111
113
  padding-left: 15px;
112
114
  font-size: 15px;
113
115
  }
114
- .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 {
116
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-listtitle .vtx-ui-searchmap-btn {
115
117
  display: inline-block;
116
118
  width: 30px;
117
119
  text-align: center;
118
- color: #1890ff;
120
+ color: var(--ant-color-primary);
119
121
  height: 30px;
120
122
  line-height: 30px;
121
123
  cursor: pointer;
122
124
  }
123
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-lists {
125
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-lists {
124
126
  width: 100%;
125
127
  line-height: 35px;
126
- border-bottom: 1px solid #d9d9d9;
128
+ border-bottom: 1px solid var(--ant-color-border);
127
129
  font-size: 12px;
128
130
  overflow: hidden;
129
131
  text-overflow: ellipsis;
@@ -132,19 +134,19 @@
132
134
  cursor: pointer;
133
135
  color: #999;
134
136
  }
135
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-lists:hover {
137
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-lists:hover {
136
138
  background-color: #ECF6FD;
137
- color: #1890ff;
139
+ color: var(--ant-color-primary);
138
140
  }
139
- .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 {
141
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-lists.vtx-ui-searchmap-select {
140
142
  background-color: #ECF6FD;
141
- color: #1890ff;
143
+ color: var(--ant-color-primary);
142
144
  }
143
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-scrollauto {
145
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_left .vtx-ui-searchmap-scrollauto {
144
146
  height: calc(100% - 30px);
145
147
  overflow-y: auto;
146
148
  }
147
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_right {
149
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-content_right {
148
150
  width: 100%;
149
151
  height: 100%;
150
152
  display: inline-block;
@@ -153,30 +155,10 @@
153
155
  -webkit-transition-property: width;
154
156
  transition-property: width;
155
157
  }
156
- .vtx-ui-searchmap-searchmodal .vtx-ui-searchmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-btn {
158
+ .vtx-ui-search-checkmap-searchmodal .vtx-ui-search-checkmap-searchmap .vtx-ui-searchmap-content .vtx-ui-searchmap-btn {
157
159
  text-align: center;
158
- color: #1890ff;
160
+ color: var(--ant-color-primary);
159
161
  height: 30px;
160
162
  line-height: 30px;
161
163
  cursor: pointer;
162
164
  }
163
- .vtx-ui-searchmap-showlabel {
164
- margin-left: 0;
165
- width: 100px;
166
- line-height: 25px;
167
- text-align: center;
168
- position: relative;
169
- left: -38px;
170
- background-color: #222020;
171
- opacity: 0.6;
172
- border-radius: 5px;
173
- color: #FFF;
174
- padding: 2px 8px;
175
- text-overflow: ellipsis;
176
- white-space: nowrap;
177
- word-break: normal;
178
- overflow: hidden;
179
- }
180
- .vtx-ui-searchmap-hiddenlabel {
181
- display: none;
182
- }
package/lib/VtxSearchCheckMap/VtxSearchCheckMap.js CHANGED
@@ -6,12 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports["default"] = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
- var _button = _interopRequireDefault(require("antd/lib/button"));
10
- var _input = _interopRequireDefault(require("antd/lib/input"));
11
- var _message = _interopRequireDefault(require("antd/lib/message"));
12
- var _checkbox = _interopRequireDefault(require("antd/lib/checkbox"));
13
- var _radio = _interopRequireDefault(require("antd/lib/radio"));
14
- var _popover = _interopRequireDefault(require("antd/lib/popover"));
9
+ var _antd = require("antd");
15
10
  var _VtxModal = require("../VtxModal");
16
11
  var _VtxMap = require("../VtxMap");
17
12
  var _default2 = _interopRequireWildcard(require("../default"));
@@ -41,10 +36,10 @@ function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Sym
41
36
  function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
42
37
  function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } //公共地址配置
43
38
  var styles = {
44
- searchModal: "vtx-ui-searchmap-searchmodal",
45
- searchMap: "vtx-ui-searchmap-searchmap",
39
+ searchModal: "vtx-ui-search-checkmap-searchmodal",
40
+ searchMap: "vtx-ui-search-checkmap-searchmap",
46
41
  top: "vtx-ui-searchmap-check-top",
47
- bottom: "vtx-ui-searchmap-bottom",
42
+ bottom: "vtx-ui-searchmap-check-bottom",
48
43
  content: "vtx-ui-searchmap-content",
49
44
  show: "vtx-ui-searchmap-show",
50
45
  hidden: "vtx-ui-searchmap-hidden",
@@ -68,7 +63,7 @@ var styles = {
68
63
  // duration: 5,
69
64
  // });
70
65
  var warning = function warning() {
71
- _message["default"].warning("位置点查询失败,请缩小比例尺或切换关键字后再重新查询!");
66
+ _antd.message.warning("位置点查询失败,请缩小比例尺或切换关键字后再重新查询!");
72
67
  };
73
68
  function distinct(ary) {
74
69
  var pts = _toConsumableArray(ary);
@@ -80,9 +75,9 @@ function distinct(ary) {
80
75
  }
81
76
  }
82
77
  var getIcon = function getIcon(type) {
83
- return _default2.antdMajorVersion === "4" ? /*#__PURE__*/_react["default"].createElement(_default2.VtxMapIcon, {
78
+ return /*#__PURE__*/_react["default"].createElement(_default2.VtxMapIcon, {
84
79
  type: "icon-".concat(_mapping.iconMapping[type])
85
- }) : type;
80
+ });
86
81
  };
87
82
  var VtxSearchCheckMap = /*#__PURE__*/function (_React$Component) {
88
83
  function VtxSearchCheckMap(props) {
@@ -381,16 +376,16 @@ var VtxSearchCheckMap = /*#__PURE__*/function (_React$Component) {
381
376
  var lnglats = (_this$state$searchVal = this.state.searchValue) === null || _this$state$searchVal === void 0 ? void 0 : _this$state$searchVal.split(",");
382
377
  // 英文逗号分割，若长度为不为2，表示数据格式错误
383
378
  if ((lnglats === null || lnglats === void 0 ? void 0 : lnglats.length) !== 2) {
384
- _message["default"].warning("请按正确的经纬度格式输入，经度在前，用英文逗号隔开！");
379
+ _antd.message.warning("请按正确的经纬度格式输入，经度在前，用英文逗号隔开！");
385
380
  return;
386
381
  }
387
382
  // 经纬度分别正则校验
388
383
  if (!new RegExp(/^[\-\+]?(0(\.\d{1,15})?|([1-9](\d)?)(\.\d{1,15})?|1[0-7]\d{1}(\.\d{1,15})?|180\.0{1,15})$/).test(lnglats[0])) {
389
- _message["default"].warning("请输入正确格式经度！");
384
+ _antd.message.warning("请输入正确格式经度！");
390
385
  return;
391
386
  }
392
387
  if (!new RegExp(/^[\-\+]?((0|([1-8]\d?))(\.\d{1,15})?|90(\.0{1,15})?)$/).test(lnglats[1])) {
393
- _message["default"].warning("请输入正确格式纬度！");
388
+ _antd.message.warning("请输入正确格式纬度！");
394
389
  return;
395
390
  }
396
391
  // 正确的经纬度作为地图中心点
@@ -512,7 +507,7 @@ var VtxSearchCheckMap = /*#__PURE__*/function (_React$Component) {
512
507
  key: "closeModal",
513
508
  value: function closeModal(e) {
514
509
  if (this.isDrawStatus && this.isClickMap) {
515
- _message["default"].warning("请双击结束图元编辑");
510
+ _antd.message.warning("请双击结束图元编辑");
516
511
  } else {
517
512
  if ("closeModal" in this.props) {
518
513
  this.props.closeModal();
@@ -564,10 +559,10 @@ var VtxSearchCheckMap = /*#__PURE__*/function (_React$Component) {
564
559
  value: function editGraphic() {
565
560
  var _this6 = this;
566
561
  if (this.isDrawStatus && this.isClickMap) {
567
- _message["default"].warning("请双击结束图元编辑");
562
+ _antd.message.warning("请双击结束图元编辑");
568
563
  return;
569
564
  }
570
- _message["default"].info("请点击图元进行编辑");
565
+ _antd.message.info("请点击图元进行编辑");
571
566
  this.clickable = true;
572
567
  this.isDrawStatus = false;
573
568
  this.setState({
@@ -831,24 +826,28 @@ var VtxSearchCheckMap = /*#__PURE__*/function (_React$Component) {
831
826
  style: {
832
827
  top: 50
833
828
  },
834
- visible: modal1Visible,
829
+ open: modal1Visible,
835
830
  maximize: true,
836
831
  isNotMoving: true,
837
- wrapClassName: styles.searchModal,
838
- bodyStyle: {
839
- height: "".concat(window.innerHeight * 0.7, "px")
832
+ classNames: {
833
+ wrapper: styles.searchModal
834
+ },
835
+ styles: {
836
+ body: {
837
+ height: "".concat(window.innerHeight * 0.7, "px")
838
+ }
840
839
  },
841
840
  maskClosable: false,
842
841
  onCancel: this.closeModal.bind(this),
843
842
  footer: /*#__PURE__*/_react["default"].createElement("div", {
844
843
  className: styles.bottom
845
- }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
844
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
846
845
  type: "primary",
847
846
  onClick: function onClick() {
848
847
  _this7.callback();
849
848
  },
850
849
  icon: getIcon("check")
851
- }, "\u786E\u5B9A"), /*#__PURE__*/_react["default"].createElement(_button["default"], {
850
+ }, "\u786E\u5B9A"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
852
851
  onClick: this.closeModal.bind(this),
853
852
  icon: getIcon("close")
854
853
  }, "\u5173\u95ED"))
@@ -856,26 +855,26 @@ var VtxSearchCheckMap = /*#__PURE__*/function (_React$Component) {
856
855
  className: styles.searchMap
857
856
  }, /*#__PURE__*/_react["default"].createElement("div", {
858
857
  className: styles.top
859
- }, mapType == "gmap" || mapType == "olmap" ? "" : [!checkValue ? /*#__PURE__*/_react["default"].createElement(_input["default"], _extends({
858
+ }, mapType == "gmap" || mapType == "olmap" ? "" : [!checkValue ? /*#__PURE__*/_react["default"].createElement(_antd.Input, _extends({
860
859
  key: "1"
861
- }, InputProps)) : /*#__PURE__*/_react["default"].createElement(_input["default"], _extends({
860
+ }, InputProps)) : /*#__PURE__*/_react["default"].createElement(_antd.Input, _extends({
862
861
  key: "1"
863
- }, checkInputProps)), this.state.graphicType == "point" ? /*#__PURE__*/_react["default"].createElement(_radio["default"], {
862
+ }, checkInputProps)), this.state.graphicType == "point" ? /*#__PURE__*/_react["default"].createElement(_antd.Radio, {
864
863
  onClick: this.counterCheck.bind(this),
865
864
  checked: checkValue
866
- }, "\u5750\u6807\u53CD\u67E5") : null, /*#__PURE__*/_react["default"].createElement(_button["default"], {
865
+ }, "\u5750\u6807\u53CD\u67E5") : null, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
867
866
  key: "2",
868
867
  type: "primary",
869
868
  onClick: this.searchList.bind(this),
870
869
  icon: getIcon("search")
871
- }, "\u67E5\u8BE2"), /*#__PURE__*/_react["default"].createElement(_button["default"], {
870
+ }, "\u67E5\u8BE2"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
872
871
  key: "3",
873
872
  onClick: this.clearList.bind(this),
874
873
  icon: getIcon("close")
875
- }, "\u6E05\u7A7A")], this.state.graphicType == "point" ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
874
+ }, "\u6E05\u7A7A")], this.state.graphicType == "point" ? /*#__PURE__*/_react["default"].createElement(_antd.Button, {
876
875
  onClick: this.correction.bind(this),
877
876
  icon: getIcon("environment")
878
- }, "\u6821\u6B63") : null, this.state.graphicType != "point" ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
877
+ }, "\u6821\u6B63") : null, this.state.graphicType != "point" ? /*#__PURE__*/_react["default"].createElement(_antd.Button, {
879
878
  disabled: this.isDrawStatus,
880
879
  onClick: function onClick() {
881
880
  _this7.isDrawStatus = true;
@@ -916,16 +915,16 @@ var VtxSearchCheckMap = /*#__PURE__*/function (_React$Component) {
916
915
  _this7.callback("editDraw");
917
916
  },
918
917
  icon: getIcon("edit")
919
- }, "\u91CD\u65B0\u7ED8\u5236") : null, this.multiDraw && /*#__PURE__*/_react["default"].createElement(_button["default"], {
918
+ }, "\u91CD\u65B0\u7ED8\u5236") : null, this.multiDraw && /*#__PURE__*/_react["default"].createElement(_antd.Button, {
920
919
  onClick: this.continueDraw.bind(this),
921
920
  icon: getIcon("edit")
922
- }, "\u7EE7\u7EED\u7ED8\u5236"), this.multiDraw && /*#__PURE__*/_react["default"].createElement(_button["default"], {
921
+ }, "\u7EE7\u7EED\u7ED8\u5236"), this.multiDraw && /*#__PURE__*/_react["default"].createElement(_antd.Button, {
923
922
  onClick: this.editGraphic.bind(this),
924
923
  icon: getIcon("edit")
925
- }, "\u7F16\u8F91\u56FE\u5143"), mapType == "gmap" || mapType == "olmap" ? "" : /*#__PURE__*/_react["default"].createElement(_button["default"], {
924
+ }, "\u7F16\u8F91\u56FE\u5143"), mapType == "gmap" || mapType == "olmap" ? "" : /*#__PURE__*/_react["default"].createElement(_antd.Button, {
926
925
  onClick: this.setFitView.bind(this),
927
926
  icon: getIcon("sync")
928
- }, "\u8FD4\u56DE\u5168\u5C40\u5730\u56FE"), isChangeMapType && (mapType == 'amap' || mapType == 'bmap' || mapType == 'tmap') && /*#__PURE__*/_react["default"].createElement(_popover["default"], {
927
+ }, "\u8FD4\u56DE\u5168\u5C40\u5730\u56FE"), isChangeMapType && (mapType == 'amap' || mapType == 'bmap' || mapType == 'tmap') && /*#__PURE__*/_react["default"].createElement(_antd.Popover, {
929
928
  overlayClassName: styles.mapTypePopover,
930
929
  content: mapTypeContent,
931
930
  trigger: "click",
@@ -934,7 +933,7 @@ var VtxSearchCheckMap = /*#__PURE__*/function (_React$Component) {
934
933
  className: styles.mapTxt
935
934
  }, "\u5207\u6362\u5730\u56FE")), isShowOther ? /*#__PURE__*/_react["default"].createElement("div", {
936
935
  className: styles.otherModal
937
- }, /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
936
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Checkbox, {
938
937
  checked: isShowOtherGraph,
939
938
  onChange: function onChange(e) {
940
939
  _this7.setState({