cy-element-ui 1.0.82 → 1.0.85

package/lib/time-picker.js

@@ -467,7 +467,7 @@ function normalizeComponent(
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "p", function() { return isMac; });
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
+/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
 
@@ -728,60 +728,6 @@ var isMac = function isMac() {
 /* 4 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return isString; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return isObject; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return isHtmlElement; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return isFunction; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return isUndefined; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isDefined; });
-/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_0__);
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
-
-
-
-function isString(obj) {
-	return Object.prototype.toString.call(obj) === '[object String]';
-}
-
-function isObject(obj) {
-	return Object.prototype.toString.call(obj) === '[object Object]';
-}
-
-function isHtmlElement(node) {
-	return node && node.nodeType === Node.ELEMENT_NODE;
-}
-
-/**
- *  - Inspired:
- *    https://github.com/jashkenas/underscore/blob/master/modules/isFunction.js
- */
-var isFunction = function isFunction(functionToCheck) {
-	var getType = {};
-	return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]';
-};
-
-if ( true && (typeof Int8Array === 'undefined' ? 'undefined' : _typeof(Int8Array)) !== 'object' && (vue__WEBPACK_IMPORTED_MODULE_0___default.a.prototype.$isServer || typeof document.childNodes !== 'function')) {
-	isFunction = function isFunction(obj) {
-		return typeof obj === 'function' || false;
-	};
-}
-
-
-
-var isUndefined = function isUndefined(val) {
-	return val === void 0;
-};
-
-var isDefined = function isDefined(val) {
-	return val !== undefined && val !== null;
-};
-
-/***/ }),
-/* 5 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "j", function() { return getI18nSettings; });
 /* unused harmony export toDate */
@@ -1120,6 +1066,60 @@ var validateRangeInOneMonth = function validateRangeInOneMonth(start, end) {
 	return start.getMonth() === end.getMonth() && start.getFullYear() === end.getFullYear();
 };
 
+/***/ }),
+/* 5 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return isString; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return isObject; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return isHtmlElement; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return isFunction; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return isUndefined; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isDefined; });
+/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
+/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_0__);
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+
+
+function isString(obj) {
+	return Object.prototype.toString.call(obj) === '[object String]';
+}
+
+function isObject(obj) {
+	return Object.prototype.toString.call(obj) === '[object Object]';
+}
+
+function isHtmlElement(node) {
+	return node && node.nodeType === Node.ELEMENT_NODE;
+}
+
+/**
+ *  - Inspired:
+ *    https://github.com/jashkenas/underscore/blob/master/modules/isFunction.js
+ */
+var isFunction = function isFunction(functionToCheck) {
+	var getType = {};
+	return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]';
+};
+
+if ( true && (typeof Int8Array === 'undefined' ? 'undefined' : _typeof(Int8Array)) !== 'object' && (vue__WEBPACK_IMPORTED_MODULE_0___default.a.prototype.$isServer || typeof document.childNodes !== 'function')) {
+	isFunction = function isFunction(obj) {
+		return typeof obj === 'function' || false;
+	};
+}
+
+
+
+var isUndefined = function isUndefined(val) {
+	return val === void 0;
+};
+
+var isDefined = function isDefined(val) {
+	return val !== undefined && val !== null;
+};
+
 /***/ }),
 /* 6 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -2110,7 +2110,7 @@ var i18n = function i18n(fn) {
  * Show migrating guide in browser console.
  *
  * Usage:
- * import Migrating from 'element-ui/src/mixins/migrating';
+ * import Migrating from 'src/mixins/migrating';
  *
  * mixins: [Migrating]
  *
@@ -2281,7 +2281,7 @@ function isKorean(text) {
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/input/src/input.vue?vue&type=template&id=af7512c8
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/input/src/input.vue?vue&type=template&id=d8ebd7ac
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -2493,7 +2493,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/input/src/input.vue?vue&type=template&id=af7512c8
+// CONCATENATED MODULE: ./packages/input/src/input.vue?vue&type=template&id=d8ebd7ac
 
 // EXTERNAL MODULE: ./src/mixins/emitter.js
 var emitter = __webpack_require__(6);
@@ -5014,7 +5014,7 @@ main.install = function (Vue) {
 
 "use strict";
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/panel/time.vue?vue&type=template&id=0e9e8e4a
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/panel/time.vue?vue&type=template&id=cfceabb8
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -5101,10 +5101,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date-picker/src/panel/time.vue?vue&type=template&id=0e9e8e4a
+// CONCATENATED MODULE: ./packages/date-picker/src/panel/time.vue?vue&type=template&id=cfceabb8
 
 // EXTERNAL MODULE: ./src/utils/date-util.js
-var date_util = __webpack_require__(5);
+var date_util = __webpack_require__(4);
 
 // EXTERNAL MODULE: ./src/mixins/locale.js
 var locale = __webpack_require__(13);
@@ -5305,7 +5305,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 
 "use strict";
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/picker.vue?vue&type=template&id=0642cc1d
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/picker.vue?vue&type=template&id=156e5e58
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -5482,17 +5482,16 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date-picker/src/picker.vue?vue&type=template&id=0642cc1d
+// CONCATENATED MODULE: ./packages/date-picker/src/picker.vue?vue&type=template&id=156e5e58
 
 // EXTERNAL MODULE: external "vue"
 var external_vue_ = __webpack_require__(0);
-var external_vue_default = /*#__PURE__*/__webpack_require__.n(external_vue_);
 
 // EXTERNAL MODULE: ./src/utils/clickoutside.js
 var clickoutside = __webpack_require__(21);
 
 // EXTERNAL MODULE: ./src/utils/date-util.js
