@panpanzhao/component-ui 0.0.8 → 0.0.10

package/lib/components/table-search.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 74);
+/******/ 	return __webpack_require__(__webpack_require__.s = 75);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,42 +192,42 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 3:
+/***/ 2:
 /***/ (function(module, exports) {
 
 module.exports = require("lodash");
 
 /***/ }),
 
-/***/ 4:
+/***/ 5:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/button");
 
 /***/ }),
 
-/***/ 53:
+/***/ 58:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/form");
 
 /***/ }),
 
-/***/ 54:
+/***/ 59:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/table");
 
 /***/ }),
 
-/***/ 74:
+/***/ 75:
 /***/ (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/table-search/src/index.vue?vue&type=template&id=d82821d8&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table-search/src/index.vue?vue&type=template&id=08925b81&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -277,7 +277,17 @@ var render = function render() {
     _c(
       "div",
       { staticClass: "table-search-table" },
-      [_c("Table", _vm._b({ ref: "table" }, "Table", _vm.tableProps, false))],
+      [
+        _c(
+          "Table",
+          _vm._b(
+            { ref: "table", attrs: { request: _vm.request } },
+            "Table",
+            _vm.tableProps,
+            false
+          )
+        ),
+      ],
       1
     ),
   ])
@@ -286,22 +296,22 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=template&id=d82821d8&
+// CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=template&id=08925b81&
 
 // 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: external "@panpanzhao/component-ui/lib/components/form"
-var form_ = __webpack_require__(53);
+var form_ = __webpack_require__(58);
 var form_default = /*#__PURE__*/__webpack_require__.n(form_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table"
-var table_ = __webpack_require__(54);
+var table_ = __webpack_require__(59);
 var table_default = /*#__PURE__*/__webpack_require__.n(table_);
 
 // 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/table-search/src/index.vue?vue&type=script&lang=js&
 
@@ -328,11 +338,7 @@ var external_lodash_ = __webpack_require__(3);
       }, this.search.form);
     },
     tableProps: function tableProps() {
-      return Object(external_lodash_["merge"])({
-        api: {
-          request: this.request
-        }
-      }, this.table, {
+      return Object(external_lodash_["merge"])(this.table, {
         api: {
           data: this.searchData
         }
@@ -349,23 +355,29 @@ var external_lodash_ = __webpack_require__(3);
   },
   mounted: function mounted() {
     var _this = this;
-    if (this.search.hasInit) {
+    if (this.search && this.search.hasInit) {
       this.$nextTick(function () {
         _this.searchSubmit();
       });
     }
   },
   methods: {
-    reset: function reset() {
+    resetForm: function resetForm() {
       this.$refs.form.resetFields();
     },
+    resetTable: function resetTable() {
+      this.$refs.table.reset();
+    },
+    reloadTable: function reloadTable() {
+      this.$refs.table.reload();
+    },
     searchSubmit: function searchSubmit() {
       var _this2 = this;
       this.$refs.form.validate(function (isValidate, errorMessage) {
         if (!isValidate) {
           return false;
         }
-        _this2.$refs.table.reset();
+        _this2.resetTable();
       });
     }
   }

package/lib/components/table.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 73);
+/******/ 	return __webpack_require__(__webpack_require__.s = 74);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -199,7 +199,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 11:
+/***/ 17:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/table-column");
@@ -209,18 +209,18 @@ module.exports = require("element-ui/lib/table-column");
 /***/ 2:
 /***/ (function(module, exports) {
 
-module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
+module.exports = require("lodash");
 
 /***/ }),
 
-/***/ 24:
+/***/ 26:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/table-column");
 
 /***/ }),
 
-/***/ 26:
+/***/ 29:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/table");
@@ -230,33 +230,33 @@ module.exports = require("element-ui/lib/table");
 /***/ 3:
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 
 /***/ }),
 
-/***/ 4:
+/***/ 5:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/button");
 
 /***/ }),
 
-/***/ 49:
+/***/ 54:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/pagination");
 
 /***/ }),
 
