@vtx/modals2 6.0.0-beta.13 → 6.0.0-beta.14

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.
@@ -1,27 +1,27 @@
1
- .vm-car-statistics {
2
- width: 208px;
3
- height: 84px;
4
- display: flex;
5
- flex-direction: column;
6
- justify-content: space-between;
7
- padding: 20px;
8
- background-size: 100% 100%;
9
- &-label {
10
- color: var(--img-text-color);
11
- }
12
- &-value, &-unit {
13
- color: #1f1f1f;
14
- }
15
- &.vm-car-statistics-dark {
16
- .vm-car-statistics-value,.vm-car-statistics-unit {
17
- background: linear-gradient(180deg, #ffffff 0%, #119FFB 100%);
18
- background-clip: text;
19
- -webkit-text-fill-color: transparent;
20
- }
21
- }
22
- &-value {
23
- font-size: 20px;
24
- font-weight: bold;
25
- margin-right: 4px;
26
- }
27
- }
1
+ .vm-car-statistics {
2
+ width: 208px;
3
+ height: 84px;
4
+ display: flex;
5
+ flex-direction: column;
6
+ justify-content: space-between;
7
+ padding: 20px;
8
+ background-size: 100% 100%;
9
+ &-label {
10
+ color: var(--img-text-color);
11
+ }
12
+ &-value, &-unit {
13
+ color: #1f1f1f;
14
+ }
15
+ &.vm-car-statistics-dark {
16
+ .vm-car-statistics-value,.vm-car-statistics-unit {
17
+ background: linear-gradient(180deg, #ffffff 0%, #119FFB 100%);
18
+ background-clip: text;
19
+ -webkit-text-fill-color: transparent;
20
+ }
21
+ }
22
+ &-value {
23
+ font-size: 20px;
24
+ font-weight: bold;
25
+ margin-right: 4px;
26
+ }
27
+ }
@@ -1,11 +1,11 @@
1
- .vm-factor-list-wrap {
2
- display: flex;
3
- padding: 12px 16px;
4
- height: 68px;
5
- background: #F3F8FF;
6
- border-radius: 8px;
7
- gap: 26px;
8
- &.dark {
9
- background: rgba(0,136,240,0.15);
10
- }
11
- }
1
+ .vm-factor-list-wrap {
2
+ display: flex;
3
+ padding: 12px 16px;
4
+ height: 68px;
5
+ background: #F3F8FF;
6
+ border-radius: 8px;
7
+ gap: 26px;
8
+ &.dark {
9
+ background: rgba(0,136,240,0.15);
10
+ }
11
+ }
@@ -59,13 +59,13 @@
59
59
  padding-top: 12px;
60
60
  overflow-y: auto;
61
61
 
62
- .channels--item {
63
- svg {
64
- display: block;
65
- margin-right: 2px;
66
- }
67
- .ant-checkbox {
68
- top: 0;
62
+ .channels--item {
63
+ svg {
64
+ display: block;
65
+ margin-right: 2px;
66
+ }
67
+ .ant-checkbox {
68
+ top: 0;
69
69
  }
70
70
  .ant-checkbox-checked .ant-checkbox-inner {
71
71
  background-color: var(--check-bg);
@@ -78,17 +78,17 @@
78
78
  width: 15px;
79
79
  height: 15px;
80
80
  }
81
- .ant-checkbox-wrapper {
82
- display: inline-flex;
83
- align-items: center;
84
- font-size: 15px;
85
- // color: var(--modal-title-color);
86
- }
87
- .ant-checkbox + span {
88
- display: inline-flex;
89
- align-items: center;
90
- padding: 0 4px;
91
- }
81
+ .ant-checkbox-wrapper {
82
+ display: inline-flex;
83
+ align-items: center;
84
+ font-size: 15px;
85
+ // color: var(--modal-title-color);
86
+ }
87
+ .ant-checkbox + span {
88
+ display: inline-flex;
89
+ align-items: center;
90
+ padding: 0 4px;
91
+ }
92
92
  }
93
93
  }
94
94
  }
@@ -1,6 +1,6 @@
1
- .vm-car-map-wrap {
2
- flex: 1;
3
- min-height: 0;
4
- width: 100%;
5
- margin-top: 10px;
6
- }
1
+ .vm-car-map-wrap {
2
+ flex: 1;
3
+ min-height: 0;
4
+ width: 100%;
5
+ margin-top: 10px;
6
+ }
@@ -1,6 +1,6 @@
1
- .vtx-car-oil-wrap {
2
- height: 100%;
3
- display: flex;
4
- gap: 16px;
5
- flex-direction: column;
6
- }
1
+ .vtx-car-oil-wrap {
2
+ height: 100%;
3
+ display: flex;
4
+ gap: 16px;
5
+ flex-direction: column;
6
+ }
@@ -1,6 +1,6 @@
1
- .vtx-car-water-wrap {
2
- height: 100%;
3
- display: flex;
4
- gap: 16px;
5
- flex-direction: column;
6
- }
1
+ .vtx-car-water-wrap {
2
+ height: 100%;
3
+ display: flex;
4
+ gap: 16px;
5
+ flex-direction: column;
6
+ }
@@ -1,6 +1,6 @@
1
- .vm-cc-unit-map-wrap {
2
- flex: 1;
3
- min-height: 230px;
4
- width: 100%;
5
- margin-top: 10px;
6
- }
1
+ .vm-cc-unit-map-wrap {
2
+ flex: 1;
3
+ min-height: 230px;
4
+ width: 100%;
5
+ margin-top: 10px;
6
+ }
@@ -1,66 +1,66 @@
1
- .vtx-device-analysis-dot {
2
- width: 6px;
3
- height: 6px;
4
- background: var(--green-color);
5
- border-radius: 50%;
6
- &.error {
7
- background: var(--red-color);
8
- }
9
- }
10
-
11
- .vtx-device-analysis-tabs {
12
- display: flex;
13
- gap: 16px;
14
- color: var(--modal-title-color);
15
- font-size: 14px;
16
- &-item {
17
- cursor: pointer;
18
- &.active {
19
- color: var(--blue-color);
20
- }
21
- }
22
- }
23
-
24
- .vtx-device-alarm-summary {
25
- width: 368px;
26
- height: 104px;
27
- padding: 20px;
28
- margin-bottom: 20px;
29
- color: var(--modal-title-color);
30
- display: flex;
31
- justify-content: space-between;
32
- flex-direction: column;
33
- cursor: pointer;
34
- background-image: url("../../imgs/current.png");
35
- background-size: 100% 100%;
36
- border-radius: 8px;
37
- border: 1px solid transparent;
38
- &-lable {
39
- font-size: 16px;
40
- font-weight: 600;
41
- }
42
- &-value {
43
- font-weight: 600;
44
- font-size: 24px;
45
- color: var(--red-color);
46
- }
47
- &.dark {
48
- background-image: url("../../imgs/current_dark.png");
49
- &:last-child {
50
- background-image: url("../../imgs/history_dark.png");
51
- }
52
- }
53
- &.active {
54
- border:1px solid var(--red-color);
55
- }
56
- &:last-child {
57
- margin-bottom: 0;
58
- background-image: url("../../imgs/history.png");
59
- .vtx-device-alarm-summary-value {
60
- color: var(--yellow-color);
61
- }
62
- &.active {
63
- border:1px solid var(--yellow-color);
64
- }
65
- }
66
- }
1
+ .vtx-device-analysis-dot {
2
+ width: 6px;
3
+ height: 6px;
4
+ background: var(--green-color);
5
+ border-radius: 50%;
6
+ &.error {
7
+ background: var(--red-color);
8
+ }
9
+ }
10
+
11
+ .vtx-device-analysis-tabs {
12
+ display: flex;
13
+ gap: 16px;
14
+ color: var(--modal-title-color);
15
+ font-size: 14px;
16
+ &-item {
17
+ cursor: pointer;
18
+ &.active {
19
+ color: var(--blue-color);
20
+ }
21
+ }
22
+ }
23
+
24
+ .vtx-device-alarm-summary {
25
+ width: 368px;
26
+ height: 104px;
27
+ padding: 20px;
28
+ margin-bottom: 20px;
29
+ color: var(--modal-title-color);
30
+ display: flex;
31
+ justify-content: space-between;
32
+ flex-direction: column;
33
+ cursor: pointer;
34
+ background-image: url("../../imgs/current.png");
35
+ background-size: 100% 100%;
36
+ border-radius: 8px;
37
+ border: 1px solid transparent;
38
+ &-lable {
39
+ font-size: 16px;
40
+ font-weight: 600;
41
+ }
42
+ &-value {
43
+ font-weight: 600;
44
+ font-size: 24px;
45
+ color: var(--red-color);
46
+ }
47
+ &.dark {
48
+ background-image: url("../../imgs/current_dark.png");
49
+ &:last-child {
50
+ background-image: url("../../imgs/history_dark.png");
51
+ }
52
+ }
53
+ &.active {
54
+ border:1px solid var(--red-color);
55
+ }
56
+ &:last-child {
57
+ margin-bottom: 0;
58
+ background-image: url("../../imgs/history.png");
59
+ .vtx-device-alarm-summary-value {
60
+ color: var(--yellow-color);
61
+ }
62
+ &.active {
63
+ border:1px solid var(--yellow-color);
64
+ }
65
+ }
66
+ }
@@ -1,16 +1,16 @@
1
- .vtx-restaurant-rule_item {
2
- border-radius: 8px 8px 8px 8px;
3
- border: 1px solid var(--gray-line-color);
4
- padding: 16px 16px 8px;
5
- margin-top: 12px;
6
- position: relative;
7
- .vtx-restaurant-border {
8
- width: 100%;
9
- position: absolute;
10
- left: 0;
11
- top: -2px;
12
- height: 44px;
13
- border-radius: 8px 8px 0px 0px;
14
- border-top: 2px solid var(--blue-color);
15
- }
16
- }
1
+ .vtx-restaurant-rule_item {
2
+ border-radius: 8px 8px 8px 8px;
3
+ border: 1px solid var(--gray-line-color);
4
+ padding: 16px 16px 8px;
5
+ margin-top: 12px;
6
+ position: relative;
7
+ .vtx-restaurant-border {
8
+ width: 100%;
9
+ position: absolute;
10
+ left: 0;
11
+ top: -2px;
12
+ height: 44px;
13
+ border-radius: 8px 8px 0px 0px;
14
+ border-top: 2px solid var(--blue-color);
15
+ }
16
+ }
@@ -201,14 +201,14 @@ var ThrowService = {
201
201
  loading: loading
202
202
  };
203
203
  },
204
- usePage: function usePage(id, startTime, endTime, page, size, source) {
204
+ usePage: function usePage(id, startTime, endTime, page, size, source, sort) {
205
205
  var _useRequest8 = useRequest(function () {
206
206
  return request.get('/cloud/ljfljc/api/v101/trow/record/detail/page', {
207
- data: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, source === 'tfd' ? 'throwPointId' : 'subjectId', id), "startTime", startTime), "endTime", endTime), "desensitization", true), "page", page), "size", size)
207
+ data: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, source === 'tfd' ? 'throwPointId' : 'subjectId', id), "startTime", startTime), "endTime", endTime), "desensitization", true), "page", page), "size", size), "sort", sort)
208
208
  });
