From cbeffcc0902631909c0373f274752a97ddaf2d4e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 06 八月 2022 01:41:54 +0800
Subject: [PATCH] 2022-08-06
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 144 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 117 insertions(+), 27 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index d4cfb8c..4bcfa1c 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader, Checkbox } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader, Checkbox, Typography } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
@@ -9,18 +9,19 @@
import './index.scss'
const { TextArea } = Input
+const { Paragraph } = Typography
const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
const acTyOptions = {
- pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'open', 'refreshTab', 'position', 'tipTitle', 'hidden'],
- prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'open', 'refreshTab', 'position', 'tipTitle', 'hidden'],
- exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'open', 'refreshTab', 'hidden'],
- excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width', 'hidden'],
- excelOut: ['label', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'resetPageIndex', 'pagination', 'search', 'width', 'hidden'],
- popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'popClose', 'resetPageIndex', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'hidden'],
+ 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'],
- innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'open', 'hidden'],
+ 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', 'resetPageIndex', 'syncComponent', 'width', 'open', 'refreshTab', 'title', 'hidden']
+ form: ['label', 'OpenType', 'formType', 'intertype', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'width', 'refreshTab', 'title', 'hidden']
}
class ActionForm extends Component {
@@ -60,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: '鑷畾涔�'
@@ -162,18 +163,33 @@
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', 'proInterface', '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
@@ -191,6 +207,12 @@
if (Ot === 'required') {
shows.push('progress')
+ }
+ if (this.record.openmenu && this.record.openmenu !== 'goback') {
+ shows.push('open')
+ }
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
}
if (this.record.sqlType === 'insert') {
@@ -219,8 +241,18 @@
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', 'proInterface', '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
@@ -239,6 +271,9 @@
if (this.record.execSuccess === 'goback') {
shows.push('reload')
}
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
+ }
reOptions.Ot = requireOptions
reOptions.sqlType = [{
@@ -255,6 +290,7 @@
if (this.record.intertype === 'outer') {
shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
reRequired.innerFunc = false
+ reRequired.callbackFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
@@ -266,6 +302,9 @@
} else if (this.record.intertype === 'inner') {
shows.push('innerFunc')
reRequired.innerFunc = true
+ }
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
}
} else if (openType === 'excelOut') {
reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
@@ -285,11 +324,17 @@
shows.push('innerFunc')
reRequired.innerFunc = true
}
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
+ }
} else if (openType === 'popview') {
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
if (this.record.display === 'drawer') {
shows.push('placement')
+ }
+ if (this.record.popClose === 'grid') {
+ shows.push('resetPageIndex')
}
} else if (openType === 'tab') {
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
@@ -300,9 +345,9 @@
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
if (this.record.pageTemplate === 'custom') {
- shows.push('url', 'joint')
+ shows.push('url', 'joint', 'open')
} else if (this.record.pageTemplate === 'linkpage') {
- shows.push('linkmenu')
+ shows.push('linkmenu', 'open')
if (Ot === 'requiredSgl') {
shows.push('joint')
@@ -323,10 +368,11 @@
let _funcType = this.record.funcType
if (_funcType === 'print') {
- shows.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError', 'resetPageIndex')
+ shows.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError')
if (this.record.intertype === 'outer') {
shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
reRequired.innerFunc = false
+ reRequired.callbackFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
@@ -338,6 +384,9 @@
} else if (this.record.intertype === 'inner') {
shows.push('innerFunc')
reRequired.innerFunc = true
+ }
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
}
} else if (_funcType === 'mkBinding' || _funcType === 'mkUnBinding') {
shows.push('execSuccess', 'execError')
@@ -362,8 +411,13 @@
shows.push('reload')
} else if (_funcType === 'megvii') {
shows.push('subFunc', 'progress')
+ } else if (_funcType === 'filezip') {
+ reOptions.Ot = requireOptions
+ reRequired.innerFunc = false
+
+ shows.push('innerFunc', 'Ot', 'execSuccess', 'execError', 'urlkey')
} else if (_funcType === 'pay') {
- shows.push('payType', 'Ot')
+ shows.push('payType', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
}
}
@@ -450,7 +504,6 @@
if (value === 'pop' || value === 'prompt' || value === 'exec') {
_fieldval.intertype = 'system'
_fieldval.sqlType = ''
-
} else if (value === 'form') {
_fieldval.Ot = 'requiredSgl'
@@ -470,9 +523,11 @@
_fieldval.intertype = 'system'
_fieldval.label = this.props.dict['model.form.excelOut']
_fieldval.class = 'dgreen'
+ _fieldval.execSuccess = 'never'
this.record.Ot = 'notRequired'
this.record.label = this.props.dict['model.form.excelOut']
this.record.class = 'dgreen'
+ this.record.execSuccess = 'never'
} else if (value === 'popview') {
_fieldval.display = 'modal'
@@ -537,7 +592,7 @@
}
} else if (value === 'audit') {
_fieldval.label = '瀹℃牳'
- _fieldval.Ot = 'requiredSgl'
+ _fieldval.Ot = 'required'
if (hasclass) {
_fieldval.class = 'primary'
} else {
@@ -545,12 +600,18 @@
}
} else if (value === 'LogicDelete' || value === 'delete') {
_fieldval.label = '鍒犻櫎'
- _fieldval.Ot = 'requiredSgl'
+ _fieldval.Ot = 'required'
if (hasclass) {
_fieldval.class = 'danger'
} else {
_fieldval.color = 'danger'
}
+ } else if (value === 'custom') {
+ _fieldval.Ot = 'required'
+ }
+
+ if (this.props.type === 'card' && _fieldval.Ot === 'required') { // 鍗＄墖涓棤澶氳閫夐」
+ _fieldval.Ot = 'requiredSgl'
}
this.record.label = _fieldval.label || this.record.label || ''
@@ -649,7 +710,7 @@
]
if (item.key === 'innerFunc') {
- let str = '^(' + item.fields.join('|') + ')'
+ let str = item.fields && item.fields.length ? '^(' + item.fields.join('|') + ')' : '^'
let _patten = new RegExp(str + formRule.func.innerPattern + '$', 'g')
rules.push(
{ pattern: _patten, message: formRule.func.innerMessage },
@@ -660,6 +721,24 @@
{ pattern: formRule.func.pattern, message: formRule.func.message },
{ max: formRule.func.max, message: formRule.func.maxMessage }
)
+ } else if (item.key === 'output') {
+ if (this.record.intertype === 'system') {
+ rules = [{
+ pattern: /^@[0-9a-zA-Z_]+@?$/,
+ message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
+ }, {
+ max: 100,
+ message: '鏈�澶�100涓瓧绗︺��'
+ }]
+ } else {
+ rules = [{
+ pattern: /^[0-9a-zA-Z_]*$/,
+ message: '瀛楁鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
+ }, {
+ max: 100,
+ message: '鏈�澶�100涓瓧绗︺��'
+ }]
+ }
} else {
rules.push({ max: formRule.input.max, message: formRule.input.message })
}
@@ -747,7 +826,7 @@
fields.push(
<Col span={span} key={index}>
- <Form.Item className={className} label={item.tooltip ?
+ <Form.Item className={className} help={item.help} label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
<QuestionCircleOutlined className="mk-form-tip" />
{item.label}
@@ -761,6 +840,17 @@
</Col>
)
})
+
+ if (window.debugger && this.props.card.uuid) {
+ fields.push(
+ <Col span={12} key="uuid">
+ <Form.Item label="鎸夐挳ID">
+ <Paragraph copyable>{this.props.card.uuid}</Paragraph>
+ </Form.Item>
+ </Col>
+ )
+ }
+
return fields
}
--
Gitblit v1.8.0