andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #482 from proddy/dev

Browse Source 
make value sortable, it doesn't really make sense but it fixes the formatting alignment issues
This commit is contained in:
Proddy
2022-05-01 16:41:29 +02:00
committed by GitHub
parent 469677aba5 2c54cafdb6
commit bf40d8feaf
1 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
interface/src/project/DashboardData.tsx
View File

@@ -138,6 +138,7 @@ const DashboardData: FC = () => {
border-right: 1px solid transparent; border-right: 1px solid transparent;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
&:nth-of-type(1) { &:nth-of-type(1) {
padding-left: 8px;
min-width: 42px; min-width: 42px;
width: 42px; width: 42px;
div { div {
@@ -200,11 +201,17 @@ const DashboardData: FC = () => {
} }
`, `,
BaseCell: ` BaseCell: `
padding-left: 16px;
cursor: pointer; cursor: pointer;
border-top: 1px solid transparent; border-top: 1px solid transparent;
border-right: 1px solid transparent; border-right: 1px solid transparent;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
&:nth-of-type(1) {
padding-left: 16px; padding-left: 16px;
}
&:nth-of-type(4) {
padding-left: 16px;
}
width: 124px; width: 124px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
@@ -214,9 +221,13 @@ const DashboardData: FC = () => {
} }
`, `,
HeaderCell: ` HeaderCell: `
padding-left: 8px;
&:nth-of-type(1) { &:nth-of-type(1) {
padding-left: 8px; padding-left: 8px;
} }
&:nth-of-type(4) {
padding-left: 16px;
}
&:not(:last-of-type) { &:not(:last-of-type) {
border-right: 1px solid #565656; border-right: 1px solid #565656;
} }
@@ -242,6 +253,7 @@ const DashboardData: FC = () => {
iconUp: <KeyboardArrowUpOutlinedIcon />, iconUp: <KeyboardArrowUpOutlinedIcon />,
iconDown: <KeyboardArrowDownOutlinedIcon /> iconDown: <KeyboardArrowDownOutlinedIcon />
}, },
sortToggleType: SortToggleType.AlternateWithReset,
sortFns: { sortFns: {
GPIO: (array) => array.sort((a, b) => a.g - b.g), GPIO: (array) => array.sort((a, b) => a.g - b.g),
NAME: (array) => array.sort((a, b) => a.n.localeCompare(b.n)), NAME: (array) => array.sort((a, b) => a.n.localeCompare(b.n)),
@@ -259,6 +271,7 @@ const DashboardData: FC = () => {
iconUp: <KeyboardArrowUpOutlinedIcon />, iconUp: <KeyboardArrowUpOutlinedIcon />,
iconDown: <KeyboardArrowDownOutlinedIcon /> iconDown: <KeyboardArrowDownOutlinedIcon />
}, },
sortToggleType: SortToggleType.AlternateWithReset,
sortFns: { sortFns: {
NAME: (array) => array.sort((a, b) => a.n.localeCompare(b.n)), NAME: (array) => array.sort((a, b) => a.n.localeCompare(b.n)),
TEMPERATURE: (array) => array.sort((a, b) => a.t - b.t) TEMPERATURE: (array) => array.sort((a, b) => a.t - b.t)
@@ -277,7 +290,8 @@ const DashboardData: FC = () => {
}, },
sortToggleType: SortToggleType.AlternateWithReset, sortToggleType: SortToggleType.AlternateWithReset,
sortFns: { sortFns: {
NAME: (array) => array.sort((a, b) => a.id.slice(2).localeCompare(b.id.slice(2))) NAME: (array) => array.sort((a, b) => a.id.slice(2).localeCompare(b.id.slice(2))),
VALUE: (array) => array.sort((a, b) => a.v.toString().localeCompare(b.v.toString()))
} }
} }
); );
@@ -762,7 +776,16 @@ const DashboardData: FC = () => {
ENTITY NAME ENTITY NAME
</Button> </Button>
</HeaderCell> </HeaderCell>
<HeaderCell resize>VALUE</HeaderCell> <HeaderCell resize>
<Button
fullWidth
style={{ fontSize: '14px', justifyContent: 'flex-start' }}
endIcon={getSortIcon(dv_sort.state, 'VALUE')}
onClick={() => dv_sort.fns.onToggleSort({ sortKey: 'VALUE' })}
>
VALUE
</Button>
</HeaderCell>
<HeaderCell /> <HeaderCell />
</HeaderRow> </HeaderRow>
</Header> </Header>