From 95afd40fc2741ac0ce59c2091f6cfce1f98877d4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 六月 2021 09:15:45 +0800
Subject: [PATCH] 2021-06-24
---
src/templates/zshare/modalform/index.jsx | 74 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 18 deletions(-)
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 733cfb2..2c30977 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -6,12 +6,14 @@
import { dateOptions } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
import EditTable from './modaleditable'
-import DataTable from './datatable'
-import FieldsTable from './fieldtable'
+import asyncComponent from '@/utils/asyncComponent'
import CodeMirror from '@/templates/zshare/codemirror'
import './index.scss'
const { TextArea } = Input
+const ColorSketch = asyncComponent(() => import('@/mob/colorsketch'))
+const FieldsTable = asyncComponent(() => import('./fieldtable'))
+const DataTable = asyncComponent(() => import('./datatable'))
const modalTypeOptions = {
text: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'regular', 'interception', 'span', 'labelwidth', 'tooltip', 'extra', 'enter', 'cursor', 'scan'],
@@ -19,15 +21,15 @@
select: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'setAll', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'emptyText', 'enter'],
checkbox: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'span', 'labelwidth', 'tooltip', 'extra'],
radio: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'setAll', 'emptyText'],
- checkcard: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'linkSubField', 'fieldlength', 'span', 'labelwidth', 'display', 'tooltip', 'extra', 'width', 'multiple'],
+ checkcard: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'linkSubField', 'fieldlength', 'span', 'labelwidth', 'display', 'tooltip', 'extra', 'width', 'multiple', 'borderColor'],
multiselect: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'fieldlength', 'span', 'labelwidth', 'tooltip', 'extra'],
link: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'setAll', 'linkField', 'span', 'labelwidth', 'tooltip', 'extra', 'emptyText', 'enter'],
- fileupload: ['readonly', 'required', 'readin', 'fieldlength', 'maxfile', 'fileType', 'span', 'labelwidth', 'tooltip', 'extra', 'suffix'],
+ fileupload: ['readonly', 'required', 'readin', 'fieldlength', 'maxfile', 'fileType', 'span', 'labelwidth', 'tooltip', 'extra', 'compress'],
switch: ['initval', 'openVal', 'closeVal', 'openText', 'closeText', 'readonly', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra'],
- date: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType'],
+ date: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode'],
datemonth: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType'],
- datetime: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType'],
- textarea: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'span', 'labelwidth', 'maxRows', 'encryption', 'interception', 'tooltip', 'extra'],
+ datetime: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode'],
+ textarea: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'span', 'labelwidth', 'maxRows', 'encryption', 'interception', 'tooltip', 'extra', 'count'],
color: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra'],
hint: ['label', 'type', 'blacklist', 'message', 'span', 'labelwidth'],
split: ['label', 'type'],
@@ -49,6 +51,7 @@
openType: null,
resourceType: null,
supField: '',
+ compress: 'false',
display: 'text',
enter: '',
cFields: [],
@@ -62,6 +65,7 @@
let resourceType = ''
let supField = ''
let display = ''
+ let compress = 'false'
let enter = ''
let cFields = []
let linkSubFields = []
@@ -69,6 +73,8 @@
formlist.forEach(cell => {
if (cell.key === 'type') {
type = cell.initVal
+ } else if (cell.key === 'compress') {
+ compress = cell.initVal
} else if (cell.key === 'display') {
display = cell.initVal
} else if (cell.key === 'enter') {
@@ -92,10 +98,11 @@
}
})
- let _options = this.getOptions(type, resourceType, supField, display, enter)
+ let _options = this.getOptions(type, resourceType, supField, display, enter, compress)
this.setState({
enter: enter,
+ compress: compress,
openType: type,
supField: supField,
display: display,
@@ -143,7 +150,7 @@
}
}
- getOptions = (type, resourceType, supField, display, enter) => {
+ getOptions = (type, resourceType, supField, display, enter, compress) => {
let _options = ['label', 'field', 'type', 'blacklist', 'writein', ...fromJS(modalTypeOptions[type]).toJS()]
if (type === 'hint') {
@@ -165,10 +172,16 @@
}
} else {
if (resourceType === '0') { // 鑷畾涔夎祫婧�
- _options.push('options', 'fields')
+ _options.push('options', 'fields', 'backgroundColor')
} else if (resourceType === '1') { // 鏁版嵁婧�
- _options.push('dataSource', 'cardValField', 'fields', 'orderBy', 'orderType', 'database')
+ _options.push('dataSource', 'cardValField', 'fields', 'orderBy', 'orderType', 'database', 'backgroundColor')
}
+ }
+ } else if (type === 'fileupload') {
+ if (compress === 'true') {
+ _options.push('limit', 'rduri', 'proRduri')
+ } else {
+ _options.push('suffix')
}
}
@@ -201,7 +214,7 @@
fieldValue.enter = 'false'
}
- let _options = this.getOptions(value, this.state.resourceType, this.state.supField, this.state.display, enter)
+ let _options = this.getOptions(value, this.state.resourceType, this.state.supField, this.state.display, enter, this.state.compress)
this.setState({
openType: value,
@@ -314,10 +327,10 @@
}
onChange = (e, key) => {
- const { openType } = this.state
+ const { openType, compress } = this.state
let value = e.target.value
if (key === 'resourceType') {
- let _options = this.getOptions(openType, value, this.state.supField, this.state.display, this.state.enter)
+ let _options = this.getOptions(openType, value, this.state.supField, this.state.display, this.state.enter, compress)
this.setState({
resourceType: value,
@@ -327,7 +340,7 @@
})
})
} else if (key === 'display') {
- let _options = this.getOptions(openType, this.state.resourceType, this.state.supField, value, this.state.enter)
+ let _options = this.getOptions(openType, this.state.resourceType, this.state.supField, value, this.state.enter, compress)
this.setState({
display: value,
@@ -336,8 +349,18 @@
return form
})
})
+ } else if (key === 'compress') {
+ let _options = this.getOptions(openType, this.state.resourceType, this.state.supField, this.state.display, this.state.enter, value)
+
+ this.setState({
+ compress: value,
+ formlist: this.state.formlist.map(form => {
+ form.show = _options.includes(form.key)
+ return form
+ })
+ })
} else if (key === 'enter') {
- let _options = this.getOptions(openType, this.state.resourceType, this.state.supField, this.state.display, value)
+ let _options = this.getOptions(openType, this.state.resourceType, this.state.supField, this.state.display, value, compress)
this.setState({
enter: value,
@@ -620,7 +643,12 @@
} else if (item.type === 'textarea') {
fields.push(
<Col span={24} key={index}>
- <Form.Item className="text-msg" label={item.label}>
+ <Form.Item className="text-msg" label={item.tooltip ?
+ <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
+ <Icon type="question-circle" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
{getFieldDecorator(item.key, {
initialValue: item.initVal,
rules: [
@@ -629,7 +657,7 @@
message: this.props.dict['form.required.input'] + item.label + '!'
}
]
- })(<TextArea rows={4} />)}
+ })(<TextArea rows={item.rows || 4} />)}
</Form.Item>
</Col>
)
@@ -665,6 +693,16 @@
</Form.Item>
</Col>
)
+ } else if (item.type === 'color') {
+ fields.push(
+ <Col span={12} key={index}>
+ <Form.Item label={item.label} className="color-form-item">
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal
+ })(<ColorSketch allowClear={true}/>)}
+ </Form.Item>
+ </Col>
+ )
}
})
--
Gitblit v1.8.0