From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx | 59 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
index 30dc05c..323f052 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
@@ -17,7 +17,6 @@
class SettingForm extends Component {
static propTpyes = {
config: PropTypes.object, // 椤甸潰閰嶇疆
- dict: PropTypes.object, // 瀛楀吀椤�
menu: PropTypes.object, // 鑿滃崟淇℃伅
setting: PropTypes.object, // 鏁版嵁婧愰厤缃�
columns: PropTypes.array, // 鍒楄缃�
@@ -190,7 +189,7 @@
}
render() {
- const { setting, dict, menu, config, columns } = this.props
+ const { setting, menu, config, columns } = this.props
const { getFieldDecorator } = this.props.form
const { interType, funcRules, funcTooltip, tableType, controlField, sysInterface } = this.state
@@ -215,24 +214,28 @@
rules: [
{
required: true,
- message: dict['form.required.input'] + '琛ㄥ悕!'
+ message: '璇疯緭鍏ヨ〃鍚�!'
},
{
max: 50,
message: '琛ㄥ悕鏈�闀夸负50涓瓧绗�!'
+ },
+ {
+ pattern: /^[a-zA-Z0-9@_]+$/,
+ message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝銆佹暟瀛椾互鍙奯'
}
]
})(<Input placeholder={''} autoComplete="off" />)}
</Form.Item>
</Col>
<Col span={8}>
- <Form.Item label={dict['header.form.intertype']}>
+ <Form.Item label="鎺ュ彛绫诲瀷">
{getFieldDecorator('interType', {
initialValue: interType,
rules: [
{
required: true,
- message: dict['form.required.select'] + dict['header.form.intertype'] + '!'
+ message: '璇烽�夋嫨鎺ュ彛绫诲瀷!'
},
]
})(
@@ -257,19 +260,24 @@
</Form.Item>
</Col>
{interType === 'outer' ? <Col span={8}>
- <Form.Item label={dict['header.form.sysInterface']}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鍗曠偣鐧诲綍绯荤粺">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 绯荤粺鎺ュ彛
+ </Tooltip>
+ }>
{getFieldDecorator('sysInterface', {
initialValue: sysInterface,
rules: [
{
required: true,
- message: dict['form.required.select'] + dict['header.form.sysInterface'] + '!'
+ message: '璇烽�夋嫨绯荤粺鎺ュ彛!'
},
]
})(
<Radio.Group onChange={(e) => {this.onRadioChange(e, 'sysInterface')}}>
- <Radio value="true">{dict['model.true']}</Radio>
- <Radio value="false">{dict['model.false']}</Radio>
+ <Radio value="true">鏄�</Radio>
+ <Radio value="false">鍚�</Radio>
</Radio.Group>)}
</Form.Item>
</Col> : null}
@@ -280,7 +288,7 @@
rules: [
{
required: interType === 'outer' && sysInterface === 'true' ? false : true,
- message: dict['form.required.input'] + '鎺ュ彛鍦板潃!'
+ message: '璇疯緭鍏ユ帴鍙ｅ湴鍧�!'
},
]
})(<TextArea rows={2} readOnly={interType === 'outer' && sysInterface === 'true'}/>)}
@@ -310,7 +318,7 @@
rules: [
{
required: true,
- message: dict['form.required.input'] + '鍐呴儴鍑芥暟!'
+ message: '璇疯緭鍏ュ唴閮ㄥ嚱鏁�!'
},
{
max: formRule.func.max,
@@ -399,7 +407,7 @@
rules: [
{
required: true,
- message: dict['form.required.input'] + '榛樿鎺掑簭!'
+ message: '璇疯緭鍏ラ粯璁ゆ帓搴�!'
},
{
max: formRule.input.max,
@@ -415,8 +423,8 @@
initialValue: setting.laypage || 'true'
})(
<Radio.Group>
- <Radio value="true">{dict['model.true']}</Radio>
- <Radio value="false">{dict['model.false']}</Radio>
+ <Radio value="true">鏄�</Radio>
+ <Radio value="false">鍚�</Radio>
</Radio.Group>)}
</Form.Item>
</Col>
@@ -437,12 +445,12 @@
initialValue: setting.actionfixed === 'true' || setting.actionfixed === true ? 'true' : 'false'
})(
<Radio.Group>
- <Radio value="true">{dict['model.true']}</Radio>
- <Radio value="false">{dict['model.false']}</Radio>
+ <Radio value="true">鏄�</Radio>
+ <Radio value="false">鍚�</Radio>
</Radio.Group>)}
</Form.Item>
</Col> : null}
- {config.Template === 'CommonTable' ? <Col span={8}>
+ {/* {config.Template === 'CommonTable' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鍚湁鍚堝苟鍒楁垨琛ㄦ牸鍑虹幇妯悜婊氬姩鏃朵細鏄剧ず寮傚父锛岃鎱庣敤锛�'}>
<QuestionCircleOutlined className="mk-form-tip" />
@@ -453,11 +461,11 @@
initialValue: setting.columnfixed === 'true' || setting.columnfixed === true ? 'true' : 'false'
})(
<Radio.Group>
- <Radio value="true">{dict['model.true']}</Radio>
- <Radio value="false">{dict['model.false']}</Radio>
+ <Radio value="true">鏄�</Radio>
+ <Radio value="false">鍚�</Radio>
</Radio.Group>)}
</Form.Item>
- </Col> : null}
+ </Col> : null} */}
<Col span={8}>
<Form.Item label="杈规">
{getFieldDecorator('bordered', {
@@ -484,17 +492,6 @@
<Radio value="middle">涓�</Radio>
<Radio value="small">灏�</Radio>
<Radio value="mini">杩蜂綘</Radio>
- </Radio.Group>)}
- </Form.Item>
- </Col>
- <Col span={8}>
- <Form.Item label="浜嬪姟">
- {getFieldDecorator('transaction', {
- initialValue: setting.transaction || 'false'
- })(
- <Radio.Group>
- <Radio value="true">浣跨敤</Radio>
- <Radio value="false">涓嶄娇鐢�</Radio>
</Radio.Group>)}
</Form.Item>
</Col>
--
Gitblit v1.8.0