From c7aece35a62b6e91fd98a625bf0e53f64bfbd18d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 八月 2023 16:22:15 +0800
Subject: [PATCH] 2023-08-17
---
src/templates/zshare/verifycard/customscript/index.jsx | 113 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 76 insertions(+), 37 deletions(-)
diff --git a/src/templates/zshare/verifycard/customscript/index.jsx b/src/templates/zshare/verifycard/customscript/index.jsx
index 979d472..cb530d4 100644
--- a/src/templates/zshare/verifycard/customscript/index.jsx
+++ b/src/templates/zshare/verifycard/customscript/index.jsx
@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Button, notification, Modal, Tooltip, Radio, Select } from 'antd'
+import { Form, Row, Col, Button, notification, Modal, Tooltip, Radio, Select, Switch } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -12,7 +12,6 @@
class CustomForm extends Component {
static propTpyes = {
type: PropTypes.any,
- dict: PropTypes.object, // 瀛楀吀椤�
btn: PropTypes.object, // 鎸夐挳淇℃伅
usefulfields: PropTypes.string, // 鍙敤瀛楁
initsql: PropTypes.string, // sql鍓嶇紑
@@ -24,7 +23,8 @@
state = {
editItem: null,
- loading: false
+ loading: false,
+ skip: false
}
edit = (record) => {
@@ -46,7 +46,7 @@
handleConfirm = () => {
const { type } = this.props
- const { editItem } = this.state
+ const { editItem, skip } = this.state
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
this.props.form.validateFieldsAndScroll((err, values) => {
if (type === 'fullscreen' && err) {
@@ -58,8 +58,20 @@
return
}
if (!err) {
+ if (/^[\s\n]+$/.test(values.sql)) {
+ notification.warning({
+ top: 92,
+ message: '璇疯緭鍏ql!',
+ duration: 5
+ })
+ return
+ }
values.uuid = editItem ? editItem.uuid : ''
values.position = values.position || (editItem ? editItem.position : 'front')
+
+ if (type === 'fullscreen' && editItem) {
+ values.status = editItem.status || 'true'
+ }
let _quot = values.sql.match(/'{1}/g)
let _lparen = values.sql.match(/\({1}/g)
@@ -90,6 +102,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')
@@ -112,9 +131,9 @@
let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
this.props.customScripts.forEach(item => {
- if (item.status === 'false' && values.uuid !== item.uuid) return
-
let _item = values.uuid === item.uuid ? values : item
+
+ if (_item.status === 'false') return
if (_item.position === 'init') {
_initCustomScript += `
@@ -177,33 +196,46 @@
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.LText = param.LText.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
+ param.LText = param.LText.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'${param.timestamp}'`)
console.info(`/* sql 楠岃瘉 */\n${param.LText.replace(/\n\s{6,20}/ig, '\n')}`)
+ param.LText = param.LText.replace(/\n/g, ' ')
param.LText = Utils.formatOptions(param.LText)
param.secretkey = Utils.encrypt('', param.timestamp)
- this.setState({loading: true})
- Api.genericInterface(param).then(res => {
- if (res.status) {
- this.setState({
- loading: false,
- editItem: null
- }, () => {
- this.props.scriptsChange(values)
- })
- this.props.form.setFieldsValue({
- sql: ' '
- })
- } else {
- this.setState({loading: false})
-
- Modal.error({
- title: res.message
- })
- }
- })
+ if (skip) {
+ this.setState({
+ skip: false,
+ editItem: null
+ }, () => {
+ this.props.scriptsChange(values)
+ })
+ this.props.form.setFieldsValue({
+ sql: ' '
+ })
+ } else {
+ this.setState({loading: true})
+ Api.genericInterface(param).then(res => {
+ if (res.status) {
+ this.setState({
+ loading: false,
+ editItem: null
+ }, () => {
+ this.props.scriptsChange(values)
+ })
+ this.props.form.setFieldsValue({
+ sql: ' '
+ })
+ } else {
+ this.setState({loading: false})
+
+ Modal.error({
+ title: res.message
+ })
+ }
+ })
+ }
}
})
}
@@ -222,6 +254,9 @@
if (!value || !option) return
let _sql = this.props.form.getFieldValue('sql')
+ if (/^\s+$/.test(_sql)) {
+ _sql = ''
+ }
if (_sql) {
_sql = _sql + `
@@ -242,7 +277,7 @@
render() {
const { usefulfields, systemScripts, btn, type } = this.props
const { getFieldDecorator } = this.props.form
- const { editItem } = this.state
+ const { editItem, skip } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -268,18 +303,18 @@
</Col> : null}
{!_type ? <Col span={10}>
<Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0, whiteSpace: 'nowrap'}}>
- ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
+ ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT銆丆NT銆�-2NT锛�, retmsg
</Form.Item>
</Col> : null}
{!_type ? <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>,
- <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>,
+ <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, mk_deleted</span></Tooltip>,
<Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'绯荤粺鍙橀噺锛岀郴缁熶細瀹氫箟鍙橀噺骞跺湪鍗曞彿鐢熸垚鎴栧垱寤哄嚟璇佹椂浣跨敤銆�'}><span style={{color: '#13c2c2'}}>BillCode, BVoucher, FIBVoucherDate, FiYear, ModularDetailCode</span></Tooltip>
{usefulfields ? <span>, {usefulfields}</span> : ''}
</Form.Item>
</Col> : null}
- {!_type ?<Col span={8} style={{whiteSpace: 'nowrap'}}>
+ {!_type ? <Col span={8} style={{whiteSpace: 'nowrap'}}>
<Form.Item style={{marginBottom: 0}} label={
<Tooltip placement="bottomLeft" title={'鑷畾涔夎剼鏈笌榛樿sql浣嶇疆鍏崇郴銆�'}>
<QuestionCircleOutlined className="mk-form-tip" />
@@ -297,7 +332,7 @@
)}
</Form.Item>
</Col> : null}
- {!_type ?<Col span={10}>
+ {!_type ? <Col span={8}>
<Form.Item label={'蹇嵎娣诲姞'} style={{marginBottom: 0}}>
<Select
showSearch
@@ -315,17 +350,21 @@
</Select>
</Form.Item>
</Col> : null}
- <Col span={6} className="add">
- <Button onClick={this.handleConfirm} loading={this.state.loading} className="mk-green" style={{marginBottom: 15, marginLeft: 40}}>
+ <Col span={5} className="add" style={{whiteSpace: 'nowrap'}}>
+ <Button onClick={this.handleConfirm} loading={this.state.loading} className="mk-green" style={{marginBottom: 15, marginLeft: 30}}>
{_type === 'fullscreen' && !editItem ? '娣诲姞' : '淇濆瓨'}
</Button>
<Button onClick={this.handleCancel} style={{marginBottom: 15, marginLeft: 10}}>
鍙栨秷
</Button>
</Col>
+ {!_type ? <Col span={3} style={{paddingTop: '15px', fontSize: '12px', whiteSpace: 'nowrap'}}>
+ 寮哄埗淇濆瓨锛�
+ <Switch checked={skip} size="small" onChange={() => this.setState({skip: !skip})}/>
+ </Col> : null}
<Col span={24} className="sql">
<Form.Item label={
- <Tooltip placement="topLeft" title={'鏁版嵁妫�鏌ユ浛鎹㈢ $check@ -> \'\'銆� @check$ -> \'\'锛孍rrorCode绛変簬C鏃� $check@ -> /*銆� @check$ -> */銆傛敞锛�1銆侀渶浣跨敤绯荤粺鎺ュ彛 2銆佽璁剧疆涓衡�滈�夋嫨澶氳鈥濇椂鏃犳晥銆傝皟璇曟浛鎹㈢ /*$breakpoint_begin_xxxx@ 銆丂breakpoint_end_xxxx$*/'}>
+ <Tooltip placement="topLeft" overlayStyle={{width: '320px', maxWidth: '320px'}} title={<><div>{'璋冭瘯鏇挎崲绗� /*$breakpoint_begin_xxxx@ 銆丂breakpoint_end_xxxx$*/锛屽湪鎺у埗鍙颁腑杈撳叆 window.debug = \'xxxx\' 浼氬惎鐢ㄥ搴旂殑璋冭瘯璇彞锛屽揩鎹烽敭 ctrl+c 鎴栧湪鎺у埗鍙颁腑杈撳叆 window.debug = false 鍏抽棴璋冭瘯銆傛敞锛氳皟璇曟椂瀛楃 $breakpoint_proc@ 灏嗚鏇挎崲銆�'}</div><div style={{height: '5px'}}></div><div>{'鏁版嵁妫�鏌ユ浛鎹㈢ $check@ -> \'\'銆� @check$ -> \'\'锛孍rrorCode绛変簬C鏃朵細璇㈤棶鏄惁缁х画鎵ц锛岀‘瀹氭椂 $check@ -> /*銆� @check$ -> */銆傛敞锛�1銆侀渶浣跨敤绯荤粺鎺ュ彛 2銆佽璁剧疆涓衡�滈�夋嫨澶氳鈥濇椂鏃犳晥銆�'}</div></>}>
<QuestionCircleOutlined className="mk-form-tip" />
sql
</Tooltip>
@@ -335,7 +374,7 @@
rules: [
{
required: true,
- message: this.props.dict['form.required.input'] + 'sql!'
+ message: '璇疯緭鍏ql!'
}
]
})(<CodeMirror />)}
--
Gitblit v1.8.0