@panpanzhao/component-ui 0.0.9 → 0.0.12

package/lib/components/crud.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 75);
+/******/ 	return __webpack_require__(__webpack_require__.s = 76);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -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=dfeb985e&
 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=dfeb985e&
 
 // 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: {}
     };
   },
@@ -433,9 +419,34 @@ var formula_ = __webpack_require__(2);
     var _this2 = this;
     this.formItems.forEach(function (item) {
       _this2.formItemLayout[item.prop] = item;
+      if (typeof item.value === "function") {
+        item.value = item.value.call(_this2);
+      }
       _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 +456,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,6 +514,36 @@ 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 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -508,7 +552,7 @@ src_form.install = function (Vue) {
 // 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-view/src/index.vue?vue&type=template&id=1df6f53d&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form-view/src/index.vue?vue&type=template&id=720bd4fc&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -555,21 +599,21 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=1df6f53d&
+// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=720bd4fc&
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions"
-var descriptions_ = __webpack_require__(17);
+var descriptions_ = __webpack_require__(18);
 var descriptions_default = /*#__PURE__*/__webpack_require__.n(descriptions_);
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions-item"
-var descriptions_item_ = __webpack_require__(18);
+var descriptions_item_ = __webpack_require__(19);
 var descriptions_item_default = /*#__PURE__*/__webpack_require__.n(descriptions_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__(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-view/src/index.vue?vue&type=script&lang=js&
 
@@ -626,7 +670,9 @@ var external_lodash_ = __webpack_require__(3);
         })) {
           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;
@@ -685,52 +731,37 @@ src.install = function (Vue) {
 /* harmony default export */ var form_view = __webpack_exports__["default"] = (src);
 
 /***/ }),
-/* 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 */
-/***/ (function(module, exports) {
-
-module.exports = require("element-ui/lib/descriptions");
-
-/***/ }),
-/* 18 */
-/***/ (function(module, exports) {
-
-module.exports = require("element-ui/lib/descriptions-item");
-
-/***/ }),
-/* 19 */,
-/* 20 */,
-/* 21 */
+/* 16 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -742,7 +773,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
 
@@ -805,7 +836,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;
     }
@@ -824,19 +855,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
@@ -1090,7 +1121,21 @@ src.install = function (Vue) {
 /* harmony default export */ var form_group = __webpack_exports__["default"] = (src);
 
 /***/ }),
-/* 22 */
+/* 17 */,
+/* 18 */
+/***/ (function(module, exports) {
+
+module.exports = require("element-ui/lib/descriptions");
+
+/***/ }),
+/* 19 */
+/***/ (function(module, exports) {
+
+module.exports = require("element-ui/lib/descriptions-item");
+
+/***/ }),
+/* 20 */,
+/* 21 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1165,23 +1210,23 @@ var form_view = __webpack_require__(10);
   }
 });
 // 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_);
 
 // EXTERNAL MODULE: external "lodash"
-var external_lodash_ = __webpack_require__(3);
+var external_lodash_ = __webpack_require__(2);
 
 // CONCATENATED MODULE: ./src/components/form-view-group/src/index.js
 
@@ -1341,11 +1386,8 @@ src.install = function (Vue) {
 /* harmony default export */ var form_view_group = __webpack_exports__["default"] = (src);
 
 /***/ }),
