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

Merge pull request #6387 from demi798/2.0

Browse source 
fix bug #5969
This commit is contained in:
debugIsFalse 2019-12-23 16:26:22 +08:00 • committed by GitHub
commit 254a37a0f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/drawer/drawer.vue
View file

@ -1,11 +1,11 @@
<template> <template>
<div v-transfer-dom :data-transfer="transfer"> <div v-transfer-dom :data-transfer="transfer">
<transition name="fade"> <transition name="fade">
<div :class="maskClasses" :style="maskStyle" v-show="visible" v-if="mask" @click="handleMask"></div> <div :class="maskClasses" :style="maskStyle" v-if="mask && visible" @click="handleMask"></div>
</transition> </transition>
<div :class="wrapClasses" @click="handleWrapClick"> <div :class="wrapClasses" @click="handleWrapClick">
<transition :name="'move-' + placement"> <transition :name="'move-' + placement">
<div :class="classes" :style="mainStyles" v-show="visible"> <div :class="classes" :style="mainStyles" v-if="visible">
<div :class="contentClasses" ref="content"> <div :class="contentClasses" ref="content">
<a class="ivu-drawer-close" v-if="closable" @click="close"> <a class="ivu-drawer-close" v-if="closable" @click="close">
<slot name="close"> <slot name="close">

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

@ -182,6 +182,7 @@
let rules = this.getFilteredRule(trigger); let rules = this.getFilteredRule(trigger);
if (!rules || rules.length === 0) { if (!rules || rules.length === 0) {
if (!this.required) { if (!this.required) {
this.validateState = '';
callback(); callback();
return true; return true;
}else { }else {