209
209
  }, {
210
210
  ready: !!id,
211
- refreshDeps: [id, startTime, endTime, page, size]
211
+ refreshDeps: [id, startTime, endTime, page, size, source, sort]
212
212
  }),
213
213
  pageRes = _useRequest8.data,
214
214
  loading = _useRequest8.loading;
@@ -31,19 +31,21 @@ var ListZymx = function ListZymx(props) {
31
31
  current: 1,
32
32
  pageSize: 10,
33
33
  total: 0
34
- }
34
+ },
35
+ sort: ''
35
36
  }),
36
37
  _useSetState2 = _slicedToArray(_useSetState, 2),
37
38
  state = _useSetState2[0],
38
39
  setState = _useSetState2[1];
39
- var pagination = state.pagination;
40
+ var pagination = state.pagination,
41
+ sort = state.sort;
40
42
  var _ThrowService$useThro = ThrowService.useThrowConfig(),
41
43
  configObj = _ThrowService$useThro.configObj;
42
44
  var weightFlag = JSON.parse(((_configObj$THROW_WEIG = configObj['THROW_WEIGHT']) === null || _configObj$THROW_WEIG === void 0 ? void 0 : _configObj$THROW_WEIG.configValue) || '[]');
43
45
  var qualityFlag = JSON.parse(((_configObj$THROW_QUAL = configObj['THROW_QUALITY']) === null || _configObj$THROW_QUAL === void 0 ? void 0 : _configObj$THROW_QUAL.configValue) || '[]');
