drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4537 from weidapao/fix_bug2

Browse source 
fix(FormItem): 解决required属性无法校验的bug
This commit is contained in:
Aresn 2018-09-18 15:24:02 +08:00 • committed by GitHub
commit 5d076fc54a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/components/form/form-item.vue
View file

@ -150,15 +150,19 @@
methods: {
setRules() {
let rules = this.getRules();
if (rules.length) {
if (rules.length&&this.required) {
return;
}else if (rules.length) {
rules.every((rule) => {
this.isRequired = rule.required;
});
this.$off('on-form-blur', this.onFieldBlur);
this.$off('on-form-change', this.onFieldChange);
this.$on('on-form-blur', this.onFieldBlur);
this.$on('on-form-change', this.onFieldChange);
}else if (this.required){
this.isRequired = this.required;
}
this.$off('on-form-blur', this.onFieldBlur);
this.$off('on-form-change', this.onFieldChange);
this.$on('on-form-blur', this.onFieldBlur);
this.$on('on-form-change', this.onFieldChange);
},
getRules () {
let formRules = this.form.rules;
@ -174,10 +178,14 @@
return rules.filter(rule => !rule.trigger || rule.trigger.indexOf(trigger) !== -1);
},
validate(trigger, callback = function () {}) {
const rules = this.getFilteredRule(trigger);
let rules = this.getFilteredRule(trigger);
if (!rules || rules.length === 0) {
callback();
return true;
if (!this.required) {
callback();
return true;
}else {
rules = [{required: true}];
}
}
this.validateState = 'validating';