From 45466976d272c7b406b0e3d8b8fba92f3eb20524 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 07 一月 2020 17:55:13 +0800
Subject: [PATCH] 2020-01-07
---
src/templates/modalconfig/modalform/index.jsx | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/templates/modalconfig/modalform/index.jsx b/src/templates/modalconfig/modalform/index.jsx
index 90dcbc0..c1e25a5 100644
--- a/src/templates/modalconfig/modalform/index.jsx
+++ b/src/templates/modalconfig/modalform/index.jsx
@@ -11,7 +11,8 @@
static propTpyes = {
dict: PropTypes.object, // 瀛楀吀椤�
formlist: PropTypes.any,
- card: PropTypes.object
+ card: PropTypes.object,
+ billCodes: PropTypes.array
}
state = {
@@ -22,7 +23,7 @@
UNSAFE_componentWillMount () {
let formlist = JSON.parse(JSON.stringify(this.props.formlist))
-
+ console.log(formlist)
let type = formlist.filter(cell => cell.key === 'type')[0].initVal
let resourceType = formlist.filter(cell => cell.key === 'resourceType')[0].initVal
let _options = ['label', 'field', 'initval', 'type', 'readonly', 'required'] // 榛樿鏄剧ず椤�
@@ -43,6 +44,10 @@
if (type === 'link') { // 鍏宠仈绫诲瀷銆佸鍔犲叧鑱斿瓧娈�
_options = [..._options, 'linkField']
+ }
+ console.log(type)
+ if (type === 'funcvar') {
+ _options = ['label', 'field', 'linkfield']
}
this.setState({
@@ -96,6 +101,10 @@
if (value === 'link') {
_options = [..._options, 'linkField']
}
+
+ if (value === 'funcvar') {
+ _options = ['label', 'field', 'linkfield']
+ }
this.setState({
openType: value,
@@ -120,7 +129,7 @@
}, () => {
this.setState({
formlist: this.state.formlist.map(form => {
- if (form.key === 'initval' && value !== 'fileupload') {
+ if (form.key === 'initval' && value !== 'fileupload' && value !== 'funcvar') {
form.hidden = false
}
return form
@@ -167,6 +176,16 @@
if (item.hidden) return
if (item.type === 'text') { // 鏂囨湰鎼滅储
+ let rules = []
+ if (item.key === 'field') {
+ rules = [{
+ pattern: /^[\u4E00-\u9FA50-9a-zA-Z,_]*$/ig,
+ message: '瀛楁鍚嶅彧鍏佽鍖呭惈鏁板瓧銆佸瓧姣嶃�佹眽瀛椾互鍙奯'
+ }, {
+ max: 50,
+ message: '瀛楁鍚嶆渶澶�50涓瓧绗︼紒'
+ }]
+ }
fields.push(
<Col span={12} key={index}>
<Form.Item label={item.label}>
@@ -176,7 +195,8 @@
{
required: !!item.required,
message: this.props.dict['form.required.input'] + item.label + '!'
- }
+ },
+ ...rules
]
})(<Input placeholder="" autoComplete="off" disabled={item.readonly} />)}
</Form.Item>
@@ -305,7 +325,6 @@
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
let isvalid = true
- values.id = this.props.card.id
values.uuid = this.props.card.uuid
// 涓嬫媺鑿滃崟鎴栧叧鑱旇彍鍗�
if ((values.type === 'multiselect' || values.type === 'select' || values.type === 'link') && values.resourceType === '0') {
@@ -324,6 +343,10 @@
values.options = []
}
+ if (!values.type) {
+ values.type = 'funcvar'
+ values.readonly = 'true'
+ }
if (isvalid) {
resolve(values)
} else {
--
Gitblit v1.8.0