improve dv validation, add back ugly step

This commit is contained in:
Proddy
2023-05-03 08:54:57 +02:00
parent 310bb53985
commit e84a3bc99a
4 changed files with 32 additions and 42 deletions

View File

@@ -168,13 +168,11 @@ export const deviceValueItemValidation = (dv: DeviceValue) =>
v: [
{ required: true, message: 'Value is required' },
{
validator(rule: InternalRuleItem, value: string, callback: (error?: string) => void) {
if (dv.u !== DeviceValueUOM.NONE && isNaN(+value)) {
callback('Not a valid number');
validator(rule: InternalRuleItem, value: any, callback: (error?: string) => void) {
if (typeof value === 'number' && dv.m && dv.x && (value < dv.m || value > dv.x)) {
callback('Value out of range');
}
(dv.m && Number(value) < dv.m) || (dv.x && Number(value) > dv.x)
? callback('Value out of range')
: callback();
callback();
}
}
]