xy 11 months ago
parent 6705e0319d
commit 0ec9deee22

@ -184,7 +184,6 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
return (isNaN(Number(target[info.name])) || !target[info.name]) ? target[info.name] : Number(target[info.name]) return (isNaN(Number(target[info.name])) || !target[info.name]) ? target[info.name] : Number(target[info.name])
} }
} }
console.log(info.name, getSelectValue(), target[info.name])
formItem = h( formItem = h(
formBuilderMap(device).get(info.type), formBuilderMap(device).get(info.type),
{ {
@ -1430,30 +1429,32 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
); );
break; break;
case "select": case "select":
let findSelect = options.find((i) =>
typeof i === "object"
? i.id === this.form[info.name]
: i === this.form[info.name]
);
formItem = h(
"van-cell",
{
attrs: {
for: info.name
},
props: {
title: info.label,
value: typeof findSelect === "object" ? findSelect.name : findSelect
}
},
);
break;
case 'choice': case 'choice':
let findChoice = options.find((i) => const getDetailMobileSelectValue = () => {
typeof i === "object" let res = ''
? i.id === this.form[info.name] if (!!info.multiple) {
: i === this.form[info.name] res = target[info.name] ? target[info.name].toString()?.split(/,|\|/).map(i => isNaN(Number(i)) ? i : Number(i)) : []
); } else {
res = isNaN(Number(target[info.name])) ? target[info.name] : Number(target[info.name])
}
if (res instanceof Array) {
if (typeof options[0] === 'object') {
return options?.filter((i) =>
res.indexOf(i.id) !== -1
)?.map(i => i.name)?.toString()
} else {
return res
}
} else {
if (typeof options[0] === 'object') {
return options?.filter((i) =>
res === i.id
)?.map(i => i.name)?.toString()
} else {
return res
}
}
}
formItem = h( formItem = h(
"van-cell", "van-cell",
{ {
@ -1462,7 +1463,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
}, },
props: { props: {
title: info.label, title: info.label,
value: typeof findChoice === "object" ? findChoice.name : findChoice value: getDetailMobileSelectValue()
} }
}, },
); );

Loading…
Cancel
Save