@vtx/modals2 5.0.7 → 5.0.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.
Files changed (6) hide show
  1. package/lib/vtx-kh-modal/api2.js +8 -5
  2. package/lib/vtx-kh-modal/components/BaseInfo/index.js +2 -1
  3. package/lib/vtx-zg-modal/api.js +15 -7
  4. package/lib/vtx-zg-modal/components/BaseInfo/index.js +5 -3
  5. package/lib/vtx-zg-modal/components/BaseInfo/index.less +2 -0
  6. package/package.json +1 -1
package/lib/vtx-kh-modal/api2.js CHANGED
@@ -9,7 +9,7 @@ import { request } from '@vtx/utils';
9
9
  import { useRequest } from 'ahooks';
10
10
  var BaseService = {
11
11
  useBaseInfo: function useBaseInfo(id) {
12
- var _info$categoryDTO, _info$geometryInfo, _info$geometryInfo2, _info$geometryInfo3;
12
+ var _info$categoryDTO, _info$geometryInfo, _info$geometryInfo2, _lngLats$split, _info$geometryInfo3;
13
13
  var _useRequest = useRequest(function () {
14
14
  return request.get('/cloud/zykh-reborn/checkResource/get', {
15
15
  data: {
@@ -62,13 +62,14 @@ var BaseService = {
62
62
  }];
63
63
  var lngLats = info === null || info === void 0 || (_info$geometryInfo = info.geometryInfo) === null || _info$geometryInfo === void 0 ? void 0 : _info$geometryInfo.lngLats;
64
64
  var type = info === null || info === void 0 || (_info$geometryInfo2 = info.geometryInfo) === null || _info$geometryInfo2 === void 0 ? void 0 : _info$geometryInfo2.type;
65
+ var center = type === 'point' ? lngLats === null || lngLats === void 0 ? void 0 : lngLats.split(',') : lngLats === null || lngLats === void 0 || (_lngLats$split = lngLats.split(';')) === null || _lngLats$split === void 0 ? void 0 : _lngLats$split[0].split(',');
65
66
  var results = {};
66
67
  if (lngLats) {
67
- var _lngLats$split, _lngLats$split2;
68
+ var _lngLats$split2, _lngLats$split3;
68
69
  results = {
69
70
  mapPoints: type === 'point' ? [{
70
- lng: lngLats === null || lngLats === void 0 || (_lngLats$split = lngLats.split(',')) === null || _lngLats$split === void 0 ? void 0 : _lngLats$split[0],
71
- lat: lngLats === null || lngLats === void 0 || (_lngLats$split2 = lngLats.split(',')) === null || _lngLats$split2 === void 0 ? void 0 : _lngLats$split2[1],
71
+ lng: lngLats === null || lngLats === void 0 || (_lngLats$split2 = lngLats.split(',')) === null || _lngLats$split2 === void 0 ? void 0 : _lngLats$split2[0],
72
+ lat: lngLats === null || lngLats === void 0 || (_lngLats$split3 = lngLats.split(',')) === null || _lngLats$split3 === void 0 ? void 0 : _lngLats$split3[1],
72
73
  icon: 'KH',
73
74
  type: type,
74
75
  url: new MapIcon.CommonIcon({
@@ -78,6 +79,7 @@ var BaseService = {
78
79
  }] : [],
79
80
  type: type,
80
81
  mapPolygons: type !== 'point' ? [{
82
+ id: info === null || info === void 0 ? void 0 : info.id,
81
83
  rings: lngLats
82
84
  }] : []
83
85
  };
@@ -85,7 +87,8 @@ var BaseService = {
85
87
  return _objectSpread({
86
88
  baseInfo: baseInfo,
87
89
  lngLats: (info === null || info === void 0 || (_info$geometryInfo3 = info.geometryInfo) === null || _info$geometryInfo3 === void 0 ? void 0 : _info$geometryInfo3.lngLats) || '',
88
- info: baseInfoRes === null || baseInfoRes === void 0 ? void 0 : baseInfoRes.data
90
+ info: baseInfoRes === null || baseInfoRes === void 0 ? void 0 : baseInfoRes.data,
91
+ center: center
89
92
  }, results);
90
93
  },
91
94
  useKhInfo: function useKhInfo(id, startDate, endDate, checkActivityCode) {
package/lib/vtx-kh-modal/components/BaseInfo/index.js CHANGED
@@ -35,6 +35,7 @@ var BaseInfo = function BaseInfo(props) {
35
35
  info = _BaseService$useBaseI.info,
36
36
  mapPoints = _BaseService$useBaseI.mapPoints,
37
37
  type = _BaseService$useBaseI.type,
38
+ center = _BaseService$useBaseI.center,
38
39
  mapPolygons = _BaseService$useBaseI.mapPolygons;
39
40
  var _BaseService$useKhInf = BaseService.useKhInfo(id, date.startOf('M').format('YYYY-MM-DD'), date.endOf('M').format('YYYY-MM-DD')),
40
41
  khRes = _BaseService$useKhInf.khRes;
@@ -53,7 +54,7 @@ var BaseInfo = function BaseInfo(props) {
53
54
  };
54
55
  if (type) {
55
56
  mapParam = {
56
- mapCenter: mapCenter,
57
+ mapCenter: center || mapCenter,
57
58
  geometryType: type,
58
59
  newMapPoints: mapPoints,
59
60
  mapPolygons: mapPolygons
package/lib/vtx-zg-modal/api.js CHANGED
@@ -3,7 +3,7 @@ import { request } from '@vtx/utils';
3
3
  import { useRequest } from 'ahooks';
4
4
  var BaseService = {
5
5
  useBaseDetail: function useBaseDetail(id) {
6
- var _info$geometryInfo, _info$geometryInfo2, _lngLats$split, _lngLats$split2, _info$geometryInfo3;
6
+ var _info$geometryInfo, _info$geometryInfo2, _lngLats$split, _lngLats$split2, _lngLats$split3, _info$geometryInfo3;
7
7
  var _useRequest = useRequest(function () {
8
8
  return request.get('/cloud/zykh-reborn/orderTask/get', {
9
9
  data: {
@@ -71,22 +71,30 @@ var BaseService = {
71
71
  value: info === null || info === void 0 ? void 0 : info.address,
72
72
  width: '100%'
73
73
  }];
74
- var lngLats = info === null || info === void 0 || (_info$geometryInfo = info.geometryInfo) === null || _info$geometryInfo === void 0 ? void 0 : _info$geometryInfo.lngLats;
74
+ var type = info === null || info === void 0 || (_info$geometryInfo = info.geometryInfo) === null || _info$geometryInfo === void 0 ? void 0 : _info$geometryInfo.type;
75
+ var lngLats = info === null || info === void 0 || (_info$geometryInfo2 = info.geometryInfo) === null || _info$geometryInfo2 === void 0 ? void 0 : _info$geometryInfo2.lngLats;
76
+ var center = type === 'point' ? lngLats === null || lngLats === void 0 ? void 0 : lngLats.split(',') : lngLats === null || lngLats === void 0 || (_lngLats$split = lngLats.split(';')) === null || _lngLats$split === void 0 ? void 0 : _lngLats$split[0].split(',');
75
77
  return {
76
78
  info: info,
77
79
  baseInfo: baseInfo,
78
- lngLats: (info === null || info === void 0 || (_info$geometryInfo2 = info.geometryInfo) === null || _info$geometryInfo2 === void 0 ? void 0 : _info$geometryInfo2.lngLats) || '',
80
+ center: center,
79
81
  loading: loading,
80
- mapPoints: [{
81
- lng: lngLats === null || lngLats === void 0 || (_lngLats$split = lngLats.split(',')) === null || _lngLats$split === void 0 ? void 0 : _lngLats$split[0],
82
- lat: lngLats === null || lngLats === void 0 || (_lngLats$split2 = lngLats.split(',')) === null || _lngLats$split2 === void 0 ? void 0 : _lngLats$split2[1],
82
+ geometryType: type,
83
+ mapPoints: type === 'point' ? [{
84
+ lng: lngLats === null || lngLats === void 0 || (_lngLats$split2 = lngLats.split(',')) === null || _lngLats$split2 === void 0 ? void 0 : _lngLats$split2[0],
85
+ lat: lngLats === null || lngLats === void 0 || (_lngLats$split3 = lngLats.split(',')) === null || _lngLats$split3 === void 0 ? void 0 : _lngLats$split3[1],
83
86
  icon: 'GD',
84
87
  type: info === null || info === void 0 || (_info$geometryInfo3 = info.geometryInfo) === null || _info$geometryInfo3 === void 0 ? void 0 : _info$geometryInfo3.type,
85
88
  url: new MapIcon.CommonIcon({
86
89
  canvasIcon: 'GD',
87
90
  color: '#119FFB'
88
91
  }).getImgUrl()
89
- }]
92
+ }] : [],
93
+ mapPolygons: type !== 'point' ? [{
94
+ id: info === null || info === void 0 ? void 0 : info.id,
95
+ rings: lngLats,
96
+ type: type
97
+ }] : []
90
98
  };
91
99
  },
92
100
  useGetRecord: function useGetRecord(orderTaskNo) {
package/lib/vtx-zg-modal/components/BaseInfo/index.js CHANGED
@@ -12,8 +12,9 @@ var BaseInfo = function BaseInfo(props) {
12
12
  var _BaseService$useBaseD = BaseService.useBaseDetail(id, 'wgs84'),
13
13
  info = _BaseService$useBaseD.info,
14
14
  baseInfo = _BaseService$useBaseD.baseInfo,
15
- lngLats = _BaseService$useBaseD.lngLats,
15
+ center = _BaseService$useBaseD.center,
16
16
  mapPoints = _BaseService$useBaseD.mapPoints,
17
+ geometryType = _BaseService$useBaseD.geometryType,
17
18
  loading = _BaseService$useBaseD.loading;
18
19
  var records = BaseService.useGetRecord(info === null || info === void 0 ? void 0 : info.orderNo);
19
20
  var getStep = function getStep() {
@@ -54,9 +55,10 @@ var BaseInfo = function BaseInfo(props) {
54
55
  }), /*#__PURE__*/_jsx("div", {
55
56
  className: "zg-base-map",
56
57
  children: /*#__PURE__*/_jsx(VmMap, {
57
- mapCenter: lngLats ? lngLats.split(',') : mapCenter,
58
+ mapCenter: center || mapCenter,
58
59
  newMapPoints: mapPoints,
59
- address: info === null || info === void 0 ? void 0 : info.address
60
+ address: info === null || info === void 0 ? void 0 : info.address,
61
+ geometryType: geometryType
60
62
  })
61
63
  })]
62
64
  })
package/lib/vtx-zg-modal/components/BaseInfo/index.less CHANGED
@@ -42,6 +42,7 @@
42
42
  display: flex;
43
43
  align-items: center;
44
44
  gap: 8px;
45
+ white-space: nowrap;
45
46
  &-order {
46
47
  width: 32px;
47
48
  height: 32px;
@@ -63,6 +64,7 @@
63
64
  font-size: 16px;
64
65
  color: var(--title-color);
65
66
  line-height: 24px;
67
+ white-space: nowrap;
66
68
  &.active {
67
69
  color: var(--modal-title-color);
68
70
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vtx/modals2",
3
- "version": "5.0.7",
3
+ "version": "5.0.8",
4
4
  "description": "弹窗组件",
5
5
  "license": "MIT",
6
6
  "module": "lib/index.js",