From 3e8e31324cbd53134e8fe483c9a6de137ade41c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 01 八月 2024 15:38:42 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/custom/components/table/base-table/index.jsx |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index 045bf64..b02d9ae 100644
--- a/src/tabviews/custom/components/table/base-table/index.jsx
+++ b/src/tabviews/custom/components/table/base-table/index.jsx
@@ -288,6 +288,12 @@
         _data.$$BID = BID || ''
         _data.$$BData = BData || ''
 
+        if (setting.controlField) {
+          if (setting.controlVal.includes(_data[setting.controlField] + '')) {
+            _data.$disabled = true
+          }
+        }
+
         if (config.absFields) {
           config.absFields.forEach(f => {
             if (!isNaN(_data[f])) {
@@ -597,9 +603,7 @@
 
     if (config.$searchId !== searchId) return
     
-    this.setState({pageIndex: 1}, () => {
-      this.reloadtable()
-    })
+    this.reloadtable()
   }
 
   autoExec = (times) => {

--
Gitblit v1.8.0