Merge pull request #1591 from lwyj123/1534

fix #1534
2017-08-11 14:25:10 +08:00 · 2017-08-11 14:25:10 +08:00 · 2ffa16c444
commit 2ffa16c444
parent 754e4c515f 64fe5039ad
2 changed files with 1 additions and 1 deletions
--- a/src/components/base/popper.js
+++ b/src/components/base/popper.js
@ -55,7 +55,6 @@ export default {
        visible(val) {
            if (val) {
                this.updatePopper();
-                this.$emit('on-popper-show');
            } else {
                this.destroyPopper();
                this.$emit('on-popper-hide');
--- a/src/components/form/form-item.vue
+++ b/src/components/form/form-item.vue
@ -177,6 +177,7 @@

                    callback(this.validateMessage);
                });
+                this.validateDisabled = false;
            },
            resetField () {
                this.validateState = '';