From 569ccb3c1ff82f30ffefa7d3700571448d742662 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 十二月 2020 11:46:28 +0800
Subject: [PATCH] 2020-12-03
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx | 45 ++++++++++++++++-----------------------------
1 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
index 108bc1d..af3c4ba 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
@@ -27,9 +27,20 @@
}
UNSAFE_componentWillMount () {
- const {usefulfields, btn} = this.props
+ this.resetfield(this.props.usefulfields)
+ }
- let fields = usefulfields.map(item => item.Column)
+ UNSAFE_componentWillReceiveProps (nextProps) {
+ if (nextProps.usefulfields && !is(fromJS(this.props.usefulfields), fromJS(nextProps.usefulfields))) {
+ this.resetfield(nextProps.usefulfields)
+ }
+ }
+
+ resetfield = (columns) => {
+ const { btn } = this.props
+ columns = columns.filter(item => item.import !== 'false')
+ let fields = columns.map(item => item.Column)
+
if (!fields.includes('ID')) {
fields.unshift('ID')
}
@@ -37,7 +48,7 @@
fields.unshift('BID')
}
- let _sql = `Declare @${btn.sheet} table (${usefulfields.map(item => item.Column + ' ' + item.type).join(',')},jskey nvarchar(50) )
+ let _sql = `Declare @${btn.sheet} table (${columns.map(item => item.Column + ' ' + item.type).join(',')},jskey nvarchar(50) )
Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50), @retmsg nvarchar(4000),@tbid Nvarchar(512)
Select @ErrorCode='', @retmsg=''
`
@@ -46,31 +57,6 @@
verifySql: _sql,
usefulfields: fields.join(', ')
})
- }
-
- UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn } = this.props
-
- if (nextProps.usefulfields && !is(fromJS(this.props.usefulfields), fromJS(nextProps.usefulfields))) {
-
- let fields = nextProps.usefulfields.map(item => item.Column)
- if (!fields.includes('ID')) {
- fields.unshift('ID')
- }
- if (!fields.includes('BID')) {
- fields.unshift('BID')
- }
-
- let _sql = `Declare @${btn.sheet} table (${nextProps.usefulfields.map(item => item.Column + ' ' + item.type).join(',')},jskey nvarchar(50) )
- Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50), @retmsg nvarchar(4000),@tbid Nvarchar(512)
- Select @ErrorCode='', @retmsg=''
- `
-
- this.setState({
- verifySql: _sql,
- usefulfields: fields.join(', ')
- })
- }
}
edit = (record) => {
@@ -196,7 +182,8 @@
let _value = ''
if (value === 'default') {
- let fields = usefulfields.map(col => col.Column).join(',')
+ let fields = usefulfields.filter(item => item.import !== 'false')
+ fields = fields.map(col => col.Column).join(',')
if (fields) {
fields = fields + ','
--
Gitblit v1.8.0