From cd5079f2dbe12eb03fcef2e1898e4f013848d895 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 28 九月 2023 12:34:30 +0800
Subject: [PATCH] 2023-09-28
---
src/templates/zshare/customscript/index.jsx | 95 +++++++++++++++++++++++++++++++++--------------
1 files changed, 67 insertions(+), 28 deletions(-)
diff --git a/src/templates/zshare/customscript/index.jsx b/src/templates/zshare/customscript/index.jsx
index 2caa82b..80db92a 100644
--- a/src/templates/zshare/customscript/index.jsx
+++ b/src/templates/zshare/customscript/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Button, notification, Select, Popconfirm, Typography } from 'antd'
+import { Form, Row, Col, Button, notification, Select, Popconfirm, Typography, Tooltip } from 'antd'
import { StopOutlined, CheckCircleOutlined, EditOutlined, SwapOutlined, DeleteOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -17,7 +17,6 @@
class CustomForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
setting: PropTypes.object, // 璁剧疆
scripts: PropTypes.array, // 鑷畾涔夎剼鏈垪琛�
searches: PropTypes.array, // 鎼滅储鏉′欢
@@ -31,6 +30,7 @@
editItem: null,
loading: false,
usefulFields: '',
+ urlFields: '',
systemScripts: [],
scriptsColumns: [
{
@@ -44,7 +44,7 @@
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
+ {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>
)
@@ -57,13 +57,13 @@
render: (text, record) => record.status === 'false' ?
(
<div style={{color: '#ff4d4f'}}>
- {this.props.dict['model.status.forbidden']}
+ 绂佺敤
<StopOutlined style={{marginLeft: '5px'}} />
</div>
) :
(
<div style={{color: '#26C281'}}>
- {this.props.dict['model.status.open']}
+ 鍚敤
<CheckCircleOutlined style={{marginLeft: '5px'}}/>
</div>
)
@@ -75,11 +75,11 @@
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'}}><EditOutlined /></span>
- <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record)} style={{color: '#8E44AD'}}><SwapOutlined /></span>
+ <span className="operation-btn" title="缂栬緫" onClick={() => this.handleEdit(record)} style={{color: '#1890ff'}}><EditOutlined /></span>
+ <span className="operation-btn" title="鐘舵�佸垏鎹�" onClick={() => this.handleStatus(record)} style={{color: '#8E44AD'}}><SwapOutlined /></span>
<Popconfirm
overlayClassName="popover-confirm"
- title={this.props.dict['model.query.delete']}
+ title="纭畾鍒犻櫎鍚�?"
onConfirm={() => this.handleDelete(record)
}>
<span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
@@ -94,26 +94,28 @@
let _usefulFields = []
searches.forEach(item => {
- if (!item.field) return
- if (item.type === 'group') {
- _usefulFields.push(item.field)
- _usefulFields.push(item.datefield)
- _usefulFields.push(item.datefield + '1')
- } else if (['dateweek', 'datemonth', 'daterange'].includes(item.type)) {
- _usefulFields.push(item.field)
- _usefulFields.push(item.field + '1')
- } else if (_usefulFields.includes(item.field)) {
- _usefulFields.push(item.field + '1')
+ if (['dateweek', 'datemonth'].includes(item.type)) {
+ _usefulFields.push(item.key)
+ _usefulFields.push(item.key + '1')
+ } else if (item.type === 'daterange') {
+ let _skey = item.key
+ let _ekey = item.key + '1'
+
+ if (/,/.test(item.key)) {
+ _skey = item.key.split(',')[0]
+ _ekey = item.key.split(',')[1]
+ }
+ _usefulFields.push(_skey)
+ _usefulFields.push(_ekey)
+ } else if (item.type === 'date' && _usefulFields.includes(item.key)) {
+ _usefulFields.push(item.key + '1')
} else {
- _usefulFields.push(item.field)
+ _usefulFields.push(item.key.replace(/,/ig, ', '))
}
})
- if (urlFields) {
- _usefulFields.push(...urlFields)
- }
-
this.setState({
+ urlFields: urlFields ? urlFields.join(', ') : '',
usefulFields: _usefulFields.join(', '),
scripts: fromJS(scripts).toJS()
})
@@ -124,6 +126,12 @@
}
getsysScript = () => {
+ if (sessionStorage.getItem('mk_sys_scripts')) {
+ this.setState({
+ systemScripts: JSON.parse(sessionStorage.getItem('mk_sys_scripts'))
+ })
+ return
+ }
let _scriptSql = `Select distinct func+Remark as funcname,longparam, s.Sort from聽 s_custom_script s inner join (select OpenID from sapp where ID=@Appkey@) p on s.openid = case when s.appkey='' then s.openid else p.OpenID end order by s.Sort`
_scriptSql = Utils.formatOptions(_scriptSql)
@@ -139,7 +147,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 => {
let _item = {
@@ -148,6 +156,8 @@
}
return _item
})
+
+ sessionStorage.setItem('mk_sys_scripts', JSON.stringify(_scripts))
this.setState({
systemScripts: _scripts
@@ -226,6 +236,32 @@
duration: 5
})
return
+ } else if (/,,/ig.test(values.sql)) {
+ notification.warning({
+ top: 92,
+ message: '鑷畾涔塻ql璇彞涓紝涓嶅彲鍑虹幇杩炵画鐨勮嫳鏂囬�楀彿锛�,,锛�',
+ duration: 5
+ })
+ return
+ } else if (/\son\s+[a-z0-9_]+\.[a-z0-9_]+\s*=\s*[a-z0-9_]+\.[a-z0-9_]+/ig.test(values.sql)) {
+ let list = values.sql.match(/\son\s+[a-z0-9_]+\.[a-z0-9_]+\s*=\s*[a-z0-9_]+\.[a-z0-9_]+/ig)
+ let errors = []
+ list.forEach(str => {
+ str = str.replace(/^\s/, '')
+ let strs = str.match(/(\s|=)[a-z0-9_]+\./ig)
+ if (strs.length === 2 && (strs[0].replace(/\s|\./g, '') === strs[1].replace(/\s|\./g, ''))) {
+ errors.push(str)
+ }
+ })
+
+ if (errors.length > 0) {
+ notification.warning({
+ top: 92,
+ message: '涓嶅彲浣跨敤鍚屼竴涓〃瀛楁杩涜鍏宠仈锛�' + errors.join('銆�'),
+ duration: 5
+ })
+ return
+ }
}
let error = Utils.verifySql(values.sql, 'customscript')
@@ -305,7 +341,7 @@
}
scrolltop = () => {
- let node = document.getElementById('model-setting-form-body').parentNode
+ let node = document.getElementById('mk-setting-scripts')
if (node && node.scrollTop) {
let inter = Math.ceil(node.scrollTop / 10)
@@ -353,7 +389,7 @@
render() {
const { setting, defaultSql, 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 },
@@ -381,7 +417,10 @@
</Col>
<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, orderBy{setting.laypage === 'true' ? ', pageSize, pageIndex': ''}{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>,
+ <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'鎺掑簭銆佸垎椤典互鍙婃悳绱㈡潯浠跺彉閲忥紝璇锋寜鐓xxx@鏍煎紡浣跨敤銆�'}>orderBy{setting.laypage === 'true' ? ', pageSize, pageIndex': ''}{usefulFields ? ', ' + 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>
<Col span={10} className="quick-add">
@@ -414,7 +453,7 @@
<Form.Item label={'sql'}>
{getFieldDecorator('sql', {
initialValue: ''
- })(<CodeMirror />)}
+ })(<CodeMirror/>)}
</Form.Item>
</Col>
</Row>
--
Gitblit v1.8.0