From fe1b8fd12f0cd2bd9530dbab1deb6b49611284a5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 28 十一月 2023 15:01:36 +0800
Subject: [PATCH] 2023-11-28

---
 src/tabviews/custom/index.jsx |   45 ++++++++++++---------------------------------
 1 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 89b981b..eee9fa8 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -772,48 +772,17 @@
       } else if (item.type === 'form') {
         item.subcards = item.subcards.map(group => {
           group.subButton.uuid = group.uuid
-          group.subButton.$menuId = group.uuid
-          group.subButton.$MenuID = this.props.MenuID
-          // group.subButton.$forbid = true // 涓嶅0鏄庢暟鎹簮鍙橀噺
           group.subButton.OpenType = 'formSubmit'
           group.subButton.execError = 'never'
-          group.subButton.logLabel = item.$menuname + '-' + group.subButton.label
-
           if (!group.subButton.Ot) {
             group.subButton.Ot = item.wrap.datatype === 'static' ? 'notRequired' : 'requiredSgl'
           }
 
-          if (item.$process) {
-            group.subButton.$process = true
-            group.subButton.$flowId = 'flow' + this.props.MenuID
-          }
+          group.subButton = this.resetButton(item, group.subButton)
 
-          if (item.$cache && item.$time) {
+          if (item.$cache && item.$time) { // 琛ㄥ崟缂撳瓨
             group.$cache = item.$cache
             group.$time = item.$time
-          }
-
-          group.subButton.syncComponentId = group.subButton.syncComponent ? (group.subButton.syncComponent.pop() || '') : ''
-
-          if (group.subButton.syncComponentId && group.subButton.syncComponentId === item.setting.supModule) {
-            group.subButton.syncComponentId = ''
-            if (group.subButton.execSuccess === 'grid') {
-              group.subButton.execSuccess = 'mainline'
-            }
-          }
-
-          if (group.subButton.verify && group.subButton.verify.invalid === 'true') {
-            if (item.wrap.datatype === 'static' || item.wrap.datatype === 'public') {
-              group.subButton.verify.invalid = 'false'
-            } else if (item.setting && item.setting.maxScript && item.setting.maxScript >= 300) {
-              group.subButton.verify.invalid = 'false'
-            } else if (group.subButton.sqlType === 'insert') {
-              group.subButton.verify.invalid = 'false'
-            } else if (group.subButton.Ot === 'notRequired') {
-              group.subButton.verify.invalid = 'false'
-            } else if (group.subButton.intertype !== 'system' && group.subButton.procMode !== 'system') {
-              group.subButton.verify.invalid = 'false'
-            }
           }
 
           group.fields = group.fields.map(cell => {
@@ -945,6 +914,16 @@
       }
     }
 
+    if (cell.verify && cell.verify.preHandle === 'true') {
+      try {
+        // eslint-disable-next-line
+        let func = new Function('btn', 'systemType', cell.verify.pre_func)
+        func(cell, window.GLOB.systemType)
+      } catch (e) {
+        console.warn(e)
+      }
+    }
+
     if (cell.syncComponentId) {
       if (cell.syncComponentId === item.setting.supModule) {
         cell.syncComponentId = ''

--
Gitblit v1.8.0