-/* 23 */,
-/* 24 */,
-/* 25 */,
-/* 26 */,
-/* 27 */
+/* 22 */,
+/* 23 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1357,24 +1399,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&
 
@@ -1452,6 +1494,7 @@ var external_lodash_ = __webpack_require__(3);
     }
   },
   props: {
+    request: Function,
     dialog: {
       type: Object,
       default: function _default() {
@@ -1464,6 +1507,10 @@ var external_lodash_ = __webpack_require__(3);
       }
     },
     formMode: String,
+    noApiClose: {
+      type: Boolean,
+      default: true
+    },
     api: {
       type: Object,
       default: function _default() {
@@ -1494,6 +1541,7 @@ var external_lodash_ = __webpack_require__(3);
     return {
       show: false,
       formModel: {},
+      expandModel: null,
       defaultTools: [{
         label: this.dialog.cancelButtonText || "取消",
         type: this.confirmButtonType,
@@ -1512,13 +1560,20 @@ 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, expandModel) {
+      var _this2 = this;
       this.show = true;
+      this.expandModel = expandModel;
+      if (model) {
+        this.$nextTick(function () {
+          _this2.setFormModel(model);
+        });
+      }
     },
     close: function close() {
       this.show = false;
@@ -1526,35 +1581,69 @@ 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();
+    },
+    closed: function closed() {
+      this.reset();
+      this.show = false;
+    },
     submit: function submit(button) {
-      var _this2 = this;
-      if (!(this.api && this.request)) {
-        return false;
-      }
+      var _this3 = this;
       this.$refs.form.validate(function (isValidate, errorMessage) {
         if (!isValidate) {
           return false;
         }
+        var reqData = Object(external_lodash_["merge"])(_this3.api.data || {}, _this3.formModel);
+        if (typeof _this3.api.before === "function") {
+          reqData = _this3.api.before.call(_this3, reqData);
+        }
+        if (!(_this3.api.url && _this3.requester)) {
+          if (_this3.noApiClose) {
+            _this3.reset();
+            _this3.show = false;
+          }
+          _this3.$emit("success", {
+            request: _this3.requester,
+            reqData: reqData,
+            expandData: _this3.expandModel
+          }, {
+            button: button
+          });
+          return false;
+        }
         button.loading = true;
-        var reqData = Object.assign(_this2.api.data, _this2.formModel);
-        _this2.request({
-          url: Object(formula_["evaluate"])(_this2.api.url, reqData),
-          method: _this2.api.method || "POST",
+        _this3.requester({
+          url: Object(formula_["evaluate"])(_this3.api.url, reqData),
+          method: _this3.api.method || "POST",
+          headers: _this3.api.headers,
           data: reqData
         }).then(function (res) {
           button.loading = false;
-          _this2.close();
-          _this2.$emit("success", res);
+          _this3.reset();
+          _this3.show = false;
+          _this3.$emit("success", {
+            request: _this3.requester,
+            reqData: reqData,
+            resData: res,
+            expandData: _this3.expandModel
+          });
         }).catch(function (error) {
           button.loading = false;
-          _this2.$emit("error", error);
+          _this3.$emit("error", {
+            request: _this3.requester,
+            reqData: reqData,
+            resError: error,
+            expandData: _this3.expandModel
+          });
         });
       });
     },
     renderForm: function renderForm(h) {
       var param = {
         attrs: Object.assign({
-          formModel: this.formModel
+          formModel: this.formModel,
+          request: this.request
         }, this.form)
       };
       if (this.formMode === "group") {
@@ -1586,7 +1675,7 @@ var external_lodash_ = __webpack_require__(3);
     }
   },
   render: function render(h) {
-    var _this3 = this;
+    var _this4 = this;
     var param = {
       attrs: Object.assign({
         visible: this.show,
@@ -1595,7 +1684,8 @@ var external_lodash_ = __webpack_require__(3);
       }, this.dialog),
       on: Object.assign(this.on, {
         close: function close() {
-          _this3.close();
+          _this4.reset();
+          _this4.show = false;
         }
       })
     };
@@ -1641,7 +1731,7 @@ src.install = function (Vue) {
 /* harmony default export */ var form_dialog = __webpack_exports__["default"] = (src);
 
 /***/ }),
