github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Dialog: Revert Fix close bug (#15000) (#15544) (#16201) 

This reverts commit 562662773e.
pull/16135/head
Zhi Cun 2019-06-24 16:04:20 +08:00 committed by GitHub
parent 562662773e
commit b9ecabbf05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/dialog/src/component.vue
View File

@ -3,7 +3,7 @@
name="dialog-fade" name="dialog-fade"
@after-enter="afterEnter" @after-enter="afterEnter"
@after-leave="afterLeave"> @after-leave="afterLeave">
<div class="el-dialog__wrapper" v-show="visible" @click.self="handleWrapperClick" @mouseup="handleMouseup"> <div class="el-dialog__wrapper" v-show="visible" @click.self="handleWrapperClick">
<div <div
role="dialog" role="dialog"
aria-modal="true" aria-modal="true"
@ -11,8 +11,7 @@
class="el-dialog" class="el-dialog"
:class="[{ 'is-fullscreen': fullscreen, 'el-dialog--center': center }, customClass]" :class="[{ 'is-fullscreen': fullscreen, 'el-dialog--center': center }, customClass]"
ref="dialog" ref="dialog"
:style="style" :style="style">
@mousedown="handleMousedown">
<div class="el-dialog__header"> <div class="el-dialog__header">
<slot name="title"> <slot name="title">
<span class="el-dialog__title">{{ title }}</span> <span class="el-dialog__title">{{ title }}</span>
@ -40,8 +39,6 @@
import Migrating from 'element-ui/src/mixins/migrating'; import Migrating from 'element-ui/src/mixins/migrating';
import emitter from 'element-ui/src/mixins/emitter'; import emitter from 'element-ui/src/mixins/emitter';
let dialogMouseDown = false;
export default { export default {
name: 'ElDialog', name: 'ElDialog',
@ -155,19 +152,9 @@
}; };
}, },
handleWrapperClick() { handleWrapperClick() {
if (!this.closeOnClickModal || dialogMouseDown) return; if (!this.closeOnClickModal) return;
this.handleClose(); this.handleClose();
}, },
handleMousedown() {
dialogMouseDown = true;
},
handleMouseup() {
if (dialogMouseDown) {
this.$nextTick(_ => {
dialogMouseDown = false;
});
}
},
handleClose() { handleClose() {
if (typeof this.beforeClose === 'function') { if (typeof this.beforeClose === 'function') {
this.beforeClose(this.hide); this.beforeClose(this.hide);