From 71e3da644eca32a5aa40503e903efb0640748093 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 七月 2023 17:00:59 +0800
Subject: [PATCH] 2023-07-21

---
 src/tabviews/subtabtable/index.jsx |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index b491e57..dfaae0f 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -50,7 +50,6 @@
     statFields: [],       // 鍚堣瀛楁
     statFValue: [],       // 鍚堣鍊�
     absFields: [],        // 缁濆鍊煎瓧娈�
-    hasReqFields: false
   }
 
   /**
@@ -126,14 +125,7 @@
       // 鏉冮檺杩囨护
       config.action = config.action.filter(item => item.hidden !== 'true')
 
-      config.search = Utils.initSearchVal(config.search)
-
-      let hasReqFields = false
-      config.search.forEach(field => {
-        if (field.required) {
-          hasReqFields = true
-        }
-      })
+      Utils.initSearchVal(config)
 
       // 瀛楁鏉冮檺榛戝悕鍗�
       let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
@@ -259,10 +251,8 @@
         }
   
         if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
-          config.setting.dataresource = config.setting.dataresource.replace(/\$@/ig, '/*')
-          config.setting.dataresource = config.setting.dataresource.replace(/@\$/ig, '*/')
-          config.setting.customScript = config.setting.customScript.replace(/\$@/ig, '/*')
-          config.setting.customScript = config.setting.customScript.replace(/@\$/ig, '*/')
+          config.setting.dataresource = config.setting.dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/')
+          config.setting.customScript = config.setting.customScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/')
         } else {
           config.setting.dataresource = config.setting.dataresource.replace(/@\$|\$@/ig, '')
           config.setting.customScript = config.setting.customScript.replace(/@\$|\$@/ig, '')
@@ -327,7 +317,6 @@
         columns: _columns,
         arr_field: _arrField.join(','),
         search: Utils.initMainSearch(config.search), // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
-        hasReqFields
       }, () => {
         if (config.setting.onload !== 'false') { // 鍒濆鍖栧彲鍔犺浇
           this.loadData()
@@ -347,11 +336,11 @@
   }
 
   loadData = (id) => {
-    const { setting, search, hasReqFields } = this.state
+    const { setting, search, config } = this.state
 
     let searches = fromJS(search).toJS()
 
-    if (hasReqFields) {
+    if (config.$s_req) {
       let requireFields = searches.filter(item => item.required && item.value === '')
       if (requireFields.length > 0) {
         this.setState({

--
Gitblit v1.8.0