-/* 28 */
+/* 24 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1653,24 +1743,21 @@ 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-view/index.js + 5 modules
 var form_view = __webpack_require__(10);
 
 // EXTERNAL MODULE: ./src/components/form-view-group/index.js + 2 modules
-var form_view_group = __webpack_require__(22);
-
-// EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
-var formula_ = __webpack_require__(2);
+var form_view_group = __webpack_require__(21);
 
 // 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-view-dialog/src/index.vue?vue&type=script&lang=js&
 
@@ -1683,7 +1770,6 @@ var external_lodash_ = __webpack_require__(3);
 
 
 
-
 /* harmony default export */ var srcvue_type_script_lang_js_ = ({
   name: "FormViewDialog",
   componentName: "FormViewDialog",
@@ -1902,8 +1988,22 @@ src.install = function (Vue) {
 /* harmony default export */ var form_view_dialog = __webpack_exports__["default"] = (src);
 
 /***/ }),
+/* 25 */,
+/* 26 */,
+/* 27 */
+/***/ (function(module, exports) {
+
+module.exports = require("@panpanzhao/component-ui/lib/components/table-search");
+
+/***/ }),
+/* 28 */,
 /* 29 */,
-/* 30 */,
+/* 30 */
+/***/ (function(module, exports) {
+
+module.exports = require("element-ui/lib/message-box");
+
+/***/ }),
 /* 31 */,
 /* 32 */,
 /* 33 */,
@@ -1930,18 +2030,8 @@ src.install = function (Vue) {
 /* 54 */,
 /* 55 */,
 /* 56 */,
-/* 57 */
-/***/ (function(module, exports) {
-
-module.exports = require("@panpanzhao/component-ui/lib/components/table-search");
-
-/***/ }),
-/* 58 */
-/***/ (function(module, exports) {
-
-module.exports = require("element-ui/lib/message-box");
-
-/***/ }),
+/* 57 */,
+/* 58 */,
 /* 59 */,
 /* 60 */,
 /* 61 */,
@@ -1958,14 +2048,15 @@ module.exports = require("element-ui/lib/message-box");
 /* 72 */,
 /* 73 */,
 /* 74 */,
-/* 75 */
+/* 75 */,
+/* 76 */
 /***/ (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/crud/src/index.vue?vue&type=template&id=0fa8c191&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/crud/src/index.vue?vue&type=template&id=34fe6a3b&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -1975,7 +2066,12 @@ var render = function render() {
       [
         _c(
           "TableSearch",
-          _vm._b({ ref: "table" }, "TableSearch", _vm.tableProps, false)
+          _vm._b(
+            { ref: "table", attrs: { request: _vm.request } },
+            "TableSearch",
+            _vm.tableProps,
+            false
+          )
         ),
       ],
       1
@@ -1986,22 +2082,28 @@ var render = function render() {
         _vm.create
           ? _c(
               "FormDialog",
-              _vm._b(
-                { ref: "createFormDialog" },
-                "FormDialog",
-                _vm.createProps,
-                false
+              _vm._g(
+                _vm._b(
+                  { ref: "createFormDialog", attrs: { request: _vm.request } },
+                  "FormDialog",
+                  _vm.createProps,
+                  false
+                ),
+                _vm.reloadTableEvent
               )
             )
           : _vm._e(),
         _vm.update
           ? _c(
               "FormDialog",
-              _vm._b(
-                { ref: "updateFormDialog" },
-                "FormDialog",
-                _vm.updateProps,
-                false
+              _vm._g(
+                _vm._b(
+                  { ref: "updateFormDialog", attrs: { request: _vm.request } },
+                  "FormDialog",
+                  _vm.updateProps,
+                  false
+                ),
+                _vm.reloadTableEvent
               )
             )
           : _vm._e(),
@@ -2009,7 +2111,7 @@ var render = function render() {
           ? _c(
               "FormViewDialog",
               _vm._b(
-                { ref: "viewFormDialog" },
+                { ref: "viewFormDialog", attrs: { request: _vm.request } },
                 "FormViewDialog",
                 _vm.viewProps,
                 false
@@ -2025,24 +2127,27 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=0fa8c191&
+// CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=34fe6a3b&
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table-search"
-var table_search_ = __webpack_require__(57);
+var table_search_ = __webpack_require__(27);
 var table_search_default = /*#__PURE__*/__webpack_require__.n(table_search_);
 
 // EXTERNAL MODULE: ./src/components/form-dialog/index.js + 3 modules
-var form_dialog = __webpack_require__(27);
+var form_dialog = __webpack_require__(23);
 
 // EXTERNAL MODULE: ./src/components/form-view-dialog/index.js + 3 modules
-var form_view_dialog = __webpack_require__(28);
+var form_view_dialog = __webpack_require__(24);
 
 // EXTERNAL MODULE: external "element-ui/lib/message-box"
-var message_box_ = __webpack_require__(58);
+var message_box_ = __webpack_require__(30);
 var message_box_default = /*#__PURE__*/__webpack_require__.n(message_box_);
 
 // 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/crud/src/index.vue?vue&type=script&lang=js&
 
@@ -2050,6 +2155,7 @@ var formula_ = __webpack_require__(2);
 
 
 
+
 /* harmony default export */ var srcvue_type_script_lang_js_ = ({
   name: "CRUD",
   componentName: "CRUD",
@@ -2140,7 +2246,14 @@ var formula_ = __webpack_require__(2);
     }
   },
   data: function data() {
-    return {};
+    var _this = this;
+    return {
+      reloadTableEvent: {
+        success: function success() {
+          _this.reloadTable();
+        }
+      }
+    };
   },
   created: function created() {
     this.addTools();
@@ -2153,13 +2266,14 @@ var formula_ = __webpack_require__(2);
         tools.unshift(Object.assign({
           label: "添加",
           loading: false,
+          sort: 10,
           on: {
             click: this.handleCreate
           }
         }, this.create.tool));
         this.table.tools = tools;
       }
-      //修改和删除按钮处理
+      //修改,查看和删除按钮处理
       if (!(this.update || this.delete || this.view)) {
         return false;
       }
@@ -2169,32 +2283,35 @@ var formula_ = __webpack_require__(2);
       var optColumn = filterColumns && filterColumns[0];
       var items = optColumn && optColumn.items || [];
       if (this.update) {
-        items.unshift(Object.assign({
+        items.push(Object.assign({
           label: "修改",
           loading: false,
+          sort: 10,
           on: {
             click: this.handleUpdate
           }
         }, this.update.tool));
       }
-      if (this.delete) {
-        items.unshift(Object.assign({
-          label: "删除",
-          loading: false,
-          on: {
-            click: this.handleDelete
-          }
-        }, this.delete.tool));
-      }
       if (this.view) {
-        items.unshift(Object.assign({
+        items.push(Object.assign({
           label: "查看",
           loading: false,
+          sort: 20,
           on: {
             click: this.handleView
           }
         }, this.view.tool));
       }
+      if (this.delete) {
+        items.push(Object.assign({
+          label: "删除",
+          loading: false,
+          sort: 30,
+          on: {
+            click: this.handleDelete
+          }
+        }, this.delete.tool));
+      }
       if (optColumn) {
         optColumn.items = items;
       } else {
@@ -2209,62 +2326,120 @@ var formula_ = __webpack_require__(2);
     handleCreate: function handleCreate() {
       this.$refs.createFormDialog.open();
     },
+    resetTable: function resetTable() {
+      this.$refs.table.resetTable();
+    },
+    reloadTable: function reloadTable() {
+      this.$refs.table.reloadTable();
+    },
+    getRequest: function getRequest(request) {
+      if (request) {
+        return request;
+      }
+      return this.request || (this.$COMPONENT || {}).request;
+    },
     handleUpdate: function handleUpdate(rowProps, that) {
-      var _this = this;
+      var _this2 = this;
       var rowData = rowProps.row;
       this.$refs.updateFormDialog.open();
-      if (this.update.detail) {
-        var request = this.update.detail.request || this.request;
+      var detailApi = this.update.detail || {};
+      var request = this.getRequest(detailApi.request);
+      var reqData = Object(external_lodash_["merge"])(detailApi.data || {}, rowData);
+      if (typeof detailApi.before === "function") {
+        reqData = detailApi.before.call(this, reqData);
+      }
+      if (detailApi.url && request) {
+        that.loading = true;
         request({
-          url: Object(formula_["evaluate"])(this.update.detail.url, rowData),
-          method: this.update.detail.method || "GET",
-          data: rowData
+          url: Object(formula_["evaluate"])(detailApi.url, rowData),
+          method: detailApi.method || "GET",
+          data: reqData
         }).then(function (res) {
-          _this.$refs.updateFormDialog.setFormModel(res);
-        }).catch(function (error) {});
+          that.loading = false;
+          if (typeof detailApi.after === "function") {
+            res = detailApi.after.call(_this2, res);
+          }
+          _this2.$refs.updateFormDialog.setFormModel(res);
+        }).catch(function (error) {
+          that.loading = false;
+        });
       } else {
         this.$nextTick(function () {
-          _this.$refs.updateFormDialog.setFormModel(rowData);
+          _this2.$refs.updateFormDialog.setFormModel(typeof detailApi.after === "function" ? detailApi.after.call(_this2, reqData) : reqData);
         });
       }
     },
     handleDelete: function handleDelete(rowProps, that) {
-      var _this2 = this;
+      var _this3 = this;
+      var deleteApi = this.delete.api;
+      if (!deleteApi) {
+        console.warn("缺少删除的配置");
+        return false;
+      }
       message_box_default.a.confirm("是否确定删除", '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function () {
-        var request = _this2.delete.api.request || _this2.request;
-        var rowData = rowProps.row;
+        var request = _this3.getRequest(deleteApi.request);
+        var reqData = Object(external_lodash_["merge"])(deleteApi.data || {}, rowProps.row);
+        if (typeof deleteApi.before === "function") {
+          reqData = deleteApi.before.call(_this3, reqData);
+        }
         that.loading = true;
         request({
-          url: Object(formula_["evaluate"])(_this2.delete.api.url, rowData),
-          method: _this2.delete.api.method || "GET",
-          data: rowData
+          url: Object(formula_["evaluate"])(deleteApi.url, reqData),
+          method: deleteApi.method || "GET",
+          data: reqData
         }).then(function (res) {
           that.loading = false;
+          _this3.reloadTable();
+          _this3.$emit("deleteSuccess", {
+            request: request,
+            reqData: reqData,
+            resData: res
+          });
         }).catch(function (error) {
           that.loading = false;
+          _this3.$emit("deleteError", {
+            request: request,
+            reqData: reqData,
+            resError: error
+          });
         });
       }).catch(function () {});
     },
     handleView: function handleView(rowProps, that) {
-      var _this3 = this;
+      var _this4 = this;
       var rowData = rowProps.row;
       this.$refs.viewFormDialog.open();
-      if (this.view.api) {
-        var request = this.view.api.request || this.request;
+      var viewApi = this.view.api || {};
+      var request = this.getRequest(viewApi.request);
+      var reqData = Object(external_lodash_["merge"])(viewApi.data || {}, rowData);
+      if (typeof viewApi.before === "function") {
+        reqData = viewApi.before.call(this, reqData);
+      }
+      if (viewApi.url && request) {
+        that.loading = true;
         request({
-          url: Object(formula_["evaluate"])(this.view.api.url, rowData),
-          method: this.view.api.method || "GET",
-          data: rowData
+          url: Object(formula_["evaluate"])(viewApi.url, reqData),
+          method: viewApi.method || "GET",
+          data: reqData
         }).then(function (res) {
-          _this3.$refs.viewFormDialog.setFormModel(res);
-        }).catch(function (error) {});
+          that.loading = false;
+          if (typeof viewApi.after === "function") {
+            res = viewApi.after.call(_this4, res);
+          }
+          _this4.$refs.viewFormDialog.setFormModel(res);
+        }).catch(function (error) {
+          that.loading = false;
+        });
       } else {
+        if (typeof viewApi.after === "function") {
+          reqData = viewApi.after.call(this, reqData);
+        }
         this.$nextTick(function () {
-          _this3.$refs.viewFormDialog.setFormModel(rowData);
+          _this4.$refs.viewFormDialog.setFormModel(typeof viewApi.after === "function" ? viewApi.after.call(_this4, reqData) : reqData);
         });
       }
     }