@panpanzhao/component-ui 0.0.9 → 0.0.10

package/lib/components/form-dialog.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 27);
+/******/ 	return __webpack_require__(__webpack_require__.s = 23);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -199,59 +199,29 @@ function normalizeComponent(
 /* 2 */
 /***/ (function(module, exports) {
 
-module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
+module.exports = require("lodash");
 
 /***/ }),
 /* 3 */
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 
 /***/ }),
 /* 4 */
-/***/ (function(module, exports) {
-
-module.exports = require("element-ui/lib/button");
-
-/***/ }),
-/* 5 */
-/***/ (function(module, exports) {
-
-module.exports = require("element-ui/lib/tabs");
-
-/***/ }),
-/* 6 */
-/***/ (function(module, exports) {
-
-module.exports = require("element-ui/lib/tab-pane");
-
-/***/ }),
-/* 7 */
-/***/ (function(module, exports) {
-
-module.exports = require("element-ui/lib/collapse");
-
-/***/ }),
-/* 8 */
-/***/ (function(module, exports) {
-
-module.exports = require("element-ui/lib/collapse-item");
-
-/***/ }),
-/* 9 */
 /***/ (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 [
@@ -270,7 +240,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",
@@ -313,26 +286,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&
 
@@ -340,6 +316,7 @@ var formula_ = __webpack_require__(2);
 
 
 
+
 /* harmony default export */ var formvue_type_script_lang_js_ = ({
   name: "Form",
   componentName: "Form",
@@ -355,7 +332,12 @@ var formula_ = __webpack_require__(2);
     };
   },
   props: {
+    isFull: {
+      type: Boolean,
+      default: true
+    },
     prop: String,
+    span: Number,
     formItems: {
       type: Array,
       default: function _default() {
@@ -402,11 +384,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;
@@ -426,6 +411,7 @@ var formula_ = __webpack_require__(2);
   data: function data() {
     return {
       defaultModel: {},
+      //默认值存储
       formItemLayout: {}
     };
   },
@@ -434,8 +420,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: {
@@ -445,6 +453,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]) {
@@ -500,44 +511,69 @@ src_form.install = function (Vue) {
 };
 /* harmony default export */ var components_form = __webpack_exports__["default"] = (src_form);
 
+/***/ }),
+/* 5 */
+/***/ (function(module, exports) {
+
+module.exports = require("element-ui/lib/button");
+
+/***/ }),
+/* 6 */
+/***/ (function(module, exports) {
+
+module.exports = require("element-ui/lib/tabs");
+
+/***/ }),
+/* 7 */
+/***/ (function(module, exports) {
+
+module.exports = require("element-ui/lib/tab-pane");
+
+/***/ }),
+/* 8 */
+/***/ (function(module, exports) {
+
+module.exports = require("element-ui/lib/collapse");
+
+/***/ }),
+/* 9 */
+/***/ (function(module, exports) {
+
+module.exports = require("element-ui/lib/collapse-item");
+
 /***/ }),
 /* 10 */,
-/* 11 */,
-/* 12 */
+/* 11 */
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/dialog");
 
 /***/ }),
-/* 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");
 
 /***/ }),
-/* 17 */,
-/* 18 */,
-/* 19 */,
-/* 20 */,
-/* 21 */
+/* 16 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -549,7 +585,7 @@ var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
 var babel_helper_vue_jsx_merge_props_default = /*#__PURE__*/__webpack_require__.n(babel_helper_vue_jsx_merge_props_);
 
 // EXTERNAL MODULE: ./src/components/form/index.js + 5 modules
-var components_form = __webpack_require__(9);
+var components_form = __webpack_require__(4);
 
 // CONCATENATED MODULE: ./src/components/form-group/src/content.js
 
@@ -612,7 +648,7 @@ var components_form = __webpack_require__(9);
     }
   },
   render: function render(h) {
-    if (this.slots.form) {
+    if (this.slots && this.slots.form) {
       var vForm = typeof this.slots.form === "function" ? this.slots.form.call(this, h) : this.slots.form;
       return vForm;
     }
@@ -631,19 +667,19 @@ var components_form = __webpack_require__(9);
   }
 });
 // EXTERNAL MODULE: external "element-ui/lib/tabs"
-var tabs_ = __webpack_require__(5);
+var tabs_ = __webpack_require__(6);
 var tabs_default = /*#__PURE__*/__webpack_require__.n(tabs_);
 
 // EXTERNAL MODULE: external "element-ui/lib/tab-pane"
-var tab_pane_ = __webpack_require__(6);
+var tab_pane_ = __webpack_require__(7);
 var tab_pane_default = /*#__PURE__*/__webpack_require__.n(tab_pane_);
 
 // EXTERNAL MODULE: external "element-ui/lib/collapse"
