cy-element-ui 1.0.78 → 1.0.80

package/lib/element-ui.common.js

@@ -34499,8 +34499,8 @@ src_form.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_form = (src_form);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/form-item.vue?vue&type=template&id=b7de1e82
-var form_itemvue_type_template_id_b7de1e82_render = function render() {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/form-item.vue?vue&type=template&id=90ab37fe
+var form_itemvue_type_template_id_90ab37fe_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -34520,33 +34520,54 @@ var form_itemvue_type_template_id_b7de1e82_render = function render() {
       ],
     },
     [
-      _c(
-        "label-wrap",
-        {
-          attrs: {
-            "is-auto-width": _vm.labelStyle && _vm.labelStyle.width === "auto",
-            "update-all": _vm.form.labelWidth === "auto",
-          },
-        },
-        [
-          _vm.label || _vm.$slots.label
-            ? _c(
-                "label",
-                {
-                  staticClass: "el-form-item__label",
-                  style: _vm.labelStyle,
-                  attrs: { for: _vm.labelFor },
-                },
-                [
-                  _vm._t("label", function () {
-                    return [_vm._v(_vm._s(_vm.label + _vm.form.labelSuffix))]
-                  }),
-                ],
-                2
-              )
-            : _vm._e(),
-        ]
-      ),
+      _vm.labelStyle && _vm.labelStyle.width === "auto"
+        ? [
+            _c(
+              "div",
+              {
+                staticClass: "el-form-item__label-wrap",
+                style: _vm.labelWrapStyle,
+              },
+              [
+                _vm.label || _vm.$slots.label
+                  ? _c(
+                      "label",
+                      {
+                        staticClass: "el-form-item__label",
+                        style: _vm.labelStyle,
+                        attrs: { for: _vm.labelFor },
+                      },
+                      [
+                        _vm._t("label", function () {
+                          return [
+                            _vm._v(_vm._s(_vm.label + _vm.form.labelSuffix)),
+                          ]
+                        }),
+                      ],
+                      2
+                    )
+                  : _vm._e(),
+              ]
+            ),
+          ]
+        : [
+            _vm.label || _vm.$slots.label
+              ? _c(
+                  "label",
+                  {
+                    staticClass: "el-form-item__label",
+                    style: _vm.labelStyle,
+                    attrs: { for: _vm.labelFor },
+                  },
+                  [
+                    _vm._t("label", function () {
+                      return [_vm._v(_vm._s(_vm.label + _vm.form.labelSuffix))]
+                    }),
+                  ],
+                  2
+                )
+              : _vm._e(),
+          ],
       _c(
         "div",
         { staticClass: "el-form-item__content", style: _vm.contentStyle },
@@ -34595,14 +34616,14 @@ var form_itemvue_type_template_id_b7de1e82_render = function render() {
         2
       ),
     ],
-    1
+    2
   )
 }
-var form_itemvue_type_template_id_b7de1e82_staticRenderFns = []
-form_itemvue_type_template_id_b7de1e82_render._withStripped = true
+var form_itemvue_type_template_id_90ab37fe_staticRenderFns = []
+form_itemvue_type_template_id_90ab37fe_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/form-item.vue?vue&type=template&id=b7de1e82
+// CONCATENATED MODULE: ./packages/form/src/form-item.vue?vue&type=template&id=90ab37fe
 
 // EXTERNAL MODULE: external "async-validator"
 var external_async_validator_ = __webpack_require__(11);
