From 6afdec0062dacbded57e166230eb22cc55ced0c1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 08 五月 2021 14:30:21 +0800
Subject: [PATCH] 2021-05-08
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 8fb4902..6a0f7b9 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,26 @@
min: 5,
max: 200,
editable: true,
- width: '25%'
+ width: '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: '鍙栫粷瀵瑰��',
@@ -57,7 +76,7 @@
inputType: 'select',
editable: true,
required: false,
- width: '25%',
+ width: '20%',
render: (text) => {
if (text === 'true') {
return '鏄�'
@@ -86,6 +105,12 @@
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 = ''
@@ -370,6 +395,7 @@
Text: item.label,
Width: 20,
abs: 'false',
+ type: 'text',
uuid: Utils.getuuid()
})
})
@@ -428,6 +454,7 @@
<Button className="excel-col-add mk-red" title="娓呯┖Excel鍒�" onClick={this.clearField}>
娓呯┖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}})}/>
</TabPane>
{card.intertype === 'system' ? <TabPane tab={
--
Gitblit v1.8.0