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/customscript/index.jsx | 75 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 25 deletions(-)
diff --git a/src/templates/zshare/customscript/index.jsx b/src/templates/zshare/customscript/index.jsx
index a69270f..662e012 100644
--- a/src/templates/zshare/customscript/index.jsx
+++ b/src/templates/zshare/customscript/index.jsx
@@ -1,13 +1,15 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Icon, 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'
import Utils from '@/utils/utils.js'
import Api from '@/api'
import CodeMirror from '@/templates/zshare/codemirror'
import asyncComponent from '@/utils/asyncComponent'
+import MKEmitter from '@/utils/events.js'
import './index.scss'
const { Paragraph } = Typography
@@ -15,10 +17,10 @@
class CustomForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
setting: PropTypes.object, // 璁剧疆
scripts: PropTypes.array, // 鑷畾涔夎剼鏈垪琛�
searches: PropTypes.array, // 鎼滅储鏉′欢
+ urlFields: PropTypes.any, // url鍙橀噺
defaultSql: PropTypes.string, // 榛樿sql
scriptsChange: PropTypes.func, // 鑷畾涔夎剼鏈垏鎹㈡椂楠岃瘉
scriptsUpdate: PropTypes.func // 琛ㄥ崟
@@ -28,6 +30,7 @@
editItem: null,
loading: false,
usefulFields: '',
+ urlFields: '',
systemScripts: [],
scriptsColumns: [
{
@@ -37,12 +40,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>
)
}
@@ -53,15 +56,15 @@
width: '12%',
render: (text, record) => record.status === 'false' ?
(
- <div>
- {this.props.dict['model.status.forbidden']}
- <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" />
+ <div style={{color: '#ff4d4f'}}>
+ 绂佺敤
+ <StopOutlined style={{marginLeft: '5px'}} />
</div>
) :
(
- <div>
- {this.props.dict['model.status.open']}
- <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" />
+ <div style={{color: '#26C281'}}>
+ 鍚敤
+ <CheckCircleOutlined style={{marginLeft: '5px'}}/>
</div>
)
},
@@ -72,14 +75,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="缂栬緫" 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'}}><Icon type="delete" /></span>
+ <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
</div>)
}
@@ -87,15 +90,13 @@
}
UNSAFE_componentWillMount() {
- const { searches, scripts } = this.props
+ const { searches, scripts, urlFields } = this.props
let _usefulFields = []
searches.forEach(item => {
if (!item.field) return
if (item.type === 'group') {
- if (item.transfer === 'true') {
- _usefulFields.push(item.field)
- }
+ _usefulFields.push(item.field)
_usefulFields.push(item.datefield)
_usefulFields.push(item.datefield + '1')
} else if (['dateweek', 'datemonth', 'daterange'].includes(item.type)) {
@@ -104,11 +105,12 @@
} else if (_usefulFields.includes(item.field)) {
_usefulFields.push(item.field + '1')
} else {
- _usefulFields.push(item.field)
+ _usefulFields.push(item.field.replace(/,/ig, ', '))
}
})
this.setState({
+ urlFields: urlFields ? urlFields.join(', ') : '',
usefulFields: _usefulFields.join(', '),
scripts: fromJS(scripts).toJS()
})
@@ -119,6 +121,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)
@@ -134,7 +142,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 = {
@@ -143,6 +151,8 @@
}
return _item
})
+
+ sessionStorage.setItem('mk_sys_scripts', JSON.stringify(_scripts))
this.setState({
systemScripts: _scripts
@@ -221,6 +231,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')
@@ -255,6 +272,8 @@
scripts: _scripts,
editItem: null
})
+
+ MKEmitter.emit('editLineId', values.uuid)
this.props.scriptsUpdate(_scripts)
this.props.form.setFieldsValue({
@@ -298,7 +317,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)
@@ -346,7 +365,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 },
@@ -374,7 +393,10 @@
</Col>
<Col span={24} className="sqlfield">
<Form.Item label={'鍙敤瀛楁'}>
- id, bid, loginuid, sessionuid, userid, username, fullname, 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">
@@ -386,6 +408,9 @@
onChange={this.selectScript}
>
<Select.Option key="default" value={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 style={{whiteSpace: 'normal'}} key={i} value={option.value}>{option.name}</Select.Option>
)}
@@ -404,7 +429,7 @@
<Form.Item label={'sql'}>
{getFieldDecorator('sql', {
initialValue: ''
- })(<CodeMirror />)}
+ })(<CodeMirror/>)}
</Form.Item>
</Col>
</Row>
--
Gitblit v1.8.0