44
46
  var integralFlag = JSON.parse(((_configObj$INTEGRAL_I = configObj['INTEGRAL_INFO']) === null || _configObj$INTEGRAL_I === void 0 ? void 0 : _configObj$INTEGRAL_I.configValue) || '[]');
45
47
  var subjectFlag = (_configObj$THROW_SUBJ = configObj['THROW_SUBJECT_DIMENSION']) === null || _configObj$THROW_SUBJ === void 0 ? void 0 : _configObj$THROW_SUBJ.configValue;
46
- var _ThrowService$usePage = ThrowService.usePage(id, startTime, endTime, pagination.current - 1, pagination.pageSize, source),
48
+ var _ThrowService$usePage = ThrowService.usePage(id, startTime, endTime, pagination.current - 1, pagination.pageSize, source, sort),
47
49
  data = _ThrowService$usePage.data,
48
50
  loading = _ThrowService$usePage.loading;
49
51
  var columns = [].concat(_toConsumableArray(subjectFlag === 'THROW_RESIDENT' ? [{
@@ -77,7 +79,8 @@ var ListZymx = function ListZymx(props) {
77
79
  title: translateLocaleText("t('vtxshxqmodal.weightKg')"),
78
80
  dataIndex: 'weight',
79
81
  key: 'weight',
80
- width: 120
82
+ width: 120,
83
+ align: 'right'
81
84
  }, qualityFlag && {
82
85
  title: translateLocaleText("t('vtxsdydtfdmodal.classificationQuality')"),
83
86
  dataIndex: 'evaluation',
@@ -103,7 +106,8 @@ var ListZymx = function ListZymx(props) {
103
106
  title: translateLocaleText("t('vtxshxqmodal.hours4')"),
104
107
  dataIndex: 'time',
105
108
  key: 'time',
106
- width: 120
109
+ width: 120,
110
+ sorter: true
107
111
  }]);
108
112
  var pageChange = function pageChange(page) {
109
113
  setState({
@@ -112,6 +116,14 @@ var ListZymx = function ListZymx(props) {
112
116
  })
113
117
  });
114
118
  };
119
+ var handleTableChange = function handleTableChange(sorter) {
120
+ setState({
121
+ pagination: _objectSpread(_objectSpread({}, pagination), {}, {
122
+ current: 1
123
+ }),
124
+ sort: sorter !== null && sorter !== void 0 && sorter.order ? "".concat(sorter.field, ",").concat(sorter.order === 'ascend' ? 'asc' : 'desc') : ''
125
+ });
126
+ };
115
127
  var tableProps = {
116
128
  height: '100%',
117
129
  isIndex: false,
@@ -121,7 +133,8 @@ var ListZymx = function ListZymx(props) {
121
133
  total: (data === null || data === void 0 ? void 0 : data.total) || 0,
122
134
  defaultPageSize: 20,
123
135
  onChange: pageChange
124
- })
136
+ }),
137
+ handleTableChange: handleTableChange
125
138
  };
