cy-element-ui 1.0.74 → 1.0.76

package/lib/skeleton-item.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 71);
+/******/ 	return __webpack_require__(__webpack_require__.s = 72);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 71:
+/***/ 72:
 /***/ (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 = 69);
+/******/ 	return __webpack_require__(__webpack_require__.s = 70);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2220,7 +2220,29 @@ function _broadcast(componentName, eventName, params) {
 
 /***/ }),
 
-/***/ 69:
+/***/ 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:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2971,28 +2993,6 @@ 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.74",
+	"version": "1.0.76",
 	"description": "基于ElementUI开发的组件",
 	"main": "lib/index.js",
 	"files": [

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

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

package/src/index.js

@@ -94,8 +94,8 @@ import SubTitle from '../packages/subTitle/index.js';
 import TabDialog from '../packages/tabDialog/index.js';
 import FileUpload from '../packages/fileUpload/index.js';
 import SelectDisplayInput from '../packages/selectDisplayInput/index.js';
-import locale from 'element-ui/src/locale';
-import CollapseTransition from 'element-ui/src/transitions/collapse-transition';
+import locale from './locale';
+import CollapseTransition from './transitions/collapse-transition';
 
 const components = [
 	Pagination,
@@ -221,7 +221,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-	version: '1.0.74',
+	version: '1.0.76',
 	locale: locale.use,
 	i18n: locale.i18n,
 	install,