doway-coms 1.4.12 → 1.4.14

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -1136,6 +1136,7 @@ export default {
             // }
               col.column.filters = [{ data: [] }];
           });
+          XEUtils.clear(this.filterExpression)
           vm.$emit("filterChange");
           break;
         case "desc":
@@ -2327,6 +2328,7 @@ export default {
           }
           colFilterExpression.expressions.push(tempPushExp);
         });
+        // debugger
         this.filterExpression.push(colFilterExpression);
         tempStr.exp = expStr + tempStr.exp.substring(0, tempStr.exp.length - 1);
         this.filterStr.push(tempStr);

package/packages/BasePagination/src/index.vue

@@ -1,25 +1,38 @@
 <template>
     <div>
-      <Pagination
-        show-quick-jumper
-        :current="currentPage"
-        size="small"
-        show-size-changer
-        @showSizeChange="onShowSizeChange"
+<!--      <Pagination-->
+<!--        show-quick-jumper-->
+<!--        :current="currentPage"-->
+<!--        size="small"-->
+<!--        show-size-changer-->
+<!--        @showSizeChange="onShowSizeChange"-->
+<!--        :total="totalRows"-->
+<!--        :page-size-options="pageSizeOptions"-->
+<!--        :defaultPageSize="pageSize"-->
+<!--        style="margin-top: 10px;"-->
+<!--        @change="onPageChange"-->
+<!--        :show-total="total => `总共 ${totalRows} 条`"-->
+<!--      />-->
+      <Pager
+        background
+        v-model:current-page="currentPage"
+        v-model:page-size="pageSize"
         :total="totalRows"
-        :page-size-options="pageSizeOptions"
-        :defaultPageSize="pageSize"
-        style="margin-top: 10px;"
-        @change="onPageChange"
-        :show-total="total => `总共 ${totalRows} 条`"
+        size="small"
+        :page-sizes="pageSizeOptions"
+        @page-change="onPageChange"
+        :layouts="['PrevJump', 'PrevPage', 'JumpNumber', 'NextPage', 'NextJump', 'Sizes', 'FullJump', 'Total']"
       />
     </div>
   </template>
   <script>
    import { Pagination } from 'ant-design-vue'
-  export default {
+   import { Pager } from "vxe-table";
+
+   export default {
     components: {
-        Pagination
+      Pagination,
+      Pager
     },
     name: 'BasePagination',
     data() {
@@ -29,7 +42,7 @@
       pageSizeOptions: {
         type: Array,
         default: function() {
-          return ['50', '100', '150', '200']
+          return [10, 20 ,50, 100, 150, 200]
         }
       },
       totalRows: {
@@ -54,11 +67,11 @@
     watch: {},
     created() {},
     methods: {
-      onPageChange(current, pageSize) {
-        if (current === 0) {
-          current = 1
+      onPageChange({currentPage, pageSize}) {
+        if (currentPage === 0) {
+          currentPage = 1
         }
-        this.$emit('pageChange', current, pageSize)
+        this.$emit('pageChange', currentPage, pageSize)
       },
       onShowSizeChange(current, pageSize) {
         if (current === 0) {