-var collapse_ = __webpack_require__(7);
+var collapse_ = __webpack_require__(8);
 var collapse_default = /*#__PURE__*/__webpack_require__.n(collapse_);
 
 // EXTERNAL MODULE: external "element-ui/lib/collapse-item"
-var collapse_item_ = __webpack_require__(8);
+var collapse_item_ = __webpack_require__(9);
 var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
 
 // CONCATENATED MODULE: ./src/components/form-group/src/index.js
@@ -897,12 +933,13 @@ src.install = function (Vue) {
 /* harmony default export */ var form_group = __webpack_exports__["default"] = (src);
 
 /***/ }),
+/* 17 */,
+/* 18 */,
+/* 19 */,
+/* 20 */,
+/* 21 */,
 /* 22 */,
-/* 23 */,
-/* 24 */,
-/* 25 */,
-/* 26 */,
-/* 27 */
+/* 23 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -914,24 +951,24 @@ var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
 var babel_helper_vue_jsx_merge_props_default = /*#__PURE__*/__webpack_require__.n(babel_helper_vue_jsx_merge_props_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/dialog"
-var dialog_ = __webpack_require__(12);
+var dialog_ = __webpack_require__(11);
 var dialog_default = /*#__PURE__*/__webpack_require__.n(dialog_);
 
 // EXTERNAL MODULE: external "element-ui/lib/button"
-var button_ = __webpack_require__(4);
+var button_ = __webpack_require__(5);
 var button_default = /*#__PURE__*/__webpack_require__.n(button_);
 
 // EXTERNAL MODULE: ./src/components/form/index.js + 5 modules
-var components_form = __webpack_require__(9);
+var components_form = __webpack_require__(4);
 
 // EXTERNAL MODULE: ./src/components/form-group/index.js + 2 modules
-var form_group = __webpack_require__(21);
+var form_group = __webpack_require__(16);
 
 // 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__(3);
+var external_lodash_ = __webpack_require__(2);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form-dialog/src/index.vue?vue&type=script&lang=js&
 
@@ -1009,6 +1046,7 @@ var external_lodash_ = __webpack_require__(3);
     }
   },
   props: {
+    request: Function,
     dialog: {
       type: Object,
       default: function _default() {
@@ -1069,13 +1107,16 @@ var external_lodash_ = __webpack_require__(3);
     };
   },
   computed: {
-    request: function request() {
-      return this.api.request || (this.$COMPONENT || {}).request;
+    requester: function requester() {
+      return this.api.request || this.request || (this.$COMPONENT || {}).request;
     }
   },
   methods: {
-    open: function open() {
+    open: function open(model) {
       this.show = true;
+      if (model) {
+        this.setFormModel(model);
+      }
     },
     close: function close() {
       this.show = false;
@@ -1083,28 +1124,49 @@ var external_lodash_ = __webpack_require__(3);
     setFormModel: function setFormModel(model) {
       Object(external_lodash_["merge"])(this.formModel, model);
     },
+    reset: function reset() {
+      this.$refs.form && this.$refs.form.reset();
+    },
     submit: function submit(button) {
       var _this2 = this;
-      if (!(this.api && this.request)) {
-        return false;
-      }
       this.$refs.form.validate(function (isValidate, errorMessage) {
         if (!isValidate) {
           return false;
         }
+        var reqData = Object(external_lodash_["merge"])(_this2.api.data || {}, _this2.formModel);
+        if (typeof _this2.api.before === "function") {
+          reqData = _this2.api.before.call(_this2, reqData);
+        }
+        if (!(_this2.api.url && _this2.requester)) {
+          _this2.close();
+          _this2.reset();
+          _this2.$emit("success", {
+            request: _this2.requester,
+            reqData: reqData
+          });
+          return false;
+        }
         button.loading = true;
-        var reqData = Object.assign(_this2.api.data, _this2.formModel);
-        _this2.request({
+        _this2.requester({
           url: Object(formula_["evaluate"])(_this2.api.url, reqData),
           method: _this2.api.method || "POST",
           data: reqData
         }).then(function (res) {
           button.loading = false;
           _this2.close();
-          _this2.$emit("success", res);
+          _this2.reset();
+          _this2.$emit("success", {
+            request: _this2.requester,
+            reqData: reqData,
+            resData: res
+          });
         }).catch(function (error) {
           button.loading = false;
-          _this2.$emit("error", error);
+          _this2.$emit("error", {
+            request: _this2.requester,
+            reqData: reqData,
+            resError: error
+          });
         });
       });
     },