From 547e5fe219ee7bee309ecd67db74bc8df66b5433 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 八月 2023 11:47:45 +0800
Subject: [PATCH] 2023-08-23
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx | 78 ++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
index 7e27b64..9f4f640 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/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, Tooltip, Select } from 'antd'
+import { Form, Row, Col, Button, notification, Tooltip, Select, Switch, Radio } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -21,6 +22,7 @@
systemScripts: [],
usefulfields: null,
loading: false,
+ skip: false
}
UNSAFE_componentWillMount () {
@@ -60,7 +62,7 @@
_sParam.secretkey = Utils.encrypt(_sParam.LText, _sParam.timestamp)
_sParam.open_key = Utils.encryptOpenKey(_sParam.secretkey, _sParam.timestamp) // 浜戠鏁版嵁楠岃瘉
- Api.getSystemConfig(_sParam).then(res => {
+ Api.getCloudConfig(_sParam).then(res => {
if (res.status) {
let _scripts = res.data.map(item => {
return {
@@ -115,11 +117,12 @@
this.props.form.setFieldsValue({
sql: record.sql,
- position: record.position || 'back'
+ position: record.position || 'front'
})
}
handleConfirm = () => {
+ const { skip } = this.state
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
@@ -163,6 +166,13 @@
duration: 5
})
return
+ } else if (/,,/ig.test(values.sql)) {
+ notification.warning({
+ top: 92,
+ message: '鑷畾涔塻ql璇彞涓紝涓嶅彲鍑虹幇杩炵画鐨勮嫳鏂囬�楀彿锛�,,锛�',
+ duration: 5
+ })
+ return
}
let error = Utils.verifySql(values.sql, 'customscript')
@@ -183,18 +193,19 @@
this.props.scriptsChange(values, (status) => {
if (status) {
this.setState({
+ skip: false,
loading: false,
editItem: null
})
this.props.form.setFieldsValue({
- sql: ''
+ sql: ' '
})
} else {
this.setState({
loading: false
})
}
- })
+ }, skip)
}
})
}
@@ -205,26 +216,17 @@
})
this.props.form.setFieldsValue({
- sql: ''
+ sql: ' ',
+ position: 'front'
})
}
selectScript = (value, option) => {
- const { usefulfields, sheet } = this.props
-
- let _value = ''
- if (value === 'default') {
- let fields = usefulfields.filter(item => item.import !== 'false')
- fields = fields.map(col => col.Column).join(',')
-
- let _sheet = sheet.replace(/(.*)\.(.*)\.|@db@/ig, '')
-
- _value = `Select ${fields} From ${_sheet}`
- } else {
- _value = value
- }
-
+ let _value = value
let _sql = this.props.form.getFieldValue('sql')
+ if (/^\s+$/.test(_sql)) {
+ _sql = ''
+ }
if (_sql) {
_sql = _sql + `
@@ -244,7 +246,7 @@
render() {
const { sheet, linefields } = this.props
- const { usefulfields, systemScripts } = this.state
+ const { usefulfields, systemScripts, skip } = this.state
const { getFieldDecorator } = this.props.form
const formItemLayout = {
labelCol: {
@@ -261,26 +263,26 @@
<Form {...formItemLayout} className="verify-form" id="verify-excelin-custom-scripts">
<Row gutter={24}>
<Col span={8}>
- <Form.Item label={'琛ㄥ悕'} style={{whiteSpace: 'nowrap', margin: 0}}>
+ <Form.Item label="琛ㄥ悕" style={{whiteSpace: 'nowrap', margin: 0}}>
{sheet}
</Form.Item>
</Col>
<Col span={10}>
- <Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0, whiteSpace: 'nowrap'}}>
- ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
+ <Form.Item label="鎶ラ敊瀛楁" style={{margin: 0, whiteSpace: 'nowrap'}}>
+ ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT銆丆NT銆�-2NT锛�, retmsg
</Form.Item>
</Col>
<Col span={24} className="sqlfield">
- <Form.Item label={'鍙敤瀛楁'}>
- <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'鍏叡鍊硷紝璇锋寜鐓xxx@鏍煎紡浣跨敤銆�'}><span style={{color: '#1890ff'}}>BID, ID, LoginUID, SessionUid, UserID, Appkey, time_id</span></Tooltip>,
+ <Form.Item label="鍙敤瀛楁">
+ <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'鍏叡鍊硷紝璇锋寜鐓xxx@鏍煎紡浣跨敤銆�'}><span style={{color: '#1890ff'}}>BID, ID, LoginUID, SessionUid, UserID, Appkey, time_id, typename</span></Tooltip>,
<Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'绯荤粺鍙橀噺锛岀郴缁熶細瀹氫箟鍙橀噺骞惰祴鍊笺��'}><span style={{color: '#fa8c16'}}>UserName, FullName, RoleID, mk_departmentcode, mk_organization, mk_user_type, mk_nation, mk_province, mk_city, mk_district, mk_address</span></Tooltip>
{usefulfields ? <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'鎼滅储鏉′欢锛岃鎸夌収@xxx@鏍煎紡浣跨敤銆�'}>, {usefulfields}</Tooltip> : null}
{linefields ? <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'琛ㄥ崟鍙婅鍙橀噺锛岀郴缁熶細瀹氫箟鍙橀噺骞惰祴鍊笺��'}>, {linefields}</Tooltip> : null}
</Form.Item>
</Col>
- {/* <Col span={8} style={{whiteSpace: 'nowrap'}}>
+ <Col span={8} style={{whiteSpace: 'nowrap'}}>
<Form.Item style={{marginBottom: 0}} label={
- <Tooltip placement="bottomLeft" title={'鑷畾涔夎剼鏈笌榛樿sql浣嶇疆鍏崇郴銆�'}>
+ <Tooltip placement="bottomLeft" title={'鑷畾涔夎剼鏈笌鏁版嵁婧愪綅缃叧绯汇��'}>
<QuestionCircleOutlined className="mk-form-tip" />
鎵ц浣嶇疆
</Tooltip>
@@ -289,24 +291,20 @@
initialValue: 'front'
})(
<Radio.Group>
- <Radio value="init">鍒濆鍖�</Radio>
- <Radio value="front">sql鍓�</Radio>
- <Radio value="back">sql鍚�</Radio>
+ <Radio value="front">鍓嶇疆</Radio>
+ <Radio value="back">鍚庣疆</Radio>
</Radio.Group>
)}
</Form.Item>
- </Col> */}
+ </Col>
<Col span={8}>
- <Form.Item style={{marginBottom: 0}} label={'蹇嵎娣诲姞'}>
+ <Form.Item style={{marginBottom: 0}} label="蹇嵎娣诲姞">
<Select
showSearch
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
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>
@@ -318,7 +316,7 @@
</Select>
</Form.Item>
</Col>
- <Col span={6} className="add">
+ <Col span={5} className="add" style={{whiteSpace: 'nowrap'}}>
<Button onClick={this.handleConfirm} loading={this.state.loading} className="mk-green" style={{marginBottom: 15, marginLeft: 40}}>
淇濆瓨
</Button>
@@ -326,8 +324,12 @@
鍙栨秷
</Button>
</Col>
+ <Col span={3} style={{paddingTop: '15px', fontSize: '12px', whiteSpace: 'nowrap'}}>
+ 寮哄埗淇濆瓨锛�
+ <Switch checked={skip} size="small" onChange={() => this.setState({skip: !skip})}/>
+ </Col>
<Col span={24} className="sql">
- <Form.Item label={'sql'}>
+ <Form.Item label="sql">
{getFieldDecorator('sql', {
initialValue: '',
rules: [
--
Gitblit v1.8.0