From 131bc212f0cfe964c9a38bbe6178aca4f4a16677 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:50:30 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index df7f722..6ae8f77 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -170,6 +170,9 @@
pageOptions.push(size)
pageOptions = pageOptions.sort((a, b) => a - b)
}
+ if (_config.wrap.maxPageSize) {
+ pageOptions = pageOptions.filter(item => item <= _config.wrap.maxPageSize)
+ }
}
if (_config.wrap.zHeight) {
@@ -543,7 +546,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