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

Jump to bottom

fix: only validate enabled fields in PresetDialog #995

Merged
merged 1 commit into from
Dec 27, 2022
Merged

fix: only validate enabled fields in PresetDialog #995

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
34 changes: 18 additions & 16 deletions src/components/settings/presets/PresetDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
>
<v-form
ref="form"
v-model="valid"
@submit.prevent="handleSave"
>
<v-card>
<v-card-title class="card-heading py-2">
<span class="focus--text">{{ (preset.id != -1) ? $t('app.general.label.edit_preset') : $t('app.general.label.add_preset') }}</span>
</v-card-title>

<v-divider />

<app-setting :title="$t('app.setting.label.thermal_preset_name')">
<v-text-field
v-model="preset.name"
Expand All @@ -37,21 +38,20 @@
<v-checkbox
v-model="preset.values[item.name].active"
hide-details
class="ma-0"
/>

<v-text-field
v-model.number="preset.values[item.name].value"
:rules="[
:disabled="!preset.values[item.name].active"
:rules="preset.values[item.name].active ? [
$rules.required,
$rules.numberValid,
$rules.numberGreaterThan(0)
]"
] : undefined"
hide-details="auto"
type="number"
suffix="°C"
class="mb-2"
outlined
filled
dense
/>
</app-setting>
Expand All @@ -69,21 +69,20 @@
<v-checkbox
v-model="preset.values[item.name].active"
hide-details
class="ma-0"
/>

<v-text-field
v-model.number="preset.values[item.name].value"
:rules="[
:disabled="!preset.values[item.name].active"
:rules="preset.values[item.name].active ? [
$rules.required,
$rules.numberValid,
$rules.numberGreaterThan(0)
]"
] : undefined"
hide-details="auto"
type="number"
suffix="°C"
class="mb-2"
outlined
filled
dense
/>
</app-setting>
Expand All @@ -96,11 +95,12 @@
v-model="preset.gcode"
rows="2"
hide-details="auto"
class="mb-2"
outlined
filled
/>
</app-setting>

<v-divider />

<v-card-actions>
<v-spacer />
<app-btn
Expand All @@ -124,9 +124,10 @@
</template>

<script lang="ts">
import { Component, Vue, Prop, VModel } from 'vue-property-decorator'
import { Component, Vue, Prop, VModel, Ref } from 'vue-property-decorator'
import { TemperaturePreset } from '@/store/config/types'
import { Fan, Heater } from '@/store/printer/types'
import { VForm } from '@/types'

@Component({})
export default class TemperaturePresetDialog extends Vue {
Expand All @@ -136,7 +137,8 @@ export default class TemperaturePresetDialog extends Vue {
@Prop({ type: Object, required: true })
readonly preset!: TemperaturePreset

valid = false
@Ref('form')
readonly form!: VForm

get heaters (): Heater[] {
return this.$store.getters['printer/getHeaters']
Expand All @@ -147,7 +149,7 @@ export default class TemperaturePresetDialog extends Vue {
}

handleSave () {
if (this.valid) {
if (this.form.validate()) {
this.$emit('save', this.preset)
this.open = false
}
Expand Down