mazey-element-ui 2.0.1 → 2.15.16

package/lib/form-item.js

@@ -1,107 +1,276 @@
-module.exports =
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
+/******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
+/******/ 	// The require scope
+/******/ 	const __webpack_require__ = {};
+/******/ 	
+/************************************************************************/
+/******/ 	/* webpack/runtime/compat get default export */
+/******/ 	(() => {
+/******/ 		// getDefaultExport function for compatibility with non-harmony modules
+/******/ 		__webpack_require__.n = (module) => {
+/******/ 			const getter = module && module.__esModule ?
+/******/ 				() => (module['default']) :
+/******/ 				() => (module);
+/******/ 			__webpack_require__.d(getter, { a: getter });
+/******/ 			return getter;
+/******/ 		};
+/******/ 	})();
+/******/ 	
+/******/ 	/* webpack/runtime/define property getters */
+/******/ 	(() => {
+/******/ 		// define getter/value functions for harmony exports
+/******/ 		__webpack_require__.d = (exports, definition) => {
+/******/ 			if(Array.isArray(definition)) {
+/******/ 				var i = 0;
+/******/ 				while(i < definition.length) {
+/******/ 					var key = definition[i++];
+/******/ 					var binding = definition[i++];
+/******/ 					if(!__webpack_require__.o(exports, key)) {
+/******/ 						if(binding === 0) {
+/******/ 							Object.defineProperty(exports, key, { enumerable: true, value: definition[i++] });
+/******/ 						} else {
+/******/ 							Object.defineProperty(exports, key, { enumerable: true, get: binding });
+/******/ 						}
+/******/ 					} else if(binding === 0) { i++; }
+/******/ 				}
+/******/ 			} else {
+/******/ 				for(var key in definition) {
+/******/ 					if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
+/******/ 						Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+/******/ 					}
+/******/ 				}
+/******/ 			}
 /******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "/dist/";
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 274);
-/******/ })
+/******/ 	})();
+/******/ 	
+/******/ 	/* webpack/runtime/hasOwnProperty shorthand */
+/******/ 	(() => {
+/******/ 		__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
+/******/ 	})();
+/******/ 	
 /************************************************************************/
