vue2-client 1.14.39 → 1.14.41

package/src/components/STable/index.js

@@ -70,7 +70,7 @@ export default {
       default: false
     },
     showPagination: {
-      type: String | Boolean,
+      type: [String, Boolean],
       default: 'auto'
     },
     // 是否隐藏翻页，如果隐藏，彻底不显示翻译
@@ -95,6 +95,11 @@ export default {
     pageURI: {
       type: Boolean,
       default: false
+    },
+    // 最大分页大小，如果设置则使用该值作为分页大小并隐藏分页组件
+    pageMaxSize: {
+      type: Number,
+      default: null
     }
   }),
   computed: {
@@ -136,11 +141,33 @@ export default {
       Object.assign(this.localPagination, {
         showSizeChanger: val
       })
+    },
+    pageMaxSize: {
+      handler (val) {
+        if (val) {
+          this.pageSize = val
+          this.hidePagination = true
+          // 更新 localPagination
+          if (this.localPagination) {
+            Object.assign(this.localPagination, {
+              pageSize: val
+            })
+          }
+        }
+      },
+      immediate: true
     }
   },
   created () {
     const { pageNo } = this.$route.params
     const localPageNum = this.pageURI && (pageNo && parseInt(pageNo)) || this.pageNum
+
+    // 如果设置了 pageMaxSize，则使用该值作为分页大小并隐藏分页
+    if (this.pageMaxSize) {
+      this.pageSize = this.pageMaxSize
+      this.hidePagination = true
+    }
+
     this.localPagination = ['auto', true].includes(this.showPagination) && Object.assign({}, this.localPagination, {
       current: localPageNum,
       pageSize: this.pageSize,
@@ -176,12 +203,23 @@ export default {
       if (sorter && sorter.order) {
         this.sortOrder = sorter.order
       }
+
+      // 确定 pageSize
+      let finalPageSize = this.pageSize
+      if (this.showPagination === false) {
+        // 当 showPagination 为 false 时，优先使用传入的 pageSize
+        finalPageSize = pagination?.pageSize || this.pageSize
+      } else if (pagination && pagination.pageSize) {
+        finalPageSize = pagination.pageSize
+      } else if (this.localPagination && this.localPagination.pageSize) {
+        finalPageSize = this.localPagination.pageSize
+      }
+
       const parameter = Object.assign({
           querySummary: !pagination && this.showSummary, // 分页查询的情况不重新获取汇总数据
           pageNo: (pagination && pagination.current) ||
             this.showPagination && this.localPagination.current || this.pageNum,
-          pageSize: (pagination && pagination.pageSize) ||
-            this.showPagination && this.localPagination.pageSize || this.pageSize
+          pageSize: finalPageSize
         },
         (this.sortField && { sortField: this.sortField }) || {},
         (this.sortOrder && { sortOrder: this.sortOrder }) || {},
@@ -208,7 +246,7 @@ export default {
             current: r.pageNo, // 返回结果中的当前分页数
             total: r.totalCount, // 返回结果中的总记录数
             showSizeChanger: this.showSizeChanger,
-            pageSize: (pagination && pagination.pageSize) || this.localPagination.pageSize
+            pageSize: finalPageSize
           }) || false
           // 为防止删除数据后导致页面当前页面数据长度为 0 ,自动翻页到上一页
           if (r.data.length === 0 && this.showPagination && this.localPagination.current > 1) {
@@ -437,7 +475,6 @@ export default {
         {Object.keys(this.$slots).map(name => (<template slot={name}>{this.$slots[name]}</template>))}
       </a-table>
     )
-
     return (
       <div class="table-wrapper">
         {showAlert && this.showSelected && this.selectRowMode === 'default' ? this.renderAlert() : null}

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -6,7 +6,7 @@ export default {
   components: { WorkflowDetail },
   mounted () {
     this.$refs.workFlow.init({
-      workflowId: '5'
+      workflowId: '1'
     })
   },
   methods: {