From f07c42a322f41e14ef5b1bf8f2fd66fc5d338cdd Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 28 六月 2023 18:17:09 +0800 Subject: [PATCH] 2023-06-28 --- src/menu/components/share/actioncomponent/actionform/index.jsx | 235 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 184 insertions(+), 51 deletions(-) diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx index e01e193..bd8ddb5 100644 --- a/src/menu/components/share/actioncomponent/actionform/index.jsx +++ b/src/menu/components/share/actioncomponent/actionform/index.jsx @@ -6,19 +6,21 @@ import { formRule } from '@/utils/option.js' import asyncComponent from '@/utils/asyncComponent' +import KeyInterface from '@/components/keyInterface' import './index.scss' const { TextArea } = Input const { Paragraph } = Typography const MkEditIcon = asyncComponent(() => import('@/components/mkIcon')) +const MKTable = asyncComponent(() => import('@/components/normalform/modalform/mkTable')) const acTyOptions = { pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden'], 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'], - popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'popClose', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'hidden'], - tab: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'linkmenu', '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', 'openTab'], innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'], funcbutton: ['label', 'OpenType', 'funcType', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'], form: ['label', 'OpenType', 'formType', 'intertype', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'width', 'refreshTab', 'title', 'hidden'] @@ -91,6 +93,8 @@ let hasclass = true this.props.formlist.forEach(item => { + if (!item.key) return + this.record[item.key] = item.initVal if (item.key === 'class') { @@ -162,7 +166,7 @@ reOptions.intertype = this.state.interTypeOptions if (intertype === 'custom') { - shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross') + shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify') if (this.record.procMode === 'system') { shows.push('sql', 'sqlType') } else if (this.record.procMode === 'inner') { @@ -177,7 +181,7 @@ reReadonly.interface = false reRequired.interface = true } else if (intertype === 'outer') { - shows.push('procMode', 'sysInterface', 'interface', 'outerFunc', 'callbackType', 'output') + shows.push('procMode', 'sysInterface', 'outerFunc', 'callbackType', 'output') if (this.record.procMode === 'system') { shows.push('sql', 'sqlType') } else if (this.record.procMode === 'inner') { @@ -190,17 +194,26 @@ shows.push('cbTable') } + reRequired.outerFunc = false if (this.record.sysInterface === 'false') { reReadonly.interface = false reRequired.interface = true - shows.push('proInterface') - } else { + shows.push('interface', 'proInterface') + } else if (this.record.sysInterface === 'true') { reReadonly.interface = true reRequired.interface = false + reRequired.outerFunc = true + + shows.push('interface') + } else if (this.record.sysInterface === 'external') { + shows.push('exInterface', 'exProInterface') } } else if (intertype === 'inner') { shows.push('innerFunc', 'output') + if (Ot === 'requiredOnce') { // 鍓嶇疆鍑芥暟 + shows.push('preFunc') + } reRequired.innerFunc = true } else { shows.push('sql', 'sqlType', 'output') @@ -208,6 +221,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') @@ -235,8 +251,10 @@ if (this.record.formType === 'switch') { shows.push('field', 'size', 'openVal', 'closeVal', 'openText', 'closeText') + } else if (this.record.formType === 'counter' || this.record.formType === 'count_line') { + shows.push('field', 'size', 'min', 'max', 'decimal') } else if (this.record.formType === 'radio') { - shows.push('field', 'openVal', 'closeVal') + shows.push('field', 'checkType', 'openVal', 'closeVal') } else { shows.push('field') } @@ -244,7 +262,7 @@ reOptions.intertype = this.state.interTypeOptions.filter(item => item.value !== 'custom') if (intertype === 'outer') { - shows.push('procMode', 'sysInterface', 'interface', 'outerFunc', 'callbackType') + shows.push('procMode', 'sysInterface', 'outerFunc', 'callbackType') if (this.record.procMode === 'system') { shows.push('sql', 'sqlType') } else if (this.record.procMode === 'inner') { @@ -257,14 +275,20 @@ shows.push('cbTable') } + reRequired.outerFunc = false if (this.record.sysInterface === 'false') { reReadonly.interface = false reRequired.interface = true - shows.push('proInterface') - } else { + shows.push('interface', 'proInterface') + } else if (this.record.sysInterface === 'true') { reReadonly.interface = true reRequired.interface = false + reRequired.outerFunc = true + + shows.push('interface') + } else if (this.record.sysInterface === 'external') { + shows.push('exInterface', 'exProInterface') } } else if (intertype === 'inner') { shows.push('innerFunc') @@ -288,23 +312,34 @@ value: 'custom', text: '鑷畾涔�' }] + + if (this.record.formType === 'count_line') { + reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value)) + shows = shows.filter(op => ['label', 'OpenType', 'formType', 'Ot', 'width', 'title', 'hidden', 'field', 'size', 'min', 'max', 'decimal'].includes(op)) + } } else if (openType === 'excelIn') { reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom') reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value)) if (this.record.intertype === 'outer') { - shows.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc') + shows.push('innerFunc', 'sysInterface', 'outerFunc', 'callbackFunc') reRequired.innerFunc = false reRequired.callbackFunc = false + reRequired.outerFunc = false if (this.record.sysInterface === 'false') { reReadonly.interface = false reRequired.interface = true - shows.push('proInterface') - } else { + shows.push('interface', 'proInterface') + } else if (this.record.sysInterface === 'true') { reReadonly.interface = true reRequired.interface = false + reRequired.outerFunc = true + + shows.push('interface') + } else if (this.record.sysInterface === 'external') { + shows.push('exInterface', 'exProInterface') } } else if (this.record.intertype === 'inner') { shows.push('innerFunc') @@ -315,19 +350,26 @@ } } 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') + shows.push('innerFunc', 'sysInterface', 'outerFunc') reRequired.innerFunc = false + reRequired.outerFunc = false if (this.record.sysInterface === 'false') { reReadonly.interface = false reRequired.interface = true - shows.push('proInterface') - } else { + shows.push('interface', 'proInterface') + } else if (this.record.sysInterface === 'true') { reReadonly.interface = true reRequired.interface = false + reRequired.outerFunc = true + + shows.push('interface') + } else if (this.record.sysInterface === 'external') { + shows.push('exInterface', 'exProInterface') } } else if (this.record.intertype === 'inner') { shows.push('innerFunc') @@ -336,10 +378,15 @@ 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)) - if (this.record.display === 'drawer') { + if (appType === 'mob') { + shows.push('placement') + } else if (this.record.display === 'drawer') { shows.push('placement') } if (this.record.popClose === 'grid') { @@ -354,7 +401,7 @@ reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value)) if (this.record.pageTemplate === 'custom') { - shows.push('url', 'joint', 'open') + shows.push('url', 'proUrl', 'joint', 'open') } else if (this.record.pageTemplate === 'linkpage') { shows.push('linkmenu', 'open') @@ -379,18 +426,24 @@ if (_funcType === 'print') { shows.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError') if (this.record.intertype === 'outer') { - shows.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc') + shows.push('innerFunc', 'sysInterface', 'outerFunc', 'callbackFunc') reRequired.innerFunc = false reRequired.callbackFunc = false + reRequired.outerFunc = false if (this.record.sysInterface === 'false') { reReadonly.interface = false reRequired.interface = true - - shows.push('proInterface') - } else { + + shows.push('interface', 'proInterface') + } else if (this.record.sysInterface === 'true') { reReadonly.interface = true reRequired.interface = false + reRequired.outerFunc = true + + shows.push('interface') + } else if (this.record.sysInterface === 'external') { + shows.push('exInterface', 'exProInterface') } } else if (this.record.intertype === 'inner') { shows.push('innerFunc') @@ -399,12 +452,15 @@ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') { shows.push('resetPageIndex') } + if (this.record.execMode === 'pop' || this.record.execMode === 'prompt') { + shows.push('position') + } } else if (_funcType === 'mkBinding' || _funcType === 'mkUnBinding') { shows.push('execSuccess', 'execError') } else if (_funcType === 'closetab') { shows.push('refreshTab') } else if (_funcType === 'scan') { - shows.push('linkmenu') + shows.push('linkmenu', 'prefix') reRequired.linkmenu = false reTooltip.linkmenu = '浣跨敤鎵爜鐧诲綍鍔熻兘鎴栬彍鍗曡烦杞姛鑳芥椂锛岄渶閫夋嫨璺宠浆鐨勮彍鍗曘��' @@ -440,7 +496,7 @@ } if (appType === 'mob') { - if (Ot !== 'notRequired') { + if (Ot !== 'notRequired' && openType !== 'excelOut') { shows.push('control') reOptions.control = [ { value: '', text: '鏃�' }, @@ -455,7 +511,7 @@ } } } else { - if (Ot !== 'notRequired') { + if (Ot !== 'notRequired' && openType !== 'excelOut') { reOptions.control = [ { value: '', text: '鏃�' }, { value: 'disabled', text: '绂佺敤' }, @@ -480,6 +536,10 @@ if (this.record.control === 'disabled') { shows.push('reason') } + } + + if (shows.includes('syncComponent') && this.record.syncComponent[0] === 'multiComponent') { + shows.push('syncComponents') } if (this.record.show === 'icon') { @@ -517,7 +577,6 @@ this.record.pageTemplate = '' this.record.funcType = '' this.record.sqlType = '' - if (value === 'pop' || value === 'prompt' || value === 'exec') { _fieldval.intertype = 'system' _fieldval.sqlType = '' @@ -528,24 +587,25 @@ } else if (value === 'excelIn') { _fieldval.intertype = 'system' _fieldval.Ot = 'notRequired' - + _fieldval.execSuccess = 'grid' _fieldval.label = '瀵煎叆Excel' - _fieldval.class = 'dgreen' + _fieldval.class = 'border-dgreen' this.record.Ot = 'notRequired' this.record.label = '瀵煎叆Excel' - this.record.class = 'dgreen' - - + this.record.class = 'border-dgreen' + this.record.execSuccess = 'grid' } else if (value === 'excelOut') { _fieldval.intertype = 'system' _fieldval.label = '瀵煎嚭Excel' _fieldval.class = 'dgreen' _fieldval.execSuccess = 'never' - this.record.Ot = 'notRequired' + _fieldval.Ot = 'requiredOnce' + _fieldval.control = '' + this.record.Ot = 'requiredOnce' this.record.label = '瀵煎嚭Excel' this.record.class = 'dgreen' this.record.execSuccess = 'never' - + this.record.control = '' } else if (value === 'popview') { _fieldval.display = 'modal' _fieldval.Ot = 'requiredSgl' @@ -566,15 +626,6 @@ // _fieldval.funcType = '' } - if (value === 'excelIn') { - _fieldval.label = '瀵煎叆Excel' - _fieldval.class = 'dgreen' - } else if (value === 'excelOut') { - _fieldval.label = '瀵煎嚭Excel' - _fieldval.class = 'dgreen' - _fieldval.control = '' - this.record.control = '' - } if (appType !== 'mob' && _fieldval.Ot === 'notRequired') { this.record.control = '' @@ -582,6 +633,11 @@ } this.props.updRecord && this.props.updRecord(this.record) + } else if (key === 'formType') { + if (value === 'count_line') { + _fieldval.Ot = 'requiredSgl' + this.record.Ot = 'requiredSgl' + } } else if (key === 'funcType') { if (value === 'print') { _fieldval.label = '鎵撳嵃' @@ -734,10 +790,10 @@ ) } else if (item.key === 'sql' || item.key === 'sheet') { rules.push( - { pattern: /^[a-zA-Z_]+$/, message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝浠ュ強_' }, + { pattern: /^[a-zA-Z0-9@_]+$/, message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝銆佹暟瀛椾互鍙奯' }, { max: formRule.func.max, message: formRule.func.maxMessage } ) - } else if (item.key === 'outerFunc' || item.key === 'callbackFunc') { + } else if (item.key === 'outerFunc' || item.key === 'callbackFunc' || item.key === 'preFunc') { rules.push( { pattern: formRule.func.pattern, message: formRule.func.message }, { max: formRule.func.max, message: formRule.func.maxMessage } @@ -766,6 +822,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 + '!' } ] @@ -786,7 +843,7 @@ getPopupContainer={() => document.getElementById('winter')} > {item.options.map((option, index) => - <Select.Option key={index} extend={option[item.extendName] || ''} value={(option.value || option.field)}> + <Select.Option key={index} title={option.text || option.label} extend={option[item.extendName] || ''} value={(option.value || option.field)}> {(option.text || option.label)} </Select.Option> )} @@ -800,7 +857,7 @@ getPopupContainer={() => document.getElementById('winter')} > {item.options.map((option, index) => - <Select.Option key={index} value={(option.value || option.field)}> + <Select.Option key={index} title={option.text || option.label} value={(option.value || option.field)}> {(option.text || option.label)} </Select.Option> )} @@ -828,7 +885,14 @@ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' } ] - content = <Cascader options={item.options || []} expandTrigger="hover" placeholder=""/> + content = <Cascader onChange={(value) => {this.optionChange(item.key, value)}} options={item.options || []} expandTrigger="hover" placeholder=""/> + } else if (item.type === 'table') { + span = 24 + className = 'textarea' + rules = [ + { required: item.required, message: '璇锋坊鍔�' + item.label + '!' } + ] + content = (<MKTable tip={''} columns={item.columns || []} actions={[]}/>) } else if (item.type === 'icon') { rules = [ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' } @@ -842,7 +906,22 @@ { required: item.readonly ? false : item.required, message: '璇疯緭鍏�' + item.label + '!' } ] + if (item.key === 'url' || item.key === 'proUrl') { + rules.push({ + pattern: /^[^\s]*$/, + message: '鍦板潃涓笉鍙娇鐢ㄧ┖鏍硷紒' + }) + } + content = <TextArea rows={2} readOnly={item.readonly}/> + } else if (item.type === 'keyinterface') { + span = 24 + className = 'textarea' + rules = [ + { required: item.required, message: '璇疯緭鍏�' + item.label + '!' } + ] + + content = <KeyInterface type={item.key === 'exInterface' ? 'develop' : 'product'}/> } fields.push( @@ -884,6 +963,60 @@ values.uuid = card.uuid values.verify = card.verify || null values.modal = card.modal || null + values.config = card.config || null + + if (card.OpenType === 'excelOut' && values.OpenType === 'excelIn') { + if (values.verify && values.verify.columns && values.verify.columns.length > 0) { + values.verify.columns = values.verify.columns.map(col => { + col.required = col.required || 'true' + col.type = col.type || 'Nvarchar(50)' + col.import = col.import || 'true' + + if (col.type === 'text' || col.type === 'image') { + col.type = 'Nvarchar(50)' + } else if (col.type === 'number') { + col.type = 'Decimal(18,2)' + } + + if (/^Nvarchar/ig.test(col.type)) { + col.limit = col.type.match(/\d+/)[0] + } else if (/^Decimal/ig.test(col.type)) { + col.limit = col.type.match(/\d+/ig)[1] + } else { + col.limit = '' + } + + delete col.output + delete col.abs + delete col.Width + + return col + }) + + values.verify.sheet = values.verify.sheet || 'Sheet1' + } + } else if (card.OpenType === 'excelIn' && values.OpenType === 'excelOut') { + if (values.verify && values.verify.columns && values.verify.columns.length > 0) { + values.verify.columns = values.verify.columns.map(col => { + col.type = col.type || 'text' + col.output = col.output || 'true' + col.required = col.required || 'false' + col.Width = 20 + + if (!['text', 'image', 'number'].includes(col.type)) { + if (/^Decimal/ig.test(col.type)) { + col.type = 'number' + } else { + col.type = 'text' + } + } + + delete col.import + + return col + }) + } + } if (values.OpenType === 'form') { if (values.formType !== 'scan') { @@ -896,7 +1029,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 = [] @@ -908,7 +1041,7 @@ values.verify.invalid = 'true' } } - } else if (values.OpenType === 'tab' && values.linkmenu) { + } else if (values.OpenType === 'tab' && values.linkmenu && Array.isArray(values.linkmenu)) { if (sessionStorage.getItem('thdMenuList')) { let list = null try { @@ -949,7 +1082,7 @@ } }) } - + resolve(values) } else { reject(err) -- Gitblit v1.8.0