meixioacomponent 2.0.37 → 2.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/packages/components/proPageTable/oa_pro_footer.vue

@@ -21,6 +21,7 @@
       <!--      </basePopoverButton>-->
 
       <base-pagination
+          :page-sizes="pageSizes"
           :config="pageConfig"
           :pageProps="pageProps"
           @currentChange="currentChange"
@@ -50,6 +51,10 @@ export default {
     pageConfig: {
       type: Object,
     },
+    pageSizes: {
+      type: Array,
+      default: () => [15, 30, 60, 100, 200, 300],
+    },
   },
   components: {
     basePopoverButton,

package/packages/components/proPageTable/oa_pro_table.vue

@@ -97,8 +97,6 @@
       >
 
 
-
-
         <template #expanded-row="{row}" v-if="expandId">
           <slot name="expandedRow" :scope="row"></slot>
         </template>
@@ -193,6 +191,7 @@
         class="oa-pro-table-footer"
     >
       <oa_pro_footerVue
+          :page-sizes="pageSizes"
           :pageConfig="pageConfig"
           :pageProps="pageProps"
           :totalList="totalList"
@@ -510,16 +509,20 @@ export default {
       default: false
     },
 
-    expandId:{
-      type:String,
-      default:null
+    expandId: {
+      type: String,
+      default: null
     },
     rowspanAndColspan: {
       type: Function,
       default: () => {
         return null
       }
-    }
+    },
+    pageSizes: {
+      type: Array,
+      default: () => [15, 30, 60, 100, 200, 300],
+    },
   },
   computed: {
     checkType() {
@@ -630,8 +633,8 @@ export default {
   },
   mixins: [tableSectionMixins],
   methods: {
-    rehandleExpandChange(value,params){
-      this.$emit('rehandleExpandChange',value)
+    rehandleExpandChange(value, params) {
+      this.$emit('rehandleExpandChange', value)
     },
     isToolTip(value) {
       if (!value) {
@@ -903,11 +906,17 @@ export default {
       }
 
       result[`keyword`] = this.module;
-      if(this.sort[`sortBy`]){
-        result[`sortField`] = this.sort?.sortBy;
-        result[`sortOrder`] = this.sort?.descending ? 'desc' : 'asc';
+      try {
+        if (this.sort[`sortBy`]) {
+          result[`sortField`] = this.sort?.sortBy;
+          result[`sortOrder`] = this.sort?.descending ? 'desc' : 'asc';
+        }
+      } catch (error) {
+        result[`sortField`] = null;
+        result[`sortOrder`] = '';
       }
 
+
       // 高级筛选的结果
       const searchList = [];