-/******/ ({
-
-/***/ 0:
-/***/ (function(module, exports) {
-
+let __webpack_exports__ = {};
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  "default": () => (/* binding */ packages_form_item)
+});
+
+;// ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib/index.js??vue-loader-options!./packages/form/src/form-item.vue?vue&type=template&id=30b5453f
+var render = function () {
+  var _vm = this
+  var _h = _vm.$createElement
+  var _c = _vm._self._c || _h
+  return _c(
+    "div",
+    {
+      staticClass: "el-form-item",
+      class: [
+        {
+          "el-form-item--feedback": _vm.elForm && _vm.elForm.statusIcon,
+          "is-error": _vm.validateState === "error",
+          "is-validating": _vm.validateState === "validating",
+          "is-success": _vm.validateState === "success",
+          "is-required": _vm.isRequired || _vm.required,
+          "is-no-asterisk": _vm.elForm && _vm.elForm.hideRequiredAsterisk,
+        },
+        _vm.sizeClass ? "el-form-item--" + _vm.sizeClass : "",
+      ],
+    },
+    [
+      _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", [
+                    _vm._v(_vm._s(_vm.label + _vm.form.labelSuffix)),
+                  ]),
+                ],
+                2
+              )
+            : _vm._e(),
+        ]
+      ),
+      _c(
+        "div",
+        { staticClass: "el-form-item__content", style: _vm.contentStyle },
+        [
+          _vm._t("default"),
+          _c(
+            "transition",
+            { attrs: { name: "el-zoom-in-top" } },
+            [
+              _vm.validateState === "error" &&
+              _vm.showMessage &&
+              _vm.form.showMessage
+                ? _vm._t(
+                    "error",
+                    [
+                      _c(
+                        "div",
+                        {
+                          staticClass: "el-form-item__error",
+                          class: {
+                            "el-form-item__error--inline":
+                              typeof _vm.inlineMessage === "boolean"
+                                ? _vm.inlineMessage
+                                : (_vm.elForm && _vm.elForm.inlineMessage) ||
+                                  false,
+                          },
+                        },
+                        [
+                          _vm._v(
+                            "\n          " +
+                              _vm._s(_vm.validateMessage) +
+                              "\n        "
+                          ),
+                        ]
+                      ),
+                    ],
+                    { error: _vm.validateMessage }
+                  )
+                : _vm._e(),
+            ],
+            2
+          ),
+        ],
+        2
+      ),
+    ],
+    1
+  )
+}
+var staticRenderFns = []
+render._withStripped = true
+
+
+;// ./packages/form/src/form-item.vue?vue&type=template&id=30b5453f
+
+;// external "async-validator"
+const external_async_validator_namespaceObject = require("async-validator");
+var external_async_validator_default = /*#__PURE__*/__webpack_require__.n(external_async_validator_namespaceObject);
+;// external "mazey-element-ui/lib/mixins/emitter"
+const emitter_namespaceObject = require("mazey-element-ui/lib/mixins/emitter");
+var emitter_default = /*#__PURE__*/__webpack_require__.n(emitter_namespaceObject);
+;// external "mazey-element-ui/lib/utils/merge"
+const merge_namespaceObject = require("mazey-element-ui/lib/utils/merge");
+var merge_default = /*#__PURE__*/__webpack_require__.n(merge_namespaceObject);
+;// external "mazey-element-ui/lib/utils/util"
+const util_namespaceObject = require("mazey-element-ui/lib/utils/util");
+;// ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/lib/index.js??vue-loader-options!./packages/form/src/label-wrap.vue?vue&type=script&lang=js
+/* harmony default export */ const label_wrapvue_type_script_lang_js = ({
+  props: {
+    isAutoWidth: Boolean,
+    updateAll: Boolean
+  },
+  inject: ['elForm', 'elFormItem'],
+  render: function render() {
+    var h = arguments[0];
+    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) {
+      if (action === void 0) {
+        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');
+  }
+});
+;// ./packages/form/src/label-wrap.vue?vue&type=script&lang=js
+ /* harmony default export */ const src_label_wrapvue_type_script_lang_js = (label_wrapvue_type_script_lang_js); 
+;// ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
 /* globals __VUE_SSR_CONTEXT__ */
 
-// IMPORTANT: Do NOT use ES2015 features in this file.
+// IMPORTANT: Do NOT use ES2015 features in this file (except for modules).
 // This module is a runtime utility for cleaner component module output and will
 // be included in the final webpack user bundle.
 
-module.exports = function normalizeComponent (
-  rawScriptExports,
-  compiledTemplate,
+function normalizeComponent(
+  scriptExports,
+  render,
+  staticRenderFns,
   functionalTemplate,
   injectStyles,
   scopeId,
-  moduleIdentifier /* server only */
+  moduleIdentifier /* server only */,
+  shadowMode /* vue-cli only */
 ) {
-  var esModule
-  var scriptExports = rawScriptExports = rawScriptExports || {}
-
-  // ES6 modules interop
-  var type = typeof rawScriptExports.default
-  if (type === 'object' || type === 'function') {
-    esModule = rawScriptExports
-    scriptExports = rawScriptExports.default
-  }
-
   // Vue.extend constructor export interop
-  var options = typeof scriptExports === 'function'
-    ? scriptExports.options
-    : scriptExports
+  var options =
+    typeof scriptExports === 'function' ? scriptExports.options : scriptExports
 
   // render functions
-  if (compiledTemplate) {
-    options.render = compiledTemplate.render
-    options.staticRenderFns = compiledTemplate.staticRenderFns
+  if (render) {
+    options.render = render
+    options.staticRenderFns = staticRenderFns
     options._compiled = true
   }
 
@@ -112,11 +281,12 @@ module.exports = function normalizeComponent (
 
   // scopedId
   if (scopeId) {
-    options._scopeId = scopeId
+    options._scopeId = 'data-v-' + scopeId
   }
 
   var hook
-  if (moduleIdentifier) { // server build
+  if (moduleIdentifier) {
+    // server build
     hook = function (context) {
       // 2.3 injection
       context =
@@ -140,170 +310,70 @@ module.exports = function normalizeComponent (
     // never gets called
     options._ssrRegister = hook
   } else if (injectStyles) {
-    hook = injectStyles
+    hook = shadowMode
+      ? function () {
+          injectStyles.call(
+            this,
+            (options.functional ? this.parent : this).$root.$options.shadowRoot
+          )
+        }
+      : injectStyles
   }
 
   if (hook) {
-    var functional = options.functional
-    var existing = functional
-      ? options.render
-      : options.beforeCreate
-
-    if (!functional) {
-      // inject component registration as beforeCreate hook
-      options.beforeCreate = existing
-        ? [].concat(existing, hook)
-        : [hook]
-    } else {
+    if (options.functional) {
       // for template-only hot-reload because in that case the render fn doesn't
       // go through the normalizer
       options._injectStyles = hook
-      // register for functioal component in vue file
-      options.render = function renderWithStyleInjection (h, context) {
+      // register for functional component in vue file
+      var originalRender = options.render
+      options.render = function renderWithStyleInjection(h, context) {
         hook.call(context)
-        return existing(h, context)
+        return originalRender(h, context)
       }
+    } else {
+      // inject component registration as beforeCreate hook
+      var existing = options.beforeCreate
+      options.beforeCreate = existing ? [].concat(existing, hook) : [hook]
     }
   }
 
   return {
-    esModule: esModule,
     exports: scriptExports,
     options: options
   }
 }
 
-
-/***/ }),
-
-/***/ 1:
-/***/ (function(module, exports) {
-
-module.exports = require("element-ui/lib/mixins/emitter");
-
-/***/ }),
-
-/***/ 274:
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+;// ./packages/form/src/label-wrap.vue
+var label_wrap_render, label_wrap_staticRenderFns
+;
 
 
-exports.__esModule = true;
 
-var _formItem = __webpack_require__(275);
-
-var _formItem2 = _interopRequireDefault(_formItem);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/* istanbul ignore next */
-_formItem2.default.install = function (Vue) {
-  Vue.component(_formItem2.default.name, _formItem2.default);
-};
-
-exports.default = _formItem2.default;
-
-/***/ }),
-
-/***/ 275:
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_13_7_3_vue_loader_lib_selector_type_script_index_0_form_item_vue__ = __webpack_require__(89);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_13_7_3_vue_loader_lib_selector_type_script_index_0_form_item_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_13_7_3_vue_loader_lib_selector_type_script_index_0_form_item_vue__);
-/* harmony namespace reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_13_7_3_vue_loader_lib_selector_type_script_index_0_form_item_vue__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_13_7_3_vue_loader_lib_selector_type_script_index_0_form_item_vue__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_13_7_3_vue_loader_lib_template_compiler_index_id_data_v_e470c770_hasScoped_false_preserveWhitespace_false_buble_transforms_node_modules_vue_loader_13_7_3_vue_loader_lib_selector_type_template_index_0_form_item_vue__ = __webpack_require__(277);
-var normalizeComponent = __webpack_require__(0)
-/* script */
-
-
-/* template */
-
-/* template functional */
-var __vue_template_functional__ = false
-/* styles */
-var __vue_styles__ = null
-/* scopeId */
-var __vue_scopeId__ = null
-/* moduleIdentifier (server only) */
-var __vue_module_identifier__ = null
-var Component = normalizeComponent(
-  __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_13_7_3_vue_loader_lib_selector_type_script_index_0_form_item_vue___default.a,
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_13_7_3_vue_loader_lib_template_compiler_index_id_data_v_e470c770_hasScoped_false_preserveWhitespace_false_buble_transforms_node_modules_vue_loader_13_7_3_vue_loader_lib_selector_type_template_index_0_form_item_vue__["a" /* default */],
-  __vue_template_functional__,
-  __vue_styles__,
-  __vue_scopeId__,
-  __vue_module_identifier__
+/* normalize component */
+;
+var component = normalizeComponent(
+  src_label_wrapvue_type_script_lang_js,
+  label_wrap_render,
+  label_wrap_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
 )
 
-/* harmony default export */ __webpack_exports__["default"] = (Component.exports);
-
-
-/***/ }),
-
-/***/ 276:
-/***/ (function(module, exports) {
-
-module.exports = require("async-validator");
-
-/***/ }),
-
-/***/ 277:
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"el-form-item",class:[{
-    'el-form-item--feedback': _vm.elForm && _vm.elForm.statusIcon,
-    'is-error': _vm.validateState === 'error',
-    'is-validating': _vm.validateState === 'validating',
-    'is-success': _vm.validateState === 'success',
-    'is-required': _vm.isRequired || _vm.required
-  },
-  _vm.sizeClass ? 'el-form-item--' + _vm.sizeClass : ''
-]},[(_vm.label || _vm.$slots.label)?_c('label',{staticClass:"el-form-item__label",style:(_vm.labelStyle),attrs:{"for":_vm.labelFor}},[_vm._t("label",[_vm._v(_vm._s(_vm.label + _vm.form.labelSuffix))])],2):_vm._e(),_c('div',{staticClass:"el-form-item__content",style:(_vm.contentStyle)},[_vm._t("default"),_c('transition',{attrs:{"name":"el-zoom-in-top"}},[(_vm.validateState === 'error' && _vm.showMessage && _vm.form.showMessage)?_c('div',{staticClass:"el-form-item__error",class:{
-          'el-form-item__error--inline': typeof _vm.inlineMessage === 'boolean'
-            ? _vm.inlineMessage
-            : (_vm.elForm && _vm.elForm.inlineMessage || false)
-        }},[_vm._v("\n        "+_vm._s(_vm.validateMessage)+"\n      ")]):_vm._e()])],2)])}
-var staticRenderFns = []
-var esExports = { render: render, staticRenderFns: staticRenderFns }
-/* harmony default export */ __webpack_exports__["a"] = (esExports);
-
-/***/ }),
-
-/***/ 3:
-/***/ (function(module, exports) {
-
-module.exports = require("element-ui/lib/utils/util");
-
-/***/ }),
-
-/***/ 89:
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-exports.__esModule = true;
-
-var _asyncValidator = __webpack_require__(276);
-
-var _asyncValidator2 = _interopRequireDefault(_asyncValidator);
-
-var _emitter = __webpack_require__(1);
-
-var _emitter2 = _interopRequireDefault(_emitter);
-
-var _merge = __webpack_require__(9);
-
-var _merge2 = _interopRequireDefault(_merge);
-
-var _util = __webpack_require__(3);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+/* harmony default export */ const label_wrap = (component.exports);
+;// ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/lib/index.js??vue-loader-options!./packages/form/src/form-item.vue?vue&type=script&lang=js
+//
+//
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -336,22 +406,21 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 //
 //
 
