mirror of https://github.com/ElemeFE/element
				
				
				
			some bug fixes
							parent
							
								
									627e6cffaa
								
							
						
					
					
						commit
						cce0061e56
					
				|  | @ -101,6 +101,8 @@ const showNextMsg = () => { | |||
|       if (isVNode(instance.message)) { | ||||
|         instance.$slots.default = [instance.message]; | ||||
|         instance.message = null; | ||||
|       } else { | ||||
|         delete instance.$slots.default; | ||||
|       } | ||||
|       ['modal', 'showClose', 'closeOnClickModal', 'closeOnPressEscape'].forEach(prop => { | ||||
|         if (instance[prop] === undefined) { | ||||
|  |  | |||
|  | @ -129,8 +129,7 @@ | |||
| 
 | ||||
|       handleWrapperClick() { | ||||
|         if (this.closeOnClickModal) { | ||||
|           this.action = ''; | ||||
|           this.doClose(); | ||||
|           this.handleAction('cancel'); | ||||
|         } | ||||
|       }, | ||||
| 
 | ||||
|  |  | |||
|  | @ -134,7 +134,7 @@ | |||
|       outline: none; | ||||
|       position: absolute; | ||||
|       margin: 0; | ||||
|       visibility: hidden; | ||||
|       size: 0; | ||||
|       left: -999px; | ||||
|     } | ||||
| 
 | ||||
|  |  | |||
|  | @ -11,6 +11,9 @@ | |||
| 
 | ||||
|     .el-button-group { | ||||
|       display: block; | ||||
|       .el-button { | ||||
|         float: none; | ||||
|       } | ||||
|     } | ||||
| 
 | ||||
|     & .el-dropdown__caret-button { | ||||
|  |  | |||
|  | @ -156,8 +156,9 @@ const PopupManager = { | |||
|       if (!topItem) return; | ||||
|       const instance = PopupManager.getInstance(topItem.id); | ||||
|       if (instance.closeOnPressEscape) { | ||||
|         instance.$emit('update:visible', false); | ||||
|         (instance.handleClose) ? instance.handleClose() : (instance.handleAction ? instance.handleAction('cancel') : instance.close()); | ||||
|         instance.handleClose | ||||
|           ? instance.handleClose() | ||||
|           : (instance.handleAction ? instance.handleAction('cancel') : instance.close()); | ||||
|       } | ||||
|     } | ||||
|   } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Leopoldthecoder
						Leopoldthecoder