Skip to content

Commit fddfa47

Browse files
proddyproddy
committed
layout changes
1 parent a1bb493 commit fddfa47

File tree

3 files changed

+43
-21
lines changed

3 files changed

+43
-21
lines changed

‎interface/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
"@mui/icons-material": "^5.14.14",
2727
"@mui/material": "^5.14.14",
2828
"@table-library/react-table-library": "4.1.7",
29-
"@types/lodash-es": "^4.17.9",
30-
"@types/node": "^20.8.6",
31-
"@types/react": "^18.2.28",
29+
"@types/lodash-es": "^4.17.10",
30+
"@types/node": "^20.8.7",
31+
"@types/react": "^18.2.29",
3232
"@types/react-dom": "^18.2.13",
3333
"@types/react-router-dom": "^5.3.3",
3434
"alova": "^2.13.1",
@@ -68,7 +68,7 @@
6868
"prettier": "^3.0.3",
6969
"rollup-plugin-visualizer": "^5.9.2",
7070
"terser": "^5.22.0",
71-
"vite": "^4.4.11",
71+
"vite": "^4.5.0",
7272
"vite-plugin-imagemin": "^0.6.1",
7373
"vite-tsconfig-paths": "^4.2.1"
7474
},

‎interface/src/project/DashboardDevices.tsx

