Merge branch 'sit'

src/components/globalComponents/ex-table/main.vue

@@ -267,14 +267,6 @@ export default {
         return this.conditions.some((item) => item.prop === col.prop);
       };
     },
-  },
-  data() {
-    return {
-      // 表格选中项
-      tableSelection: [],
-    };
-  },
-  computed: {
     page_curr() {
       return this.page.curr;
     },
@@ -285,6 +277,12 @@ export default {
       return this.page.total;
     },
   },
+  data() {
+    return {
+      // 表格选中项
+      tableSelection: [],
+    };
+  },
   watch: {
     page_curr: function (val) {
       this.page.curr = val;