From 5ef3d9f4fd1b7edc167cca043498cf494960b52f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 25 八月 2023 17:16:23 +0800
Subject: [PATCH] 2023-08-25
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index 2ec586a..0bc167a 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -38,6 +38,7 @@
width: '14%',
inputType: 'input',
unique: true,
+ strict: true,
editable: true
},
{
@@ -84,8 +85,20 @@
dataIndex: 'import',
width: '10%',
editable: true,
- inputType: 'switch',
- render: (text, record) => record.import !== 'false' ? '鏄�' : '鍚�'
+ inputType: 'radio',
+ render: (text, record) => {
+ if (record.import === 'init') {
+ return '鍒濆鍖�'
+ } else if (record.import === 'false') {
+ return '鍚�'
+ }
+ return '鏄�'
+ },
+ options: [
+ { value: 'true', text: '鏄�' },
+ { value: 'false', text: '鍚�' },
+ { value: 'init', text: '鍒濆鍖�' }
+ ]
},
{
title: '鏈�灏忓��',
@@ -253,8 +266,6 @@
const { card } = this.props
let _verify = fromJS(card.verify || {}).toJS()
let _columns = _verify.columns || []
-
- delete _verify.dataresource
// 鏃ф暟鎹吋瀹�
_columns = _columns.map(col => {
@@ -638,7 +649,7 @@
if (!err) {
let _verify = {...verify, ...values}
- let cols = _verify.columns.map(col => col.Column)
+ let cols = _verify.columns.map(col => col.Column.toLowerCase())
cols = Array.from(new Set(cols))
if (_verify.columns.length === 0) {
@@ -666,6 +677,15 @@
return
}
}
+
+ _verify.columns.sort((a, b) => {
+ if (a.import === 'init' && b.import !== 'init') {
+ return 1
+ } else if (a.import !== 'init' && b.import === 'init') {
+ return -1
+ }
+ return 0
+ })
let _loading = false
if (this.scriptsForm && this.scriptsForm.state.editItem) {
@@ -838,7 +858,7 @@
<Button className="excel-col-add mk-red" title="娓呯┖Excel鍒�" onClick={this.clearField}>
娓呯┖Excel鍒�
</Button>
- <Col style={{fontSize: '12px', color: '#757575', paddingLeft: '10px'}} span={24}>娉細鏁板�肩被鍨嬶紙int 鎴� decimal锛夛紝鍐呭涓哄繀濉紱鏈�澶у�煎拰鏈�灏忓�煎湪绫诲瀷涓烘暟鍊兼椂鏈夋晥銆�</Col>
+ <Col style={{fontSize: '12px', color: '#757575', paddingLeft: '10px'}} span={24}>娉細鏁板�肩被鍨嬶紙int 鎴� decimal锛夛紝鍐呭涓哄繀濉紱鏈�澶у�煎拰鏈�灏忓�煎湪绫诲瀷涓烘暟鍊兼椂鏈夋晥銆傚鍏�-鍒濆鍖栵細鐢ㄤ簬excel涓笉瀛樺湪锛屽鍏ユ椂闇�瑕佸垵濮嬪寲鐨勫瓧娈�</Col>
<EditTable actions={['edit', 'move', 'copy', 'del', 'extra:required:鏄惁蹇呭～']} type="excelcolumn" data={verify.columns} columns={excelColumns} onChange={this.changeColumns}/>
</TabPane>
{card.intertype === 'system' ? <TabPane tab={
--
Gitblit v1.8.0