From f01086dc94827dbb15811760e5d13683977fcec9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 十一月 2022 00:40:12 +0800
Subject: [PATCH] 2022-11-10
---
src/menu/components/form/formaction/actionform/index.jsx | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index dacfdd8..7f5eae5 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -11,7 +11,6 @@
class ActionForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
formlist: PropTypes.any, // 琛ㄥ崟淇℃伅
card: PropTypes.any, // 鎸夐挳淇℃伅
inputSubmit: PropTypes.any // 鍥炶溅鎻愪氦浜嬩欢
@@ -55,10 +54,13 @@
const { card } = this.props
if (card.type === 'prev') {
- return ['type', 'label', 'enable']
+ return ['type', 'label', 'enable', 'actionType']
} else if (card.type === 'next') {
+ return ['type', 'label', 'enable', 'actionType']
+ } else if (card.type === 'close') {
return ['type', 'label', 'enable']
}
+
let _options = ['type', 'label', 'intertype', 'Ot', 'execSuccess', 'syncComponent', 'anchors', 'linkmenu', 'enable', 'output', 'reload'] // 閫夐」鍒楄〃
if (_intertype === 'custom') {
@@ -192,7 +194,7 @@
getFields() {
const { getFieldDecorator } = this.props.form
- const { interType } = this.state
+ const { interType, callbackType } = this.state
const fields = []
this.state.formlist.forEach((item, index) => {
@@ -219,7 +221,7 @@
message: formRule.func.maxMessage
}]
} else if (item.key === 'output') {
- if (interType === 'system') {
+ if (interType === 'system' || ((interType === 'outer' || interType === 'custom') && callbackType === 'script')) {
_rules = [{
pattern: /^@[0-9a-zA-Z_]+@?$/,
message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
@@ -255,7 +257,7 @@
rules: [
{
required: item.readonly ? false : !!item.required,
- message: this.props.dict['form.required.input'] + item.label + '!'
+ message: '璇疯緭鍏�' + item.label + '!'
},
..._rules
]
@@ -285,7 +287,7 @@
rules: [
{
required: item.readonly ? false : !!item.required,
- message: this.props.dict['form.required.input'] + item.label + '!'
+ message: '璇疯緭鍏�' + item.label + '!'
}
]
})(<InputNumber min={0} max={10000} precision={0} onPressEnter={this.handleSubmit}/>)}
@@ -306,7 +308,7 @@
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.select'] + item.label + '!'
+ message: '璇烽�夋嫨' + item.label + '!'
}
]
})(
@@ -341,7 +343,7 @@
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.select'] + item.label + '!'
+ message: '璇烽�夋嫨' + item.label + '!'
}
]
})(
@@ -367,7 +369,7 @@
rules: [
{
required: item.readonly ? false : !!item.required,
- message: this.props.dict['form.required.input'] + item.label + '!'
+ message: '璇疯緭鍏�' + item.label + '!'
}
]
})(<TextArea rows={2} readOnly={item.readonly}/>)}
@@ -388,7 +390,7 @@
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.select'] + item.label + '!'
+ message: '璇烽�夋嫨' + item.label + '!'
}
]
})(
--
Gitblit v1.8.0