+5-3
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const DashboardDevices: FC = () => {
136136
common_theme,
137137
{
138138
Table: `
139-
--data-table-library_grid-template-columns: 40px repeat(1, minmax(0, 1fr));
139+
--data-table-library_grid-template-columns: 40px repeat(1, minmax(0, 1fr)) 130px;
140140
`,
141141
BaseRow: `
142142
.td {
@@ -418,6 +418,7 @@ const DashboardDevices: FC = () => {
418418
<HeaderRow>
419419
<HeaderCell stiff />
420420
<HeaderCell resize>{LL.DESCRIPTION()}</HeaderCell>
421+
<HeaderCell stiff>{LL.TYPE(0)}</HeaderCell>
421422
</HeaderRow>
422423
</Header>
423424
<Body>
@@ -430,6 +431,7 @@ const DashboardDevices: FC = () => {
430431
{device.n}
431432
<span style={{ color: 'lightblue' }}>&nbsp;&nbsp;({device.e})</span>
432433
</Cell>
434+
<Cell stiff>{device.tn}</Cell>
433435
</Row>
434436
))}
435437
</Body>
@@ -482,8 +484,8 @@ const DashboardDevices: FC = () => {
482484
right: 16,
483485
bottom: 0,
484486
top: 128,
485-
maxHeight: () => size[1] - 210,
486-
zIndex: 'modal'
487+
zIndex: 'modal',
488+
border: '1px solid #177ac9'
487489
}}
488490
>
489491
<Box sx={{ border: '1px solid #177ac9' }}>

‎interface/yarn.lock

+34-14
Original file line numberDiff line numberDiff line change
@@ -1265,12 +1265,12 @@ __metadata:
12651265
languageName: node
12661266
linkType: hard
12671267

1268-
"@types/lodash-es@npm:^4.17.9":
1269-
version: 4.17.9
1270-
resolution: "@types/lodash-es@npm:4.17.9"
1268+
"@types/lodash-es@npm:^4.17.10":
1269+
version: 4.17.10
1270+
resolution: "@types/lodash-es@npm:4.17.10"
12711271
dependencies:
12721272
"@types/lodash": "npm:*"
1273-
checksum: 5e3a8a74134e67c37f1b8eb4a2897c88038f1b1bd7f508feec9e5561b52787d7efcc30c18981e9c6edec2b894f127b60312a431d98b84e12e785bea9cb5d1d40
1273+
checksum: a6c68872425418491d693186238e22c9da0e88bdf7ffe2b26e5436a19027ffedabeaec162e336b3722d5c43411866e859beae76a1a8f737bb5b115d5a574f758
12741274
languageName: node
12751275
linkType: hard
12761276

@@ -1288,7 +1288,7 @@ __metadata:
12881288
languageName: node
12891289
linkType: hard
12901290

1291-
"@types/node@npm:*, @types/node@npm:^20.8.6":
1291+
"@types/node@npm:*":
12921292
version: 20.8.6
12931293
resolution: "@types/node@npm:20.8.6"
12941294
dependencies:
@@ -1297,6 +1297,15 @@ __metadata:
12971297
languageName: node
12981298
linkType: hard
12991299

1300+
"@types/node@npm:^20.8.7":
1301+
version: 20.8.7
1302+
resolution: "@types/node@npm:20.8.7"
1303+
dependencies:
1304+
undici-types: "npm:~5.25.1"
1305+
checksum: a347ac7e6a9748ffff018ca01142ba625e774cb0b53785abb58b16a5a8468cc9b7656686dbe4c39c2f3fc477439994ee8aeae9b80ced86f320598bafaf83f802
1306+
languageName: node
1307+
linkType: hard
1308+
13001309
"@types/parse-json@npm:^4.0.0":
13011310
version: 4.0.0
13021311
resolution: "@types/parse-json@npm:4.0.0"
@@ -1350,7 +1359,7 @@ __metadata:
13501359
languageName: node
13511360
linkType: hard
13521361

1353-
"@types/react@npm:*, @types/react@npm:^18.2.28":
1362+
"@types/react@npm:*":
13541363
version: 18.2.28
13551364
resolution: "@types/react@npm:18.2.28"
13561365
dependencies:
@@ -1361,6 +1370,17 @@ __metadata:
13611370
languageName: node
13621371
linkType: hard
13631372

1373+
"@types/react@npm:^18.2.29":
1374+
version: 18.2.29
1375+
resolution: "@types/react@npm:18.2.29"
1376+
dependencies:
1377+
"@types/prop-types": "npm:*"
1378+
"@types/scheduler": "npm:*"
1379+
csstype: "npm:^3.0.2"
1380+
checksum: c261e4e2ec18a7244c959cb40ac2f43b0fa7f0b40fcce615243402fc61699cbebf6f2eae2632b8a0f0a2775a1ca735279b15543349cafa276c064b591712b85b
1381+
languageName: node
1382+
linkType: hard
1383+
13641384
"@types/responselike@npm:^1.0.0":
13651385
version: 1.0.1
13661386
resolution: "@types/responselike@npm:1.0.1"
@@ -1528,9 +1548,9 @@ __metadata:
15281548
"@preact/compat": "npm:^17.1.2"
15291549
"@preact/preset-vite": "npm:^2.6.0"
15301550
"@table-library/react-table-library": "npm:4.1.7"
1531-
"@types/lodash-es": "npm:^4.17.9"
1532-
"@types/node": "npm:^20.8.6"
1533-
"@types/react": "npm:^18.2.28"
1551+
"@types/lodash-es": "npm:^4.17.10"
1552+
"@types/node": "npm:^20.8.7"
1553+
"@types/react": "npm:^18.2.29"
15341554
"@types/react-dom": "npm:^18.2.13"
15351555
"@types/react-router-dom": "npm:^5.3.3"
15361556
"@typescript-eslint/eslint-plugin": "npm:^6.8.0"
@@ -1566,7 +1586,7 @@ __metadata:
15661586
terser: "npm:^5.22.0"
15671587
typesafe-i18n: "npm:^5.26.2"
15681588
typescript: "npm:^5.2.2"
1569-
vite: "npm:^4.4.11"
1589+
vite: "npm:^4.5.0"
15701590
vite-plugin-imagemin: "npm:^0.6.1"
15711591
vite-tsconfig-paths: "npm:^4.2.1"
15721592
languageName: unknown
@@ -8298,9 +8318,9 @@ __metadata:
82988318
languageName: node
82998319
linkType: hard
83008320

8301-
"vite@npm:^4.4.11":
8302-
version: 4.4.11
8303-
resolution: "vite@npm:4.4.11"
8321+
"vite@npm:^4.5.0":
8322+
version: 4.5.0
8323+
resolution: "vite@npm:4.5.0"
83048324
dependencies:
83058325
esbuild: "npm:^0.18.10"
83068326
fsevents: "npm:~2.3.2"
@@ -8334,7 +8354,7 @@ __metadata:
83348354
optional: true
83358355
bin:
83368356
vite: bin/vite.js
8337-
checksum: 325e2955fe939bc5706aab2aa46498d98adace1df4d11f42cf4539754b886798b6bf7c247c94d23fb6cf3a569e56bad4a11561bf25e8e6dcc8c0e2f73ecc5e5b
8357+
checksum: b262ea4880ba7de8a77b0a665c771561ae3cb7f0d6c5b90e65298039755192550bf90cb96a2910d564506e2d499aa20e9becd330b835c34d414249083ac6e40c
83388358
languageName: node
83398359
linkType: hard
83408360

0 commit comments

Comments
 (0)