-exports.default = {
-  name: 'ElFormItem',
 
-  componentName: 'ElFormItem',
 
-  mixins: [_emitter2.default],
 
+
+
+/* harmony default export */ const form_itemvue_type_script_lang_js = ({
+  name: 'ElFormItem',
+  componentName: 'ElFormItem',
+  mixins: [(emitter_default())],
   provide: function provide() {
     return {
       elFormItem: this
     };
   },
-
-
   inject: ['elForm'],
-
   props: {
     label: String,
     labelWidth: String,
@@ -374,6 +443,10 @@ exports.default = {
     },
     size: String
   },
+  components: {
+    // use this component to calculate auto width
+    LabelWrap: label_wrap
+  },
   watch: {
     error: {
       immediate: true,
@@ -384,6 +457,11 @@ exports.default = {
     },
     validateStatus: function validateStatus(value) {
       this.validateState = value;
+    },
+    rules: function rules(value) {
+      if ((!value || value.length === 0) && this.required === undefined) {
+        this.clearValidate();
+      }
     }
   },
   computed: {
@@ -405,7 +483,13 @@ exports.default = {
       if (this.form.labelPosition === 'top' || this.form.inline) return ret;
       if (!label && !this.labelWidth && this.isNested) return ret;
       var labelWidth = this.labelWidth || this.form.labelWidth;
-      if (labelWidth) {
+      if (labelWidth === 'auto') {
+        if (this.labelWidth === 'auto') {
+          ret.marginLeft = this.computedLabelWidth;
+        } else if (this.form.labelWidth === 'auto') {
+          ret.marginLeft = this.elForm.autoLabelWidth;
+        }
+      } else {
         ret.marginLeft = labelWidth;
       }
       return ret;
@@ -422,27 +506,20 @@ exports.default = {
       }
       return parent;
     },
-
-    fieldValue: {
-      cache: false,
-      get: function get() {
-        var model = this.form.model;
-        if (!model || !this.prop) {
-          return;
-        }
-
-        var path = this.prop;
-        if (path.indexOf(':') !== -1) {
-          path = path.replace(/:/, '.');
-        }
-
-        return (0, _util.getPropByPath)(model, path, true).v;
+    fieldValue: function fieldValue() {
+      var model = this.form.model;
+      if (!model || !this.prop) {
+        return;
+      }
+      var path = this.prop;
+      if (path.indexOf(':') !== -1) {
+        path = path.replace(/:/, '.');
       }
+      return (0,util_namespaceObject.getPropByPath)(model, path, true).v;
     },
     isRequired: function isRequired() {
       var rules = this.getRules();
       var isRequired = false;
-
       if (rules && rules.length) {
         rules.every(function (rule) {
           if (rule.required) {
@@ -461,7 +538,7 @@ exports.default = {
       return this.size || this._formSize;
     },
     sizeClass: function sizeClass() {
-      return (this.$ELEMENT || {}).size || this.elFormItemSize;
+      return this.elFormItemSize || (this.$ELEMENT || {}).size;
     }
   },
   data: function data() {
@@ -470,25 +547,23 @@ exports.default = {
       validateMessage: '',
       validateDisabled: false,
       validator: {},
-      isNested: false
+      isNested: false,
+      computedLabelWidth: ''
     };
   },
-
   methods: {
-    validate: function validate(trigger) {
+    validate: function validate(trigger, callback) {
       var _this = this;
-
-      var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _util.noop;
-
+      if (callback === void 0) {
+        callback = util_namespaceObject.noop;
+      }
       this.validateDisabled = false;
       var rules = this.getFilteredRule(trigger);
       if ((!rules || rules.length === 0) && this.required === undefined) {
         callback();
         return true;
       }
-
       this.validateState = 'validating';
-
       var descriptor = {};
       if (rules && rules.length > 0) {
         rules.forEach(function (rule) {
@@ -496,18 +571,16 @@ exports.default = {
         });
       }
       descriptor[this.prop] = rules;
-
-      var validator = new _asyncValidator2.default(descriptor);
+      var validator = new (external_async_validator_default())(descriptor);
       var model = {};
-
       model[this.prop] = this.fieldValue;
-
-      validator.validate(model, { firstFields: true }, function (errors, invalidFields) {
+      validator.validate(model, {
+        firstFields: true
+      }, function (errors, invalidFields) {
         _this.validateState = !errors ? 'success' : 'error';
         _this.validateMessage = errors ? errors[0].message : '';
-
         callback(_this.validateMessage, invalidFields);
-        _this.elForm && _this.elForm.$emit('validate', _this.prop, !errors);
+        _this.elForm && _this.elForm.$emit('validate', _this.prop, !errors, _this.validateMessage || null);
       });
     },
     clearValidate: function clearValidate() {
@@ -516,44 +589,41 @@ exports.default = {
       this.validateDisabled = false;
     },
     resetField: function resetField() {
+      var _this2 = this;
       this.validateState = '';
       this.validateMessage = '';
-
       var model = this.form.model;
       var value = this.fieldValue;
       var path = this.prop;
       if (path.indexOf(':') !== -1) {
         path = path.replace(/:/, '.');
       }
-
-      var prop = (0, _util.getPropByPath)(model, path, true);
-
+      var prop = (0,util_namespaceObject.getPropByPath)(model, path, true);
       this.validateDisabled = true;
       if (Array.isArray(value)) {
         prop.o[prop.k] = [].concat(this.initialValue);
       } else {
         prop.o[prop.k] = this.initialValue;
       }
-      /* Select 的值被代码改变时不会触发校验，
-         这里需要强行触发一次，刷新 validateDisabled 的值，
-         确保 Select 下一次值改变时能正确触发校验 */
-      this.broadcast('ElSelect', 'fieldReset');
 
+      // reset validateDisabled after onFieldChange triggered
+      this.$nextTick(function () {
+        _this2.validateDisabled = false;
+      });
       this.broadcast('ElTimeSelect', 'fieldReset', this.initialValue);
     },
     getRules: function getRules() {
       var formRules = this.form.rules;
       var selfRules = this.rules;
-      var requiredRule = this.required !== undefined ? { required: !!this.required } : [];
-
-      var prop = (0, _util.getPropByPath)(formRules, this.prop || '');
+      var requiredRule = this.required !== undefined ? {
+        required: !!this.required
+      } : [];
+      var prop = (0,util_namespaceObject.getPropByPath)(formRules, this.prop || '');
       formRules = formRules ? prop.o[this.prop || ''] || prop.v : [];
-
       return [].concat(selfRules || formRules || []).concat(requiredRule);
     },
     getFilteredRule: function getFilteredRule(trigger) {
       var rules = this.getRules();
-
       return rules.filter(function (rule) {
         if (!rule.trigger || trigger === '') return true;
         if (Array.isArray(rule.trigger)) {
@@ -562,7 +632,7 @@ exports.default = {
           return rule.trigger === trigger;
         }
       }).map(function (rule) {
-        return (0, _merge2.default)({}, rule);
+        return merge_default()({}, rule);
       });
     },
     onFieldBlur: function onFieldBlur() {
@@ -573,14 +643,25 @@ exports.default = {
         this.validateDisabled = false;
         return;
       }
-
       this.validate('change');
+    },
+    updateComputedLabelWidth: function updateComputedLabelWidth(width) {
+      this.computedLabelWidth = width ? width + "px" : '';
+    },
+    addValidateEvents: function addValidateEvents() {
+      var rules = this.getRules();
+      if (rules.length || this.required !== undefined) {
+        this.$on('el.form.blur', this.onFieldBlur);
+        this.$on('el.form.change', this.onFieldChange);
+      }
+    },
+    removeValidateEvents: function removeValidateEvents() {
+      this.$off();
     }
   },
   mounted: function mounted() {
     if (this.prop) {
       this.dispatch('ElForm', 'el.form.addField', [this]);
-
       var initialValue = this.fieldValue;
       if (Array.isArray(initialValue)) {
         initialValue = [].concat(initialValue);
@@ -588,27 +669,43 @@ exports.default = {
       Object.defineProperty(this, 'initialValue', {
         value: initialValue
       });
-
-      var rules = this.getRules();
-
-      if (rules.length || this.required !== undefined) {
-        this.$on('el.form.blur', this.onFieldBlur);
-        this.$on('el.form.change', this.onFieldChange);
-      }
+      this.addValidateEvents();
     }
   },
   beforeDestroy: function beforeDestroy() {
     this.dispatch('ElForm', 'el.form.removeField', [this]);
   }
-};
+});
+;// ./packages/form/src/form-item.vue?vue&type=script&lang=js
+ /* harmony default export */ const src_form_itemvue_type_script_lang_js = (form_itemvue_type_script_lang_js); 
+;// ./packages/form/src/form-item.vue
 
-/***/ }),
 
-/***/ 9:
-/***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/utils/merge");
 
-/***/ })
 
-/******/ });
+/* normalize component */
+;
+var form_item_component = normalizeComponent(
+  src_form_itemvue_type_script_lang_js,
+  render,
+  staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ const form_item = (form_item_component.exports);
+;// ./packages/form-item/index.js
+
+
+/* istanbul ignore next */
+form_item.install = function (Vue) {
+  Vue.component(form_item.name, form_item);
+};
+/* harmony default export */ const packages_form_item = (form_item);
+module.exports = __webpack_exports__["default"];
+/******/ })()
+;