aligning table formatting and style

This commit is contained in:
proddy
2024-11-06 20:33:04 +01:00
parent b193b45f1f
commit 2623178a00
2 changed files with 9 additions and 10 deletions

View File

@@ -185,7 +185,7 @@ const Dashboard = () => {
// if its a device (parent node) and has entities // if its a device (parent node) and has entities
if (di.nodes?.length) { if (di.nodes?.length) {
return ( return (
<span style="font-weight:bold; font-size: 14px"> <span style={{ fontWeight: 'bold', fontSize: '14px' }}>
<DeviceIcon type_id={di.t ?? 0} /> <DeviceIcon type_id={di.t ?? 0} />
&nbsp;&nbsp;{showType(di.n, di.t)} &nbsp;&nbsp;{showType(di.n, di.t)}
<span style={{ color: 'lightblue' }}>&nbsp;({di.nodes?.length})</span> <span style={{ color: 'lightblue' }}>&nbsp;({di.nodes?.length})</span>
@@ -248,10 +248,10 @@ const Dashboard = () => {
onChange={handleShowAll} onChange={handleShowAll}
> >
<ToggleButton value={true}> <ToggleButton value={true}>
<UnfoldMoreIcon sx={{ fontSize: 14 }} /> <UnfoldMoreIcon sx={{ fontSize: 18 }} />
</ToggleButton> </ToggleButton>
<ToggleButton value={false}> <ToggleButton value={false}>
<UnfoldLessIcon sx={{ fontSize: 14 }} /> <UnfoldLessIcon sx={{ fontSize: 18 }} />
</ToggleButton> </ToggleButton>
</ToggleButtonGroup> </ToggleButtonGroup>
</Grid> </Grid>
@@ -302,7 +302,7 @@ const Dashboard = () => {
title={formatValue(LL, di.dv?.v, di.dv?.u)} title={formatValue(LL, di.dv?.v, di.dv?.u)}
arrow arrow
> >
{formatValue(LL, di.dv?.v, di.dv?.u)} <span>{formatValue(LL, di.dv?.v, di.dv?.u)}</span>
</Tooltip> </Tooltip>
</Cell> </Cell>
@@ -310,10 +310,7 @@ const Dashboard = () => {
{me.admin && {me.admin &&
di.dv?.c && di.dv?.c &&
!hasMask(di.dv.id, DeviceEntityMask.DV_READONLY) && ( !hasMask(di.dv.id, DeviceEntityMask.DV_READONLY) && (
<IconButton <IconButton onClick={() => editDashboardValue(di)}>
size="small"
onClick={() => editDashboardValue(di)}
>
<EditIcon <EditIcon
color="primary" color="primary"
sx={{ fontSize: 16 }} sx={{ fontSize: 16 }}

View File

@@ -522,7 +522,7 @@ const Devices = () => {
<IconContext.Provider <IconContext.Provider
value={{ value={{
color: 'lightblue', color: 'lightblue',
size: '18', size: '16',
style: { verticalAlign: 'middle' } style: { verticalAlign: 'middle' }
}} }}
> >
@@ -573,7 +573,9 @@ const Devices = () => {
const deviceValueDialogClose = () => { const deviceValueDialogClose = () => {
setDeviceValueDialogOpen(false); setDeviceValueDialogOpen(false);
void sendDeviceData(selectedDevice); if (selectedDevice !== undefined) {
void sendDeviceData(selectedDevice);
}
}; };
const renderDeviceData = () => { const renderDeviceData = () => {