From 8acfcd6e349ef2d1b797a7483940a2f3f2dfcfe6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:49:25 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/custom/components/card/data-card/index.jsx |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 4315f80..1955b65 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -154,6 +154,10 @@
         pageOptions.push(size)
         pageOptions = pageOptions.sort((a, b) => a - b)
       }
+
+      if (_config.wrap.maxPageSize) {
+        pageOptions = pageOptions.filter(item => item <= _config.wrap.maxPageSize)
+      }
     }
 
     let _data = []
@@ -701,7 +705,9 @@
       if (!config.setting.supModule || config.setting.supModule !== MenuID) return
       if (id !== this.state.BID || id !== '') {
         this.setState({ BID: id, BData: data, pageIndex: 1 }, () => {
-          this.loadData()
+          if (!config.checkBid) {
+            this.loadData()
+          }
         })
       }
     }

--
Gitblit v1.8.0