From 3c6862fdfc6af3ae176436d2e22f1b7f8bcc8479 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 07 六月 2023 17:55:07 +0800
Subject: [PATCH] 2023-06-07

---
 src/tabviews/custom/components/table/normal-table/index.jsx |   35 +++++++++++------------------------
 1 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 5788718..ca20ae8 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -112,7 +112,7 @@
         }
 
         if (setting.controlField) {
-          if (setting.controlVal.includes(item[setting.controlField])) {
+          if (setting.controlVal.includes(item[setting.controlField] + '')) {
             item.$disabled = true
           }
         }
@@ -273,7 +273,7 @@
         }
 
         if (setting.controlField) {
-          if (setting.controlVal.includes(item[setting.controlField])) {
+          if (setting.controlVal.includes(item[setting.controlField] + '')) {
             item.$disabled = true
           }
         }
@@ -475,26 +475,13 @@
    * 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
    */
   refreshbysearch = (searches) => {
-    const { setting } = this.state
-
-    if (setting.onload === 'false') {
-      this.setState({
-        pageIndex: 1,
-        search: searches,
-        setting: {...setting, onload: 'true'}
-      }, () => {
-        this.loadmaindata()
-        this.getStatFieldsValue()
-      })
-    } else {
-      this.setState({
-        pageIndex: 1,
-        search: searches
-      }, () => {
-        this.loadmaindata(true, 'true')
-        this.getStatFieldsValue()
-      })
-    }
+    this.setState({
+      pageIndex: 1,
+      search: searches
+    }, () => {
+      this.loadmaindata(true, 'true')
+      this.getStatFieldsValue()
+    })
   }
 
   /**
@@ -643,7 +630,7 @@
           }
 
           if (setting.controlField) {
-            if (setting.controlVal.includes(item[setting.controlField])) {
+            if (setting.controlVal.includes(item[setting.controlField] + '')) {
               item.$disabled = true
             }
           }
@@ -714,7 +701,7 @@
           }
 
           if (setting.controlField) {
-            if (setting.controlVal.includes(item[setting.controlField])) {
+            if (setting.controlVal.includes(item[setting.controlField] + '')) {
               item.$disabled = true
             }
           }

--
Gitblit v1.8.0