show resize column header bars, disable default sorting

This commit is contained in:
Proddy
2022-04-18 12:54:44 +02:00
parent 9f6bbac8ce
commit 22595b0f24
3 changed files with 25 additions and 34 deletions

View File

@@ -42,6 +42,7 @@ import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined';
import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined'; import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined';
import KeyboardArrowUpOutlinedIcon from '@mui/icons-material/KeyboardArrowUpOutlined'; import KeyboardArrowUpOutlinedIcon from '@mui/icons-material/KeyboardArrowUpOutlined';
import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined'; import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined';
import UnfoldMoreOutlinedIcon from '@mui/icons-material/UnfoldMoreOutlined';
import StarIcon from '@mui/icons-material/Star'; import StarIcon from '@mui/icons-material/Star';
import DeviceIcon from './DeviceIcon'; import DeviceIcon from './DeviceIcon';
@@ -208,6 +209,9 @@ const DashboardData: FC = () => {
`, `,
HeaderCell: ` HeaderCell: `
padding-left: 0px; padding-left: 0px;
&:not(:last-of-type) {
border-right: 1px solid #565656;
}
` `
}); });
@@ -215,23 +219,18 @@ const DashboardData: FC = () => {
if (state.sortKey === sortKey && state.reverse) { if (state.sortKey === sortKey && state.reverse) {
return <KeyboardArrowDownOutlinedIcon />; return <KeyboardArrowDownOutlinedIcon />;
} }
if (state.sortKey === sortKey && !state.reverse) { if (state.sortKey === sortKey && !state.reverse) {
return <KeyboardArrowUpOutlinedIcon />; return <KeyboardArrowUpOutlinedIcon />;
} }
return <UnfoldMoreOutlinedIcon />;
}; };
const analog_sort = useSort( const analog_sort = useSort(
{ nodes: sensorData.analogs }, { nodes: sensorData.analogs },
{ {},
state: {
sortKey: 'GPIO',
reverse: false
}
},
{ {
sortIcon: { sortIcon: {
iconDefault: null, iconDefault: <UnfoldMoreOutlinedIcon />,
iconUp: <KeyboardArrowUpOutlinedIcon />, iconUp: <KeyboardArrowUpOutlinedIcon />,
iconDown: <KeyboardArrowDownOutlinedIcon /> iconDown: <KeyboardArrowDownOutlinedIcon />
}, },
@@ -246,15 +245,10 @@ const DashboardData: FC = () => {
const sensor_sort = useSort( const sensor_sort = useSort(
{ nodes: sensorData.sensors }, { nodes: sensorData.sensors },
{ {},
state: {
sortKey: 'NAME',
reverse: false
}
},
{ {
sortIcon: { sortIcon: {
iconDefault: null, iconDefault: <UnfoldMoreOutlinedIcon />,
iconUp: <KeyboardArrowUpOutlinedIcon />, iconUp: <KeyboardArrowUpOutlinedIcon />,
iconDown: <KeyboardArrowDownOutlinedIcon /> iconDown: <KeyboardArrowDownOutlinedIcon />
}, },
@@ -267,15 +261,10 @@ const DashboardData: FC = () => {
const dv_sort = useSort( const dv_sort = useSort(
{ nodes: deviceData.data }, { nodes: deviceData.data },
{ {},
state: {
sortKey: 'NAME',
reverse: false
}
},
{ {
sortIcon: { sortIcon: {
iconDefault: null, iconDefault: <UnfoldMoreOutlinedIcon />,
iconUp: <KeyboardArrowUpOutlinedIcon />, iconUp: <KeyboardArrowUpOutlinedIcon />,
iconDown: <KeyboardArrowDownOutlinedIcon /> iconDown: <KeyboardArrowDownOutlinedIcon />
}, },
@@ -759,7 +748,7 @@ const DashboardData: FC = () => {
ENTITY NAME ENTITY NAME
</Button> </Button>
</HeaderCell> </HeaderCell>
<HeaderCell> <HeaderCell resize>
<Button <Button
fullWidth fullWidth
style={{ fontSize: '14px', justifyContent: 'flex-start' }} style={{ fontSize: '14px', justifyContent: 'flex-start' }}
@@ -831,7 +820,7 @@ const DashboardData: FC = () => {
NAME NAME
</Button> </Button>
</HeaderCell> </HeaderCell>
<HeaderCell> <HeaderCell resize>
<Button <Button
fullWidth fullWidth
style={{ fontSize: '14px', justifyContent: 'flex-start' }} style={{ fontSize: '14px', justifyContent: 'flex-start' }}
@@ -906,7 +895,7 @@ const DashboardData: FC = () => {
TYPE TYPE
</Button> </Button>
</HeaderCell> </HeaderCell>
<HeaderCell> <HeaderCell resize>
<Button <Button
fullWidth fullWidth
style={{ fontSize: '14px', justifyContent: 'flex-start' }} style={{ fontSize: '14px', justifyContent: 'flex-start' }}

View File

@@ -31,6 +31,7 @@ import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOu
import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore'; import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
import KeyboardArrowUpOutlinedIcon from '@mui/icons-material/KeyboardArrowUpOutlined'; import KeyboardArrowUpOutlinedIcon from '@mui/icons-material/KeyboardArrowUpOutlined';
import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined'; import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined';
import UnfoldMoreOutlinedIcon from '@mui/icons-material/UnfoldMoreOutlined';
import { ButtonRow, FormLoader, ValidatedTextField, SectionContent } from '../components'; import { ButtonRow, FormLoader, ValidatedTextField, SectionContent } from '../components';
@@ -105,6 +106,12 @@ const SettingsCustomization: FC = () => {
min-width: 70%; min-width: 70%;
width: 70%; width: 70%;
} }
`,
HeaderCell: `
padding-left: 0px;
&:nth-of-type(2) {
border-right: 1px solid #565656;
}
` `
}); });
@@ -112,23 +119,18 @@ const SettingsCustomization: FC = () => {
if (state.sortKey === sortKey && state.reverse) { if (state.sortKey === sortKey && state.reverse) {
return <KeyboardArrowDownOutlinedIcon />; return <KeyboardArrowDownOutlinedIcon />;
} }
if (state.sortKey === sortKey && !state.reverse) { if (state.sortKey === sortKey && !state.reverse) {
return <KeyboardArrowUpOutlinedIcon />; return <KeyboardArrowUpOutlinedIcon />;
} }
return <UnfoldMoreOutlinedIcon />;
}; };
const entity_sort = useSort( const entity_sort = useSort(
{ nodes: deviceEntities }, { nodes: deviceEntities },
{ {},
state: {
sortKey: 'NAME',
reverse: false
}
},
{ {
sortIcon: { sortIcon: {
iconDefault: null, iconDefault: <UnfoldMoreOutlinedIcon />,
iconUp: <KeyboardArrowUpOutlinedIcon />, iconUp: <KeyboardArrowUpOutlinedIcon />,
iconDown: <KeyboardArrowDownOutlinedIcon /> iconDown: <KeyboardArrowDownOutlinedIcon />
}, },

View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.4.0b12t" #define EMSESP_APP_VERSION "3.4.0b12t2"