cy-element-ui 1.0.76 → 1.0.77

package/lib/loading.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 74);
+/******/ 	return __webpack_require__(__webpack_require__.s = 73);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -463,7 +463,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 74:
+/***/ 73:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/menu-item-group.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 87);
+/******/ 	return __webpack_require__(__webpack_require__.s = 86);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 87:
+/***/ 86:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/menu-item.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 86);
+/******/ 	return __webpack_require__(__webpack_require__.s = 85);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2703,7 +2703,7 @@ var scrollBarWidth = void 0;
 
 /***/ }),
 
-/***/ 86:
+/***/ 85:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/menu.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 79);
+/******/ 	return __webpack_require__(__webpack_require__.s = 78);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1027,7 +1027,7 @@ function _broadcast(componentName, eventName, params) {
 
 /***/ }),
 
-/***/ 79:
+/***/ 78:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/message-box.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 77);
+/******/ 	return __webpack_require__(__webpack_require__.s = 76);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2153,7 +2153,7 @@ function _broadcast(componentName, eventName, params) {
 
 /***/ }),
 
-/***/ 77:
+/***/ 76:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/message.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 83);
+/******/ 	return __webpack_require__(__webpack_require__.s = 82);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -861,7 +861,7 @@ var scrollBarWidth = void 0;
 
 /***/ }),
 
-/***/ 83:
+/***/ 82:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/notification.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 82);
+/******/ 	return __webpack_require__(__webpack_require__.s = 81);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -861,7 +861,7 @@ var scrollBarWidth = void 0;
 
 /***/ }),
 
-/***/ 82:
+/***/ 81:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/option-group.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 92);
+/******/ 	return __webpack_require__(__webpack_require__.s = 91);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -232,7 +232,7 @@ function _broadcast(componentName, eventName, params) {
 
 /***/ }),
 
-/***/ 92:
+/***/ 91:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/pagination.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 78);
+/******/ 	return __webpack_require__(__webpack_require__.s = 77);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -6170,8 +6170,7 @@ src_select.install = function (Vue) {
 /* 74 */,
 /* 75 */,
 /* 76 */,
-/* 77 */,
-/* 78 */
+/* 77 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/radio-button.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 89);
+/******/ 	return __webpack_require__(__webpack_require__.s = 88);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -232,7 +232,7 @@ function _broadcast(componentName, eventName, params) {
 
 /***/ }),
 
-/***/ 89:
+/***/ 88:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/radio-group.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 88);
+/******/ 	return __webpack_require__(__webpack_require__.s = 87);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -232,7 +232,7 @@ function _broadcast(componentName, eventName, params) {
 
 /***/ }),
 
-/***/ 88:
+/***/ 87:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/skeleton-item.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 72);
+/******/ 	return __webpack_require__(__webpack_require__.s = 71);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 72:
+/***/ 71:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/switch.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 91);
+/******/ 	return __webpack_require__(__webpack_require__.s = 90);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -671,7 +671,7 @@ function _broadcast(componentName, eventName, params) {
 
 /***/ }),
 
-/***/ 91:
+/***/ 90:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tabDialog.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 76);
+/******/ 	return __webpack_require__(__webpack_require__.s = 75);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1258,7 +1258,7 @@ function _broadcast(componentName, eventName, params) {
 
 /***/ }),
 
-/***/ 76:
+/***/ 75:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/time-picker.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 81);
+/******/ 	return __webpack_require__(__webpack_require__.s = 80);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -7002,8 +7002,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 /* 77 */,
 /* 78 */,
 /* 79 */,
-/* 80 */,
-/* 81 */
+/* 80 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/time-select.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 80);
+/******/ 	return __webpack_require__(__webpack_require__.s = 79);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -6103,8 +6103,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 /* 76 */,
 /* 77 */,
 /* 78 */,
-/* 79 */,
-/* 80 */
+/* 79 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/transfer.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 70);
+/******/ 	return __webpack_require__(__webpack_require__.s = 69);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2220,29 +2220,7 @@ function _broadcast(componentName, eventName, params) {
 
 /***/ }),
 
-/***/ 7:
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony default export */ __webpack_exports__["a"] = (function (target) {
-	for (var i = 1, j = arguments.length; i < j; i++) {
-		var source = arguments[i] || {};
-		for (var prop in source) {
-			if (source.hasOwnProperty(prop)) {
-				var value = source[prop];
-				if (value !== undefined) {
-					target[prop] = value;
-				}
-			}
-		}
-	}
-
-	return target;
-});;
-
-/***/ }),
-
-/***/ 70:
+/***/ 69:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2993,6 +2971,28 @@ main.install = function (Vue) {
 
 /* harmony default export */ var transfer = __webpack_exports__["default"] = (main);
 
+/***/ }),
+
+/***/ 7:
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony default export */ __webpack_exports__["a"] = (function (target) {
+	for (var i = 1, j = arguments.length; i < j; i++) {
+		var source = arguments[i] || {};
+		for (var prop in source) {
+			if (source.hasOwnProperty(prop)) {
+				var value = source[prop];
+				if (value !== undefined) {
+					target[prop] = value;
+				}
+			}
+		}
+	}
+
+	return target;
+});;
+
 /***/ })
 
 /******/ });

package/package.json

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

package/packages/form/src/form-item.vue

@@ -43,7 +43,86 @@
 	import emitter from '../../../src/mixins/emitter';
 	import objectAssign from '../../../src/utils/merge';
 	import { noop, getPropByPath } from '../../../src/utils/util';
-	import LabelWrap from './label-wrap';
+
+	const LabelWrap = {
+		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');
+		}
+	};
+
 	export default {
 		name: 'ElFormItem',
 

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

@@ -1,4 +1,3 @@
-<template></template>
 <script>
 
 export default {

package/src/index.js

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