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

fix #4831

Browse source
This commit is contained in:
梁灏 2018-12-17 16:57:11 +08:00
parent 38a28d582b
commit b0fe4f9836
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@
</template> </template>
<script> <script>
import Icon from '../icon'; import Icon from '../icon';
import { oneOf } from '../../utils/assist'; import { oneOf, findBrothersComponents, findComponentsUpward } from '../../utils/assist';
import TransferDom from '../../directives/transfer-dom'; import TransferDom from '../../directives/transfer-dom';
import Emitter from '../../mixins/emitter'; import Emitter from '../../mixins/emitter';
import ScrollbarMixins from '../modal/mixins-scrollbar'; import ScrollbarMixins from '../modal/mixins-scrollbar';
@ -193,7 +193,17 @@
if (val === false) { if (val === false) {
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.wrapShow = false; this.wrapShow = false;
this.removeScrollEffect(); // #4831 Check if there are any drawers left at the parent level
const brotherDrawers = findBrothersComponents(this, 'Drawer') || [];
const parentDrawers = findComponentsUpward(this, 'Drawer') || [];
const otherDrawers = [].concat(brotherDrawers).concat(parentDrawers);
const isScrollDrawer = otherDrawers.some(item => item.visible && !item.scrollable);
if (!isScrollDrawer) {
this.removeScrollEffect();
}
}, 300); }, 300);
} else { } else {
if (this.timer) clearTimeout(this.timer); if (this.timer) clearTimeout(this.timer);