From bdfec44c9f3a37dbbe05bf14a252ffec04132a86 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 06 九月 2022 21:24:28 +0800 Subject: [PATCH] Merge branch 'develop' --- src/templates/sharecomponent/actioncomponent/actionform/index.jsx | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx index 0a94c8d..c034b51 100644 --- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx +++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx @@ -164,7 +164,7 @@ reReadonly.interface = false reRequired.interface = true } else if (intertype === 'outer') { - shows.push('procMode', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackType', 'output') + shows.push('procMode', 'sysInterface', 'interface', 'outerFunc', 'callbackType', 'output') // reRequired.innerFunc = false if (this.record.procMode === 'system') { shows.push('sql', 'sqlType') @@ -181,6 +181,8 @@ if (this.record.sysInterface === 'false') { reReadonly.interface = false reRequired.interface = true + + shows.push('proInterface') } else { reReadonly.interface = true reRequired.interface = false @@ -212,13 +214,15 @@ reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value)) if (this.record.intertype === 'outer') { - shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc') + shows.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc') reRequired.innerFunc = false reRequired.callbackFunc = false if (this.record.sysInterface === 'false') { reReadonly.interface = false reRequired.interface = true + + shows.push('proInterface') } else { reReadonly.interface = true reRequired.interface = false @@ -231,12 +235,14 @@ reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom') if (this.record.intertype === 'outer') { - shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc') + shows.push('innerFunc', 'sysInterface', 'interface', 'outerFunc') reRequired.innerFunc = false if (this.record.sysInterface === 'false') { reReadonly.interface = false reRequired.interface = true + + shows.push('proInterface') } else { reReadonly.interface = true reRequired.interface = false @@ -275,13 +281,15 @@ if (_funcType === 'print') { shows.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError', 'resetPageIndex') if (this.record.intertype === 'outer') { - shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc') + shows.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc') reRequired.innerFunc = false reRequired.callbackFunc = false if (this.record.sysInterface === 'false') { reReadonly.interface = false reRequired.interface = true + + shows.push('proInterface') } else { reReadonly.interface = true reRequired.interface = false @@ -294,6 +302,10 @@ shows.push('refreshTab') } else if (_funcType === 'megvii') { shows.push('subFunc', 'progress') + } else if (_funcType === 'refund') { + shows.push('Ot', 'execSuccess', 'execError') + + reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl') } else if (_funcType === 'filezip') { reOptions.Ot = requireOptions reRequired.innerFunc = false -- Gitblit v1.8.0