From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/share/actioncomponent/actionform/index.jsx |   44 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index a9d4429..77ac27d 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -161,6 +161,8 @@
     let reRequired = {}
     let reReadonly = {}
 
+    reTooltip.interface = ''
+    reTooltip.proInterface = '姝ｅ紡绯荤粺鎵�浣跨敤鐨勬帴鍙ｅ湴鍧�銆�'
     if (['pop', 'prompt', 'exec'].includes(openType)) {
       let intertype = this.record.intertype
 
@@ -183,6 +185,8 @@
         }
         reReadonly.interface = false
         reRequired.interface = true
+        reTooltip.interface = `鍙娇鐢ㄥ彉閲廆mywebsite@ (鍩熷悕+铏氭嫙鐩綍)銆丂mydomain@ (鍩熷悕)锛屽锛欯mywebsite@/webapi/dostars 浠ｈ〃 ${window.GLOB.baseurl}webapi/dostars銆俙
+        reTooltip.proInterface += reTooltip.interface
       } else if (intertype === 'outer') {
         shows.push('procMode', 'sysInterface', 'outerFunc', 'callbackType')
         if (this.record.procMode === 'system') {
@@ -226,9 +230,15 @@
 
       if (Ot === 'required') {
         shows.push('progress')
+        if (intertype === 'inner' || intertype === 'system') {
+          shows.push('execType')
+          if (this.record.execType === 'single') {
+            shows.push('execInterval')
+          }
+        }
       }
-      if (Ot === 'required' && (intertype === 'inner' || intertype === 'system')) {
-        shows.push('execType')
+      if (intertype === 'outer' || intertype === 'custom') {
+        shows.push('execInterval')
       }
       if (this.record.openmenu && this.record.openmenu !== 'goback') {
         shows.push('open')
@@ -251,7 +261,7 @@
       if (openType === 'pop') {
         shows.push('extBtn')
         if (this.record.extBtn === 'true') {
-          shows.push('extLabel', 'extValue')
+          shows.push('extLabel', 'extStyle', 'confLabel', 'confStyle', 'extValue')
         }
       }
     } else if (openType === 'form') {
@@ -495,6 +505,9 @@
         shows.push('execSuccess', 'execError', 'tipTitle')
       } else if (_funcType === 'mkUnsubscribe' || _funcType === 'reAuth') {
         shows.push('tipTitle')
+      } else if (_funcType === 'reSystem') {
+        shows.push('tipTitle', 'Ot')
+        reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
       } else if (_funcType === 'closetab') {
         shows.push('refreshTab')
       } else if (_funcType === 'scan') {
@@ -616,6 +629,10 @@
       if (['pop', 'prompt', 'exec', 'popview', 'tab', 'innerpage'].includes(openType)) {
         shows.push('showName')
       }
+    }
+
+    if (shows.includes('refreshTab') && this.record.refreshTab && this.record.refreshTab.length) {
+      shows.push('urlPar')
     }
 
     return {
@@ -741,6 +758,10 @@
             _fieldval.color = 'primary'
           }
         }
+        this.record.resetPageIndex = 'false'
+        if ([this.record.execSuccess, this.record.execError].includes('grid')) {
+          _fieldval.resetPageIndex = 'false'
+        }
       } else if (value === 'audit') {
         _fieldval.label = '瀹℃牳'
         _fieldval.Ot = 'required'
@@ -756,6 +777,10 @@
           _fieldval.class = 'danger'
         } else {
           _fieldval.color = 'danger'
+        }
+        this.record.resetPageIndex = 'true'
+        if ([this.record.execSuccess, this.record.execError].includes('grid')) {
+          _fieldval.resetPageIndex = 'true'
         }
       } else if (value === 'custom') {
         _fieldval.Ot = 'required'
@@ -1272,6 +1297,19 @@
             delete values.extraParam
           }
 
+          if (values.refreshTab && values.refreshTab.length && ['pop', 'prompt', 'exec'].includes(values.OpenType) && window.GLOB.customMenu) {
+            let id = values.refreshTab[values.refreshTab.length - 1]
+            if (id === window.GLOB.customMenu.uuid) {
+              if (values.execSuccess !== 'never' || (values.syncComponent && values.syncComponent.length)) {
+                notification.warning({
+                  top: 92,
+                  message: '鎸夐挳鍒锋柊鑿滃崟涓哄綋鍓嶈彍鍗曟椂锛屾垚鍔熷悗鐨勭粍浠跺埛鏂帮紙鎴栧叧闂爣绛撅級灏嗗け鏁�!',
+                  duration: 5
+                })
+              }
+            }
+          }
+
           resolve(values)
         } else {
           reject(err)

--
Gitblit v1.8.0