-/***/ 73:
+/***/ 74:
 /***/ (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/table/src/table.vue?vue&type=template&id=f8ac923e&
-var tablevue_type_template_id_f8ac923e_render = function render() {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/table.vue?vue&type=template&id=189ef3b0&
+var tablevue_type_template_id_189ef3b0_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c("div", { staticClass: "table" }, [
@@ -335,40 +335,40 @@ var tablevue_type_template_id_f8ac923e_render = function render() {
   ])
 }
 var staticRenderFns = []
-tablevue_type_template_id_f8ac923e_render._withStripped = true
+tablevue_type_template_id_189ef3b0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=template&id=f8ac923e&
+// CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=template&id=189ef3b0&
 
 // EXTERNAL MODULE: external "@vue/babel-helper-vue-jsx-merge-props"
 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 "element-ui/lib/button"
-var button_ = __webpack_require__(4);
+var button_ = __webpack_require__(5);
 var button_default = /*#__PURE__*/__webpack_require__.n(button_);
 
 // EXTERNAL MODULE: external "element-ui/lib/table"
-var table_ = __webpack_require__(26);
+var table_ = __webpack_require__(29);
 var table_default = /*#__PURE__*/__webpack_require__.n(table_);
 
 // EXTERNAL MODULE: external "element-ui/lib/table-column"
-var table_column_ = __webpack_require__(11);
+var table_column_ = __webpack_require__(17);
 var table_column_default = /*#__PURE__*/__webpack_require__.n(table_column_);
 
 // EXTERNAL MODULE: external "element-ui/lib/pagination"
-var pagination_ = __webpack_require__(49);
+var pagination_ = __webpack_require__(54);
 var pagination_default = /*#__PURE__*/__webpack_require__.n(pagination_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table-column"
-var components_table_column_ = __webpack_require__(24);
+var components_table_column_ = __webpack_require__(26);
 var components_table_column_default = /*#__PURE__*/__webpack_require__.n(components_table_column_);
 
 // 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/table/src/table.vue?vue&type=script&lang=js&
 
@@ -449,22 +449,24 @@ var external_lodash_ = __webpack_require__(3);
     };
   },
   props: {
+    request: Function,
     data: {
       type: Array,
       default: function _default() {
         return null;
       }
     },
-    api: Object,
+    api: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
+    hasInit: Boolean,
     remoteProp: {
       type: Object,
       default: function _default() {
-        return {
-          data: "list",
-          currentPage: "page",
-          pageSize: "pageSize",
-          total: "total"
-        };
+        return {};
       }
     },
     dataSource: Object,
@@ -474,7 +476,6 @@ var external_lodash_ = __webpack_require__(3);
         return [];
       }
     },
-    beforeSearch: Function,
     pagination: {
       type: [Boolean, Object],
       default: function _default() {
@@ -517,6 +518,17 @@ var external_lodash_ = __webpack_require__(3);
     }
   },
   computed: {
+    requester: function requester() {
+      return this.api.request || this.request || (this.$COMPONENT || {}).request;
+    },
+    remoteDataProp: function remoteDataProp() {
+      return Object.assign({
+        data: "list",
+        currentPage: "page",
+        pageSize: "pageSize",
+        total: "total"
+      }, this.remoteProp);
+    },
     tableSource: function tableSource() {
       return this.data || this.remoteData || [];
     },
@@ -589,40 +601,59 @@ var external_lodash_ = __webpack_require__(3);
     }
   },
   mounted: function mounted() {
-    //this.reset()
+    if (this.hasInit) {
+      this.reset();
+    }
   },
   methods: {
     reset: function reset() {
       this.currentPage = 1;
       this.search();
     },
+    reload: function reload() {
+      this.search();
+    },
     search: function search() {
       var _this4 = this;
-      if (!(this.api && this.api.url && this.api.request)) {
+      if (!this.requester) {
         return false;
       }
-      var requestData = Object.assign({}, this.api.data);
+      var reqData = Object.assign({}, this.api.data);
       if (this.pagination) {
-        Object(external_lodash_["set"])(requestData, this.remoteProp.currentPage, this.currentPage);
-        Object(external_lodash_["set"])(requestData, this.remoteProp.pageSize, this.pageSize);
+        Object(external_lodash_["set"])(reqData, this.remoteDataProp.currentPage, this.currentPage);
+        Object(external_lodash_["set"])(reqData, this.remoteDataProp.pageSize, this.pageSize);
       }
-      if (typeof this.beforeSearch === "function") {
-        requestData = this.beforeSearch.call(this, requestData);
+      if (typeof this.api.before === "function") {
+        reqData = this.api.before.call(this, reqData);
       }
-      this.$emit("loadingChange", true);
-      this.api.request({
-        url: Object(formula_["evaluate"])(this.api.url, requestData),
+      this.$emit("request", {
+        request: this.requester,
+        reqData: reqData
+      });
+      this.requester({
+        url: Object(formula_["evaluate"])(this.api.url, reqData),
         method: this.api.method || "POST",
-        data: requestData
+        data: reqData
       }).then(function (res) {
-        _this4.$emit("loadingChange", false);
-        _this4.remoteData = Object(external_lodash_["get"])(res, _this4.remoteProp.data, []);
+        if (typeof _this4.api.after === "function") {
+          res = _this4.api.after.call(_this4, res);
+        }
+        _this4.remoteData = _this4.remoteDataProp.data ? Object(external_lodash_["get"])(res, _this4.remoteDataProp.data, []) : res;
         if (_this4.pagination) {
-          _this4.total = Object(external_lodash_["get"])(res, _this4.remoteProp.total, []);
+          _this4.total = Object(external_lodash_["get"])(res, _this4.remoteDataProp.total, 0);
         }
+        _this4.$emit("success", {
+          request: _this4.requester,
+          reqData: reqData,
+          resData: res
+        });
       }).catch(function (error) {
-        _this4.$emit("loadingChange", false);
         _this4.remoteData = [], _this4.total = 0;
+        _this4.$emit("error", {
+          request: _this4.requester,
+          reqData: reqData,
+          resError: error
+        });
       });
     }
   }
@@ -642,7 +673,7 @@ var componentNormalizer = __webpack_require__(1);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_f8ac923e_render,
+  tablevue_type_template_id_189ef3b0_render,
   staticRenderFns,
   false,
   null,