diff --git a/jero-web/src/components/ParameterLibraryAdd/index.vue b/jero-web/src/components/ParameterLibraryAdd/index.vue index 7c92dfe48..80c226ea3 100644 --- a/jero-web/src/components/ParameterLibraryAdd/index.vue +++ b/jero-web/src/components/ParameterLibraryAdd/index.vue @@ -2,6 +2,7 @@
@@ -87,7 +87,7 @@ export default { visible: false, rules: { paramsTemplateName:[ - { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'change' }, + { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'blur' }, { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' }, ], description:[ diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 5c1c8ec40..eb51bb29e 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -22,7 +22,7 @@ @@ -55,7 +55,7 @@ @@ -127,7 +127,7 @@ style='height: 95px; width: 100%' type="textarea" :disabled="disabled" - v-model="formInline.description" + v-model.trim="formInline.description" :placeholder="$t('PleaseEnter')+$t('NParameterDescription')"/> @@ -204,7 +204,7 @@ @@ -349,12 +349,12 @@ export default { visible: false, rules: { nioNumber:[ - { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'change' }, + { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'blur' }, { min:1, max: 15, message: this.$t('cantExeed')+'15'+this.$t('characters'), trigger: 'blur' }, { pattern: /^[0-9a-zA-Z-]{1,}$/, message: this.$t('onlyThree'), - trigger: 'change' + trigger: 'blur' } ], certCategory: [ @@ -364,7 +364,7 @@ export default { { required: true, message: this.$t('pleaseSelect')+this.$t('Required'), trigger: 'change' }, ], paramsName: [ - { required: true, message: this.$t('pleaseSelect')+this.$t('ParameterName'), trigger: 'change' }, + { required: true, message: this.$t('pleaseSelect')+this.$t('ParameterName'), trigger: 'blur' }, { min:1, max: 30, message: this.$t('cantExeed')+'30'+this.$t('characters'), trigger: 'blur' }, ], technologyTerritory: [ @@ -386,7 +386,7 @@ export default { { required: true, message: this.$t('PleaseEnter')+this.$t('controlVerification'), trigger: 'change' }, ], controlValues: [ - { required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'change' }, + { required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'blur' }, { min:1, max: 500, message: this.$t('cantExeed')+'500'+this.$t('characters'), trigger: 'blur' }, ], }, diff --git a/jero-web/src/views/projectManagement/ParameterItemCollection/index.vue b/jero-web/src/views/projectManagement/ParameterItemCollection/index.vue deleted file mode 100644 index b43b77d8c..000000000 --- a/jero-web/src/views/projectManagement/ParameterItemCollection/index.vue +++ /dev/null @@ -1,262 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index ce51d31e5..35767d708 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1,161 +1,172 @@ \ No newline at end of file