1. add support for reset button callback function;

2. update config of build; 3. update docs
zollero · Feb 22, 2019 · c566c0e · c566c0e
1 parent 5833fa7
commit c566c0e
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 25 deletions.
diff --git a/build/cooking.common.js b/build/cooking.common.js
@@ -21,7 +21,7 @@ cooking.add('loader.scss', {
 });
 cooking.add('vue.preserveWhitespace', false);
 cooking.add('plugin.banner', new webpack.BannerPlugin({
-  banner: 'el-search-table-pagination\nCopyright(c) 2017 zollero\nMIT Licensed',
+  banner: `el-search-table-pagination\nCopyright(c) 2017 - ${new Date().getFullYear()} zollero\nMIT Licensed`,
   entryOnly: true
 }));
 

diff --git a/build/cooking.component.js b/build/cooking.component.js
@@ -22,7 +22,7 @@ cooking.add('loader.scss', {
 });
 cooking.add('vue.preserveWhitespace', false);
 cooking.add('plugin.banner', new webpack.BannerPlugin({
-  banner: 'el-search-table-pagination\nCopyright(c) 2017 zollero\nMIT Licensed',
+  banner: `el-search-table-pagination\nCopyright(c) 2017 - ${new Date().getFullYear()} zollero\nMIT Licensed`,
   entryOnly: true
 }));
 

diff --git a/build/cooking.conf.js b/build/cooking.conf.js
@@ -21,7 +21,7 @@ cooking.add('loader.scss', {
 });
 cooking.add('vue.preserveWhitespace', false);
 cooking.add('plugin.banner', new webpack.BannerPlugin({
-  banner: 'el-search-table-pagination\nCopyright(c) 2017 zollero\nMIT Licensed',
+  banner: `el-search-table-pagination\nCopyright(c) 2017 - ${new Date().getFullYear()} zollero\nMIT Licensed`,
   entryOnly: true
 }));
 

diff --git a/docs/en_US.md b/docs/en_US.md
@@ -62,6 +62,7 @@ submitHandler | function to hander click event of submit button, the will receiv
 | submitLoading | detemine whether the button is loading | boolean | - | - |
 | submitBtnText | text of submit button | string | - | 查询 |
 | resetBtnText | text of reset button | string | - | 重置 |
+| resetBtnCallback | callback function in reset button's click event handler, will be called after resetting the search params | function | - | - |
 
 ### Form Item Attributes
 

diff --git a/docs/zh_CN.md b/docs/zh_CN.md
@@ -62,6 +62,7 @@ submitHandler | 查询按钮的click处理函数，接收form表单对象数据
 | submitLoading | 查询按钮的加载中状态 | boolean | - | - |
 | submitBtnText | 查询按钮的文本 | string | - | 查询 |
 | resetBtnText | 重置按钮的文本 | string | - | 重置 |
+| resetBtnCallback | 重置按钮点击事件的回调函数，在重置了搜索条件之后执行 | function | - | - |
 
 ### Form Item 属性
 

diff --git a/lib/el-search-table-pagination.common.js b/lib/el-search-table-pagination.common.js
@@ -1,6 +1,6 @@
 /*!
  * el-search-table-pagination
- * Copyright(c) 2017 zollero
+ * Copyright(c) 2017 - 2019 zollero
  * MIT Licensed
  */
 module.exports =
@@ -219,6 +219,7 @@ var formProps = exports.formProps = {
     type: String,
     default: '重置'
   },
