From fe21d23b147ed5cec22b4f76a88840b05495d4ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 18 六月 2022 22:33:59 +0800
Subject: [PATCH] 2022-06-18
---
src/templates/zshare/verifycard/customscript/index.jsx | 88 ++++++++++++++++++++++++++++++--------------
1 files changed, 60 insertions(+), 28 deletions(-)
diff --git a/src/templates/zshare/verifycard/customscript/index.jsx b/src/templates/zshare/verifycard/customscript/index.jsx
index f7f1d2e..257064a 100644
--- a/src/templates/zshare/verifycard/customscript/index.jsx
+++ b/src/templates/zshare/verifycard/customscript/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Button, notification, Modal, Tooltip, Icon, 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'
@@ -10,6 +11,7 @@
class CustomForm extends Component {
static propTpyes = {
+ type: PropTypes.any,
dict: PropTypes.object, // 瀛楀吀椤�
btn: PropTypes.object, // 鎸夐挳淇℃伅
usefulfields: PropTypes.string, // 鍙敤瀛楁
@@ -30,18 +32,34 @@
editItem: record
})
- this.props.form.setFieldsValue({
- sql: record.sql,
- position: record.position || 'back'
- })
+ if (this.props.type) {
+ this.props.form.setFieldsValue({
+ sql: record.sql
+ })
+ } else {
+ this.props.form.setFieldsValue({
+ sql: record.sql,
+ position: record.position || 'back'
+ })
+ }
}
handleConfirm = () => {
+ const { type } = this.props
const { editItem } = this.state
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
this.props.form.validateFieldsAndScroll((err, values) => {
+ if (type === 'fullscreen' && err) {
+ notification.warning({
+ top: 92,
+ message: '璇疯緭鍏ql!',
+ duration: 5
+ })
+ return
+ }
if (!err) {
values.uuid = editItem ? editItem.uuid : ''
+ values.position = values.position || (editItem ? editItem.position : 'front')
let _quot = values.sql.match(/'{1}/g)
let _lparen = values.sql.match(/\({1}/g)
@@ -94,22 +112,24 @@
let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
this.props.customScripts.forEach(item => {
- if (item.status === 'false') return
+ if (item.status === 'false' && values.uuid !== item.uuid) return
- if (item.position === 'init') {
+ let _item = values.uuid === item.uuid ? values : item
+
+ if (_item.position === 'init') {
_initCustomScript += `
/* 鍒濆鍖栬剼鏈� */
- ${values.uuid === item.uuid ? values.sql : item.sql}
+ ${_item.sql}
`
- } else if (item.position === 'front') {
+ } else if (_item.position === 'front') {
_prevCustomScript += `
/* 榛樿sql鍓嶈剼鏈� */
- ${values.uuid === item.uuid ? values.sql : item.sql}
+ ${_item.sql}
`
} else {
_backCustomScript += `
/* 榛樿sql鍚庤剼鏈� */
- ${values.uuid === item.uuid ? values.sql : item.sql}
+ ${_item.sql}
`
}
})
@@ -137,6 +157,13 @@
func: 's_debug_sql',
exec_type: 'y',
LText: this.props.initsql + _initCustomScript + _prevCustomScript + _backCustomScript + tail
+ }
+
+ if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
+ window.GLOB.funcs.forEach(item => {
+ let reg = new RegExp('\\$ex@' + item.func_code + '@ex\\$', 'ig')
+ param.LText = param.LText.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
+ })
}
// 鏁版嵁鏉冮檺
@@ -211,8 +238,9 @@
}
render() {
- const { usefulfields, systemScripts, btn } = this.props
+ const { usefulfields, systemScripts, btn, type } = this.props
const { getFieldDecorator } = this.props.form
+ const { editItem } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -224,28 +252,30 @@
}
}
+ let _type = type || ''
+
return (
- <Form {...formItemLayout} className="verify-form" id="verify-custom-scripts">
+ <Form {...formItemLayout} className="verify-form verify-custom-scripts" id={'verify-custom-scripts' + _type}>
<Row gutter={24}>
- {btn.sql ? <Col span={8}>
+ {!_type ? <Col span={8}>
<Form.Item label={'琛ㄥ悕'} style={{whiteSpace: 'nowrap', margin: 0}}>
- {btn.sql}
+ {btn.sql || ''}
</Form.Item>
</Col> : null}
- <Col span={10}>
+ {!_type ? <Col span={10}>
<Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0, whiteSpace: 'nowrap'}}>
ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
</Form.Item>
- </Col>
- {usefulfields ? <Col span={24} className="sqlfield">
+ </Col> : null}
+ {!_type && usefulfields ? <Col span={24} className="sqlfield">
<Form.Item label={'鍙敤瀛楁'}>
{usefulfields}
</Form.Item>
</Col> : null}
- <Col span={8} style={{whiteSpace: 'nowrap'}}>
+ {!_type ?<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>
}>
@@ -259,26 +289,28 @@
</Radio.Group>
)}
</Form.Item>
- </Col>
- <Col span={10}>
+ </Col> : null}
+ {!_type ?<Col span={10}>
<Form.Item label={'蹇嵎娣诲姞'} style={{marginBottom: 0}}>
<Select
showSearch
- allowClear
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
- onChange={this.selectScript}
- getPopupContainer={() => document.getElementById('verify-custom-scripts')}
+ onSelect={this.selectScript}
+ getPopupContainer={() => document.getElementById('verify-custom-scripts' + _type)}
>
<Select.Option key="default" value={this.props.defaultsql}>榛樿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}</Select.Option>
)}
</Select>
</Form.Item>
- </Col>
+ </Col> : null}
<Col span={6} className="add">
<Button onClick={this.handleConfirm} loading={this.state.loading} className="mk-green" style={{marginBottom: 15, marginLeft: 40}}>
- 淇濆瓨
+ {_type === 'fullscreen' && !editItem ? '娣诲姞' : '淇濆瓨'}
</Button>
<Button onClick={this.handleCancel} style={{marginBottom: 15, marginLeft: 10}}>
鍙栨秷
@@ -287,7 +319,7 @@
<Col span={24} className="sql">
<Form.Item label={
<Tooltip placement="topLeft" title={'鏁版嵁妫�鏌ユ浛鎹㈢ $check@ -> \'\'銆� @check$ -> \'\'锛孍rrorCode绛変簬C鏃� $check@ -> /*銆� @check$ -> */'}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
sql
</Tooltip>
}>
--
Gitblit v1.8.0