From 76c4adc98ef8e7a3ea0f44d608363e3c0ddacf9b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 03 七月 2024 18:01:35 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 a5fd92e..a3c0682 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -374,14 +374,20 @@
let supModule = config.setting.supModule
if (position === 'line' || position === 'line_grid') {
- if (lines && lines.length === 1) {
+ if (lines && lines.length === 1 && !config.forbidLine) {
this.loadLinedata(lines[0].$$parentId || lines[0].$$uuid, position)
+ } else if (btn.resetPageIndex !== 'false') {
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadData(id)
+ })
} else {
this.loadData(id)
}
} else if (['mainline', 'maingrid', 'popclose'].includes(position) && supModule) {
MKEmitter.emit('reloadData', supModule, position === 'maingrid' ? '' : BID)
- } else if (!btn || btn.resetPageIndex !== 'false') {
+ } else if (btn.resetPageIndex !== 'false') {
this.setState({
pageIndex: 1
}, () => {
--
Gitblit v1.8.0