From ce70be666bcd78a7e16e739040488cf7e7256cc2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 31 五月 2021 15:49:43 +0800
Subject: [PATCH] 2021-05-31
---
src/tabviews/formtab/formgroup/index.jsx | 55 +++----------------------------------------------------
1 files changed, 3 insertions(+), 52 deletions(-)
diff --git a/src/tabviews/formtab/formgroup/index.jsx b/src/tabviews/formtab/formgroup/index.jsx
index aed3d1a..e03fbc1 100644
--- a/src/tabviews/formtab/formgroup/index.jsx
+++ b/src/tabviews/formtab/formgroup/index.jsx
@@ -4,7 +4,6 @@
import { Form, Row, Col, Input, InputNumber, Select, DatePicker, notification, Collapse } from 'antd'
import moment from 'moment'
import { formRule } from '@/utils/option.js'
-import Utils from '@/utils/utils.js'
import FileUpload from '@/tabviews/zshare/fileupload'
import './index.scss'
@@ -71,24 +70,6 @@
_fieldsvalue[key] = _val
} else if (datatype[key] === 'fileupload') {
let _val = nextProps.data[key] ? nextProps.data[key] : ''
-
- if (_val) {
- try {
- _val = _val.split(',').map((url, index) => {
- return {
- uid: `${index}`,
- name: url.slice(url.lastIndexOf('/') + 1),
- status: 'done',
- url: url,
- origin: true
- }
- })
- } catch {
- _val = []
- }
- } else {
- _val = []
- }
_fieldsvalue[key] = _val
} else if (datatype[key] === 'text' || datatype[key] === 'textarea') {
@@ -521,30 +502,11 @@
</Col>
)
} else if (item.type === 'fileupload') {
- let filelist = this.props.data ? this.props.data[item.field] : item.initval
- if (filelist && this.state.readin[item.field]) {
- try {
- filelist = filelist.split(',').map((url, index) => {
- return {
- uid: `${index}`,
- name: url.slice(url.lastIndexOf('/') + 1),
- status: 'done',
- url: url,
- origin: true
- }
- })
- } catch {
- filelist = []
- }
- } else {
- filelist = []
- }
-
fields.push(
<Col span={24 / cols} key={index}>
<Form.Item label={item.label}>
{getFieldDecorator(item.field, {
- initialValue: filelist,
+ initialValue: item.initval,
rules: [
{
required: item.required === 'true',
@@ -552,7 +514,7 @@
}
]
})(
- <FileUpload />
+ <FileUpload config={item}/>
)}
</Form.Item>
</Col>
@@ -674,19 +636,8 @@
_value = values[key] ? values[key].join(',') : ''
} else if (this.state.datatype[key] === 'fileupload') {
- let vals = []
+ _value = values[key]
- if (values[key] && values[key].length > 0) {
- values[key].forEach(_val => {
- if (_val.origin && _val.url) {
- vals.push(_val.url)
- } else if (!_val.origin && _val.status === 'done' && _val.response) {
- vals.push(Utils.getrealurl(_val.response))
- }
- })
- }
-
- _value = vals.join(',')
} else if (this.state.datatype[key] === 'text' || this.state.datatype[key] === 'textarea') {
_value = values[key].replace(/\t*|\v*/g, '') // 鍘婚櫎鍒惰〃绗�
--
Gitblit v1.8.0