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/normal-table/index.jsx | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 676488a..92c7018 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -390,6 +390,7 @@
this.setState({
data: [],
selectedData: [],
+ loading: false,
total: 0
})
@@ -400,6 +401,7 @@
}
this.loaded = true
+ this.requestId = ''
return
}
@@ -427,8 +429,12 @@
let _orderBy = orderBy || setting.order
let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID)
- let result = await Api.genericInterface(param)
+ this.requestId = config.uuid + new Date().getTime()
+
+ let result = await Api.genericInterface(param, '', '', this.requestId)
if (result.status) {
+ if (result.$requestId && this.requestId !== result.$requestId) return
+
this.loaded = true
if (config.$cache && type === 'init') {
Api.writeCacheConfig(config.uuid, result.data || [], BID)
--
Gitblit v1.8.0