cy-element-ui 1.0.77 → 1.0.78

package/lib/time-picker.js

@@ -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=d9910d56
+// 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
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -5482,7 +5482,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date-picker/src/picker.vue?vue&type=template&id=d9910d56
+// CONCATENATED MODULE: ./packages/date-picker/src/picker.vue?vue&type=template&id=0642cc1d
 
 // EXTERNAL MODULE: external "vue"
 var external_vue_ = __webpack_require__(0);
@@ -5942,7 +5942,7 @@ var validator = function validator(val) {
 			} else if (formattedValue) {
 				return this.type === 'dates' || this.type === 'years' || this.type === 'months' ? formattedValue.join(', ') : formattedValue;
 			} else {
-				return '';
+				return this.ranged ? ['', ''] : '';
 			}
 		},
 		parsedValue: function parsedValue() {

package/lib/time-select.js

@@ -4999,7 +4999,7 @@ function scrollIntoView(container, selected) {
 
 "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=d9910d56
+// 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
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -5176,7 +5176,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date-picker/src/picker.vue?vue&type=template&id=d9910d56
+// CONCATENATED MODULE: ./packages/date-picker/src/picker.vue?vue&type=template&id=0642cc1d
 
 // EXTERNAL MODULE: external "vue"
 var external_vue_ = __webpack_require__(0);
@@ -5636,7 +5636,7 @@ var validator = function validator(val) {
 			} else if (formattedValue) {
 				return this.type === 'dates' || this.type === 'years' || this.type === 'months' ? formattedValue.join(', ') : formattedValue;
 			} else {
-				return '';
+				return this.ranged ? ['', ''] : '';
 			}
 		},
 		parsedValue: function parsedValue() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cy-element-ui",
-	"version": "1.0.77",
+	"version": "1.0.78",
 	"description": "基于ElementUI开发的组件",
 	"main": "lib/index.js",
 	"files": [

package/packages/date-picker/src/picker.vue

@@ -542,7 +542,7 @@ export default {
 					? formattedValue.join(', ')
 					: formattedValue;
 			} else {
-				return '';
+				return this.ranged ? ['', ''] : '';
 			}
 		},
 

package/src/index.js

@@ -221,7 +221,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-	version: '1.0.77',
+	version: '1.0.78',
 	locale: locale.use,
 	i18n: locale.i18n,
 	install,

package/packages/form/src/label-wrap.vue

@@ -1,81 +0,0 @@
-<script>
-
-export default {
-	props: {
-		isAutoWidth: Boolean,
-		updateAll: Boolean
-	},
-
-	inject: ['elForm', 'elFormItem'],
-
-	render: function(h) {
-		var slots = this.$slots.default;
-		if (!slots) return null;
-		if (this.isAutoWidth) {
-			var autoLabelWidth = this.elForm.autoLabelWidth;
-			var style = {};
-			if (autoLabelWidth && autoLabelWidth !== 'auto') {
-				var marginLeft = parseInt(autoLabelWidth, 10) - this.computedWidth;
-				if (marginLeft) {
-					style.marginLeft = marginLeft + 'px';
-				}
-			}
-			return h(
-				'div',
-				{ 'class': 'el-form-item__label-wrap', style: style },
-				[slots]
-			);
-		} else {
-			return slots[0];
-		}
-	},
-
-	methods: {
-		getLabelWidth: function() {
-			if (this.$el && this.$el.firstElementChild) {
-				var computedWidth = window.getComputedStyle(this.$el.firstElementChild).width;
-				return Math.ceil(parseFloat(computedWidth));
-			} else {
-				return 0;
-			}
-		},
-		updateLabelWidth: function(action) {
-			action = action || 'update';
-			if (this.$slots.default && this.isAutoWidth && this.$el.firstElementChild) {
-				if (action === 'update') {
-					this.computedWidth = this.getLabelWidth();
-				} else if (action === 'remove') {
-					this.elForm.deregisterLabelWidth(this.computedWidth);
-				}
-			}
-		}
-	},
-
-	watch: {
-		computedWidth: function(val, oldVal) {
-			if (this.updateAll) {
-				this.elForm.registerLabelWidth(val, oldVal);
-				this.elFormItem.updateComputedLabelWidth(val);
-			}
-		}
-	},
-
-	data: function() {
-		return {
-			computedWidth: 0
-		};
-	},
-
-	mounted: function() {
-		this.updateLabelWidth('update');
-	},
-
-	updated: function() {
-		this.updateLabelWidth('update');
-	},
-
-	beforeDestroy: function() {
-		this.updateLabelWidth('remove');
-	}
-};
-</script>