mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-06 07:49:52 +03:00
formatting
This commit is contained in:
1099
interface/package-lock.json
generated
1099
interface/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -42,6 +42,7 @@ import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined';
|
||||
import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined';
|
||||
import KeyboardArrowUpOutlinedIcon from '@mui/icons-material/KeyboardArrowUpOutlined';
|
||||
import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined';
|
||||
import StarIcon from '@mui/icons-material/Star';
|
||||
|
||||
import DeviceIcon from './DeviceIcon';
|
||||
|
||||
@@ -716,6 +717,7 @@ const DashboardData: FC = () => {
|
||||
const renderNameCell = (dv: DeviceValue) => (
|
||||
<>
|
||||
{dv.id.slice(2)}
|
||||
{hasMask(dv.id, DeviceEntityMask.DV_FAVORITE) && <StarIcon color="primary" sx={{ fontSize: 12 }} />}
|
||||
{hasMask(dv.id, DeviceEntityMask.DV_READONLY) && <EditOffOutlinedIcon color="primary" sx={{ fontSize: 12 }} />}
|
||||
{hasMask(dv.id, DeviceEntityMask.DV_API_MQTT_EXCLUDE) && (
|
||||
<CommentsDisabledOutlinedIcon color="primary" sx={{ fontSize: 12 }} />
|
||||
|
||||
@@ -54,9 +54,6 @@ const SettingsCustomization: FC = () => {
|
||||
const [masks, setMasks] = useState(() => ['']);
|
||||
|
||||
const entities_theme = useTheme({
|
||||
Table: `
|
||||
height: 100%;
|
||||
`,
|
||||
BaseRow: `
|
||||
font-size: 14px;
|
||||
color: white;
|
||||
@@ -100,13 +97,13 @@ const SettingsCustomization: FC = () => {
|
||||
border-right: 1px solid transparent;
|
||||
border-bottom: 1px solid transparent;
|
||||
&:nth-of-type(1) {
|
||||
width: 130px;
|
||||
left: 0px;
|
||||
min-width: 124px;
|
||||
width: 124px;
|
||||
}
|
||||
&:nth-of-type(2) {
|
||||
flex: 1;
|
||||
}
|
||||
&:last-of-type {
|
||||
text-align: right;
|
||||
min-width: 70%;
|
||||
width: 70%;
|
||||
}
|
||||
`
|
||||
});
|
||||
@@ -302,10 +299,19 @@ const SettingsCustomization: FC = () => {
|
||||
|
||||
return (
|
||||
<>
|
||||
<Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="center">
|
||||
<Grid
|
||||
container
|
||||
ml={1}
|
||||
mb={1}
|
||||
mt={1}
|
||||
spacing={1}
|
||||
direction="row"
|
||||
justifyContent="flex-start"
|
||||
alignItems="center"
|
||||
>
|
||||
<Grid item>
|
||||
<Typography sx={{ pt: 1, pb: 1 }} variant="subtitle2" color="primary">
|
||||
Apply filter:
|
||||
<Typography align="right" variant="subtitle2" color="primary">
|
||||
Set filter:
|
||||
</Typography>
|
||||
</Grid>
|
||||
<Grid item>
|
||||
@@ -354,13 +360,13 @@ const SettingsCustomization: FC = () => {
|
||||
data={{ nodes: deviceEntities.filter((de) => de.m & selectedFilters || !selectedFilters) }}
|
||||
theme={entities_theme}
|
||||
sort={entity_sort}
|
||||
layout={{ custom: true }}
|
||||
layout={{ custom: true, horizontalScroll: true }}
|
||||
>
|
||||
{(tableList: any) => (
|
||||
<>
|
||||
<Header>
|
||||
<HeaderRow>
|
||||
<HeaderCell>OPTIONS</HeaderCell>
|
||||
<HeaderCell pinLeft>OPTIONS</HeaderCell>
|
||||
<HeaderCell resize>
|
||||
<Button
|
||||
fullWidth
|
||||
@@ -371,7 +377,7 @@ const SettingsCustomization: FC = () => {
|
||||
NAME
|
||||
</Button>
|
||||
</HeaderCell>
|
||||
<HeaderCell pinRight={true}>VALUE</HeaderCell>
|
||||
<HeaderCell>VALUE</HeaderCell>
|
||||
<HeaderCell />
|
||||
</HeaderRow>
|
||||
</Header>
|
||||
|
||||
@@ -555,19 +555,19 @@ const emsesp_devicedata_4 = {
|
||||
{
|
||||
v: 16,
|
||||
u: 1,
|
||||
id: '00hc2 selected room temperature',
|
||||
id: '08hc2 selected room temperature',
|
||||
c: 'hc2/seltemp',
|
||||
},
|
||||
{
|
||||
v: 18.6,
|
||||
u: 1,
|
||||
id: '00hc2 current room temperature',
|
||||
id: '02hc2 current room temperature',
|
||||
c: '',
|
||||
},
|
||||
{
|
||||
v: 'off',
|
||||
u: 0,
|
||||
id: '00hc2 mode',
|
||||
id: '02hc2 mode',
|
||||
c: 'hc2/mode',
|
||||
},
|
||||
],
|
||||
@@ -705,14 +705,14 @@ const emsesp_deviceentities_4 = [
|
||||
v: 18.5,
|
||||
id: 'hc2 current room temperature',
|
||||
s: 'hc2/curtemp',
|
||||
m: 3,
|
||||
m: 2,
|
||||
w: false,
|
||||
},
|
||||
{
|
||||
v: 'off',
|
||||
id: 'hc2 mode',
|
||||
s: 'hc2/mode',
|
||||
m: 3,
|
||||
m: 2,
|
||||
w: true,
|
||||
},
|
||||
]
|
||||
|
||||
@@ -1 +1 @@
|
||||
#define EMSESP_APP_VERSION "3.4.0b12"
|
||||
#define EMSESP_APP_VERSION "3.4.0b12t"
|
||||
|
||||
Reference in New Issue
Block a user