@@ -34615,81 +34636,6 @@ var external_async_validator_default = /*#__PURE__*/__webpack_require__.n(extern
 
 
 
-var LabelWrap = {
-	props: {
-		isAutoWidth: Boolean,
-		updateAll: Boolean
-	},
-
-	inject: ['elForm', 'elFormItem'],
-
-	render: function render(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 getLabelWidth() {
-			if (this.$el && this.$el.firstElementChild) {
-				var computedWidth = window.getComputedStyle(this.$el.firstElementChild).width;
-				return Math.ceil(parseFloat(computedWidth));
-			} else {
-				return 0;
-			}
-		},
-		updateLabelWidth: function updateLabelWidth(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 computedWidth(val, oldVal) {
-			if (this.updateAll) {
-				this.elForm.registerLabelWidth(val, oldVal);
-				this.elFormItem.updateComputedLabelWidth(val);
-			}
-		}
-	},
-
-	data: function data() {
-		return {
-			computedWidth: 0
-		};
-	},
-
-	mounted: function mounted() {
-		this.updateLabelWidth('update');
-	},
-
-	updated: function updated() {
-		this.updateLabelWidth('update');
-	},
-
-	beforeDestroy: function beforeDestroy() {
-		this.updateLabelWidth('remove');
-	}
-};
-
 /* harmony default export */ var form_itemvue_type_script_lang_js = ({
 	name: 'ElFormItem',
 
@@ -34728,10 +34674,6 @@ var LabelWrap = {
 		},
 		size: String
 	},
-	components: {
-		// use this component to calculate auto width
-		LabelWrap: LabelWrap
-	},
 	watch: {
 		error: {
 			immediate: true,
@@ -34747,6 +34689,11 @@ var LabelWrap = {
 			if ((!value || value.length === 0) && this.required === undefined) {
 				this.clearValidate();
 			}
+		},
+		computedLabelWidth: function computedLabelWidth(val, oldVal) {
+			if (this.form.labelWidth === 'auto') {
+				this.elForm.registerLabelWidth(val, oldVal);
+			}
 		}
 	},
 	computed: {
@@ -34762,6 +34709,17 @@ var LabelWrap = {
 			}
 			return ret;
 		},
+		labelWrapStyle: function labelWrapStyle() {
+			var style = {};
+			var autoLabelWidth = this.elForm.autoLabelWidth;
+			if (autoLabelWidth && autoLabelWidth !== 'auto') {
+				var marginLeft = parseInt(autoLabelWidth, 10) - this.computedLabelWidth;
+				if (marginLeft) {
+					style.marginLeft = marginLeft + 'px';
+				}
+			}
+			return style;
+		},
 		contentStyle: function contentStyle() {
 			var ret = {};
 			var label = this.label;
@@ -34836,11 +34794,30 @@ var LabelWrap = {
 			validateDisabled: false,
 			validator: {},
 			isNested: false,
-			computedLabelWidth: ''
+			computedLabelWidth: 0
 		};
 	},
 
 	methods: {
+		getLabelWidth: function getLabelWidth() {
+			if (this.$el && this.$el.querySelector('.el-form-item__label')) {
+				var labelEl = this.$el.querySelector('.el-form-item__label');
+				var computedWidth = window.getComputedStyle(labelEl).width;
+				return Math.ceil(parseFloat(computedWidth));
+			} else {
+				return 0;
+			}
+		},
+		updateLabelWidth: function updateLabelWidth(action) {
+			action = action || 'update';
+			if ((this.label || this.$slots.label) && this.form.labelWidth === 'auto') {
+				if (action === 'update') {
+					this.computedLabelWidth = this.getLabelWidth();
+				} else if (action === 'remove') {
+					this.elForm.deregisterLabelWidth(this.computedLabelWidth);
+				}
+			}
+		},
 		validate: function validate(trigger) {
 			var _this = this;
 
@@ -34903,7 +34880,6 @@ var LabelWrap = {
 				prop.o[prop.k] = this.initialValue;
 			}
 
-			// reset validateDisabled after onFieldChange triggered
 			this.$nextTick(function () {
 				_this2.validateDisabled = false;
 			});
@@ -34961,6 +34937,7 @@ var LabelWrap = {
 		}
 	},
 	mounted: function mounted() {
+		this.updateLabelWidth('update');
 		if (this.prop) {
 			this.dispatch('ElForm', 'el.form.addField', [this]);
 
@@ -34975,7 +34952,11 @@ var LabelWrap = {
 			this.addValidateEvents();
 		}
 	},
+	updated: function updated() {
+		this.updateLabelWidth('update');
+	},
 	beforeDestroy: function beforeDestroy() {
+		this.updateLabelWidth('remove');
 		this.dispatch('ElForm', 'el.form.removeField', [this]);
 	}
 });
@@ -34991,8 +34972,8 @@ var LabelWrap = {
 
 var form_item_component = normalizeComponent(
   src_form_itemvue_type_script_lang_js,
-  form_itemvue_type_template_id_b7de1e82_render,
-  form_itemvue_type_template_id_b7de1e82_staticRenderFns,
+  form_itemvue_type_template_id_90ab37fe_render,
+  form_itemvue_type_template_id_90ab37fe_staticRenderFns,
   false,
   null,
   null,
@@ -54518,7 +54499,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-	version: '1.0.78',
+	version: '1.0.80',
 	locale: locale.use,
 	i18n: locale.i18n,
 	install: src_install,

package/lib/form-item.js

@@ -619,7 +619,7 @@ function _broadcast(componentName, eventName, params) {
 // 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/form/src/form-item.vue?vue&type=template&id=b7de1e82
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/form-item.vue?vue&type=template&id=90ab37fe
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -640,33 +640,54 @@ var render = function render() {
       ],
     },
     [
-      _c(
-        "label-wrap",
-        {
-          attrs: {
-            "is-auto-width": _vm.labelStyle && _vm.labelStyle.width === "auto",
-            "update-all": _vm.form.labelWidth === "auto",
-          },
-        },
-        [
-          _vm.label || _vm.$slots.label
-            ? _c(
-                "label",
-                {
-                  staticClass: "el-form-item__label",
-                  style: _vm.labelStyle,
-                  attrs: { for: _vm.labelFor },
-                },
-                [
-                  _vm._t("label", function () {
-                    return [_vm._v(_vm._s(_vm.label + _vm.form.labelSuffix))]
-                  }),
-                ],
-                2
-              )
-            : _vm._e(),
-        ]
-      ),
+      _vm.labelStyle && _vm.labelStyle.width === "auto"
+        ? [
+            _c(
+              "div",
+              {
+                staticClass: "el-form-item__label-wrap",
+                style: _vm.labelWrapStyle,
+              },
+              [
+                _vm.label || _vm.$slots.label
+                  ? _c(
+                      "label",
+                      {
+                        staticClass: "el-form-item__label",
+                        style: _vm.labelStyle,
+                        attrs: { for: _vm.labelFor },
+                      },
+                      [
+                        _vm._t("label", function () {
+                          return [
+                            _vm._v(_vm._s(_vm.label + _vm.form.labelSuffix)),
+                          ]
+                        }),
+                      ],
+                      2
+                    )
+                  : _vm._e(),
+              ]
+            ),
+          ]
+        : [
+            _vm.label || _vm.$slots.label
+              ? _c(
+                  "label",
+                  {
+                    staticClass: "el-form-item__label",
+                    style: _vm.labelStyle,
+                    attrs: { for: _vm.labelFor },
+                  },
+                  [
+                    _vm._t("label", function () {
+                      return [_vm._v(_vm._s(_vm.label + _vm.form.labelSuffix))]
+                    }),
+                  ],
+                  2
+                )
+              : _vm._e(),
+          ],
       _c(
         "div",
         { staticClass: "el-form-item__content", style: _vm.contentStyle },
@@ -715,14 +736,14 @@ var render = function render() {
         2
       ),
     ],
-    1
+    2
   )
 }
 var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/form-item.vue?vue&type=template&id=b7de1e82
+// CONCATENATED MODULE: ./packages/form/src/form-item.vue?vue&type=template&id=90ab37fe
 
 // EXTERNAL MODULE: external "async-validator"
 var external_async_validator_ = __webpack_require__(58);
@@ -744,81 +765,6 @@ var util = __webpack_require__(3);
 
 
 
-var LabelWrap = {
-	props: {
-		isAutoWidth: Boolean,
-		updateAll: Boolean
-	},
-
-	inject: ['elForm', 'elFormItem'],
-
-	render: function render(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 getLabelWidth() {
-			if (this.$el && this.$el.firstElementChild) {
-				var computedWidth = window.getComputedStyle(this.$el.firstElementChild).width;
-				return Math.ceil(parseFloat(computedWidth));
-			} else {
-				return 0;
-			}
-		},
-		updateLabelWidth: function updateLabelWidth(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 computedWidth(val, oldVal) {
-			if (this.updateAll) {
-				this.elForm.registerLabelWidth(val, oldVal);
-				this.elFormItem.updateComputedLabelWidth(val);
-			}
-		}
-	},
-
-	data: function data() {
-		return {
-			computedWidth: 0
-		};
-	},
-
-	mounted: function mounted() {
-		this.updateLabelWidth('update');
-	},
-
-	updated: function updated() {
-		this.updateLabelWidth('update');
-	},
-
-	beforeDestroy: function beforeDestroy() {
-		this.updateLabelWidth('remove');
-	}
-};
-
 /* harmony default export */ var form_itemvue_type_script_lang_js = ({
 	name: 'ElFormItem',
 
@@ -857,10 +803,6 @@ var LabelWrap = {
 		},
 		size: String
 	},
-	components: {
-		// use this component to calculate auto width
-		LabelWrap: LabelWrap
-	},
 	watch: {
 		error: {
 			immediate: true,
@@ -876,6 +818,11 @@ var LabelWrap = {
 			if ((!value || value.length === 0) && this.required === undefined) {
 				this.clearValidate();
 			}
+		},
+		computedLabelWidth: function computedLabelWidth(val, oldVal) {
+			if (this.form.labelWidth === 'auto') {
+				this.elForm.registerLabelWidth(val, oldVal);
+			}
 		}
 	},
 	computed: {
@@ -891,6 +838,17 @@ var LabelWrap = {
 			}
 			return ret;
 		},
+		labelWrapStyle: function labelWrapStyle() {
+			var style = {};
+			var autoLabelWidth = this.elForm.autoLabelWidth;
+			if (autoLabelWidth && autoLabelWidth !== 'auto') {
+				var marginLeft = parseInt(autoLabelWidth, 10) - this.computedLabelWidth;
+				if (marginLeft) {
+					style.marginLeft = marginLeft + 'px';
+				}
+			}
+			return style;
+		},
 		contentStyle: function contentStyle() {
 			var ret = {};
 			var label = this.label;
@@ -965,11 +923,30 @@ var LabelWrap = {
 			validateDisabled: false,
 			validator: {},
 			isNested: false,
-			computedLabelWidth: ''
+			computedLabelWidth: 0
 		};
 	},
 
 	methods: {
+		getLabelWidth: function getLabelWidth() {
+			if (this.$el && this.$el.querySelector('.el-form-item__label')) {
+				var labelEl = this.$el.querySelector('.el-form-item__label');
+				var computedWidth = window.getComputedStyle(labelEl).width;
+				return Math.ceil(parseFloat(computedWidth));
+			} else {
+				return 0;
+			}
+		},
+		updateLabelWidth: function updateLabelWidth(action) {
+			action = action || 'update';
+			if ((this.label || this.$slots.label) && this.form.labelWidth === 'auto') {
+				if (action === 'update') {
+					this.computedLabelWidth = this.getLabelWidth();
+				} else if (action === 'remove') {
+					this.elForm.deregisterLabelWidth(this.computedLabelWidth);
+				}
+			}
+		},
 		validate: function validate(trigger) {
 			var _this = this;
 
@@ -1032,7 +1009,6 @@ var LabelWrap = {
 				prop.o[prop.k] = this.initialValue;
 			}
 
-			// reset validateDisabled after onFieldChange triggered
 			this.$nextTick(function () {
 				_this2.validateDisabled = false;
 			});
@@ -1090,6 +1066,7 @@ var LabelWrap = {
 		}
 	},
 	mounted: function mounted() {
+		this.updateLabelWidth('update');
 		if (this.prop) {
 			this.dispatch('ElForm', 'el.form.addField', [this]);
 
@@ -1104,7 +1081,11 @@ var LabelWrap = {
 			this.addValidateEvents();
 		}
 	},
+	updated: function updated() {
+		this.updateLabelWidth('update');
+	},
 	beforeDestroy: function beforeDestroy() {
+		this.updateLabelWidth('remove');
 		this.dispatch('ElForm', 'el.form.removeField', [this]);
 	}
 });