From b6cbfb08b51e87e6eac995be8e7751815715e6a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 三月 2022 15:36:21 +0800
Subject: [PATCH] 2022-03-29
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
index 26c87fe..f89a973 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Form, Row, Col, Button, notification, Modal, Icon, Tooltip, Radio, Select } from 'antd'
+import { Form, Row, Col, Button, notification, Modal, Tooltip, Radio, Select } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Utils from '@/utils/utils.js'
@@ -41,15 +42,16 @@
columns = columns.filter(item => item.import !== 'false')
let fields = columns.map(item => item.Column)
- if (!fields.includes('ID')) {
- fields.unshift('ID')
- }
- if (!fields.includes('BID')) {
- fields.unshift('BID')
+ fields.push('jskey')
+
+ let _dec = columns.map(item => item.Column + ' ' + item.type).join(',')
+
+ if (_dec) {
+ _dec += ','
}
- let _sql = `Declare @${btn.sheet} table (${columns.map(item => item.Column + ' ' + item.type).join(',')},jskey nvarchar(50) )
- Declare @UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50), @retmsg nvarchar(4000),@tbid Nvarchar(512)
+ let _sql = `Declare @${btn.sheet} table (${_dec}jskey nvarchar(50) )
+ Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50), @retmsg nvarchar(4000),@tbid Nvarchar(512)
Select @ErrorCode='', @retmsg=''
`
@@ -229,8 +231,10 @@
fields = fields + ','
}
- let database = btn.sheet.match(/(.*)\.(.*)\./ig) || ''
- let sheet = btn.sheet.replace(/(.*)\.(.*)\./ig, '')
+ let database = btn.sheet.match(/(.*)\.(.*)\.|@db@/ig) || ''
+ let sheet = btn.sheet.replace(/(.*)\.(.*)\.|@db@/ig, '')
+
+ database = database ? (database[0] || '') : ''
_value = `Insert into ${database}${sheet} (${fields}createuserid,createuser,createstaff,bid)\nSelect ${fields}@userid@,@username,@fullname,@BID@ From @${sheet}`
} else {
@@ -285,13 +289,13 @@
</Col>
{usefulfields ? <Col span={24} className="sqlfield">
<Form.Item label={'鍙敤瀛楁'}>
- {usefulfields}, jskey
+ BID, ID, LoginUID, SessionUid, UserID, Appkey, UserName, FullName, RoleID, mk_departmentcode, mk_organization, login_city, {usefulfields}
</Form.Item>
</Col> : null}
<Col span={8} style={{whiteSpace: 'nowrap'}}>
<Form.Item style={{marginBottom: 0}} label={
<Tooltip placement="bottomLeft" title={'鑷畾涔夎剼鏈笌榛樿sql浣嶇疆鍏崇郴銆�'}>
- <Icon type="question-circle" style={{color: '#c49f47', marginRight: '5px'}} />
+ <QuestionCircleOutlined className="mk-form-tip" />
鎵ц浣嶇疆
</Tooltip>
}>
@@ -311,12 +315,15 @@
<Select
showSearch
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
- onChange={this.selectScript}
+ onSelect={this.selectScript}
getPopupContainer={() => document.getElementById('verify-excelin-custom-scripts')}
>
<Select.Option key="default" value={'default'}>
榛樿sql
</Select.Option>
+ <Select.Option key="debugger" value={`z_debug: select @ErrorCode='E',@retmsg='娴嬭瘯鏂偣' goto aaa`}>
+ 娴嬭瘯鏂偣
+ </Select.Option>
{systemScripts.map((option, i) =>
<Select.Option key={i} value={option.value}>
{option.name}
--
Gitblit v1.8.0