+  resetBtnCallback: Function,
   forms: {
     type: Array,
     required: true
@@ -303,7 +304,7 @@ function sizeValidator(value) {
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_main_vue__ = __webpack_require__(10);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_main_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_main_vue__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_5b9d566d_hasScoped_false_preserveWhitespace_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_main_vue__ = __webpack_require__(11);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_8678d27c_hasScoped_false_preserveWhitespace_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_main_vue__ = __webpack_require__(11);
 var normalizeComponent = __webpack_require__(0)
 /* script */
 
@@ -319,7 +320,7 @@ var __vue_scopeId__ = null
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_main_vue___default.a,
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_5b9d566d_hasScoped_false_preserveWhitespace_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_main_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_8678d27c_hasScoped_false_preserveWhitespace_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_main_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -418,7 +419,7 @@ exports.default = _main2.default;
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_main_vue__ = __webpack_require__(7);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_main_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_main_vue__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_1e22773a_hasScoped_false_preserveWhitespace_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_main_vue__ = __webpack_require__(12);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_aae06b82_hasScoped_false_preserveWhitespace_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_main_vue__ = __webpack_require__(12);
 var normalizeComponent = __webpack_require__(0)
 /* script */
 
@@ -434,7 +435,7 @@ var __vue_scopeId__ = null
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_main_vue___default.a,
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_1e22773a_hasScoped_false_preserveWhitespace_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_main_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_aae06b82_hasScoped_false_preserveWhitespace_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_main_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -586,6 +587,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 //
 //
 //
+//
+//
 
 var _vue = __webpack_require__(8);
 
@@ -1265,6 +1268,9 @@ exports.default = {
     },
     resetForm: function resetForm() {
       this.$refs['form'].resetFields();
+      var resetBtnCallback = this.resetBtnCallback;
+
+      if (resetBtnCallback) resetBtnCallback();
     },
     changeDate: function changeDate(date, startDate, endDate) {
       var dates = void 0;
@@ -1333,7 +1339,7 @@ var esExports = { render: render, staticRenderFns: staticRenderFns }
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(_vm.formOptions)?_c('search-form',{ref:"searchForm",attrs:{"forms":_vm.formOptions.forms,"size":_vm.formOptions.size,"fuzzy":_vm.formOptions.fuzzy,"inline":_vm.formOptions.inline,"label-width":_vm.formOptions.labelWidth,"item-width":_vm.formOptions.itemWidth,"submit-handler":_vm.searchHandler,"submit-loading":_vm.loading,"showResetBtn":_vm.formOptions.showResetBtn,"submitBtnText":_vm.formOptions.submitBtnText,"resetBtnText":_vm.formOptions.resetBtnText}}):_vm._e(),_vm._t("form",null,{loading:_vm.loading,search:_vm.searchHandler}),_vm._t("default"),_c('el-table',{directives:[{name:"loading",rawName:"v-loading.lock",value:(_vm.loading),expression:"loading",modifiers:{"lock":true}}],ref:"table",style:(_vm.tableStyle),attrs:{"data":_vm.tableData,"border":_vm.border,"size":_vm.size,"stripe":_vm.stripe,"height":_vm.height,"max-height":_vm.maxHeight,"fit":_vm.fit,"show-header":_vm.showHeader,"highlight-current-row":_vm.highlightCurrentRow,"current-row-key":_vm.currentRowKey,"row-class-name":_vm.rowClassName,"row-style":_vm.rowStyle,"row-ket":_vm.rowKey,"empty-text":_vm.emptyText,"default-expand-all":_vm.defaultExpandAll,"expand-row-keys":_vm.expandRowKeys,"default-sort":_vm.defaultSort,"tooltip-effect":_vm.tooltipEffect,"show-summary":_vm.showSummary,"sum-text":_vm.sumText,"summary-method":_vm.summaryMethod},on:{"select":function (selection, row) { return _vm.emitEventHandler('select', selection, row); },"select-all":function (selection) { return _vm.emitEventHandler('select-all', selection); },"selection-change":function (selection) { return _vm.emitEventHandler('selection-change', selection); },"cell-mouse-enter":function (row, column, cell, event) { return _vm.emitEventHandler('cell-mouse-enter', row, column, cell, event); },"cell-mouse-leave":function (row, column, cell, event) { return _vm.emitEventHandler('cell-mouse-leave', row, column, cell, event); },"cell-click":function (row, column, cell, event) { return _vm.emitEventHandler('cell-click', row, column, cell, event); },"cell-dblclick":function (row, column, cell, event) { return _vm.emitEventHandler('cell-dblclick', row, column, cell, event); },"row-click":function (row, event, column) { return _vm.emitEventHandler('row-click', row, event, column); },"row-dblclick":function (row, event) { return _vm.emitEventHandler('row-dblclick', row, event); },"row-contextmenu":function (row, event) { return _vm.emitEventHandler('row-contextmenu', row, event); },"header-click":function (column, event) { return _vm.emitEventHandler('header-click', column, event); },"sort-change":function (args) { return _vm.emitEventHandler('sort-change', args); },"filter-change":function (filters) { return _vm.emitEventHandler('filter-change', filters); },"current-change":function (currentRow, oldCurrentRow) { return _vm.emitEventHandler('current-change', currentRow, oldCurrentRow); },"header-dragend":function (newWidth, oldWidth, column, event) { return _vm.emitEventHandler('header-dragend', newWidth, oldWidth, column, event); },"expand-change":function (row, expanded) { return _vm.emitEventHandler('expand-change', row, expanded); }}},[_vm._t("prepend"),_vm._l((_vm.columns),function(column,columnIndex){return [(column.type === undefined)?_c('el-table-column',{attrs:{"column-key":column.columnKey,"prop":column.prop,"label":column.label,"width":column.minWidth ? '-' : (column.width || 140),"minWidth":column.minWidth || column.width || 140,"fixed":column.fixed,"render-header":column.renderHeader,"sortable":column.sortable,"sort-by":column.sortBy,"sort-method":column.method,"resizable":column.resizable,"formatter":column.formatter,"show-overflow-tooltip":column.showOverflowTooltip,"align":column.align,"header-align":column.headerAlign || column.align,"class-name":column.className,"label-class-name":column.labelClassName,"selectable":column.selectable,"reserve-selection":column.reserveSelection,"filters":column.filters,"filter-placement":column.filterPlacement,"filter-multiple":column.filterMultiple,"filter-method":column.filterMethod,"filtered-value":column.filteredValue},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [(column.filter)?_c('span',[_vm._v("\n            "+_vm._s(_vm.Vue.filter(column['filter'])(scope.row[column.prop]))+"\n          ")]):(column.slotName)?_c('span',[_vm._t(column.slotName,null,{row:scope.row,$index:scope.$index})],2):(column.render)?_c('span',[_vm._v("\n            "+_vm._s(column.render(scope.row))+"\n          ")]):(column.formatter)?_c('span',[_vm._v("\n            "+_vm._s(column.formatter(scope.row, scope.column, scope.row[column.prop], scope.$index))+"\n          ")]):_c('span',[_vm._v("\n            "+_vm._s(scope.row[column.prop])+"\n          ")])]}}])}):_c('el-table-column',_vm._b({},'el-table-column',column,false))]}),_vm._t("append")],2),(_vm.showPagination)?_c('div',{staticStyle:{"margin-top":"10px","text-align":"right"}},[_c('el-pagination',{attrs:{"current-page":_vm.pagination.pageIndex,"page-sizes":_vm.pageSizes,"page-size":_vm.pagination.pageSize,"layout":_vm.paginationLayout,"total":_vm.total},on:{"size-change":_vm.handleSizeChange,"current-change":_vm.handleCurrentChange}})],1):_vm._e()],2)}
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(_vm.formOptions)?_c('search-form',{ref:"searchForm",attrs:{"forms":_vm.formOptions.forms,"size":_vm.formOptions.size,"fuzzy":_vm.formOptions.fuzzy,"inline":_vm.formOptions.inline,"label-width":_vm.formOptions.labelWidth,"item-width":_vm.formOptions.itemWidth,"submit-handler":_vm.searchHandler,"submit-loading":_vm.loading,"showResetBtn":_vm.formOptions.showResetBtn,"submitBtnText":_vm.formOptions.submitBtnText,"resetBtnText":_vm.formOptions.resetBtnText,"resetBtnCallback":_vm.formOptions.resetBtnCallback}}):_vm._e(),_vm._t("form",null,{loading:_vm.loading,search:_vm.searchHandler}),_vm._t("default"),_c('el-table',{directives:[{name:"loading",rawName:"v-loading.lock",value:(_vm.loading),expression:"loading",modifiers:{"lock":true}}],ref:"table",style:(_vm.tableStyle),attrs:{"data":_vm.tableData,"border":_vm.border,"size":_vm.size,"stripe":_vm.stripe,"height":_vm.height,"max-height":_vm.maxHeight,"fit":_vm.fit,"show-header":_vm.showHeader,"highlight-current-row":_vm.highlightCurrentRow,"current-row-key":_vm.currentRowKey,"row-class-name":_vm.rowClassName,"row-style":_vm.rowStyle,"row-ket":_vm.rowKey,"empty-text":_vm.emptyText,"default-expand-all":_vm.defaultExpandAll,"expand-row-keys":_vm.expandRowKeys,"default-sort":_vm.defaultSort,"tooltip-effect":_vm.tooltipEffect,"show-summary":_vm.showSummary,"sum-text":_vm.sumText,"summary-method":_vm.summaryMethod},on:{"select":function (selection, row) { return _vm.emitEventHandler('select', selection, row); },"select-all":function (selection) { return _vm.emitEventHandler('select-all', selection); },"selection-change":function (selection) { return _vm.emitEventHandler('selection-change', selection); },"cell-mouse-enter":function (row, column, cell, event) { return _vm.emitEventHandler('cell-mouse-enter', row, column, cell, event); },"cell-mouse-leave":function (row, column, cell, event) { return _vm.emitEventHandler('cell-mouse-leave', row, column, cell, event); },"cell-click":function (row, column, cell, event) { return _vm.emitEventHandler('cell-click', row, column, cell, event); },"cell-dblclick":function (row, column, cell, event) { return _vm.emitEventHandler('cell-dblclick', row, column, cell, event); },"row-click":function (row, event, column) { return _vm.emitEventHandler('row-click', row, event, column); },"row-dblclick":function (row, event) { return _vm.emitEventHandler('row-dblclick', row, event); },"row-contextmenu":function (row, event) { return _vm.emitEventHandler('row-contextmenu', row, event); },"header-click":function (column, event) { return _vm.emitEventHandler('header-click', column, event); },"sort-change":function (args) { return _vm.emitEventHandler('sort-change', args); },"filter-change":function (filters) { return _vm.emitEventHandler('filter-change', filters); },"current-change":function (currentRow, oldCurrentRow) { return _vm.emitEventHandler('current-change', currentRow, oldCurrentRow); },"header-dragend":function (newWidth, oldWidth, column, event) { return _vm.emitEventHandler('header-dragend', newWidth, oldWidth, column, event); },"expand-change":function (row, expanded) { return _vm.emitEventHandler('expand-change', row, expanded); }}},[_vm._t("prepend"),_vm._l((_vm.columns),function(column,columnIndex){return [(column.type === undefined)?_c('el-table-column',{key:columnIndex,attrs:{"column-key":column.columnKey,"prop":column.prop,"label":column.label,"width":column.minWidth ? '-' : (column.width || 140),"minWidth":column.minWidth || column.width || 140,"fixed":column.fixed,"render-header":column.renderHeader,"sortable":column.sortable,"sort-by":column.sortBy,"sort-method":column.method,"resizable":column.resizable,"formatter":column.formatter,"show-overflow-tooltip":column.showOverflowTooltip,"align":column.align,"header-align":column.headerAlign || column.align,"class-name":column.className,"label-class-name":column.labelClassName,"selectable":column.selectable,"reserve-selection":column.reserveSelection,"filters":column.filters,"filter-placement":column.filterPlacement,"filter-multiple":column.filterMultiple,"filter-method":column.filterMethod,"filtered-value":column.filteredValue},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [(column.filter)?_c('span',[_vm._v("\n            "+_vm._s(_vm.Vue.filter(column['filter'])(scope.row[column.prop]))+"\n          ")]):(column.slotName)?_c('span',[_vm._t(column.slotName,null,{row:scope.row,$index:scope.$index})],2):(column.render)?_c('span',[_vm._v("\n            "+_vm._s(column.render(scope.row))+"\n          ")]):(column.formatter)?_c('span',[_vm._v("\n            "+_vm._s(column.formatter(scope.row, scope.column, scope.row[column.prop], scope.$index))+"\n          ")]):_c('span',[_vm._v("\n            "+_vm._s(scope.row[column.prop])+"\n          ")])]}}])}):_c('el-table-column',_vm._b({key:columnIndex},'el-table-column',column,false))]}),_vm._t("append")],2),(_vm.showPagination)?_c('div',{staticStyle:{"margin-top":"10px","text-align":"right"}},[_c('el-pagination',{attrs:{"current-page":_vm.pagination.pageIndex,"page-sizes":_vm.pageSizes,"page-size":_vm.pagination.pageSize,"layout":_vm.paginationLayout,"total":_vm.total},on:{"size-change":_vm.handleSizeChange,"current-change":_vm.handleCurrentChange}})],1):_vm._e()],2)}
 var staticRenderFns = []
 var esExports = { render: render, staticRenderFns: staticRenderFns }
 /* harmony default export */ __webpack_exports__["a"] = (esExports);

diff --git a/lib/index.js b/lib/index.js