From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
index 41dce62..4dad8fb 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
@@ -1,8 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Icon, Button, notification, Select, Popconfirm, Typography, Modal, Radio } from 'antd'
-import { StopOutlined, CheckCircleOutlined } from '@ant-design/icons'
+import { Form, Row, Col, Button, notification, Select, Popconfirm, Typography, Modal, Radio, Tooltip } from 'antd'
+import { StopOutlined, CheckCircleOutlined, EditOutlined, SwapOutlined, DeleteOutlined } from '@ant-design/icons'
import moment from 'moment'
import Utils from '@/utils/utils.js'
@@ -31,6 +31,7 @@
editItem: null,
loading: false,
usefulFields: '',
+ urlFields: '',
systemScripts: [],
scriptsColumns: [
{
@@ -40,12 +41,12 @@
render: (text) => {
let title = text.match(/^\s*\/\*.+\*\//)
title = title && title[0] ? title[0] : ''
- text = title ? text.replace(title, '') : text
+ let _text = title ? text.replace(title, '') : text
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
- <Paragraph copyable ellipsis={{ rows: 4, expandable: true }}>{text}</Paragraph>
+ {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null}
+ <Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph>
</div>
)
}
@@ -69,7 +70,7 @@
render: (text, record) => record.status === 'false' ?
(
<div style={{color: '#ff4d4f'}}>
- {this.props.dict['model.status.forbidden']}
+ 绂佺敤
<StopOutlined style={{marginLeft: '5px'}} />
</div>
) :
@@ -87,14 +88,14 @@
dataIndex: 'operation',
render: (text, record) =>
(<div style={{textAlign: 'center'}}>
- <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record)} style={{color: '#1890ff'}}><Icon type="edit" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record)} style={{color: '#8E44AD'}}><Icon type="swap" /></span>
+ <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record)} style={{color: '#1890ff'}}><EditOutlined /></span>
+ <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record)} style={{color: '#8E44AD'}}><SwapOutlined /></span>
<Popconfirm
overlayClassName="popover-confirm"
title={this.props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record)
}>
- <span className="operation-btn" style={{color: '#ff4d4f'}}><Icon type="delete" /></span>
+ <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
</div>)
}
@@ -106,6 +107,7 @@
let _usefulFields = []
let scriptsColumns = fromJS(this.state.scriptsColumns).toJS()
+ let _urlFields = ''
if (searches) {
searches.forEach(item => {
@@ -120,14 +122,11 @@
} else if (_usefulFields.includes(item.field)) {
_usefulFields.push(item.field + '1')
} else {
- _usefulFields.push(item.field)
+ _usefulFields.push(item.field.replace(/,/ig, ', '))
}
})
- if (urlFields) {
- _usefulFields.push(...urlFields)
- }
-
+ _urlFields = urlFields ? urlFields.join(', ') : ''
_usefulFields = _usefulFields.join(', ')
scriptsColumns = scriptsColumns.filter(item => {
if (item.dataIndex === 'sql') {
@@ -140,6 +139,7 @@
}
this.setState({
+ urlFields: _urlFields,
usefulFields: _usefulFields,
scripts: fromJS(scripts).toJS(),
scriptsColumns
@@ -289,8 +289,10 @@
exec_type: 'y',
LText: SettingUtils.getCustomDebugSql(_scripts, this.props.regoptions)
}
- param.LText = Utils.formatOptions(param.LText)
+
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 = Utils.formatOptions(param.LText)
param.secretkey = Utils.encrypt('', param.timestamp)
this.setState({loading: true})
@@ -404,7 +406,7 @@
render() {
const { setting, scripts } = this.props
const { getFieldDecorator } = this.props.form
- const { usefulFields, scriptsColumns, systemScripts } = this.state
+ const { usefulFields, scriptsColumns, systemScripts, urlFields } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -430,16 +432,14 @@
ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
</Form.Item>
</Col>
- {usefulFields ? <Col span={24} className="sqlfield">
+ <Col span={24} className="sqlfield">
<Form.Item label={'鍙敤瀛楁'}>
- id, bid, loginuid, sessionuid, userid, username, fullname, RoleID, mk_departmentcode, mk_organization, login_city, appkey, time_id{usefulFields ? ', ' + usefulFields : ''}
+ <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>
+ {usefulFields ? <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'鎼滅储鏉′欢鍙橀噺锛岃鎸夌収@xxx@鏍煎紡浣跨敤銆�'}>, {usefulFields}</Tooltip> : ''}
+ {urlFields ?<Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'url鍙橀噺锛岃鎸夌収@xxx@鏍煎紡浣跨敤銆�'}>, <span style={{color: '#13c2c2'}}>{urlFields}</span></Tooltip> : ''}
</Form.Item>
- </Col> : null}
- {!usefulFields ? <Col span={24} className="sqlfield">
- <Form.Item label={'鍙敤瀛楁'}>
- id, bid, loginuid, sessionuid, userid, username, fullname, RoleID, mk_departmentcode, mk_organization, login_city, appkey, time_id
- </Form.Item>
- </Col> : null}
+ </Col>
{!usefulFields ? <Col span={8} style={{whiteSpace: 'nowrap'}}>
<Form.Item style={{marginBottom: 0}} label="鎵ц浣嶇疆">
{getFieldDecorator('position', {
--
Gitblit v1.8.0