Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI update: or-input bug fix for number input (Fixes #65) and or-rules fix for switching rules after save (Fixes #61)

Rich Turnerbb1974ae2685
diff --git a/ui/component/or-input/src/index.ts b/ui/component/or-input/src/index.ts
index de567aadf..b95ea13bf 100644
--- a/ui/component/or-input/src/index.ts
+++ b/ui/component/or-input/src/index.ts
@@ -549,10 +549,10 @@ export class OrInput extends LitElement {
?readonly="${this.readonly}"
?disabled="${this.disabled}"
@change="${(e: Event) => this.onValueChange((e.target as HTMLInputElement), (e.target as HTMLInputElement).value)}"
- .value="${val ? val : ""}"
+ .value="${val !== null && val !== undefined ? val : ""}"
min="${ifDefined(this.min)}"
max="${ifDefined(this.max)}"
- step="${ifDefined(this.step)}"
+ step="${this.step ? this.step : "any"}"
aria-label="${ifDefined(this.label)}"
minlength="${ifDefined(this.minLength)}"
maxlength="${ifDefined(this.maxLength)}"
diff --git a/ui/component/or-rules/src/index.ts b/ui/component/or-rules/src/index.ts
index a8155a4e9..3d18a496d 100644
--- a/ui/component/or-rules/src/index.ts
+++ b/ui/component/or-rules/src/index.ts
@@ -665,6 +665,7 @@ export class OrRules extends translate(i18next)(LitElement) {
protected _onRuleSelectionChanged(event: OrRulesSelectionChangedEvent) {
this._activeRuleset = event.detail.length === 1 ? {...event.detail[0]} : undefined;
+ this.selectedIds = event.detail.length === 1 ? [event.detail[0].id!] : undefined;
}
protected _onRuleSaveStart(event: OrRulesSaveStartEvent) {