@panpanzhao/component-ui 0.0.9 → 0.0.10

package/lib/components/form.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 9);
+/******/ 	return __webpack_require__(__webpack_require__.s = 4);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -194,29 +194,29 @@ function normalizeComponent(
 /* 2 */
 /***/ (function(module, exports) {
 
+module.exports = require("lodash");
+
+/***/ }),
+/* 3 */
+/***/ (function(module, exports) {
+
 module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 
 /***/ }),
-/* 3 */,
-/* 4 */,
-/* 5 */,
-/* 6 */,
-/* 7 */,
-/* 8 */,
-/* 9 */
+/* 4 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // 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!./src/components/form/src/form.vue?vue&type=template&id=42f43bc0&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/form.vue?vue&type=template&id=26d7095f&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
     "div",
-    { staticClass: "form" },
+    { class: ["form", { "is-full": _vm.isFull }] },
     [
       _vm._t("default", function () {
         return [
@@ -235,7 +235,10 @@ var render = function render() {
                     return [
                       _c(
                         "el-col",
-                        { key: item.prop, attrs: { span: item.span } },
+                        {
+                          key: item.prop,
+                          attrs: { span: item.span || _vm.span },
+                        },
                         [
                           _c(
                             "form-item",
@@ -278,26 +281,29 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=42f43bc0&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=26d7095f&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
-var form_ = __webpack_require__(13);
+var form_ = __webpack_require__(12);
 var form_default = /*#__PURE__*/__webpack_require__.n(form_);
 
 // EXTERNAL MODULE: external "element-ui/lib/row"
-var row_ = __webpack_require__(14);
+var row_ = __webpack_require__(13);
 var row_default = /*#__PURE__*/__webpack_require__.n(row_);
 
 // EXTERNAL MODULE: external "element-ui/lib/col"
-var col_ = __webpack_require__(15);
+var col_ = __webpack_require__(14);
 var col_default = /*#__PURE__*/__webpack_require__.n(col_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-item"
-var form_item_ = __webpack_require__(16);
+var form_item_ = __webpack_require__(15);
 var form_item_default = /*#__PURE__*/__webpack_require__.n(form_item_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
-var formula_ = __webpack_require__(2);
+var formula_ = __webpack_require__(3);
+
+// EXTERNAL MODULE: external "lodash"
+var external_lodash_ = __webpack_require__(2);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/form.vue?vue&type=script&lang=js&
 
@@ -305,6 +311,7 @@ var formula_ = __webpack_require__(2);
 
 
 
+
 /* harmony default export */ var formvue_type_script_lang_js_ = ({
   name: "Form",
   componentName: "Form",
@@ -320,7 +327,12 @@ var formula_ = __webpack_require__(2);
     };
   },
   props: {
+    isFull: {
+      type: Boolean,
+      default: true
+    },
     prop: String,
+    span: Number,
     formItems: {
       type: Array,
       default: function _default() {
@@ -367,11 +379,14 @@ var formula_ = __webpack_require__(2);
         }
         if (typeof item.show === "function" && !item.show.call(_this, {
           form: _this,
+          formModel: _this.formModel,
           config: item
         })) {
           return false;
         }
-        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this.formModel)) {
+        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this.formModel, {
+          evalMode: true
+        })) {
           return false;
         }
         return true;
@@ -391,6 +406,7 @@ var formula_ = __webpack_require__(2);
   data: function data() {
     return {
       defaultModel: {},
+      //默认值存储
       formItemLayout: {}
     };
   },
@@ -399,8 +415,30 @@ var formula_ = __webpack_require__(2);
     this.formItems.forEach(function (item) {
       _this2.formItemLayout[item.prop] = item;
       _this2.defaultModel[item.prop] = item.value;
-      //初始化数据值
-      _this2.$set(_this2.formModel, item.prop, item.value || null);
+      //初始化值处理
+      var formVal = Object(external_lodash_["get"])(_this2.formModel, item.prop);
+      if (typeof formVal === 'undefined') {
+        //初始化数据值
+        if (item.prop && item.prop.indexOf(".") != -1) {
+          //循环设置值
+          var keyArr = item.prop.split('.');
+          var tempObj = _this2.formModel;
+          keyArr.forEach(function (key, index) {
+            if (index < keyArr.length - 1) {
+              if (typeof tempObj[key] === 'undefined') {
+                _this2.$set(tempObj, key, {});
+              }
+              tempObj = tempObj[key];
+            } else {
+              _this2.$set(tempObj, key, item.value || null);
+            }
+          });
+        } else {
+          _this2.$set(_this2.formModel, item.prop, item.value || null);
+        }
+      } else {
+        item.value = formVal;
+      }
     });
   },
   methods: {
@@ -410,6 +448,9 @@ var formula_ = __webpack_require__(2);
     validateField: function validateField(props, callback) {
       return this.$refs.form.validateField(props, callback);
     },
+    reset: function reset() {
+      this.resetFields();
+    },
     resetFields: function resetFields() {
       for (var key in this.defaultModel) {
         if (this.formItemLayout[key]) {
@@ -466,28 +507,32 @@ src_form.install = function (Vue) {
 /* harmony default export */ var components_form = __webpack_exports__["default"] = (src_form);
 
 /***/ }),
+/* 5 */,
+/* 6 */,
+/* 7 */,
+/* 8 */,
+/* 9 */,
 /* 10 */,
 /* 11 */,
-/* 12 */,
-/* 13 */
+/* 12 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/form");
 
 /***/ }),
-/* 14 */
+/* 13 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/row");
 
 /***/ }),
-/* 15 */
+/* 14 */
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/col");
 
 /***/ }),
-/* 16 */
+/* 15 */
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/form-item");