jason/DigitalConsumer.ISS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #402 from Safelite/feature/richardson/SSR-589.1

Browse source 
Downgrade vee-validate to match FMG
This commit is contained in:
brich1212safe 2023-08-09 11:05:17 -04:00 committed by GitHub
commit 06dae71b70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
package-lock.json generated
View file

@ -14,7 +14,7 @@
"maska": "^1.5.0", "maska": "^1.5.0",
"pinia": "^2.1.4", "pinia": "^2.1.4",
"pinia-plugin-persistedstate": "^2.2.0", "pinia-plugin-persistedstate": "^2.2.0",
"vee-validate": "^4.7.0", "vee-validate": "^4.5.7",
"vue": "^3.3.4", "vue": "^3.3.4",
"vue-plugin-load-script": "^2.1.0", "vue-plugin-load-script": "^2.1.0",
"vue-router": "4.2.4" "vue-router": "4.2.4"
@ -17395,11 +17395,11 @@
} }
}, },
"node_modules/vee-validate": { "node_modules/vee-validate": {
"version": "4.7.0", "version": "4.5.7",
"resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-4.7.0.tgz", "resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-4.5.7.tgz",
"integrity": "sha512-7HW2RE8mWaT57Jn+JU7jwczFqtlc1rIAwSbp8kD1L2sO0plhT9YeDNKW5iaI9baosc4h+iyb6itMlXtqAAqAfw==", "integrity": "sha512-EcpvOikBP5LlRIKwULfwRDeyIaERuOJztZUPWRmSIeWpeQWD6hs9qQ8A3CmVVteqEohbUM07gV/ea8lPXCfCJQ==",
"dependencies": { "dependencies": {
"@vue/devtools-api": "^6.1.4" "@vue/devtools-api": "^6.0.0-beta.15"
}, },
"peerDependencies": { "peerDependencies": {
"vue": "^3.0.0" "vue": "^3.0.0"

2
package.json
View file

@ -21,7 +21,7 @@
"maska": "^1.5.0", "maska": "^1.5.0",
"pinia": "^2.1.4", "pinia": "^2.1.4",
"pinia-plugin-persistedstate": "^2.2.0", "pinia-plugin-persistedstate": "^2.2.0",
"vee-validate": "^4.7.0", "vee-validate": "^4.5.7",
"vue": "^3.3.4", "vue": "^3.3.4",
"vue-plugin-load-script": "^2.1.0", "vue-plugin-load-script": "^2.1.0",
"vue-router": "4.2.4" "vue-router": "4.2.4"

39
src/digital-components/textbox-question/textbox-question.vue
View file

@ -1,7 +1,5 @@
<template> <template>
<div <div class="textbox-question" :class="(errors && errors.length) || hasError ? 'has-error' : ''">
class="textbox-question"
:class="(errors && errors.length) || hasError ? 'has-error' : ''">
<label <label
v-if="displayQuestionText" v-if="displayQuestionText"
:for="inputId" :for="inputId"
@ -40,15 +38,12 @@
:maxlength="maxLength ? maxLength : '999'" :maxlength="maxLength ? maxLength : '999'"
:data-bs-toggle="includeSelectIcon ? 'modal' : ''" :data-bs-toggle="includeSelectIcon ? 'modal' : ''"
:data-bs-target="'#' + cmsWidgetName" :data-bs-target="'#' + cmsWidgetName"
@change="validationRules ? handleChange : () => {}" @change="handleChange"
@blur="validationRules ? handleChange : () => {}" @blur="handleChange"
@focus="$emit('focus', $event.target.value)" @focus="$emit('focus', $event.target.value)"
@paste="trimOnPaste" @paste="trimOnPaste"
@drop="trimOnPaste" /> @drop="trimOnPaste" />
<button <button v-if="includeSearchIcon" type="submit" aria-label="Search button" />
v-if="includeSearchIcon"
type="submit"
aria-label="Search button" />
<button <button
v-if="includeSelectIcon" v-if="includeSelectIcon"
type="submit" type="submit"
@ -56,12 +51,8 @@
:data-bs-target="'#' + cmsWidgetName" :data-bs-target="'#' + cmsWidgetName"
aria-label="Select button" /> aria-label="Select button" />
</div> </div>
<div <div v-show="errorMessage" class="row my-1 form-test-error">
v-show="errorMessage" <span class="d-inline-flex mt-0" role="alert">{{ errorMessage }}</span>
class="row my-1 form-test-error">
<span
class="d-inline-flex mt-0"
role="alert">{{ errorMessage }}</span>
</div> </div>
</div> </div>
</template> </template>
@ -116,12 +107,12 @@ export default {
let initialValue; let initialValue;
switch (typeof modelValue) { switch (typeof modelValue) {
case 'number': case 'number':
initialValue = modelValue; initialValue = modelValue;
break; break;
default: default:
initialValue = modelValue && modelValue.length > 0 ? modelValue : ''; initialValue = modelValue && modelValue.length > 0 ? modelValue : '';
break; break;
} }
const fieldOptions = { const fieldOptions = {
@ -131,9 +122,11 @@ export default {
}; };
// eslint-disable-next-line no-shadow // eslint-disable-next-line no-shadow
const { errorMessage, handleBlur, handleChange, meta, validate, errors } = useField(props.inputId, const { errorMessage, handleBlur, handleChange, meta, validate, errors } = useField(
props.inputId,
props.validationRules, props.validationRules,
fieldOptions); fieldOptions
);
return { return {
errorMessage, errorMessage,