From b8cde0c39d7b6d58ceff3adf6dea3cb3118ea602 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 13 九月 2022 14:46:15 +0800 Subject: [PATCH] 2022-09-13 --- src/menu/components/share/actioncomponent/actionform/index.jsx | 66 ++++++++++++++++++++++++++------ 1 files changed, 53 insertions(+), 13 deletions(-) diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx index 2cfa4c0..a6125a5 100644 --- a/src/menu/components/share/actioncomponent/actionform/index.jsx +++ b/src/menu/components/share/actioncomponent/actionform/index.jsx @@ -61,13 +61,13 @@ }], interTypeOptions: [{ value: 'system', - text: this.props.dict['model.interface.system'] + text: '绯荤粺' }, { value: 'inner', - text: this.props.dict['model.interface.inner'] + text: '鍐呴儴' }, { value: 'outer', - text: this.props.dict['model.interface.outer'] + text: '澶栭儴' }, { value: 'custom', text: '鑷畾涔�' @@ -163,22 +163,39 @@ reOptions.intertype = this.state.interTypeOptions if (intertype === 'custom') { - shows.push('procMode', 'interface', 'callbackType', 'cbTable', 'proInterface', 'method', 'cross') + shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross') if (this.record.procMode === 'system') { shows.push('sql', 'sqlType') - } else { + } else if (this.record.procMode === 'inner') { reRequired.innerFunc = true shows.push('innerFunc') + } + if (this.record.callbackType === 'func') { + shows.push('callbackFunc') + } else if (this.record.callbackType !== 'none') { + shows.push('cbTable') } reReadonly.interface = false reRequired.interface = true } else if (intertype === 'outer') { - shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc', 'output') - reRequired.innerFunc = false + shows.push('procMode', 'sysInterface', 'interface', 'outerFunc', 'callbackType', 'output') + if (this.record.procMode === 'system') { + shows.push('sql', 'sqlType') + } else if (this.record.procMode === 'inner') { + reRequired.innerFunc = true + shows.push('innerFunc') + } + if (this.record.callbackType === 'func') { + shows.push('callbackFunc') + } else if (this.record.callbackType !== 'none') { + shows.push('cbTable') + } if (this.record.sysInterface === 'false') { reReadonly.interface = false reRequired.interface = true + + shows.push('proInterface') } else { reReadonly.interface = true reRequired.interface = false @@ -226,12 +243,24 @@ reOptions.intertype = this.state.interTypeOptions.filter(item => item.value !== 'custom') if (intertype === 'outer') { - shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc') - reRequired.innerFunc = false + shows.push('procMode', 'sysInterface', 'interface', 'outerFunc', 'callbackType') + if (this.record.procMode === 'system') { + shows.push('sql', 'sqlType') + } else if (this.record.procMode === 'inner') { + reRequired.innerFunc = true + shows.push('innerFunc') + } + if (this.record.callbackType === 'func') { + shows.push('callbackFunc') + } else if (this.record.callbackType !== 'none') { + shows.push('cbTable') + } if (this.record.sysInterface === 'false') { reReadonly.interface = false reRequired.interface = true + + shows.push('proInterface') } else { reReadonly.interface = true reRequired.interface = false @@ -263,12 +292,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 @@ -284,12 +316,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 @@ -344,12 +378,15 @@ if (_funcType === 'print') { shows.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError') 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 @@ -391,6 +428,9 @@ shows.push('innerFunc', 'Ot', 'execSuccess', 'execError', 'urlkey') } else if (_funcType === 'pay') { shows.push('payType', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu') + reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value)) + } else if (_funcType === 'refund') { + shows.push('Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu') reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value)) } } @@ -695,7 +735,7 @@ { max: formRule.func.max, message: formRule.func.maxMessage } ) } else if (item.key === 'output') { - if (this.record.intertype === 'system') { + if (this.record.intertype === 'system' || ((this.record.intertype === 'outer' || this.record.intertype === 'custom') && this.record.callbackType === 'script')) { rules = [{ pattern: /^@[0-9a-zA-Z_]+@?$/, message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯' -- Gitblit v1.8.0