doway-coms 1.4.17 → 1.4.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.4.17",
+  "version": "1.4.19",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -1123,7 +1123,7 @@ export default {
         case "clearFilter":
           // 示例
           const filterList = this.$refs.baseGrid.getCheckedFilters();
-          this.$refs.baseGrid.clearFilter();
+
           filterList.forEach((col) => {
             // if (
             //   col.column.params.controlType === "select" ||
@@ -1133,10 +1133,19 @@ export default {
             // } else {
             //   col.column.filters = [{ data: [] }];
             // }
-              col.column.filters = [{ data: [] }];
+              this.$refs.baseGrid.clearFilter(col.column);
+              col.column.filters = [
+                  {
+                      data: {
+                          bindingValues: '',
+                          displayValues: ''
+                      }
+                  }
+              ]
           });
-          XEUtils.clear(this.filterExpression)
-          vm.$emit("filterChange");
+            // this.$refs.baseGrid.clearFilter();
+            XEUtils.clear(this.filterExpression)
+            vm.$emit("filterChange");
           break;
         case "desc":
           if (this.sortRemote) {

package/packages/BasePagination/src/index.vue

@@ -68,13 +68,15 @@
     watch: {},
     created() {},
     methods: {
-      onPageChange({currentPage, pageSize}) {
+      onPageChange({type, currentPage, pageSize}) {
         if (currentPage === 0) {
           currentPage = 1
         }
-        this.$emit('pageChange', currentPage, pageSize)
-        this.$emit('pageSizeChange', currentPage, pageSize)
-
+       if(type === 'current') {
+         this.$emit('pageChange', currentPage, pageSize)
+       }else {
+         this.$emit('pageSizeChange', currentPage, pageSize)
+       }
       },
       // onShowSizeChange(current, pageSize) {
       //   if (current === 0) {