From 1bec8d69cf14bd88591eee5b0320c5c8f6c25a08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 三月 2024 21:19:31 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/base-table/index.jsx | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index 7c86fca..ec29c8f 100644
--- a/src/tabviews/custom/components/table/base-table/index.jsx
+++ b/src/tabviews/custom/components/table/base-table/index.jsx
@@ -104,6 +104,7 @@
this.setState({
data: [],
selectedData: [],
+ loading: false,
total: 0
})
@@ -112,6 +113,8 @@
if (setting.$hasSyncModule) {
MKEmitter.emit('syncBalconyData', config.uuid, [], false)
}
+
+ this.requestId = ''
return
}
@@ -137,8 +140,12 @@
let _orderBy = orderBy || setting.order
let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID)
- let result = await Api.genericInterface(param, setting.js_script)
+ this.requestId = config.uuid + new Date().getTime()
+
+ let result = await Api.genericInterface(param, setting.js_script, '', this.requestId)
if (result.status) {
+ if (result.$requestId && this.requestId !== result.$requestId) return
+
if (repage === 'false' && result.data && result.data.length === 0 && result.total > 0 && pageIndex > 1) {
let _pageIndex = Math.ceil(result.total / pageSize)
--
Gitblit v1.8.0