@vtx/modals2 5.0.15 → 5.0.17

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 (11) hide show
  1. package/lib/vtx-base-modal/Tabs/index.js +3 -1
  2. package/lib/vtx-base-modal/Tabs/index.less +23 -0
  3. package/lib/vtx-car-modal/components/Info/index.js +3 -0
  4. package/lib/vtx-car-modal/components/Info/index.less +1 -1
  5. package/lib/vtx-car-modal/content/Common/BaseInfo/index.js +16 -7
  6. package/lib/vtx-car-modal/content/JXH/BaseInfo/index.js +2 -1
  7. package/lib/vtx-car-modal/content/Ljsy/BaseInfo/index.js +21 -10
  8. package/lib/vtx-car-modal/content/Ljzy/BaseInfo/index.js +16 -7
  9. package/lib/vtx-qyry-modal/api.js +2 -0
  10. package/lib/vtx-qyry-modal/index.js +0 -4
  11. package/package.json +1 -1
package/lib/vtx-base-modal/Tabs/index.js CHANGED
@@ -90,7 +90,9 @@ var Tabs = function Tabs(props) {
90
90
  onClick: function onClick() {
91
91
  onChange(tab.key);
92
92
  },
93
- className: classNames('vm-modal-tabs-item', active === tab.key ? 'vm-modal-tabs-item-active' : 'vm-modal-tabs-item-normal'),
93
+ className: classNames('vm-modal-tabs-item', active === tab.key ? 'vm-modal-tabs-item-active' : 'vm-modal-tabs-item-normal', {
94
+ 'vm-modal-tabs-item-dark': theme !== 'light'
95
+ }),
94
96
  children: [ComponentIcon && /*#__PURE__*/_jsx(ComponentIcon, {
95
97
  width: width,
96
98
  height: height,
package/lib/vtx-base-modal/Tabs/index.less CHANGED
@@ -26,6 +26,29 @@
26
26
  border-radius: 26px;
27
27
  color: var(--vm-tab-item-active-color);
28
28
  box-shadow: var(--vm-tab-item-active-box-shadow);
29
+ &.vm-modal-tabs-item-dark {
30
+ position: relative;
31
+ &::before {
32
+ content: '';
33
+ position: absolute;
34
+ top: 0;
35
+ left: 0;
36
+ right: 0;
37
+ bottom: 0;
38
+ background: linear-gradient(
39
+ 180deg,
40
+ rgba(255, 255, 255, 1),
41
+ rgba(54, 161, 255, 1)
42
+ );
43
+ border-radius: 26px;
44
+ padding: 1px;
45
+ -webkit-mask: linear-gradient(#fff 0 0) content-box,
46
+ linear-gradient(#fff 0 0);
47
+ -webkit-mask-composite: xor;
48
+ mask-composite: exclude;
49
+ z-index: -1;
50
+ }
51
+ }
29
52
  }
30
53
  }
31
54
  }
package/lib/vtx-car-modal/components/Info/index.js CHANGED
@@ -87,6 +87,9 @@ var Info = function Info() {
87
87
  }];
88
88
  return /*#__PURE__*/_jsx(Col, {
89
89
  flex: '400px',
90
+ style: {
91
+ height: '100%'
92
+ },
90
93
  children: /*#__PURE__*/_jsxs(VmWrapper, {
91
94
  title: '基本信息',
92
95
  children: [/*#__PURE__*/_jsx(VmInfoCollection, {
package/lib/vtx-car-modal/components/Info/index.less CHANGED
@@ -1,6 +1,6 @@
1
1
  .vm-car-map-wrap {
2
2
  flex: 1;
3
- min-height: 230px;
3
+ min-height: 0;
4
4
  width: 100%;
5
5
  margin-top: 10px;
6
6
  }
package/lib/vtx-car-modal/content/Common/BaseInfo/index.js CHANGED
@@ -34,6 +34,14 @@ var BaseInfo = function BaseInfo() {
34
34
  loading = _BaseService$useDaily.loading;
35
35
  var todayInfo = _.last(dailyCarRunRes);
36
36
  var xAxis = _.map(dailyCarRunRes, 'reportDate');
37
+ var blueColor = '#1677FF';
38
+ var greenColor = '#0FB964';
39
+ var colorOpacity = 0.2;
40
+ if (isDark) {
41
+ blueColor = '#0095FF';
42
+ greenColor = '#36AB78';
43
+ colorOpacity = 0.6;
44
+ }
37
45
  return /*#__PURE__*/_jsxs(Row, {
38
46
  gutter: [16, 16],
39
47
  style: {
@@ -42,7 +50,8 @@ var BaseInfo = function BaseInfo() {
42
50
  children: [/*#__PURE__*/_jsx(Info, {}), /*#__PURE__*/_jsx(Col, {
43
51
  flex: '1',
44
52
  style: {
45
- minWidth: 0
53
+ minWidth: 0,
54
+ height: '100%'
46
55
  },
47
56
  children: /*#__PURE__*/_jsxs("div", {
48
57
  className: 'vtx-car-info-right-wrap',
@@ -77,18 +86,18 @@ var BaseInfo = function BaseInfo() {
77
86
  dataList: [{
78
87
  name: '行驶里程',
79
88
  data: _.map(dailyCarRunRes, 'sumMileage'),
80
- color: 'rgba(22, 119, 255, 0.20)',
89
+ color: transformRgb(blueColor, colorOpacity),
81
90
  smooth: true,
82
91
  symbol: 'none',
83
92
  areaStyle: {
84
93
  color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
85
94
  offset: 0,
86
- color: 'rgba(22, 119, 255, 0.20)'
95
+ color: transformRgb(blueColor, colorOpacity)
87
96
  },
88
97
  // 半透明
89
98
  {
90
99
  offset: 1,
91
- color: 'rgba(22, 119, 255, 0)'
100
+ color: transformRgb(blueColor, 0)
92
101
  } // 更透明
93
102
  ])
94
103
  }
@@ -132,18 +141,18 @@ var BaseInfo = function BaseInfo() {
132
141
  dataList: [{
133
142
  name: '行驶时长',
134
143
  data: _.map(dailyCarRunRes, 'driveDuration'),
135
- color: 'rgba(15, 185, 100, 0.20)',
144
+ color: transformRgb(greenColor, colorOpacity),
136
145
  smooth: true,
137
146
  symbol: 'none',
138
147
  areaStyle: {
139
148
  color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
140
149
  offset: 0,
141
- color: 'rgba(15, 185, 100, 0.20)'
150
+ color: transformRgb(greenColor, colorOpacity)
142
151
  },
143
152
  // 半透明
144
153
  {
145
154
  offset: 1,
146
- color: 'rgba(15, 185, 100, 0)'
155
+ color: transformRgb(greenColor, 0)
147
156
  } // 更透明
148
157
  ])
149
158
  }
package/lib/vtx-car-modal/content/JXH/BaseInfo/index.js CHANGED
@@ -32,7 +32,8 @@ var BaseInfo = function BaseInfo() {
32
32
  children: [/*#__PURE__*/_jsx(Info, {}), /*#__PURE__*/_jsx(Col, {
33
33
  flex: '1',
34
34
  style: {
35
- minWidth: 0
35
+ minWidth: 0,
36
+ height: '100%'
36
37
  },
37
38
  children: /*#__PURE__*/_jsxs("div", {
38
39
  className: 'vtx-car-info-right-wrap',
package/lib/vtx-car-modal/content/Ljsy/BaseInfo/index.js CHANGED
@@ -10,6 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
10
10
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
11
11
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
12
12
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
13
+ import { transformRgb } from "../../../../_util";
13
14
  import { Col, Row } from 'antd';
14
15
  import dayjs from 'dayjs';
15
16
  import * as echarts from 'echarts';
@@ -108,6 +109,15 @@ var BaseInfo = function BaseInfo() {
108
109
  fontType: 'blue'
109
110
  });
110
111
  }
112
+ var blueColor = '#1677FF';
113
+ var greenColor = '#0FB964';
114
+ var yellowColor = '#ffaa00';
115
+ var colorOpacity = 0.2;
116
+ if (isDark) {
117
+ blueColor = '#0095FF';
118
+ greenColor = '#36AB78';
119
+ colorOpacity = 0.6;
120
+ }
111
121
  return /*#__PURE__*/_jsxs(Row, {
112
122
  gutter: [16, 16],
113
123
  style: {
@@ -116,7 +126,8 @@ var BaseInfo = function BaseInfo() {
116
126
  children: [/*#__PURE__*/_jsx(Info, {}), /*#__PURE__*/_jsx(Col, {
117
127
  flex: '1',
118
128
  style: {
119
- minWidth: 0
129
+ minWidth: 0,
130
+ height: '100%'
120
131
  },
121
132
  children: /*#__PURE__*/_jsxs("div", {
122
133
  className: 'vtx-car-info-right-wrap',
@@ -179,18 +190,18 @@ var BaseInfo = function BaseInfo() {
179
190
  dataList: [{
180
191
  name: '已收点位',
181
192
  data: _.map(taskDaySummary, 'collectPointNum'),
182
- color: 'rgba(22, 119, 255, 0.20)',
193
+ color: transformRgb(greenColor, colorOpacity),
183
194
  smooth: true,
184
195
  symbol: 'none',
185
196
  areaStyle: {
186
197
  color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
187
198
  offset: 0,
188
- color: 'rgba(22, 119, 255, 0.20)'
199
+ color: transformRgb(greenColor, colorOpacity)
189
200
  },
190
201
  // 半透明
191
202
  {
192
203
  offset: 1,
193
- color: 'rgba(22, 119, 255, 0)'
204
+ color: transformRgb(greenColor, 0)
194
205
  } // 更透明
195
206
  ])
196
207
  }
@@ -230,18 +241,18 @@ var BaseInfo = function BaseInfo() {
230
241
  dataList: [{
231
242
  name: '收集桶数',
232
243
  data: _.map(taskDaySummary, 'bucketNum'),
233
- color: 'rgba(15, 185, 100, 0.20)',
244
+ color: transformRgb(blueColor, colorOpacity),
234
245
  smooth: true,
235
246
  symbol: 'none',
236
247
  areaStyle: {
237
248
  color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
238
249
  offset: 0,
239
- color: 'rgba(15, 185, 100, 0.20)'
250
+ color: transformRgb(blueColor, colorOpacity)
240
251
  },
241
252
  // 半透明
242
253
  {
243
254
  offset: 1,
244
- color: 'rgba(15, 185, 100, 0)'
255
+ color: transformRgb(blueColor, 0)
245
256
  } // 更透明
246
257
  ])
247
258
  }
@@ -282,18 +293,18 @@ var BaseInfo = function BaseInfo() {
282
293
  dataList: [{
283
294
  name: '收集重量',
284
295
  data: _.map(taskDaySummary, 'weight'),
285
- color: 'rgba(17, 159, 251, 0.20)',
296
+ color: transformRgb(yellowColor, colorOpacity),
286
297
  smooth: true,
287
298
  symbol: 'none',
288
299
  areaStyle: {
289
300
  color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
290
301
  offset: 0,
291
- color: 'rgba(17, 159, 251, 0.20)'
302
+ color: transformRgb(yellowColor, colorOpacity)
292
303
  },
293
304
  // 半透明
294
305
  {
295
306
  offset: 1,
296
- color: 'rgba(17, 159, 251, 0)'
307
+ color: transformRgb(yellowColor, 0)
297
308
  } // 更透明
298
309
  ])
299
310
  }
package/lib/vtx-car-modal/content/Ljzy/BaseInfo/index.js CHANGED
@@ -39,6 +39,14 @@ var BaseInfo = function BaseInfo() {
39
39
  loading = _LjzyService$useGetCa.loading;
40
40
  var xAxis = _.map(taskDaySummary, 'date');
41
41
  var todayInfo = _.last(taskDaySummary) || {};
42
+ var blueColor = '#1677FF';
43
+ var greenColor = '#0FB964';
44
+ var colorOpacity = 0.2;
45
+ if (isDark) {
46
+ blueColor = '#0095FF';
47
+ greenColor = '#36AB78';
48
+ colorOpacity = 0.6;
49
+ }
42
50
  return /*#__PURE__*/_jsxs(Row, {
43
51
  gutter: [16, 16],
44
52
  style: {
@@ -47,7 +55,8 @@ var BaseInfo = function BaseInfo() {
47
55
  children: [/*#__PURE__*/_jsx(Info, {}), /*#__PURE__*/_jsx(Col, {
48
56
  flex: '1',
49
57
  style: {
50
- minWidth: 0
58
+ minWidth: 0,
59
+ height: '100%'
51
60
  },
52
61
  children: /*#__PURE__*/_jsxs("div", {
53
62
  className: 'vtx-car-info-right-wrap',
@@ -82,18 +91,18 @@ var BaseInfo = function BaseInfo() {
82
91
  dataList: [{
83
92
  name: '进场车次',
84
93
  data: _.map(taskDaySummary, 'carNums'),
85
- color: 'rgba(22, 119, 255, 0.20)',
94
+ color: transformRgb(blueColor, colorOpacity),
86
95
  smooth: true,
87
96
  symbol: 'none',
88
97
  areaStyle: {
89
98
  color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
90
99
  offset: 0,
91
- color: 'rgba(22, 119, 255, 0.20)'
100
+ color: transformRgb(blueColor, colorOpacity)
92
101
  },
93
102
  // 半透明
94
103
  {
95
104
  offset: 1,
96
- color: 'rgba(22, 119, 255, 0)'
105
+ color: transformRgb(blueColor, 0)
97
106
  } // 更透明
98
107
  ])
99
108
  }
@@ -132,18 +141,18 @@ var BaseInfo = function BaseInfo() {
132
141
  dataList: [{
133
142
  name: '进场量',
134
143
  data: _.map(taskDaySummary, 'netWeight'),
135
- color: 'rgba(15, 185, 100, 0.20)',
144
+ color: transformRgb(greenColor, colorOpacity),
136
145
  smooth: true,
137
146
  symbol: 'none',
138
147
  areaStyle: {
139
148
  color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
140
149
  offset: 0,
141
- color: 'rgba(15, 185, 100, 0.20)'
150
+ color: transformRgb(greenColor, colorOpacity)
142
151
  },
143
152
  // 半透明
144
153
  {
145
154
  offset: 1,
146
- color: 'rgba(15, 185, 100, 0)'
155
+ color: transformRgb(greenColor, 0)
147
156
  } // 更透明
148
157
  ])
149
158
  }
package/lib/vtx-qyry-modal/api.js CHANGED
@@ -83,6 +83,8 @@ var BaseService = {
83
83
  refreshDeps: [id]
84
84
  }),
85
85
  areas = _useRequest3.data;
86
+ var _useSettings = useSettings(),
87
+ isDark = _useSettings.isDark;
86
88
  return {
87
89
  info: mapInfoRes === null || mapInfoRes === void 0 ? void 0 : mapInfoRes.data,
88
90
  mapPoints: mapInfoRes !== null && mapInfoRes !== void 0 && (_mapInfoRes$data = mapInfoRes.data) !== null && _mapInfoRes$data !== void 0 && _mapInfoRes$data.lngDone ? [{
package/lib/vtx-qyry-modal/index.js CHANGED
@@ -12,7 +12,6 @@ import { BaseService } from "./api";
12
12
  import { jsx as _jsx } from "react/jsx-runtime";
13
13
  var TABS_BASE = 'base';
14
14
  var TABS_CALENDAR = 'calendar';
15
- var TABS_DETAIL = 'detail';
16
15
  var TABS_ALARM = 'alarm';
17
16
  var TABS_ATTENDANCE = 'attendance';
18
17
  var TABS_EUQIPMENT = 'equipment';
@@ -22,9 +21,6 @@ var tabs = [{
22
21
  }, {
23
22
  key: TABS_CALENDAR,
24
23
  title: '作业日历'
25
- }, {
26
- key: TABS_DETAIL,
27
- title: '详细信息'
28
24
  }, {
29
25
  key: TABS_ALARM,
30
26
  title: '报警信息'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vtx/modals2",
3
- "version": "5.0.15",
3
+ "version": "5.0.17",
4
4
  "description": "弹窗组件",
5
5
  "license": "MIT",
6
6
  "module": "lib/index.js",