From 769725931ef28d1a86b0fdd89cf5a44faf7bec27 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 八月 2020 12:07:57 +0800
Subject: [PATCH] 2020-08-03

---
 src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
index 01ddd1f..89c7887 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
@@ -1,5 +1,6 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
+import { is, fromJS } from 'immutable'
 import { Form, Row, Col, Input, Button, notification, Modal, Icon, Tooltip, Radio, Select } from 'antd'
 import moment from 'moment'
 
@@ -38,7 +39,7 @@
     }
 
     let _sql = `Declare @${btn.sheet} table (${usefulfields.map(item => item.Column + ' ' + item.type).join(',')},jskey nvarchar(50) )
-      Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50), @retmsg nvarchar(4000)
+      Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50), @retmsg nvarchar(4000),@tbid Nvarchar(512)
       Select @ErrorCode='', @retmsg=''
     `
     
@@ -46,6 +47,31 @@
       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) => {
@@ -125,6 +151,9 @@
           func: 's_debug_sql',
           LText: this.state.verifySql + _initsql + values.sql + tail
         }
+
+        param.LText = param.LText.replace(/@\$|\$@/ig, '')
+
         param.LText = Utils.formatOptions(param.LText)
         param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
         param.secretkey = Utils.encrypt(param.LText, param.timestamp)
@@ -174,7 +203,7 @@
         fields = fields + ','
       }
 
-      _value = `Insert into ${btn.sheet} (${fields}createuserid,createuser,createstaff,bid)\nSelect ${fields}@userid,@username,@fullname,@BID From @${btn.sheet}`
+      _value = `Insert into ${btn.sheet} (${fields}createuserid,createuser,createstaff,bid)\nSelect ${fields}@userid@,@username,@fullname,@BID@ From @${btn.sheet}`
     } else {
       _value = value
     }
@@ -227,7 +256,7 @@
           </Col>
           {usefulfields ? <Col span={24} className="sqlfield">
             <Form.Item label={'鍙敤瀛楁'}>
-              {usefulfields}
+              {usefulfields}, jskey
             </Form.Item>
           </Col> : null}
           <Col span={8} style={{whiteSpace: 'nowrap'}}>
@@ -238,7 +267,7 @@
               </Tooltip>
             }>
               {getFieldDecorator('position', {
-                initialValue: 'back'
+                initialValue: 'front'
               })(
                 <Radio.Group>
                   <Radio value="init">鍒濆鍖�</Radio>

--
Gitblit v1.8.0