126
139
  return /*#__PURE__*/_jsx("div", {
127
140
  className: "shxq-thr-table",
package/package.json CHANGED
@@ -1,92 +1,92 @@
1
- {
2
- "name": "@vtx/modals2",
3
- "version": "6.0.0-beta.13",
4
- "description": "弹窗组件",
5
- "license": "MIT",
6
- "module": "lib/index.js",
7
- "types": "lib/index.d.ts",
8
- "files": [
9
- "lib"
10
- ],
11
- "scripts": {
12
- "build": "father build",
13
- "build:watch": "father dev",
14
- "dev": "dumi dev",
15
- "docs:build": "dumi build",
16
- "docs:preview": "dumi preview",
17
- "doctor": "father doctor",
18
- "lint": "npm run lint:es && npm run lint:css",
19
- "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
20
- "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
21
- "prepare": "husky install && dumi setup",
22
- "prepublishOnly": "npm run build",
23
- "start": "npm run dev"
24
- },
25
- "dependencies": {
26
- "@turf/turf": "^7.3.4",
27
- "ahooks": "^3.1.5",
28
- "axios": "^0.21.1",
29
- "base-64": "^1.0.0",
30
- "classnames": "^2.5.1",
31
- "dayjs": "^1.11.10",
32
- "echarts": "^5.3.2",
33
- "echarts-for-react": "3.0.2",
34
- "htmr": "^1.0.2",
35
- "lodash": "^4.17.21",
36
- "number-precision": "^1.6.0",
37
- "proj4": "^2.20.8",
38
- "qs": "^6.0.0",
39
- "react-tagcloud": "^2.3.3",
40
- "viewerjs": "^1.3.3"
41
- },
42
- "devDependencies": {
43
- "@ant-design/icons": "6.0.0",
44
- "@babel/preset-react": "^7.28.5",
45
- "@babel/runtime": "^7.6.3",
46
- "@commitlint/cli": "^17.1.2",
47
- "@commitlint/config-conventional": "^17.1.0",
48
- "@types/lodash": "^4.14.202",
49
- "@types/qs": "^6.9.11",
50
- "@types/react": "^18.0.0",
51
- "@types/react-dom": "^18.0.0",
52
- "@umijs/lint": "^4.0.0",
53
- "@vtx/components": "^4.0.0-beta.58",
54
- "@vtx/map-icon": "^2.0.62",
55
- "@vtx/ol-map": "^2.0.0-beta.16",
56
- "@vtx/player": "^1.12.7",
57
- "@vtx/utils": "^1.0.20",
58
- "antd": "6.0.0",
59
- "antd-dayjs-webpack-plugin": "^1.0.6",
60
- "babel-eslint": "^10.1.0",
61
- "babel-plugin-import": "^1.13.8",
62
- "dumi": "^2.2.13",
63
- "echarts-liquidfill": "^3.1.0",
64
- "eslint": "^8.23.0",
65
- "father": "^4.1.0",
66
- "husky": "^8.0.1",
67
- "lint-staged": "^13.0.3",
68
- "ol": "6.15.1",
69
- "prettier": "^2.7.1",
70
- "prettier-plugin-organize-imports": "^3.0.0",
71
- "prettier-plugin-packagejson": "^2.2.18",
72
- "react": "18.0.0",
73
- "react-dom": "18.0.0",
74
- "stylelint": "^14.9.1"
75
- },
76
- "peerDependencies": {
77
- "@ant-design/icons": ">=6",
78
- "@vtx/components": ">=4.0.0-beta.0",
79
- "@vtx/map-icon": ">=2.0.0",
80
- "@vtx/ol-map": ">=2.0.0-beta.0",
81
- "@vtx/player": ">=1.0.0",
82
- "@vtx/utils": ">=1.0.20",
83
- "antd": ">=6",
84
- "ol": ">=6.15.1",
85
- "react": ">=18",
86
- "react-dom": ">=18"
87
- },
88
- "publishConfig": {
89
- "access": "public"
90
- },
91
- "authors": []
92
- }
1
+ {
2
+ "name": "@vtx/modals2",
3
+ "version": "6.0.0-beta.14",
4
+ "description": "弹窗组件",
5
+ "license": "MIT",
6
+ "module": "lib/index.js",
7
+ "types": "lib/index.d.ts",
8
+ "files": [
9
+ "lib"
10
+ ],
11
+ "scripts": {
12
+ "build": "father build",
13
+ "build:watch": "father dev",
14
+ "dev": "dumi dev",
15
+ "docs:build": "dumi build",
16
+ "docs:preview": "dumi preview",
17
+ "doctor": "father doctor",
18
+ "lint": "npm run lint:es && npm run lint:css",
19
+ "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
20
+ "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
21
+ "prepare": "husky install && dumi setup",
22
+ "prepublishOnly": "npm run build",
23
+ "start": "npm run dev"
24
+ },
25
+ "dependencies": {
26
+ "@turf/turf": "^7.3.4",
27
+ "ahooks": "^3.1.5",
28
+ "axios": "^0.21.1",
29
+ "base-64": "^1.0.0",
30
+ "classnames": "^2.5.1",
31
+ "dayjs": "^1.11.10",
32
+ "echarts": "^5.3.2",
33
+ "echarts-for-react": "3.0.2",
34
+ "htmr": "^1.0.2",
35
+ "lodash": "^4.17.21",
36
+ "number-precision": "^1.6.0",
37
+ "proj4": "^2.20.8",
38
+ "qs": "^6.0.0",
39
+ "react-tagcloud": "^2.3.3",
40
+ "viewerjs": "^1.3.3"
41
+ },
42
+ "devDependencies": {
43
+ "@ant-design/icons": "6.0.0",
44
+ "@babel/preset-react": "^7.28.5",
45
+ "@babel/runtime": "^7.6.3",
46
+ "@commitlint/cli": "^17.1.2",
47
+ "@commitlint/config-conventional": "^17.1.0",
48
+ "@types/lodash": "^4.14.202",
49
+ "@types/qs": "^6.9.11",
50
+ "@types/react": "^18.0.0",
51
+ "@types/react-dom": "^18.0.0",
52
+ "@umijs/lint": "^4.0.0",
53
+ "@vtx/components": "^4.0.0-beta.58",
54
+ "@vtx/map-icon": "^2.0.62",
55
+ "@vtx/ol-map": "^2.0.0-beta.16",
56
+ "@vtx/player": "^1.12.7",
57
+ "@vtx/utils": "^1.0.20",
58
+ "antd": "6.0.0",
59
+ "antd-dayjs-webpack-plugin": "^1.0.6",
60
+ "babel-eslint": "^10.1.0",
61
+ "babel-plugin-import": "^1.13.8",
62
+ "dumi": "^2.2.13",
63
+ "echarts-liquidfill": "^3.1.0",
64
+ "eslint": "^8.23.0",
65
+ "father": "^4.1.0",
66
+ "husky": "^8.0.1",
67
+ "lint-staged": "^13.0.3",
68
+ "ol": "6.15.1",
69
+ "prettier": "^2.7.1",
70
+ "prettier-plugin-organize-imports": "^3.0.0",
71
+ "prettier-plugin-packagejson": "^2.2.18",
72
+ "react": "18.0.0",
73
+ "react-dom": "18.0.0",
74
+ "stylelint": "^14.9.1"
75
+ },
76
+ "peerDependencies": {
77
+ "@ant-design/icons": ">=6",
78
+ "@vtx/components": ">=4.0.0-beta.0",
79
+ "@vtx/map-icon": ">=2.0.0",
80
+ "@vtx/ol-map": ">=2.0.0-beta.0",
81
+ "@vtx/player": ">=1.0.0",
82
+ "@vtx/utils": ">=1.0.20",
83
+ "antd": ">=6",
84
+ "ol": ">=6.15.1",
85
+ "react": ">=18",
86
+ "react-dom": ">=18"
87
+ },
88
+ "publishConfig": {
89
+ "access": "public"
90
+ },
91
+ "authors": []
92
+ }