From f068c617b918fc7817c11724424cb1a9149ec3a2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 一月 2020 16:51:10 +0800
Subject: [PATCH] 2020-01-09
---
src/templates/modalviewconfig/settingform/index.jsx | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/src/templates/modalviewconfig/settingform/index.jsx b/src/templates/modalviewconfig/settingform/index.jsx
index 243ed97..24ce02c 100644
--- a/src/templates/modalviewconfig/settingform/index.jsx
+++ b/src/templates/modalviewconfig/settingform/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { Form, Row, Col, Input, Radio, Select, Tooltip, Icon, notification } from 'antd'
+import { formRule } from '@/utils/option.js'
import './index.scss'
const { TextArea } = Input
@@ -114,7 +115,7 @@
}
let str = '^(' + usefulFields.join('|') + ')'
- let _patten = new RegExp(str + '[0-9a-zA-Z_]*$', 'g')
+ let _patten = new RegExp(str + formRule.func.innerPattern + '$', 'g')
return (
<Form {...formItemLayout} className="ant-advanced-search-form commontable-setting-form" id="commontable-setting-form">
@@ -127,6 +128,10 @@
{
required: true,
message: dict['form.required.input'] + '琛ㄥ悕!'
+ },
+ {
+ max: formRule.input.max,
+ message: formRule.input.message
}
]
})(<Input placeholder="" autoComplete="off" />)}
@@ -167,15 +172,12 @@
{
required: true,
message: dict['form.required.input'] + dict['header.form.interface'] + '!'
+ },
+ {
+ max: formRule.input.max,
+ message: formRule.input.message
}
]
- })(<Input placeholder="" autoComplete="off" />)}
- </Form.Item>
- </Col> : null}
- {interType === 'outer' ? <Col span={12}>
- <Form.Item label={dict['header.form.outerFunc']}>
- {getFieldDecorator('outerFunc', {
- initialValue: data.outerFunc || ''
})(<Input placeholder="" autoComplete="off" />)}
</Form.Item>
</Col> : null}
@@ -191,10 +193,10 @@
rules: [
{
pattern: _patten,
- message: '鍚嶇О鍙厑璁稿寘鍚暟瀛椼�佸瓧姣嶅拰涓嬪垝绾匡紝涓斾互鎸囧畾瀛楃寮�濮嬨��'
+ message: formRule.func.innerMessage
}, {
- max: 50,
- message: '鍐呴儴鍑芥暟鍚嶇О涓嶈秴杩�50涓瓧绗︺��'
+ max: formRule.func.max,
+ message: formRule.func.maxMessage
}
]
})(<Input placeholder="" autoComplete="off" />)}
@@ -224,6 +226,22 @@
)}
</Form.Item>
</Col>
+ {interType === 'outer' ? <Col span={12}>
+ <Form.Item label={dict['header.form.outerFunc']}>
+ {getFieldDecorator('outerFunc', {
+ initialValue: data.outerFunc || '',
+ rules: [
+ {
+ pattern: formRule.func.pattern,
+ message: formRule.func.message
+ }, {
+ max: formRule.func.max,
+ message: formRule.func.maxMessage
+ }
+ ]
+ })(<Input placeholder="" autoComplete="off" />)}
+ </Form.Item>
+ </Col> : null}
<Col span={12}>
<Form.Item label="鍥哄畾鍒�">
{getFieldDecorator('columnfixed', {
@@ -264,6 +282,10 @@
{
required: true,
message: dict['form.required.input'] + '榛樿鎺掑簭瀛楁!'
+ },
+ {
+ max: formRule.input.max,
+ message: formRule.input.message
}
]
})(<Input placeholder="ID asc, UID desc" autoComplete="off" />)}
--
Gitblit v1.8.0