From e1dbc27fbe3f083322f87fc46070191c619c5199 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 八月 2023 20:31:06 +0800
Subject: [PATCH] 2023-08-07
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 147 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 123 insertions(+), 24 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 30473b8..bcba0e8 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -12,6 +12,7 @@
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'],
@@ -19,7 +20,7 @@
excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'syncComponent', 'switchTab', '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'],
+ 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']
@@ -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') {
@@ -163,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', 'ContentType', 'outerBlacklist')
if (this.record.procMode === 'system') {
shows.push('sql', 'sqlType')
} else if (this.record.procMode === 'inner') {
@@ -191,6 +194,7 @@
shows.push('cbTable')
}
+ reRequired.outerFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
reRequired.interface = true
@@ -199,6 +203,7 @@
} else if (this.record.sysInterface === 'true') {
reReadonly.interface = true
reRequired.interface = false
+ reRequired.outerFunc = true
shows.push('interface')
} else if (this.record.sysInterface === 'external') {
@@ -206,6 +211,9 @@
}
} else if (intertype === 'inner') {
shows.push('innerFunc', 'output')
+ if (Ot === 'requiredOnce') { // 鍓嶇疆鍑芥暟
+ shows.push('preFunc')
+ }
reRequired.innerFunc = true
} else {
shows.push('sql', 'sqlType', 'output')
@@ -243,7 +251,7 @@
if (this.record.formType === 'switch') {
shows.push('field', 'size', 'openVal', 'closeVal', 'openText', 'closeText')
- } else if (this.record.formType === 'counter') {
+ } 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', 'checkType', 'openVal', 'closeVal')
@@ -267,6 +275,7 @@
shows.push('cbTable')
}
+ reRequired.outerFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
reRequired.interface = true
@@ -275,6 +284,7 @@
} else if (this.record.sysInterface === 'true') {
reReadonly.interface = true
reRequired.interface = false
+ reRequired.outerFunc = true
shows.push('interface')
} else if (this.record.sysInterface === 'external') {
@@ -302,6 +312,11 @@
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))
@@ -310,6 +325,7 @@
shows.push('innerFunc', 'sysInterface', 'outerFunc', 'callbackFunc')
reRequired.innerFunc = false
reRequired.callbackFunc = false
+ reRequired.outerFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
@@ -319,6 +335,7 @@
} else if (this.record.sysInterface === 'true') {
reReadonly.interface = true
reRequired.interface = false
+ reRequired.outerFunc = true
shows.push('interface')
} else if (this.record.sysInterface === 'external') {
@@ -338,6 +355,7 @@
if (this.record.intertype === 'outer') {
shows.push('innerFunc', 'sysInterface', 'outerFunc')
reRequired.innerFunc = false
+ reRequired.outerFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
@@ -347,6 +365,7 @@
} else if (this.record.sysInterface === 'true') {
reReadonly.interface = true
reRequired.interface = false
+ reRequired.outerFunc = true
shows.push('interface')
} else if (this.record.sysInterface === 'external') {
@@ -369,6 +388,8 @@
shows.push('placement')
} else if (this.record.display === 'drawer') {
shows.push('placement')
+ } else if (this.record.display === 'modal') {
+ shows.push('popshow')
}
if (this.record.popClose === 'grid') {
shows.push('resetPageIndex')
@@ -382,7 +403,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')
@@ -394,7 +415,7 @@
reTooltip.linkmenu = ''
} else if (this.record.pageTemplate === 'billprint') {
shows.push('printTemp')
- reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl', 'required'].includes(op.value))
+ reOptions.Ot = requireOptions
} else if (this.record.pageTemplate === 'pay') {
reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
}
@@ -410,6 +431,7 @@
shows.push('innerFunc', 'sysInterface', 'outerFunc', 'callbackFunc')
reRequired.innerFunc = false
reRequired.callbackFunc = false
+ reRequired.outerFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
@@ -419,6 +441,7 @@
} else if (this.record.sysInterface === 'true') {
reReadonly.interface = true
reRequired.interface = false
+ reRequired.outerFunc = true
shows.push('interface')
} else if (this.record.sysInterface === 'external') {
@@ -475,7 +498,7 @@
}
if (appType === 'mob') {
- if (Ot !== 'notRequired' && openType !== 'excelOut') {
+ if (openType !== 'excelOut') {
shows.push('control')
reOptions.control = [
{ value: '', text: '鏃�' },
@@ -490,7 +513,7 @@
}
}
} else {
- if (Ot !== 'notRequired' && openType !== 'excelOut') {
+ if (openType !== 'excelOut') {
reOptions.control = [
{ value: '', text: '鏃�' },
{ value: 'disabled', text: '绂佺敤' },
@@ -515,6 +538,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') {
@@ -552,7 +579,6 @@
this.record.pageTemplate = ''
this.record.funcType = ''
this.record.sqlType = ''
-
if (value === 'pop' || value === 'prompt' || value === 'exec') {
_fieldval.intertype = 'system'
_fieldval.sqlType = ''
@@ -565,10 +591,10 @@
_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'
@@ -576,11 +602,12 @@
_fieldval.class = 'dgreen'
_fieldval.execSuccess = 'never'
_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'
@@ -601,15 +628,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 = ''
@@ -617,6 +635,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 = '鎵撳嵃'
@@ -772,10 +795,14 @@
{ 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 }
+ )
+ } else if (item.key === 'outerBlacklist') {
+ rules.push(
+ { max: 512, message: '鏈�澶�512涓瓧绗�' }
)
} else if (item.key === 'output') {
if (this.record.intertype === 'system' || ((this.record.intertype === 'outer' || this.record.intertype === 'custom') && this.record.callbackType === 'script')) {
@@ -864,7 +891,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 + '!' }
@@ -877,6 +911,13 @@
rules = [
{ 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') {
@@ -929,6 +970,60 @@
values.verify = card.verify || null
values.modal = card.modal || null
values.config = card.config || null
+ values.$fixed = card.$fixed || false
+
+ 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') {
@@ -953,7 +1048,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 {
@@ -973,6 +1068,10 @@
}
})
}
+ }
+
+ if (values.outerBlacklist) {
+ values.outerBlacklist = values.outerBlacklist.replace(/\s/ig, '')
}
if (values.openmenu && Array.isArray(values.openmenu) && values.openmenu.length > 0) {
@@ -994,7 +1093,7 @@
}
})
}
-
+
resolve(values)
} else {
reject(err)
--
Gitblit v1.8.0