Support nested parameter tables

This commit is contained in:
Zaid Abdulla committed 2018-12-26 00:22:07 -08:00
1 parent 16b10a698b
commit e1bdcda191
3 files changed
+19 -11

No files matched your search

+8 -4
View File
@@ -8,8 +8,8 @@ import * as filterParser from "../../common/filter-parser";
const component = {
oninit: vnode => {
vnode.state.object = filterParser.parseParameter(vnode.attrs.object);
vnode.state.parameters = Object.values(vnode.attrs.parameters).map(
vnode.state.object = filterParser.parseParameter(vnode.attrs.parameter);
vnode.state.parameters = Object.values(vnode.attrs.childParameters).map(
parameter => {
let p = filterParser.parseParameter(parameter.parameter);
return Object.assign({}, parameter, { parameter: p });
@@ -42,10 +42,14 @@ const component = {
m(
"td",
m(
components.get("parameter"),
components.get(p.type || "parameter"),
Object.assign({}, p, {
device: device,
parameter: `${i}.${store.evaluateExpression(p.parameter, device)}`
parameter: `${i}.${store.evaluateExpression(
p.parameter,
device
)}`,
label: ""
})
)
)
+4
View File
@@ -245,6 +245,10 @@ table.table {
border-spacing: 0;
text-align: left;
& table.table {
font-size: 90%;
}
& th {
color: var(--color4);
font-weight: bold;
+7 -7
View File
@@ -91,13 +91,13 @@
"ui.device.30.parameters.11.parameter": "InternetGatewayDevice.LANDevice.1.WLANConfiguration.1.KeyPassphrase",
"ui.device.40.type": "parameter-table",
"ui.device.40.label": "WLAN hosts",
"ui.device.40.object": "InternetGatewayDevice.LANDevice.1.Hosts.Host",
"ui.device.40.parameters.1.label": "Host name",
"ui.device.40.parameters.1.parameter": "HostName",
"ui.device.40.parameters.2.label": "IP address",
"ui.device.40.parameters.2.parameter": "IPAddress",
"ui.device.40.parameters.3.label": "MAC address",
"ui.device.40.parameters.3.parameter": "MACAddress",
"ui.device.40.parameter": "InternetGatewayDevice.LANDevice.1.Hosts.Host",
"ui.device.40.childParameters.1.label": "Host name",
"ui.device.40.childParameters.1.parameter": "HostName",
"ui.device.40.childParameters.2.label": "IP address",
"ui.device.40.childParameters.2.parameter": "IPAddress",
"ui.device.40.childParameters.3.label": "MAC address",
"ui.device.40.childParameters.3.parameter": "MACAddress",
"ui.device.50.type": "device-faults",
"ui.device.60.type": "all-parameters",
"ui.device.70.type": "device-actions"