From a4ef35bb323b5f8300f15a4eb604d61ff39a194a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 十二月 2020 17:35:39 +0800
Subject: [PATCH] 2020-12-17
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
index 01ddd1f..af3c4ba 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
@@ -1,13 +1,13 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Button, notification, Modal, Icon, Tooltip, Radio, Select } from 'antd'
+import { is, fromJS } from 'immutable'
+import { Form, Row, Col, Button, notification, Modal, Icon, Tooltip, Radio, Select } from 'antd'
import moment from 'moment'
import Utils from '@/utils/utils.js'
import Api from '@/api'
+import CodeMirror from '@/templates/zshare/codemirror'
import './index.scss'
-
-const { TextArea } = Input
class CustomForm extends Component {
static propTpyes = {
@@ -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,8 +48,8 @@
fields.unshift('BID')
}
- 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)
+ 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=''
`
@@ -125,8 +136,11 @@
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.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
this.setState({loading: true})
@@ -168,13 +182,17 @@
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 + ','
}
- _value = `Insert into ${btn.sheet} (${fields}createuserid,createuser,createstaff,bid)\nSelect ${fields}@userid,@username,@fullname,@BID From @${btn.sheet}`
+ let database = btn.sheet.match(/(.*)\.(.*)\./ig) || ''
+ let sheet = btn.sheet.replace(/(.*)\.(.*)\./ig, '')
+
+ _value = `Insert into ${database}${sheet} (${fields}createuserid,createuser,createstaff,bid)\nSelect ${fields}@userid@,@username,@fullname,@BID@ From @${sheet}`
} else {
_value = value
}
@@ -227,7 +245,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 +256,7 @@
</Tooltip>
}>
{getFieldDecorator('position', {
- initialValue: 'back'
+ initialValue: 'front'
})(
<Radio.Group>
<Radio value="init">鍒濆鍖�</Radio>
@@ -285,7 +303,7 @@
message: this.props.dict['form.required.input'] + 'sql!'
}
]
- })(<TextArea rows={15} />)}
+ })(<CodeMirror />)}
</Form.Item>
</Col>
</Row>
--
Gitblit v1.8.0