@panpanzhao/component-ui 0.0.10 → 0.0.12

package/lib/components/crud.js

@@ -215,7 +215,7 @@ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 // 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=26d7095f&
+// 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
@@ -286,7 +286,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=26d7095f&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=dfeb985e&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(12);
@@ -419,6 +419,9 @@ var external_lodash_ = __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;
       //初始化值处理
       var formVal = Object(external_lodash_["get"])(_this2.formModel, item.prop);
@@ -1504,6 +1507,10 @@ var external_lodash_ = __webpack_require__(2);
       }
     },
     formMode: String,
+    noApiClose: {
+      type: Boolean,
+      default: true
+    },
     api: {
       type: Object,
       default: function _default() {
@@ -1534,6 +1541,7 @@ var external_lodash_ = __webpack_require__(2);
     return {
       show: false,
       formModel: {},
+      expandModel: null,
       defaultTools: [{
         label: this.dialog.cancelButtonText || "取消",
         type: this.confirmButtonType,
@@ -1557,10 +1565,14 @@ var external_lodash_ = __webpack_require__(2);
     }
   },
   methods: {
-    open: function open(model) {
+    open: function open(model, expandModel) {
+      var _this2 = this;
       this.show = true;
+      this.expandModel = expandModel;
       if (model) {
-        this.setFormModel(model);
+        this.$nextTick(function () {
+          _this2.setFormModel(model);
+        });
       }
     },
     close: function close() {
@@ -1572,45 +1584,57 @@ var external_lodash_ = __webpack_require__(2);
     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;
+      var _this3 = this;
       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);
+        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 (!(_this2.api.url && _this2.requester)) {
-          _this2.close();
-          _this2.reset();
-          _this2.$emit("success", {
-            request: _this2.requester,
-            reqData: 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;
-        _this2.requester({
-          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.reset();
-          _this2.$emit("success", {
-            request: _this2.requester,
+          _this3.reset();
+          _this3.show = false;
+          _this3.$emit("success", {
+            request: _this3.requester,
             reqData: reqData,
-            resData: res
+            resData: res,
+            expandData: _this3.expandModel
           });
         }).catch(function (error) {
           button.loading = false;
-          _this2.$emit("error", {
-            request: _this2.requester,
+          _this3.$emit("error", {
+            request: _this3.requester,
             reqData: reqData,
-            resError: error
+            resError: error,
+            expandData: _this3.expandModel
           });
         });
       });
@@ -1618,7 +1642,8 @@ var external_lodash_ = __webpack_require__(2);
     renderForm: function renderForm(h) {
       var param = {
         attrs: Object.assign({
-          formModel: this.formModel
+          formModel: this.formModel,
+          request: this.request
         }, this.form)
       };
       if (this.formMode === "group") {
@@ -1650,7 +1675,7 @@ var external_lodash_ = __webpack_require__(2);
     }
   },
   render: function render(h) {
-    var _this3 = this;
+    var _this4 = this;
     var param = {
       attrs: Object.assign({
         visible: this.show,
@@ -1659,7 +1684,8 @@ var external_lodash_ = __webpack_require__(2);
       }, this.dialog),
       on: Object.assign(this.on, {
         close: function close() {
-          _this3.close();
+          _this4.reset();
+          _this4.show = false;
         }
       })
     };
@@ -2030,7 +2056,7 @@ module.exports = require("element-ui/lib/message-box");
 // 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=39c4f843&
+// 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
@@ -2101,7 +2127,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=39c4f843&
+// 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__(27);
@@ -2300,6 +2326,9 @@ var external_lodash_ = __webpack_require__(2);
     handleCreate: function handleCreate() {
       this.$refs.createFormDialog.open();
     },
+    resetTable: function resetTable() {
+      this.$refs.table.resetTable();
+    },
     reloadTable: function reloadTable() {
       this.$refs.table.reloadTable();
     },

package/lib/components/form-dialog.js

@@ -215,7 +215,7 @@ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 // 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=26d7095f&
+// 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
@@ -286,7 +286,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=26d7095f&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=dfeb985e&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(12);
@@ -419,6 +419,9 @@ var external_lodash_ = __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;
       //初始化值处理
       var formVal = Object(external_lodash_["get"])(_this2.formModel, item.prop);
@@ -1059,6 +1062,10 @@ var external_lodash_ = __webpack_require__(2);
       }
     },
     formMode: String,
+    noApiClose: {
+      type: Boolean,
+      default: true
+    },
     api: {
       type: Object,
       default: function _default() {
@@ -1089,6 +1096,7 @@ var external_lodash_ = __webpack_require__(2);
     return {
       show: false,
       formModel: {},
+      expandModel: null,
       defaultTools: [{
         label: this.dialog.cancelButtonText || "取消",
         type: this.confirmButtonType,
@@ -1112,10 +1120,14 @@ var external_lodash_ = __webpack_require__(2);
     }
   },
   methods: {
-    open: function open(model) {
+    open: function open(model, expandModel) {
+      var _this2 = this;
       this.show = true;
+      this.expandModel = expandModel;
       if (model) {
-        this.setFormModel(model);
+        this.$nextTick(function () {
+          _this2.setFormModel(model);
+        });
       }
     },
     close: function close() {
@@ -1127,45 +1139,57 @@ var external_lodash_ = __webpack_require__(2);
     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;
+      var _this3 = this;
       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);
+        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 (!(_this2.api.url && _this2.requester)) {
-          _this2.close();
-          _this2.reset();
-          _this2.$emit("success", {
-            request: _this2.requester,
-            reqData: 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;
-        _this2.requester({
-          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.reset();
-          _this2.$emit("success", {
-            request: _this2.requester,
+          _this3.reset();
+          _this3.show = false;
+          _this3.$emit("success", {
+            request: _this3.requester,
             reqData: reqData,
-            resData: res
+            resData: res,
+            expandData: _this3.expandModel
           });
         }).catch(function (error) {
           button.loading = false;
-          _this2.$emit("error", {
-            request: _this2.requester,
+          _this3.$emit("error", {
+            request: _this3.requester,
             reqData: reqData,
-            resError: error
+            resError: error,
+            expandData: _this3.expandModel
           });
         });
       });
@@ -1173,7 +1197,8 @@ var external_lodash_ = __webpack_require__(2);
     renderForm: function renderForm(h) {
       var param = {
         attrs: Object.assign({
-          formModel: this.formModel
+          formModel: this.formModel,
+          request: this.request
         }, this.form)
       };
       if (this.formMode === "group") {
@@ -1205,7 +1230,7 @@ var external_lodash_ = __webpack_require__(2);
     }
   },
   render: function render(h) {
-    var _this3 = this;
+    var _this4 = this;
     var param = {
       attrs: Object.assign({
         visible: this.show,
@@ -1214,7 +1239,8 @@ var external_lodash_ = __webpack_require__(2);
       }, this.dialog),
       on: Object.assign(this.on, {
         close: function close() {
-          _this3.close();
+          _this4.reset();
+          _this4.show = false;
         }
       })
     };

package/lib/components/form-drawer.js

@@ -616,7 +616,7 @@ module.exports = require("@panpanzhao/component-ui/lib/components/drawer");
 // 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=26d7095f&
+// 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
@@ -687,7 +687,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=26d7095f&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=dfeb985e&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(12);
@@ -820,6 +820,9 @@ var external_lodash_ = __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;
       //初始化值处理
       var formVal = Object(external_lodash_["get"])(_this2.formModel, item.prop);

package/lib/components/form-group.js

@@ -215,7 +215,7 @@ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 // 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=26d7095f&
+// 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
@@ -286,7 +286,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=26d7095f&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=dfeb985e&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(12);
@@ -419,6 +419,9 @@ var external_lodash_ = __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;
       //初始化值处理
       var formVal = Object(external_lodash_["get"])(_this2.formModel, item.prop);