From cc810edac6aec3c858fb352091ad8c11332447a5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 10 十二月 2023 19:12:53 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/custom/components/share/normalTable/index.jsx |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 840b824..01eacd8 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -499,10 +499,6 @@
             } else if (_format && !Math.floor(Math.random() * radio)) {
               item.blur = true
             }
-    
-            if (item.marks && item.marks.length === 0) {
-              item.marks = ''
-            }
   
             if (item.field) {
               orderfields[item.uuid] = item.field
@@ -838,6 +834,8 @@
   onSelectChange = (selectedRowKeys, e) => {
     const { setting, MenuID, data } = this.props
 
+    if (this.state.pickup) return
+
     let index = ''
     let _activeIndex = null
     if (selectedRowKeys.length > 0) {

--
Gitblit v1.8.0