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 | 65 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 6a0f7b9..72cc3a2 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -49,7 +49,8 @@
min: 5,
max: 200,
editable: true,
- width: '20%'
+ width: '20%',
+ render: (text) => text || 20
},
{
title: '绫诲瀷',
@@ -117,6 +118,7 @@
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}`
@@ -138,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)
})
@@ -423,6 +426,27 @@
})
}
+ 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() {
const { card } = this.props
const { verify, excelColumns, defaultscript } = this.state
@@ -455,7 +479,7 @@
娓呯┖Excel鍒�
</Button>
<div style={{color: '#959595', fontSize: '13px', paddingLeft: '10px'}}>濡傞渶瀵煎嚭搴忓彿锛岃浣跨敤瀛楁 $Index銆�</div>
- <EditTable actions={['edit', 'move', 'copy', 'del']} type="exceloutcolumn" data={verify.columns} columns={excelColumns} onChange={(columns) => this.setState({verify: {...verify, columns}})}/>
+ <EditTable actions={['edit', 'move', 'copy', 'del']} type="excelcolumn" data={verify.columns} columns={excelColumns} onChange={this.changeColumns}/>
</TabPane>
{card.intertype === 'system' ? <TabPane tab={
<span>
@@ -473,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