From e469a34f26637e177854b960bbd35c900ce0daff Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 30 一月 2023 15:50:34 +0800
Subject: [PATCH] 2023-01-30

---
 src/templates/sharecomponent/actioncomponent/actionform/index.jsx |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index eaefc28..13bf576 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -18,7 +18,7 @@
   prompt: ['label', 'position', 'OpenType', 'intertype', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'openmenu', 'output', 'tipTitle', 'hidden'],
   exec: ['label', 'position', 'OpenType', 'intertype', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'openmenu', 'output', 'hidden'],
   excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'icon', 'class', 'sheet', 'execSuccess', 'execError', 'hidden'],
-  excelOut: ['label', 'OpenType', 'intertype', 'icon', 'class', 'execSuccess', 'execError', 'pagination', 'search', 'hidden'],
+  excelOut: ['label', 'Ot', 'OpenType', 'intertype', 'icon', 'class', 'execSuccess', 'execError', 'pagination', 'search', 'hidden'],
   popview: ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabType', 'linkTab', 'popClose', 'display', 'ratio', 'clickouter', 'hidden'],
   tab: ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'linkmenu', 'hidden'],
   innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class', 'position', 'hidden'],
@@ -232,6 +232,7 @@
       }
     } else if (openType === 'excelOut') {
       reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
+      reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredOnce'].includes(op.value))
 
       if (this.record.intertype === 'outer') {
         shows.push('innerFunc', 'sysInterface', 'interface', 'outerFunc')
@@ -249,6 +250,9 @@
       } else if (this.record.intertype === 'inner') {
         shows.push('innerFunc')
         reRequired.innerFunc = true
+      }
+      if (this.record.Ot !== 'notRequired' && this.record.Ot !== 'requiredOnce') {
+        this.record.Ot = 'notRequired'
       }
     } else if (openType === 'popview') {
       reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
@@ -317,7 +321,7 @@
       reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
     }
     
-    if (Ot !== 'notRequired') {
+    if (Ot !== 'notRequired' && openType !== 'excelOut') {
       reOptions.control = [
         { value: '', text: '鏃�' },
         { value: 'disabled', text: '绂佺敤' },
@@ -387,6 +391,7 @@
         _fieldval.label = '瀵煎嚭Excel'
         _fieldval.class = 'dgreen'
         _fieldval.execSuccess = 'never'
+        _fieldval.Ot = 'notRequired'
         this.record.Ot = 'notRequired'
         this.record.label = '瀵煎嚭Excel'
         this.record.class = 'dgreen'
@@ -683,7 +688,7 @@
           values.position = values.position || 'toolbar'
 
           if (values.OpenType === 'excelOut') {
-            values.Ot = 'notRequired'
+            values.Ot = values.Ot || 'notRequired'
           } else if (values.OpenType === 'popview' && !values.linkTab) { // 娌℃湁鍏宠仈鏍囩锛堟柊寤烘椂锛夛紝鍒涘缓鏂版爣绛綢d
             values.linkTab = Utils.getuuid()
           } else if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.verify) {

--
Gitblit v1.8.0