Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix decimal formatting for oh-stepper #2090

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Fix decimal formatting for oh-stepper #2090

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions bundles/org.openhab.ui/web/src/components/widgets/system/oh-stepper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ export default {
},
computed: {
value () {
const applyOffset = (value) => (typeof this.config.offset === 'number') ? value + this.config.offset : value
const applyOffset = (value) => (typeof this.config.offset === 'number') ? Number(this.toStepFixed(value + this.config.offset)) : value
if (this.config.variable) {
if (this.config.variableKey) {
return applyOffset(this.getLastVariableKeyValue(this.context.vars[this.config.variable], this.config.variableKey))
}
return applyOffset(this.context.vars[this.config.variable])
}
let value = applyOffset(this.toStepFixed(parseFloat(this.context.store[this.config.item].state)))
let value = applyOffset(Number(this.context.store[this.config.item].state))
if (this.config.min !== undefined) value = Math.max(value, this.config.min)
if (this.config.max !== undefined) value = Math.min(value, this.config.max)
return value
Expand All @@ -37,7 +37,7 @@ export default {
watch: {
value (newValue) {
if (isNaN(newValue) || !isFinite(newValue)) return
this.$refs.stepper.setValue(this.toStepFixed(newValue).toString())
this.$refs.stepper.setValue(Number(this.toStepFixed(newValue)))
}
},
methods: {
Expand All @@ -48,11 +48,11 @@ export default {
// uses the number of decimals in the step config to round the provided number
if (!this.config.step) return value
const nbDecimals = Number(this.config.step).toString().replace(',', '.').split('.')[1]
return parseFloat(Number(value).toFixed(nbDecimals))
return parseFloat(Number(value)).toFixed(nbDecimals.length)
},
onChange (value) {
const applyOffset = (value) => (typeof this.config.offset === 'number') ? value - this.config.offset : value
let newValue = applyOffset(this.toStepFixed(value))
const applyOffset = (value) => (typeof this.config.offset === 'number') ? Number(this.toStepFixed(value - this.config.offset)) : value
let newValue = applyOffset(Number(this.toStepFixed(value)))
if (newValue === this.value) return
if (this.config.variable) {
if (this.config.variableKey) {
Expand Down