From 2dadcbe39d6211bb08139cd600d6b8c9ca92d508 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 二月 2024 20:44:30 +0800
Subject: [PATCH] 2024-02-28

---
 src/tabviews/custom/components/table/base-table/index.jsx |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index 2cc683f..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
       })
       
@@ -139,13 +140,11 @@
     let _orderBy = orderBy || setting.order
     let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID)
 
-    if (param.func === 'sPC_Get_TableData') {
-      this.requestId = param.timestamp
-    }
+    this.requestId = config.uuid + new Date().getTime()
 
-    let result = await Api.genericInterface(param, setting.js_script)
+    let result = await Api.genericInterface(param, setting.js_script, '', this.requestId)
     if (result.status) {
-      if (result.timestamp_back && this.requestId !== result.timestamp_back) return
+      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