cy-element-ui 1.0.4 → 1.0.6

package/packages/message/src/main.vue

@@ -25,93 +25,93 @@
 </template>
 
 <script type="text/babel">
-	const typeMap = {
-		success: 'success',
-		info: 'info',
-		warning: 'warning',
-		error: 'error'
-	};
+const typeMap = {
+	success: 'success',
+	info: 'info',
+	warning: 'warning',
+	error: 'error'
+};
 
-	export default {
-		data() {
+export default {
+	data() {
+		return {
+			visible: false,
+			message: '',
+			duration: 3000,
+			type: 'info',
+			iconClass: '',
+			customClass: '',
+			onClose: null,
+			showClose: false,
+			closed: false,
+			verticalOffset: 20,
+			timer: null,
+			dangerouslyUseHTMLString: false,
+			center: false
+		};
+	},
+
+	computed: {
+		typeClass() {
+			return this.type && !this.iconClass
+				? `el-message__icon el-icon-${ typeMap[this.type] }`
+				: '';
+		},
+		positionStyle() {
 			return {
-				visible: false,
-				message: '',
-				duration: 3000,
-				type: 'info',
-				iconClass: '',
-				customClass: '',
-				onClose: null,
-				showClose: false,
-				closed: false,
-				verticalOffset: 20,
-				timer: null,
-				dangerouslyUseHTMLString: false,
-				center: false
+				'top': `${ this.verticalOffset }px`
 			};
-		},
+		}
+	},
 
-		computed: {
-			typeClass() {
-				return this.type && !this.iconClass
-					? `el-message__icon el-icon-${ typeMap[this.type] }`
-					: '';
-			},
-			positionStyle() {
-				return {
-					'top': `${ this.verticalOffset }px`
-				};
+	watch: {
+		closed(newVal) {
+			if (newVal) {
+				this.visible = false;
 			}
+		}
+	},
+
+	methods: {
+		handleAfterLeave() {
+			this.$destroy(true);
+			this.$el.parentNode.removeChild(this.$el);
 		},
 
-		watch: {
-			closed(newVal) {
-				if (newVal) {
-					this.visible = false;
-				}
+		close() {
+			this.closed = true;
+			if (typeof this.onClose === 'function') {
+				this.onClose(this);
 			}
 		},
 
-		methods: {
-			handleAfterLeave() {
-				this.$destroy(true);
-				this.$el.parentNode.removeChild(this.$el);
-			},
-
-			close() {
-				this.closed = true;
-				if (typeof this.onClose === 'function') {
-					this.onClose(this);
-				}
-			},
-
-			clearTimer() {
-				clearTimeout(this.timer);
-			},
+		clearTimer() {
+			clearTimeout(this.timer);
+		},
 
-			startTimer() {
-				if (this.duration > 0) {
-					this.timer = setTimeout(() => {
-						if (!this.closed) {
-							this.close();
-						}
-					}, this.duration);
-				}
-			},
-			keydown(e) {
-				if (e.keyCode === 27) { // esc关闭消息
+		startTimer() {
+			if (this.duration > 0) {
+				this.timer = setTimeout(() => {
 					if (!this.closed) {
 						this.close();
 					}
-				}
+				}, this.duration);
 			}
 		},
-		mounted() {
-			this.startTimer();
-			document.addEventListener('keydown', this.keydown);
-		},
-		beforeDestroy() {
-			document.removeEventListener('keydown', this.keydown);
+		keydown(e) {
+			if (e.keyCode === 27) { // esc关闭消息
+				if (!this.closed) {
+					this.close();
+				}
+			}
 		}
-	};
+	},
+	mounted() {
+		this.startTimer();
+		document.addEventListener('keydown', this.keydown);
+	},
+	beforeDestroy() {
+		document.removeEventListener('keydown', this.keydown);
+	}
+};
 </script>

package/packages/message-box/src/main.vue

@@ -79,254 +79,254 @@
 </template>
 
 <script type="text/babel">
-	import Popup from 'element-ui/src/utils/popup';
-	import Locale from 'element-ui/src/mixins/locale';
-	import ElInput from 'element-ui/packages/input';
-	import ElButton from 'element-ui/packages/button';
-	import { addClass, removeClass } from 'element-ui/src/utils/dom';
-	import { t } from 'element-ui/src/locale';
-	import Dialog from 'element-ui/src/utils/aria-dialog';
+import Popup from 'element-ui/src/utils/popup';
+import Locale from 'element-ui/src/mixins/locale';
+import ElInput from 'element-ui/packages/input';
+import ElButton from 'element-ui/packages/button';
+import { addClass, removeClass } from 'element-ui/src/utils/dom';
+import { t } from 'element-ui/src/locale';
+import Dialog from 'element-ui/src/utils/aria-dialog';
 
-	let messageBox;
-	let typeMap = {
-		success: 'success',
-		info: 'info',
-		warning: 'warning',
-		error: 'error'
-	};
+let messageBox;
+let typeMap = {
+	success: 'success',
+	info: 'info',
+	warning: 'warning',
+	error: 'error'
+};
 
-	export default {
-		mixins: [Popup, Locale],
+export default {
+	mixins: [Popup, Locale],
 
-		props: {
-			modal: {
-				default: true
-			},
-			lockScroll: {
-				default: true
-			},
-			showClose: {
-				type: Boolean,
-				default: true
-			},
-			closeOnClickModal: {
-				default: true
-			},
-			closeOnPressEscape: {
-				default: true
-			},
-			closeOnHashChange: {
-				default: true
-			},
-			center: {
-				default: false,
-				type: Boolean
-			},
-			roundButton: {
-				default: false,
-				type: Boolean
-			}
+	props: {
+		modal: {
+			default: true
 		},
-
-		components: {
-			ElInput,
-			ElButton
+		lockScroll: {
+			default: true
+		},
+		showClose: {
+			type: Boolean,
+			default: true
+		},
+		closeOnClickModal: {
+			default: true
+		},
+		closeOnPressEscape: {
+			default: true
 		},
+		closeOnHashChange: {
+			default: true
+		},
+		center: {
+			default: false,
+			type: Boolean
+		},
+		roundButton: {
+			default: false,
+			type: Boolean
+		}
+	},
 
-		computed: {
-			icon() {
-				const { type, iconClass } = this;
-				return iconClass || (type && typeMap[type] ? `el-icon-${ typeMap[type] }` : '');
-			},
+	components: {
+		ElInput,
+		ElButton
+	},
 
-			confirmButtonClasses() {
-				return `el-button--primary ${ this.confirmButtonClass }`;
-			},
-			cancelButtonClasses() {
-				return `${ this.cancelButtonClass }`;
-			}
+	computed: {
+		icon() {
+			const { type, iconClass } = this;
+			return iconClass || (type && typeMap[type] ? `el-icon-${ typeMap[type] }` : '');
 		},
 
-		methods: {
-			getSafeClose() {
-				const currentId = this.uid;
-				return () => {
-					this.$nextTick(() => {
-						if (currentId === this.uid) this.doClose();
-					});
-				};
-			},
-			doClose() {
-				if (!this.visible) return;
-				this.visible = false;
-				this._closing = true;
+		confirmButtonClasses() {
+			return `el-button--primary ${ this.confirmButtonClass }`;
+		},
+		cancelButtonClasses() {
+			return `${ this.cancelButtonClass }`;
+		}
+	},
 
-				this.onClose && this.onClose();
-				messageBox.closeDialog(); // 解绑
-				if (this.lockScroll) {
-					setTimeout(this.restoreBodyStyle, 200);
-				}
-				this.opened = false;
-				this.doAfterClose();
-				setTimeout(() => {
-					if (this.action) this.callback(this.action, this);
+	methods: {
+		getSafeClose() {
+			const currentId = this.uid;
+			return () => {
+				this.$nextTick(() => {
+					if (currentId === this.uid) this.doClose();
 				});
-			},
+			};
+		},
+		doClose() {
+			if (!this.visible) return;
+			this.visible = false;
+			this._closing = true;
 
-			handleWrapperClick() {
-				if (this.closeOnClickModal) {
-					this.handleAction(this.distinguishCancelAndClose ? 'close' : 'cancel');
-				}
-			},
+			this.onClose && this.onClose();
+			messageBox.closeDialog(); // 解绑
+			if (this.lockScroll) {
+				setTimeout(this.restoreBodyStyle, 200);
+			}
+			this.opened = false;
+			this.doAfterClose();
+			setTimeout(() => {
+				if (this.action) this.callback(this.action, this);
+			});
+		},
 
-			handleInputEnter() {
-				if (this.inputType !== 'textarea') {
-					return this.handleAction('confirm');
-				}
-			},
+		handleWrapperClick() {
+			if (this.closeOnClickModal) {
+				this.handleAction(this.distinguishCancelAndClose ? 'close' : 'cancel');
+			}
+		},
 
-			handleAction(action) {
-				if (this.$type === 'prompt' && action === 'confirm' && !this.validate()) {
-					return;
-				}
-				this.action = action;
-				if (typeof this.beforeClose === 'function') {
-					this.close = this.getSafeClose();
-					this.beforeClose(action, this, this.close);
-				} else {
-					this.doClose();
-				}
-			},
+		handleInputEnter() {
+			if (this.inputType !== 'textarea') {
+				return this.handleAction('confirm');
+			}
+		},
+
+		handleAction(action) {
+			if (this.$type === 'prompt' && action === 'confirm' && !this.validate()) {
+				return;
+			}
+			this.action = action;
+			if (typeof this.beforeClose === 'function') {
+				this.close = this.getSafeClose();
+				this.beforeClose(action, this, this.close);
+			} else {
+				this.doClose();
+			}
+		},
 
-			validate() {
-				if (this.$type === 'prompt') {
-					const inputPattern = this.inputPattern;
-					if (inputPattern && !inputPattern.test(this.inputValue || '')) {
+		validate() {
+			if (this.$type === 'prompt') {
+				const inputPattern = this.inputPattern;
+				if (inputPattern && !inputPattern.test(this.inputValue || '')) {
+					this.editorErrorMessage = this.inputErrorMessage || t('el.messagebox.error');
+					addClass(this.getInputElement(), 'invalid');
+					return false;
+				}
+				const inputValidator = this.inputValidator;
+				if (typeof inputValidator === 'function') {
+					const validateResult = inputValidator(this.inputValue);
+					if (validateResult === false) {
 						this.editorErrorMessage = this.inputErrorMessage || t('el.messagebox.error');
 						addClass(this.getInputElement(), 'invalid');
 						return false;
 					}
-					const inputValidator = this.inputValidator;
-					if (typeof inputValidator === 'function') {
-						const validateResult = inputValidator(this.inputValue);
-						if (validateResult === false) {
-							this.editorErrorMessage = this.inputErrorMessage || t('el.messagebox.error');
-							addClass(this.getInputElement(), 'invalid');
-							return false;
-						}
-						if (typeof validateResult === 'string') {
-							this.editorErrorMessage = validateResult;
-							addClass(this.getInputElement(), 'invalid');
-							return false;
-						}
+					if (typeof validateResult === 'string') {
+						this.editorErrorMessage = validateResult;
+						addClass(this.getInputElement(), 'invalid');
+						return false;
 					}
 				}
-				this.editorErrorMessage = '';
-				removeClass(this.getInputElement(), 'invalid');
-				return true;
-			},
-			getFirstFocus() {
-				const btn = this.$el.querySelector('.el-message-box__btns .el-button');
-				const title = this.$el.querySelector('.el-message-box__btns .el-message-box__title');
-				return btn || title;
-			},
-			getInputElement() {
-				const inputRefs = this.$refs.input.$refs;
-				return inputRefs.input || inputRefs.textarea;
-			},
-			handleClose() {
-				this.handleAction('close');
 			}
+			this.editorErrorMessage = '';
+			removeClass(this.getInputElement(), 'invalid');
+			return true;
 		},
+		getFirstFocus() {
+			const btn = this.$el.querySelector('.el-message-box__btns .el-button');
+			const title = this.$el.querySelector('.el-message-box__btns .el-message-box__title');
+			return btn || title;
+		},
+		getInputElement() {
+			const inputRefs = this.$refs.input.$refs;
+			return inputRefs.input || inputRefs.textarea;
+		},
+		handleClose() {
+			this.handleAction('close');
+		}
+	},
 
-		watch: {
-			inputValue: {
-				immediate: true,
-				handler(val) {
-					this.$nextTick(_ => {
-						if (this.$type === 'prompt' && val !== null) {
-							this.validate();
-						}
-					});
-				}
-			},
-
-			visible(val) {
-				if (val) {
-					this.uid++;
-					if (this.$type === 'alert' || this.$type === 'confirm') {
-						this.$nextTick(() => {
-							this.$refs.confirm.$el.focus();
-						});
+	watch: {
+		inputValue: {
+			immediate: true,
+			handler(val) {
+				this.$nextTick(_ => {
+					if (this.$type === 'prompt' && val !== null) {
+						this.validate();
 					}
-					this.focusAfterClosed = document.activeElement;
-					messageBox = new Dialog(this.$el, this.focusAfterClosed, this.getFirstFocus());
-				}
-
-				// prompt
-				if (this.$type !== 'prompt') return;
-				if (val) {
-					setTimeout(() => {
-						if (this.$refs.input && this.$refs.input.$el) {
-							this.getInputElement().focus();
-						}
-					}, 500);
-				} else {
-					this.editorErrorMessage = '';
-					removeClass(this.getInputElement(), 'invalid');
-				}
+				});
 			}
 		},
 
-		mounted() {
-			this.$nextTick(() => {
-				if (this.closeOnHashChange) {
-					window.addEventListener('hashchange', this.close);
+		visible(val) {
+			if (val) {
+				this.uid++;
+				if (this.$type === 'alert' || this.$type === 'confirm') {
+					this.$nextTick(() => {
+						this.$refs.confirm.$el.focus();
+					});
 				}
-			});
-		},
+				this.focusAfterClosed = document.activeElement;
+				messageBox = new Dialog(this.$el, this.focusAfterClosed, this.getFirstFocus());
+			}
+
+			// prompt
+			if (this.$type !== 'prompt') return;
+			if (val) {
+				setTimeout(() => {
+					if (this.$refs.input && this.$refs.input.$el) {
+						this.getInputElement().focus();
+					}
+				}, 500);
+			} else {
+				this.editorErrorMessage = '';
+				removeClass(this.getInputElement(), 'invalid');
+			}
+		}
+	},
 
-		beforeDestroy() {
+	mounted() {
+		this.$nextTick(() => {
 			if (this.closeOnHashChange) {
-				window.removeEventListener('hashchange', this.close);
+				window.addEventListener('hashchange', this.close);
 			}
-			setTimeout(() => {
-				messageBox.closeDialog();
-			});
-		},
+		});
+	},
 
-		data() {
-			return {
-				uid: 1,
-				title: undefined,
-				message: '',
-				type: '',
-				iconClass: '',
-				customClass: '',
-				showInput: false,
-				inputValue: null,
-				inputPlaceholder: '',
-				inputType: 'text',
-				inputPattern: null,
-				inputValidator: null,
-				inputErrorMessage: '',
-				showConfirmButton: true,
-				showCancelButton: false,
-				action: '',
-				confirmButtonText: '',
-				cancelButtonText: '',
-				confirmButtonLoading: false,
-				cancelButtonLoading: false,
-				confirmButtonClass: '',
-				confirmButtonDisabled: false,
-				cancelButtonClass: '',
-				editorErrorMessage: null,
-				callback: null,
-				dangerouslyUseHTMLString: false,
-				focusAfterClosed: null,
-				isOnComposition: false,
-				distinguishCancelAndClose: false
-			};
+	beforeDestroy() {
+		if (this.closeOnHashChange) {
+			window.removeEventListener('hashchange', this.close);
 		}
-	};
+		setTimeout(() => {
+			messageBox.closeDialog();
+		});
+	},
+
+	data() {
+		return {
+			uid: 1,
+			title: undefined,
+			message: '',
+			type: '',
+			iconClass: '',
+			customClass: '',
+			showInput: false,
+			inputValue: null,
+			inputPlaceholder: '',
+			inputType: 'text',
+			inputPattern: null,
+			inputValidator: null,
+			inputErrorMessage: '',
+			showConfirmButton: true,
+			showCancelButton: false,
+			action: '',
+			confirmButtonText: '',
+			cancelButtonText: '',
+			confirmButtonLoading: false,
+			cancelButtonLoading: false,
+			confirmButtonClass: '',
+			confirmButtonDisabled: false,
+			cancelButtonClass: '',
+			editorErrorMessage: null,
+			callback: null,
+			dangerouslyUseHTMLString: false,
+			focusAfterClosed: null,
+			isOnComposition: false,
+			distinguishCancelAndClose: false
+		};
+	}
+};
 </script>

package/packages/notification/src/main.js

@@ -77,7 +77,7 @@ Notification.close = function(id, userOnClose) {
 	if (len <= 1) return;
 	const position = instance.position;
 	const removedHeight = instance.dom.offsetHeight;
-	for (let i = index; i < len - 1 ; i++) {
+	for (let i = index; i < len - 1; i++) {
 		if (instances[i].position === position) {
 			instances[i].dom.style[instance.verticalProperty] =
 				parseInt(instances[i].dom.style[instance.verticalProperty], 10) - removedHeight - 16 + 'px';