From a29d9d644a2a30e9ef4afcc6d728c20c218dc359 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 15 六月 2023 14:25:28 +0800
Subject: [PATCH] 2023-06-15
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 138 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 31 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index efe091f..b1d19ea 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -12,13 +12,14 @@
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'],
+ 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'],
funcbutton: ['label', 'OpenType', 'funcType', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'],
@@ -92,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') {
@@ -206,6 +209,9 @@
}
} else if (intertype === 'inner') {
shows.push('innerFunc', 'output')
+ if (Ot === 'requiredOnce') { // 鍓嶇疆鍑芥暟
+ shows.push('preFunc')
+ }
reRequired.innerFunc = true
} else {
shows.push('sql', 'sqlType', 'output')
@@ -213,6 +219,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,8 +249,10 @@
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', 'openVal', 'closeVal')
+ shows.push('field', 'checkType', 'openVal', 'closeVal')
} else {
shows.push('field')
}
@@ -328,6 +339,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')
@@ -353,10 +365,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') {
@@ -420,12 +437,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 = '浣跨敤鎵爜鐧诲綍鍔熻兘鎴栬彍鍗曡烦杞姛鑳芥椂锛岄渶閫夋嫨璺宠浆鐨勮彍鍗曘��'
@@ -461,7 +481,7 @@
}
if (appType === 'mob') {
- if (Ot !== 'notRequired') {
+ if (Ot !== 'notRequired' && openType !== 'excelOut') {
shows.push('control')
reOptions.control = [
{ value: '', text: '鏃�' },
@@ -476,7 +496,7 @@
}
}
} else {
- if (Ot !== 'notRequired') {
+ if (Ot !== 'notRequired' && openType !== 'excelOut') {
reOptions.control = [
{ value: '', text: '鏃�' },
{ value: 'disabled', text: '绂佺敤' },
@@ -501,6 +521,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') {
@@ -538,7 +562,6 @@
this.record.pageTemplate = ''
this.record.funcType = ''
this.record.sqlType = ''
-
if (value === 'pop' || value === 'prompt' || value === 'exec') {
_fieldval.intertype = 'system'
_fieldval.sqlType = ''
@@ -549,24 +572,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'
@@ -586,15 +610,6 @@
} else if (value === 'funcbutton') {
// _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') {
@@ -758,7 +773,7 @@
{ 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 }
@@ -787,6 +802,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 + '!' }
]
@@ -807,7 +823,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>
)}
@@ -821,7 +837,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>
)}
@@ -849,7 +865,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 + '!' }
@@ -915,6 +938,59 @@
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') {
if (/^(0|[1-9]\d*)$/.test(values.openVal) && /^(0|[1-9]\d*)$/.test(values.closeVal)) {
@@ -926,7 +1002,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 = []
@@ -938,7 +1014,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 {
@@ -979,7 +1055,7 @@
}
})
}
-
+
resolve(values)
} else {
reject(err)
--
Gitblit v1.8.0