From 92224e3d5e03f223bf2fb4b0eb88b74e790d8da9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 一月 2022 10:00:05 +0800
Subject: [PATCH] 2022-01-17
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 132 +++++++++++++++++++++++++++++++------------
1 files changed, 95 insertions(+), 37 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index e71b802..72cc3a2 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -33,14 +33,14 @@
inputType: 'input',
editable: true,
unique: true,
- width: '25%'
+ width: '20%'
},
{
title: this.props.dict['model.name'],
dataIndex: 'Text',
inputType: 'input',
editable: true,
- width: '25%'
+ width: '20%'
},
{
title: this.props.dict['model.form.columnWidth'],
@@ -49,7 +49,46 @@
min: 5,
max: 200,
editable: true,
- width: '25%'
+ width: '20%',
+ render: (text) => text || 20
+ },
+ {
+ title: '绫诲瀷',
+ dataIndex: 'type',
+ inputType: 'select',
+ editable: true,
+ required: false,
+ width: '20%',
+ render: (text) => {
+ if (text === 'image') {
+ return '鍥剧墖'
+ } else {
+ return '鏂囨湰'
+ }
+ },
+ options: [
+ {value: 'text', text: '鏂囨湰'},
+ {value: 'image', text: '鍥剧墖'}
+ ]
+ },
+ {
+ title: '鍙栫粷瀵瑰��',
+ dataIndex: 'abs',
+ inputType: 'select',
+ editable: true,
+ required: false,
+ width: '20%',
+ render: (text) => {
+ if (text === 'true') {
+ return '鏄�'
+ } else {
+ return '鍚�'
+ }
+ },
+ options: [
+ {value: 'true', text: '鏄�'},
+ {value: 'false', text: '鍚�'}
+ ]
}
]
}
@@ -65,29 +104,21 @@
_verify.enable = _verify.enable || 'false'
_verify.columns = _verify.columns || []
- // 鍚屾鏄剧ず鍒�
- // if (!_verify.columns || _verify.columns.length === 0) {
- // _verify.columns = []
- // config.columns.forEach(item => {
- // if (!item.field) return
-
- // _verify.columns.push({
- // Column: item.field,
- // Text: item.label,
- // Width: 20,
- // uuid: Utils.getuuid()
- // })
- // })
- // }
-
if (card.intertype !== 'system') {
_verify.enable = 'false'
+ }
+ if (_verify.columns[0] && !_verify.columns[0].type) {
+ _verify.columns = _verify.columns.map(col => {
+ col.type = col.type || 'text'
+ return col
+ })
}
let defaultscript = ''
if (!_verify.script && card.intertype === 'system') {
let search = this.formatSearch(config.search)
search = Utils.joinMainSearchkey(search)
+ search = search.replace(/@\$@/ig, '')
search = search ? 'where ' + search : ''
defaultscript = `update ${config.setting.tableName || ''} set idefine5= idefine5+1 ,modifydate=getdate(),cdefine5='宸插鍑�',modifyuserid=@userid@ ${search}`
@@ -109,36 +140,37 @@
let newsearches = []
searches.forEach(search => {
+ if (!search.field) return
+
let item = {
key: search.field,
match: search.match,
type: search.type,
label: search.label,
- value: `@${search.field}@`,
+ value: search.initval,
required: search.required === 'true'
}
if (item.type === 'group') {
- let copy = fromJS(item).toJS()
- copy.key = search.datefield
+ item.key = search.datefield
+ item.type = 'daterange'
+ item.match = 'between'
+ item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',')
- item.value = `@${search.field}@`
- item.match = '='
-
- copy.type = 'daterange'
- copy.match = 'between'
- copy.value = [`@${search.datefield}@`, `@${search.datefield}1@`]
-
- if (search.transfer === 'true') {
- newsearches.push(item)
- }
- newsearches.push(copy)
+ newsearches.push(item)
return
+ } else if (item.type === 'date') {
+ item.value = moment().format('YYYY-MM-DD')
+ } else if (item.type === 'datemonth') {
+ item.value = moment().format('YYYY-MM')
} else if (item.type === 'dateweek') {
- item.value = [`@${search.field}@`, `@${search.field}1@`]
+ item.value = moment().format('YYYY-MM-DD')
} else if (item.type === 'daterange') {
- item.value = [`@${search.field}@`, `@${search.field}1@`]
- } else if (item.type === 'multiselect') {
- item.value = [`@${search.field}@`]
+ item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',')
+ } else if (item.type === 'multiselect' || (item.type === 'checkcard' && search.multiple === 'true')) {
+ item.type = 'multi'
+ item.value = '@$@'
+ } else {
+ item.value = '@$@'
}
newsearches.push(item)
})
@@ -159,6 +191,7 @@
return
}
values.uuid = Utils.getuuid()
+ values.abs = 'false'
verify.columns.push(values)
this.setState({
@@ -364,6 +397,8 @@
Column: item.field,
Text: item.label,
Width: 20,
+ abs: 'false',
+ type: 'text',
uuid: Utils.getuuid()
})
})
@@ -389,6 +424,27 @@
},
onCancel() {}
})
+ }
+
+ changeColumns = (columns) => {
+ const { verify } = this.state
+
+ if (columns[0] && (columns[0].type !== 'image' && columns[0].type !== 'text')) {
+ columns = columns.map(col => {
+ let _cell = {
+ uuid: Utils.getuuid(),
+ Column: col.Column,
+ Text: col.Text,
+ Width: 20,
+ abs: 'false',
+ type: 'text',
+ }
+
+ return _cell
+ })
+ }
+
+ this.setState({verify: {...verify, columns}})
}
render() {
@@ -422,7 +478,8 @@
<Button className="excel-col-add mk-red" title="娓呯┖Excel鍒�" onClick={this.clearField}>
娓呯┖Excel鍒�
</Button>
- <EditTable actions={['edit', 'move', 'copy', 'del']} type="exceloutcolumn" data={verify.columns} columns={excelColumns} onChange={(columns) => this.setState({verify: {...verify, columns}})}/>
+ <div style={{color: '#959595', fontSize: '13px', paddingLeft: '10px'}}>濡傞渶瀵煎嚭搴忓彿锛岃浣跨敤瀛楁 $Index銆�</div>
+ <EditTable actions={['edit', 'move', 'copy', 'del']} type="excelcolumn" data={verify.columns} columns={excelColumns} onChange={this.changeColumns}/>
</TabPane>
{card.intertype === 'system' ? <TabPane tab={
<span>
@@ -440,6 +497,7 @@
</Radio.Group>
</Form.Item>
</Col>
+ <div style={{color: '#959595', fontSize: '13px', paddingTop: '30px', float: 'right'}}>鎵ц鎴愬姛鍚庣殑鍥炶皟鍑芥暟銆�</div>
<Col span={24} className="sql">
<Form.Item label={'sql'}>
{getFieldDecorator('sql', {
--
Gitblit v1.8.0