From 34e7681fd12b1c4e4994d3bea1a553870e10bc50 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期六, 11 三月 2023 17:58:54 +0800 Subject: [PATCH] 2023-03-11 --- src/menu/components/share/actioncomponent/actionform/index.jsx | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx index 5c0a14c..30473b8 100644 --- a/src/menu/components/share/actioncomponent/actionform/index.jsx +++ b/src/menu/components/share/actioncomponent/actionform/index.jsx @@ -17,7 +17,7 @@ prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden'], exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hidden'], excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'width', 'hidden'], - excelOut: ['label', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'pagination', 'search', 'width', 'hidden'], + excelOut: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'pagination', 'search', 'width', 'hidden'], popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'popClose', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'maskStyle', 'closeButton', 'hidden'], tab: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'linkmenu', 'width', 'hidden'], innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'], @@ -214,6 +214,9 @@ if (Ot === 'required') { shows.push('progress') } + if (Ot === 'required' && (intertype === 'inner' || intertype === 'system')) { + shows.push('execType') + } if (this.record.openmenu && this.record.openmenu !== 'goback') { shows.push('open') } @@ -240,6 +243,8 @@ if (this.record.formType === 'switch') { shows.push('field', 'size', 'openVal', 'closeVal', 'openText', 'closeText') + } else if (this.record.formType === 'counter') { + shows.push('field', 'size', 'min', 'max', 'decimal') } else if (this.record.formType === 'radio') { shows.push('field', 'checkType', 'openVal', 'closeVal') } else { @@ -328,6 +333,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', 'outerFunc') @@ -352,6 +358,9 @@ } if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') { shows.push('resetPageIndex') + } + 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)) @@ -430,7 +439,7 @@ } else if (_funcType === 'closetab') { shows.push('refreshTab') } else if (_funcType === 'scan') { - shows.push('linkmenu') + shows.push('linkmenu', 'prefix') reRequired.linkmenu = false reTooltip.linkmenu = '浣跨敤鎵爜鐧诲綍鍔熻兘鎴栬彍鍗曡烦杞姛鑳芥椂锛岄渶閫夋嫨璺宠浆鐨勮彍鍗曘��' @@ -466,7 +475,7 @@ } if (appType === 'mob') { - if (Ot !== 'notRequired') { + if (Ot !== 'notRequired' && openType !== 'excelOut') { shows.push('control') reOptions.control = [ { value: '', text: '鏃�' }, @@ -481,7 +490,7 @@ } } } else { - if (Ot !== 'notRequired') { + if (Ot !== 'notRequired' && openType !== 'excelOut') { reOptions.control = [ { value: '', text: '鏃�' }, { value: 'disabled', text: '绂佺敤' }, @@ -566,7 +575,8 @@ _fieldval.label = '瀵煎嚭Excel' _fieldval.class = 'dgreen' _fieldval.execSuccess = 'never' - this.record.Ot = 'notRequired' + _fieldval.Ot = 'requiredOnce' + this.record.Ot = 'requiredOnce' this.record.label = '瀵煎嚭Excel' this.record.class = 'dgreen' this.record.execSuccess = 'never' @@ -791,6 +801,7 @@ content = <Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} /> } else if (item.type === 'number') { + initVal = item.initVal || item.initVal === 0 ? item.initVal : '' rules = [ { required: item.required, message: '璇疯緭鍏�' + item.label + '!' } ] @@ -930,7 +941,7 @@ values.icon = 'scan' } } else if (values.OpenType === 'excelOut') { - values.Ot = 'notRequired' + values.Ot = values.Ot || 'notRequired' } else if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.verify) { if ((values.Ot === 'requiredOnce' || card.Ot === 'requiredOnce') && card.Ot !== values.Ot) { values.verify.uniques = [] -- Gitblit v1.8.0