-var date_util = __webpack_require__(5);
+var date_util = __webpack_require__(4);
 
 // EXTERNAL MODULE: ./src/utils/vue-popper.js
 var vue_popper = __webpack_require__(10);
@@ -5555,794 +5554,262 @@ var pickervue_type_script_lang_js_DATE_PARSER = function DATE_PARSER(text, forma
 	if (format === 'timestamp') return new Date(Number(text));
 	return Object(date_util["z" /* parseDate */])(text, format);
 };
-var RANGE_FORMATTER = function RANGE_FORMATTER(value, format) {
+var pickervue_type_script_lang_js_RANGE_FORMATTER = function RANGE_FORMATTER(value, format) {
 	if (Array.isArray(value) && value.length === 2) {
 		var start = value[0];
 		var end = value[1];
-
-		if (start && end) {
-			return [pickervue_type_script_lang_js_DATE_FORMATTER(start, format), pickervue_type_script_lang_js_DATE_FORMATTER(end, format)];
+		if (Object(date_util["r" /* isDateObject */])(start) && Object(date_util["r" /* isDateObject */])(end)) {
+			return [Object(date_util["f" /* formatDate */])(start, format), Object(date_util["f" /* formatDate */])(end, format)];
 		}
 	}
-	return '';
+	return ['', ''];
 };
-var RANGE_PARSER = function RANGE_PARSER(array, format, separator) {
-	if (!Array.isArray(array)) {
-		array = array.split(separator);
-	}
-	if (array.length === 2) {
-		var range1 = array[0];
-		var range2 = array[1];
-
-		return [pickervue_type_script_lang_js_DATE_PARSER(range1, format), pickervue_type_script_lang_js_DATE_PARSER(range2, format)];
+var pickervue_type_script_lang_js_RANGE_PARSER = function RANGE_PARSER(text, format) {
+	if (Array.isArray(text) && text.length === 2) {
+		return [Object(date_util["z" /* parseDate */])(text[0], format), Object(date_util["z" /* parseDate */])(text[1], format)];
 	}
 	return [];
 };
-var TYPE_VALUE_RESOLVER_MAP = {
-	default: {
-		formatter: function formatter(value) {
-			if (!value) return '';
-			return '' + value;
-		},
-		parser: function parser(text) {
-			if (text === undefined || text === '') return null;
-			return text;
-		}
-	},
-	week: {
-		formatter: function formatter(value, format) {
-			var week = Object(date_util["p" /* getWeekNumber */])(value);
-			var month = value.getMonth();
-			var trueDate = new Date(value);
-			if (week === 1 && month === 11) {
-				trueDate.setHours(0, 0, 0, 0);
-				trueDate.setDate(trueDate.getDate() + 3 - (trueDate.getDay() + 6) % 7);
-			}
-			var date = Object(date_util["f" /* formatDate */])(trueDate, format);
-
-			date = /WW/.test(date) ? date.replace(/WW/, week < 10 ? '0' + week : week) : date.replace(/W/, week);
-			return date;
-		},
-		parser: function parser(text, format) {
-			// parse as if a normal date
-			return TYPE_VALUE_RESOLVER_MAP.date.parser(text, format);
-		}
-	},
-	date: {
-		formatter: pickervue_type_script_lang_js_DATE_FORMATTER,
-		parser: pickervue_type_script_lang_js_DATE_PARSER
-	},
-	datetime: {
-		formatter: pickervue_type_script_lang_js_DATE_FORMATTER,
-		parser: pickervue_type_script_lang_js_DATE_PARSER
-	},
-	daterange: {
-		formatter: RANGE_FORMATTER,
-		parser: RANGE_PARSER
-	},
-	monthrange: {
-		formatter: RANGE_FORMATTER,
-		parser: RANGE_PARSER
-	},
-	datetimerange: {
-		formatter: RANGE_FORMATTER,
-		parser: RANGE_PARSER
-	},
-	timerange: {
-		formatter: RANGE_FORMATTER,
-		parser: RANGE_PARSER
-	},
-	time: {
-		formatter: pickervue_type_script_lang_js_DATE_FORMATTER,
-		parser: pickervue_type_script_lang_js_DATE_PARSER
-	},
-	month: {
-		formatter: pickervue_type_script_lang_js_DATE_FORMATTER,
-		parser: pickervue_type_script_lang_js_DATE_PARSER
-	},
-	year: {
-		formatter: pickervue_type_script_lang_js_DATE_FORMATTER,
-		parser: pickervue_type_script_lang_js_DATE_PARSER
-	},
-	number: {
-		formatter: function formatter(value) {
-			if (!value) return '';
-			return '' + value;
-		},
-		parser: function parser(text) {
-			var result = Number(text);
-
-			if (!isNaN(text)) {
-				return result;
-			} else {
-				return null;
-			}
-		}
-	},
-	dates: {
-		formatter: function formatter(value, format) {
-			return value.map(function (date) {
-				return pickervue_type_script_lang_js_DATE_FORMATTER(date, format);
-			});
-		},
-		parser: function parser(value, format) {
-			return (typeof value === 'string' ? value.split(', ') : value).map(function (date) {
-				return date instanceof Date ? date : pickervue_type_script_lang_js_DATE_PARSER(date, format);
-			});
-		}
-	},
-	months: {
-		formatter: function formatter(value, format) {
-			return value.map(function (date) {
-				return pickervue_type_script_lang_js_DATE_FORMATTER(date, format);
-			});
-		},
-		parser: function parser(value, format) {
-			return (typeof value === 'string' ? value.split(', ') : value).map(function (date) {
-				return date instanceof Date ? date : pickervue_type_script_lang_js_DATE_PARSER(date, format);
-			});
-		}
-	},
-	years: {
-		formatter: function formatter(value, format) {
-			return value.map(function (date) {
-				return pickervue_type_script_lang_js_DATE_FORMATTER(date, format);
-			});
-		},
-		parser: function parser(value, format) {
-			return (typeof value === 'string' ? value.split(', ') : value).map(function (date) {
-				return date instanceof Date ? date : pickervue_type_script_lang_js_DATE_PARSER(date, format);
-			});
-		}
-	}
-};
-var PLACEMENT_MAP = {
-	left: 'bottom-start',
-	center: 'bottom',
-	right: 'bottom-end'
-};
-
-var parseAsFormatAndType = function parseAsFormatAndType(value, customFormat, type) {
-	var rangeSeparator = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '-';
-
-	if (!value) return null;
-	var parser = (TYPE_VALUE_RESOLVER_MAP[type] || TYPE_VALUE_RESOLVER_MAP['default']).parser;
-	var format = customFormat || DEFAULT_FORMATS[type];
-	return parser(value, format, rangeSeparator);
-};
-
-var formatAsFormatAndType = function formatAsFormatAndType(value, customFormat, type) {
-	if (!value) return null;
-	var formatter = (TYPE_VALUE_RESOLVER_MAP[type] || TYPE_VALUE_RESOLVER_MAP['default']).formatter;
-	var format = customFormat || DEFAULT_FORMATS[type];
-	return formatter(value, format);
-};
-
-/*
- * Considers:
- *	 1. Date object
- *	 2. date string
- *	 3. array of 1 or 2
- */
-var valueEquals = function valueEquals(a, b) {
-	// considers Date object and string
-	var dateEquals = function dateEquals(a, b) {
-		var aIsDate = a instanceof Date;
-		var bIsDate = b instanceof Date;
-		if (aIsDate && bIsDate) {
-			return a.getTime() === b.getTime();
-		}
-		if (!aIsDate && !bIsDate) {
-			return a === b;
-		}
-		return false;
-	};
-
-	var aIsArray = a instanceof Array;
-	var bIsArray = b instanceof Array;
-	if (aIsArray && bIsArray) {
-		if (a.length !== b.length) {
-			return false;
-		}
-		return a.every(function (item, index) {
-			return dateEquals(item, b[index]);
-		});
-	}
-	if (!aIsArray && !bIsArray) {
-		return dateEquals(a, b);
-	}
-	return false;
-};
 
-var isString = function isString(val) {
-	return typeof val === 'string' || val instanceof String;
-};
+/* harmony default export */ var pickervue_type_script_lang_js = ({
+	name: 'ElDatePicker',
 
-var validator = function validator(val) {
-	// either: String, Array of String, null / undefined
-	return val === null || val === undefined || isString(val) || Array.isArray(val) && val.length === 2 && val.every(isString);
-};
+	componentName: 'ElDatePicker',
 
-/* harmony default export */ var pickervue_type_script_lang_js = ({
-	mixins: [emitter["a" /* default */], NewPopper],
+	mixins: [emitter["a" /* default */]],
 
-	inject: {
-		elForm: {
+	props: {
+		modelValue: {
 			default: ''
 		},
-		elFormItem: {
+		value: {
 			default: ''
-		}
-	},
-
-	props: {
-		size: String,
-		format: String,
-		valueFormat: String,
-		readonly: Boolean,
-		placeholder: String,
-		startPlaceholder: String,
-		endPlaceholder: String,
-		prefixIcon: String,
-		clearIcon: {
-			type: String,
-			default: 'el-icon-circle-close'
-		},
-		name: {
-			default: '',
-			validator: validator
 		},
+		readonly: Boolean,
 		disabled: Boolean,
-		clearable: {
-			type: Boolean,
-			default: true
-		},
-		id: {
-			default: '',
-			validator: validator
-		},
-		popperClass: String,
+		size: String,
 		editable: {
 			type: Boolean,
 			default: true
 		},
+		type: {
+			type: String,
+			default: 'date',
+			validator: function validator(val) {
+				return ['date', 'dates', 'datetime', 'week', 'month', 'months', 'year', 'years', 'datetimerange', 'daterange', 'monthrange', 'timerange'].indexOf(val) > -1;
+			}
+		},
+		format: String,
 		align: {
 			type: String,
 			default: 'left'
 		},
-		value: {},
-		defaultValue: {},
-		defaultTime: {},
+		pickerOptions: Object,
 		rangeSeparator: {
+			type: String,
 			default: '-'
 		},
-		pickerOptions: {},
-		unlinkPanels: Boolean,
+		startPlaceholder: String,
+		endPlaceholder: String,
+		placeholder: String,
+		timeArrowControl: Boolean,
+		name: [String, Array],
+		autocomplete: {
+			type: String,
+			default: 'off'
+		},
+		popperClass: String,
+		teleported: {
+			type: Boolean,
+			default: true
+		},
 		validateEvent: {
 			type: Boolean,
 			default: true
+		},
+		dateRangeSeparator: {
+			type: String,
+			default: '-'
 		}
 	},
 
-	components: { ElInput: input["default"] },
-
-	directives: { Clickoutside: clickoutside["a" /* default */] },
-
 	data: function data() {
 		return {
 			pickerVisible: false,
+			userInput: '',
 			showClose: false,
-			userInput: null,
-			valueOnOpen: null, // value when picker opens, used to determine whether to emit change
-			unwatchPickerOptions: null
+			pickerDate: null,
+			selectionMode: 'date',
+			dateRangeSeparator: this.rangeSeparator
 		};
 	},
 
 
-	watch: {
-		pickerVisible: function pickerVisible(val) {
-			if (this.readonly || this.pickerDisabled) return;
-			if (val) {
-				this.showPicker();
-				this.valueOnOpen = Array.isArray(this.value) ? [].concat(this.value) : this.value;
-			} else {
-				this.hidePicker();
-				this.emitChange(this.value);
-				this.userInput = null;
-				if (this.validateEvent) {
-					this.dispatch('ElFormItem', 'el.form.blur');
-				}
-				this.$emit('blur', this);
-				this.blur();
-			}
-		},
-
-		parsedValue: {
-			immediate: true,
-			handler: function handler(val) {
-				if (this.picker) {
-					this.picker.value = val;
-				}
-			}
-		},
-		defaultValue: function defaultValue(val) {
-			// NOTE: should eventually move to jsx style picker + panel ?
-			if (this.picker) {
-				this.picker.defaultValue = val;
+	computed: {
+		actualValue: {
+			get: function get() {
+				return this.modelValue !== undefined ? this.modelValue : this.value;
+			},
+			set: function set(value) {
+				this.$emit('update:modelValue', value);
+				this.$emit('input', value);
 			}
 		},
-		value: function value(val, oldVal) {
-			if (!valueEquals(val, oldVal) && !this.pickerVisible && this.validateEvent) {
-				this.dispatch('ElFormItem', 'el.form.change', val);
-			}
-		}
-	},
-
-	computed: {
 		ranged: function ranged() {
-			return this.type.indexOf('range') > -1;
-		},
-		reference: function reference() {
-			var reference = this.$refs.reference;
-			return reference.$el || reference;
+			return this.type === 'daterange' || this.type === 'monthrange' || this.type === 'datetimerange' || this.type === 'timerange';
 		},
-		refInput: function refInput() {
-			if (this.reference) {
-				return [].slice.call(this.reference.querySelectorAll('input'));
-			}
-			return [];
-		},
-		valueIsEmpty: function valueIsEmpty() {
-			var val = this.value;
-			if (Array.isArray(val)) {
-				for (var i = 0, len = val.length; i < len; i++) {
-					if (val[i]) {
-						return false;
-					}
-				}
-			} else {
-				if (val) {
-					return false;
-				}
-			}
-			return true;
+		pickerSize: function pickerSize() {
+			return this.size || (this.$ELEMENT || {}).size;
 		},
-		triggerClass: function triggerClass() {
-			return this.prefixIcon || (this.type.indexOf('time') !== -1 ? 'el-icon-time' : 'el-icon-date');
-		},
-		selectionMode: function selectionMode() {
-			if (this.type === 'week') {
-				return 'week';
-			} else if (this.type === 'month') {
-				return 'month';
-			} else if (this.type === 'year') {
-				return 'year';
-			} else if (this.type === 'dates') {
-				return 'dates';
-			} else if (this.type === 'months') {
-				return 'months';
-			} else if (this.type === 'years') {
-				return 'years';
-			}
-
-			return 'day';
+		pickerDisabled: function pickerDisabled() {
+			return this.disabled || (this.elForm || {}).disabled;
 		},
 		haveTrigger: function haveTrigger() {
-			if (typeof this.showTrigger !== 'undefined') {
-				return this.showTrigger;
-			}
 			return HAVE_TRIGGER_TYPES.indexOf(this.type) !== -1;
 		},
-		displayValue: function displayValue() {
-			var formattedValue = formatAsFormatAndType(this.parsedValue, this.format, this.type, this.rangeSeparator);
-			if (Array.isArray(this.userInput)) {
-				return [this.userInput[0] || formattedValue && formattedValue[0] || '', this.userInput[1] || formattedValue && formattedValue[1] || ''];
-			} else if (this.userInput !== null) {
-				return this.userInput;
-			} else if (formattedValue) {
-				return this.type === 'dates' || this.type === 'years' || this.type === 'months' ? formattedValue.join(', ') : formattedValue;
-			} else {
-				return this.ranged ? ['', ''] : '';
-			}
+		triggerClass: function triggerClass() {
+			return this.pickerVisible ? 'el-icon-d-arrow-down' : 'el-icon-calendar';
 		},
-		parsedValue: function parsedValue() {
-			if (!this.value) return this.value; // component value is not set
-			if (this.type === 'time-select') return this.value; // time-select does not require parsing, this might change in next major version
-
-			var valueIsDateObject = Object(date_util["r" /* isDateObject */])(this.value) || Array.isArray(this.value) && this.value.every(date_util["r" /* isDateObject */]);
-			if (valueIsDateObject) {
-				return this.value;
-			}
-
-			if (this.valueFormat) {
-				return parseAsFormatAndType(this.value, this.valueFormat, this.type, this.rangeSeparator) || this.value;
+		elForm: function elForm() {
+			var parent = this.$parent;
+			while (parent) {
+				if (parent.$options.componentName === 'ElForm') {
+					return parent;
+				}
+				parent = parent.$parent;
 			}
-
-			// NOTE: deal with common but incorrect usage, should remove in next major version
-			// user might provide string / timestamp without value-format, coerce them into date (or array of date)
-			return Array.isArray(this.value) ? this.value.map(function (val) {
-				return new Date(val);
-			}) : new Date(this.value);
+			return null;
 		},
-		_elFormItemSize: function _elFormItemSize() {
-			return (this.elFormItem || {}).elFormItemSize;
+		displayFormat: function displayFormat() {
+			return this.format || DEFAULT_FORMATS[this.type];
 		},
-		pickerSize: function pickerSize() {
-			return this.size || this._elFormItemSize || (this.$ELEMENT || {}).size;
-		},
-		pickerDisabled: function pickerDisabled() {
-			return this.disabled || (this.elForm || {}).disabled;
-		},
-		firstInputId: function firstInputId() {
-			var obj = {};
-			var id = void 0;
+		displayValue: function displayValue() {
+			var value = this.actualValue;
 			if (this.ranged) {
-				id = this.id && this.id[0];
+				if (Array.isArray(value) && value.length === 2) {
+					var start = value[0];
+					var end = value[1];
+					if (Object(date_util["r" /* isDateObject */])(start) && Object(date_util["r" /* isDateObject */])(end)) {
+						return [Object(date_util["f" /* formatDate */])(start, this.displayFormat), Object(date_util["f" /* formatDate */])(end, this.displayFormat)];
+					}
+				}
+				return ['', ''];
 			} else {
-				id = this.id;
+				if (Object(date_util["r" /* isDateObject */])(value)) {
+					return Object(date_util["f" /* formatDate */])(value, this.displayFormat);
+				}
+				return '';
 			}
-			if (id) obj.id = id;
-			return obj;
+		},
+		clearIcon: function clearIcon() {
+			return 'el-icon-circle-close';
+		},
+		firstInputId: function firstInputId() {
+			return this.name ? { id: 'el-date-picker-' + this.name } : {};
 		},
 		secondInputId: function secondInputId() {
-			var obj = {};
-			var id = void 0;
-			if (this.ranged) {
-				id = this.id && this.id[1];
-			}
-			if (id) obj.id = id;
-			return obj;
+			return this.name && Array.isArray(this.name) ? { id: 'el-date-picker-' + this.name[1] } : {};
 		}
 	},
 
-	created: function created() {
-		// vue-popper
-		this.popperOptions = {
-			boundariesPadding: 0,
-			gpuAcceleration: false
-		};
-		this.placement = PLACEMENT_MAP[this.align] || PLACEMENT_MAP.left;
-
-		this.$on('fieldReset', this.handleFieldReset);
-	},
-
-
-	methods: {
-		focus: function focus() {
-			if (!this.ranged) {
-				this.$refs.reference.focus();
-			} else {
-				this.handleFocus();
-			}
-		},
-		blur: function blur() {
-			this.refInput.forEach(function (input) {
-				return input.blur();
-			});
-		},
-
+	watch: {
+		pickerVisible: function pickerVisible(val) {
+			var _this = this;
 
-		// {parse, formatTo} Value deals maps component value with internal Date
-		parseValue: function parseValue(value) {
-			var isParsed = Object(date_util["r" /* isDateObject */])(value) || Array.isArray(value) && value.every(date_util["r" /* isDateObject */]);
-			if (this.valueFormat && !isParsed) {
-				return parseAsFormatAndType(value, this.valueFormat, this.type, this.rangeSeparator) || value;
+			if (val) {
+				this.$emit('visible-change', true);
+				this.$nextTick(function () {
+					_this.updateScrollBar();
+				});
 			} else {
-				return value;
+				this.$emit('visible-change', false);
 			}
 		},
-		formatToValue: function formatToValue(date) {
-			var isFormattable = Object(date_util["r" /* isDateObject */])(date) || Array.isArray(date) && date.every(date_util["r" /* isDateObject */]);
-			if (this.valueFormat && isFormattable) {
-				return formatAsFormatAndType(date, this.valueFormat, this.type, this.rangeSeparator);
+		actualValue: function actualValue(val) {
+			if (this.ranged) {
+				if (Array.isArray(val) && val.length === 2) {
+					this.pickerDate = val[0];
+				}
 			} else {
-				return date;
+				this.pickerDate = val;
 			}
-		},
-
+			this.userInput = '';
+		}
+	},
 
-		// {parse, formatTo} String deals with user input
-		parseString: function parseString(value) {
-			var type = Array.isArray(value) ? this.type : this.type.replace('range', '');
-			return parseAsFormatAndType(value, this.format, type);
-		},
-		formatToString: function formatToString(value) {
-			var type = Array.isArray(value) ? this.type : this.type.replace('range', '');
-			return formatAsFormatAndType(value, this.format, type);
+	methods: {
+		handleFocus: function handleFocus(e) {
+			if (this.pickerDisabled) return;
+			this.pickerVisible = true;
+			this.$emit('focus', e);
 		},
-		handleMouseEnter: function handleMouseEnter() {
-			if (this.readonly || this.pickerDisabled) return;
-			if (!this.valueIsEmpty && this.clearable) {
-				this.showClose = true;
-			}
+		handleClose: function handleClose() {
+			this.pickerVisible = false;
+			this.showClose = false;
 		},
-		handleChange: function handleChange() {
-			if (this.userInput) {
-				var value = this.parseString(this.displayValue);
-				if (value) {
-					this.picker.value = value;
-					if (this.isValidValue(value)) {
-						this.emitInput(value);
-						this.userInput = null;
-					}
-				}
-			}
-			if (this.userInput === '') {
-				this.emitInput(null);
-				this.emitChange(null);
-				this.userInput = null;
+		handleKeydown: function handleKeydown(e) {
+			if (e.keyCode === 27) {
+				this.handleClose();
 			}
 		},
-		handleStartInput: function handleStartInput(event) {
-			if (this.userInput) {
-				this.userInput = [event.target.value, this.userInput[1]];
+		handleClickIcon: function handleClickIcon() {
+			if (this.showClose) {
+				this.handleClear();
 			} else {
-				this.userInput = [event.target.value, null];
+				this.handleFocus();
 			}
 		},
-		handleEndInput: function handleEndInput(event) {
-			if (this.userInput) {
-				this.userInput = [this.userInput[0], event.target.value];
-			} else {
-				this.userInput = [null, event.target.value];
-			}
+		handleClear: function handleClear() {
+			this.actualValue = this.ranged ? ['', ''] : '';
+			this.showClose = false;
+			this.$emit('clear');
 		},
-		handleStartChange: function handleStartChange(event) {
-			var value = this.parseString(this.userInput && this.userInput[0]);
-			if (value) {
-				this.userInput = [this.formatToString(value), this.displayValue[1]];
-				var newValue = [value, this.picker.value && this.picker.value[1]];
-				this.picker.value = newValue;
-				if (this.isValidValue(newValue)) {
-					this.emitInput(newValue);
-					this.userInput = null;
-				}
-			}
+		handleChange: function handleChange(e) {
+			this.$emit('change', e);
 		},
-		handleEndChange: function handleEndChange(event) {
-			var value = this.parseString(this.userInput && this.userInput[1]);
-			if (value) {
-				this.userInput = [this.displayValue[0], this.formatToString(value)];
-				var newValue = [this.picker.value && this.picker.value[0], value];
-				this.picker.value = newValue;
-				if (this.isValidValue(newValue)) {
-					this.emitInput(newValue);
-					this.userInput = null;
-				}
-			}
+		handleStartInput: function handleStartInput(value) {
+			this.userInput = value;
 		},
-		handleClickIcon: function handleClickIcon(event) {
-			if (this.readonly || this.pickerDisabled) return;
-			if (this.showClose) {
-				this.valueOnOpen = this.value;
-				event.stopPropagation();
-				this.emitInput(null);
-				this.emitChange(null);
-				this.showClose = false;
-				if (this.picker && typeof this.picker.handleClear === 'function') {
-					this.picker.handleClear();
-				}
-			} else {
-				this.pickerVisible = !this.pickerVisible;
-			}
+		handleEndInput: function handleEndInput(value) {
+			this.userInput = value;
 		},
-		handleClose: function handleClose() {
-			if (!this.pickerVisible) return;
-			this.pickerVisible = false;
-
-			if (this.type === 'dates' || this.type === 'years' || this.type === 'months') {
-				// restore to former value
-				var oldValue = parseAsFormatAndType(this.valueOnOpen, this.valueFormat, this.type, this.rangeSeparator) || this.valueOnOpen;
-				this.emitInput(oldValue);
-			}
+		handleStartChange: function handleStartChange(value) {
+			this.$emit('change', value);
 		},
-		handleFieldReset: function handleFieldReset(initialValue) {
-			this.userInput = initialValue === '' ? null : initialValue;
+		handleEndChange: function handleEndChange(value) {
+			this.$emit('change', value);
 		},
-		handleFocus: function handleFocus() {
-			var type = this.type;
-
-			if (HAVE_TRIGGER_TYPES.indexOf(type) !== -1 && !this.pickerVisible) {
-				this.pickerVisible = true;
-			}
-			this.$emit('focus', this);
-		},
-		handleKeydown: function handleKeydown(event) {
-			var _this = this;
-
-			var keyCode = event.keyCode;
-
-			// ESC
-			if (keyCode === 27) {
-				this.pickerVisible = false;
-				event.stopPropagation();
-				return;
-			}
-
-			// Tab
-			if (keyCode === 9) {
-				if (!this.ranged) {
-					this.handleChange();
-					this.pickerVisible = this.picker.visible = false;
-					this.blur();
-					event.stopPropagation();
-				} else {
-					// user may change focus between two input
-					setTimeout(function () {
-						if (_this.refInput.indexOf(document.activeElement) === -1) {
-							_this.pickerVisible = false;
-							_this.blur();
-							event.stopPropagation();
-						}
-					}, 0);
-				}
-				return;
-			}
-
-			// Enter
-			if (keyCode === 13) {
-				if (this.userInput === '' || this.isValidValue(this.parseString(this.displayValue))) {
-					this.handleChange();
-					this.pickerVisible = this.picker.visible = false;
-					this.blur();
-				}
-				event.stopPropagation();
-				return;
-			}
-
-			// if user is typing, do not let picker handle key input
-			if (this.userInput) {
-				event.stopPropagation();
-				return;
-			}
-
-			// delegate other keys to panel
-			if (this.picker && this.picker.handleKeydown) {
-				this.picker.handleKeydown(event);
-			}
-		},
-		handleRangeClick: function handleRangeClick() {
-			var type = this.type;
-
-			if (HAVE_TRIGGER_TYPES.indexOf(type) !== -1 && !this.pickerVisible) {
-				this.pickerVisible = true;
+		handleRangeClick: function handleRangeClick(e) {
+			if (this.pickerDisabled) return;
+			var target = e.target;
+			var isInput = target.tagName === 'INPUT';
+			if (!isInput) {
+				this.pickerVisible = !this.pickerVisible;
 			}
-			this.$emit('focus', this);
 		},
-		hidePicker: function hidePicker() {
-			if (this.picker) {
-				this.picker.resetView && this.picker.resetView();
-				this.pickerVisible = this.picker.visible = false;
-				this.destroyPopper();
+		handleMouseEnter: function handleMouseEnter() {
+			if (this.actualValue) {
+				this.showClose = true;
 			}
 		},
-		showPicker: function showPicker() {
+		updateScrollBar: function updateScrollBar() {
 			var _this2 = this;
 
-			if (this.$isServer) return;
-			if (!this.picker) {
-				this.mountPicker();
-			}
-			this.pickerVisible = this.picker.visible = true;
-
-			this.updatePopper();
-
-			this.picker.value = this.parsedValue;
-			this.picker.resetView && this.picker.resetView();
-
 			this.$nextTick(function () {
-				_this2.picker.adjustSpinners && _this2.picker.adjustSpinners();
-			});
-		},
-		mountPicker: function mountPicker() {
-			var _this3 = this;
-
-			this.picker = new external_vue_default.a(this.panel).$mount();
-			this.picker.defaultValue = this.defaultValue;
-			this.picker.defaultTime = this.defaultTime;
-			this.picker.popperClass = this.popperClass;
-			this.popperElm = this.picker.$el;
-			this.picker.width = this.reference.getBoundingClientRect().width;
-			this.picker.showTime = this.type === 'datetime' || this.type === 'datetimerange';
-			this.picker.selectionMode = this.selectionMode;
-			this.picker.unlinkPanels = this.unlinkPanels;
-			this.picker.arrowControl = this.arrowControl || this.timeArrowControl || false;
-			this.$watch('format', function (format) {
-				_this3.picker.format = format;
-			});
-
-			var updateOptions = function updateOptions() {
-				var options = _this3.pickerOptions;
-
-				if (options && options.selectableRange) {
-					var ranges = options.selectableRange;
-					var parser = TYPE_VALUE_RESOLVER_MAP.datetimerange.parser;
-					var format = DEFAULT_FORMATS.timerange;
-
-					ranges = Array.isArray(ranges) ? ranges : [ranges];
-					_this3.picker.selectableRange = ranges.map(function (range) {
-						return parser(range, format, _this3.rangeSeparator);
-					});
-				}
-
-				for (var option in options) {
-					if (options.hasOwnProperty(option) &&
-					// 忽略 time-picker 的该配置项
-					option !== 'selectableRange') {
-						_this3.picker[option] = options[option];
-					}
-				}
-
-				// main format must prevail over undocumented pickerOptions.format
-				if (_this3.format) {
-					_this3.picker.format = _this3.format;
+				var scrollbar = _this2.$refs.reference && _this2.$refs.reference.$el;
+				if (scrollbar) {
+					scrollbar.scrollLeft = 0;
 				}
-			};
-			updateOptions();
-			this.unwatchPickerOptions = this.$watch('pickerOptions', function () {
-				return updateOptions();
-			}, { deep: true });
-			this.$el.appendChild(this.picker.$el);
-			this.picker.resetView && this.picker.resetView();
-
-			this.picker.$on('dodestroy', this.doDestroy);
-			this.picker.$on('pick', function () {
-				var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-				var visible = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
-				_this3.userInput = null;
-				_this3.pickerVisible = _this3.picker.visible = visible;
-				_this3.emitInput(date);
-				_this3.picker.resetView && _this3.picker.resetView();
 			});
-
-			this.picker.$on('select-range', function (start, end, pos) {
-				if (_this3.refInput.length === 0) return;
-				if (!pos || pos === 'min') {
-					_this3.refInput[0].setSelectionRange(start, end);
-					_this3.refInput[0].focus();
-				} else if (pos === 'max') {
-					_this3.refInput[1].setSelectionRange(start, end);
-					_this3.refInput[1].focus();
-				}
-			});
-		},
-		unmountPicker: function unmountPicker() {
-			if (this.picker) {
-				this.picker.$destroy();
-				this.picker.$off();
-				if (typeof this.unwatchPickerOptions === 'function') {
-					this.unwatchPickerOptions();
-				}
-				this.picker.$el.parentNode.removeChild(this.picker.$el);
-			}
-		},
-		emitChange: function emitChange(val) {
-			// determine user real change only
-			if (!valueEquals(val, this.valueOnOpen)) {
-				this.$emit('change', val);
-				this.valueOnOpen = val;
-				if (this.validateEvent) {
-					this.dispatch('ElFormItem', 'el.form.change', val);
-				}
-			}
-		},
-		emitInput: function emitInput(val) {
-			var formatted = this.formatToValue(val);
-			if (!valueEquals(this.value, formatted)) {
-				this.$emit('input', formatted);
-			}
-		},
-		isValidValue: function isValidValue(value) {
-			if (!this.picker) {
-				this.mountPicker();
-			}
-			if (this.picker.isValidValue) {
-				return value && this.picker.isValidValue(value);
-			} else {
-				return true;
-			}
 		}
+	},
+
+	directives: {
+		clickoutside: clickoutside["a" /* default */]
+	},
+
+	components: {
+		ElInput: input["default"]
 	}
 });
 // CONCATENATED MODULE: ./packages/date-picker/src/picker.vue?vue&type=script&lang=js
@@ -6381,7 +5848,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 
 "use strict";
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/basic/time-spinner.vue?vue&type=template&id=60aeb3bd
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/basic/time-spinner.vue?vue&type=template&id=42edb53e
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -6735,10 +6202,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date-picker/src/basic/time-spinner.vue?vue&type=template&id=60aeb3bd
+// CONCATENATED MODULE: ./packages/date-picker/src/basic/time-spinner.vue?vue&type=template&id=42edb53e
 
 // EXTERNAL MODULE: ./src/utils/date-util.js
-var date_util = __webpack_require__(5);
+var date_util = __webpack_require__(4);
 
 // EXTERNAL MODULE: ./packages/scrollbar/index.js + 3 modules
 var scrollbar = __webpack_require__(25);
@@ -7015,7 +6482,7 @@ var picker = __webpack_require__(41);
 // EXTERNAL MODULE: ./packages/date-picker/src/panel/time.vue + 4 modules
 var time = __webpack_require__(39);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/panel/time-range.vue?vue&type=template&id=48439bdb
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/panel/time-range.vue?vue&type=template&id=dd07c916
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -7148,10 +6615,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date-picker/src/panel/time-range.vue?vue&type=template&id=48439bdb
+// CONCATENATED MODULE: ./packages/date-picker/src/panel/time-range.vue?vue&type=template&id=dd07c916
 
 // EXTERNAL MODULE: ./src/utils/date-util.js
-var date_util = __webpack_require__(5);
+var date_util = __webpack_require__(4);
 
 // EXTERNAL MODULE: ./src/mixins/locale.js
 var locale = __webpack_require__(13);