From a9b02f6862522b54d0824152017bf2acfec2af7b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 三月 2024 10:29:50 +0800
Subject: [PATCH] 2024-03-21

---
 src/tabviews/custom/components/table/edit-table/index.jsx |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 6cc0650..14776ec 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -113,10 +113,6 @@
             item.type = 'text'
           }
 
-          if (item.marks && item.marks.length === 0) {
-            item.marks = ''
-          }
-
           if (item.editable === 'true') {
             setting.hasSubmit = setting.commit !== 'change'
             item.$ctrl = setting.commit === 'change'
@@ -275,9 +271,12 @@
       this.setState({
         data: [],
         selectedData: [],
+        loading: false,
         total: 0
       })
       reset && MKEmitter.emit('resetTable', config.uuid, 'true') // 鍒楄〃閲嶇疆
+
+      this.requestId = ''
       return
     }
 
@@ -303,8 +302,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
+      
       reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
 
       let start = 1
@@ -588,9 +591,11 @@
         BID: id,
         BData: data
       }, () => {
-        setTimeout(() => {
-          this.loadmaindata(true, 'true')
-        }, setting.delay || 0)
+        if (!setting.checkBid) {
+          setTimeout(() => {
+            this.loadmaindata(true, 'true')
+          }, setting.delay || 0)
+        }
       })
     }
   }

--
Gitblit v1.8.0