Skip to content

Commit b8b8951

Browse files
update to run blur,change,input only if set
1 parent 1dbe35b commit b8b8951

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

src/plugin/components/fields/CommonField/CommonField.vue

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
:error="hasErrors"
88
:error-messages="errorMessage || field.errorMessages"
99
:items="fieldItems"
10-
@blur="onActions('blur')"
11-
@change="onActions('change')"
12-
@input="onActions('input')"
10+
@blur="fieldValidateOn === 'blur' ? onActions('blur') : undefined"
11+
@change="fieldValidateOn === 'change' ? onActions('change') : undefined"
12+
@input="fieldValidateOn === 'input' ? onActions('input') : undefined"
1313
>
1414
<template #label>
1515
<FieldLabel
@@ -43,7 +43,6 @@ const fieldRequired = computed<FieldLabelProps['required']>(() => {
4343
const fieldValidateOn = computed(() => field.value?.validateOn ?? settings.value.validateOn);
4444
const originalValue = modelValue.value;
4545
46-
4746
const { errorMessage, setValue, validate, value } = useField(
4847
field.value.name,
4948
undefined,

src/plugin/components/fields/VSFCheckbox/VSFCheckbox.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
:disabled="isValidating"
99
:error="errorMessage ? errorMessage?.length > 0 : false"
1010
:error-messages="errorMessage"
11-
@blur="onActions('blur')"
12-
@change="onActions('change')"
11+
@blur="fieldValidateOn === 'blur' ? onActions('blur') : undefined"
12+
@change="fieldValidateOn === 'change' ? onActions('change') : undefined"
1313
@click="fieldValidateOn === 'blur' || fieldValidateOn === 'change' ? onActions('click') : undefined"
14-
@input="onActions('input')"
14+
@input="fieldValidateOn === 'input' ? onActions('input') : undefined"
1515
>
1616
<template #label>
1717
<FieldLabel

src/plugin/components/fields/VSFRadio/VSFRadio.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@
6262
:style="radioStyle"
6363
:true-value="option.value || field.trueValue"
6464
:value="option.value"
65-
@blur="onActions('blur', option.value)"
66-
@change="onActions('change', option.value)"
65+
@blur="fieldValidateOn === 'blur' ? onActions('blur', option.value) : undefined"
66+
@change="fieldValidateOn === 'change' ? onActions('change', option.value) : undefined"
6767
@click="fieldValidateOn === 'blur' || fieldValidateOn === 'change' ? onActions('click', option.value) : undefined"
68-
@input="onActions('input', option.value)"
68+
@input="fieldValidateOn === 'input' ? onActions('input', option.value) : undefined"
6969
>
7070
</v-radio>
7171
</div>

src/plugin/components/fields/VSFSwitch/VSFSwitch.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
:disabled="isValidating"
2020
:error="props.errorMessage ? props.errorMessage?.length > 0 : false"
2121
:error-messages="props.errorMessage"
22-
@blur="onActions((props.validate as ValidateFieldResult), 'blur')"
23-
@change="onActions((props.validate as ValidateFieldResult), 'change')"
22+
@blur="fieldValidateOn === 'blur' ? onActions((props.validate as ValidateFieldResult), 'blur') : undefined"
23+
@change="fieldValidateOn === 'change' ? onActions((props.validate as ValidateFieldResult), 'change') : undefined"
2424
@click="fieldValidateOn === 'blur' || fieldValidateOn === 'change' ? onActions(props.validate, 'click') : undefined"
25-
@input="onActions((props.validate as ValidateFieldResult), 'input')"
25+
@input="fieldValidateOn === 'input' ? onActions((props.validate as ValidateFieldResult), 'input') : undefined"
2626
>
2727
<template #label>
2828
<FieldLabel

0 commit comments

Comments
 (0)