From 04a71ecb03c8aaebceade470045ea8676f0baf2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 01 七月 2022 14:31:23 +0800
Subject: [PATCH] 2022-07-01
---
src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 193 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 151 insertions(+), 42 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
index 6ef30e6..2fec3e1 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, notification, Modal, Spin, Tabs } from 'antd'
+import { Form, notification, Modal, Spin, Tabs, Typography, Popconfirm, Button } from 'antd'
+import { CheckCircleOutlined, StopOutlined, SwapOutlined, DeleteOutlined, BorderOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -9,9 +10,12 @@
import SettingUtils from './utils.jsx'
import asyncComponent from '@/utils/asyncComponent'
import DataSource from './datasource'
+import MinView from '@/assets/img/minview.png'
import './index.scss'
const { TabPane } = Tabs
+const { Paragraph } = Typography
+const CodeMirror = asyncComponent(() => import('@/templates/zshare/codemirror'))
const CustomScript = asyncComponent(() => import('@/templates/zshare/customscript'))
const SimpleScript = asyncComponent(() => import('./simplescript'))
@@ -20,7 +24,8 @@
dict: PropTypes.object, // 瀛楀吀椤�
menu: PropTypes.object, // 鑿滃崟淇℃伅
config: PropTypes.object, // 椤甸潰閰嶇疆淇℃伅
- search: PropTypes.array // 鎼滅储鏉′欢
+ search: PropTypes.array, // 鎼滅储鏉′欢
+ updRecord: PropTypes.func
}
state = {
@@ -32,6 +37,9 @@
regoptions: [],
setting: null,
defaultSql: '',
+ visible: false,
+ script: null,
+ scriptValue: '',
status: {}
}
@@ -126,6 +134,10 @@
cbScripts: _cbScripts,
status
})
+ }
+
+ componentDidMount () {
+ this.props.updRecord(this.state.status)
}
getRegOptions = (searches) => {
@@ -257,26 +269,6 @@
if (activeKey === 'setting') {
return new Promise((resolve, reject) => {
this.settingForm.handleConfirm().then(res => {
- if (trigger === 'func' && res.interType !== 'inner') {
- notification.warning({
- top: 92,
- message: '浣跨敤鍐呴儴鎺ュ彛锛屾墠鍙互鍒涘缓瀛樺偍杩囩▼锛�',
- duration: 5
- })
- this.setState({loading: false})
- reject()
- return
- } else if (trigger === 'interface' && res.interType !== 'system') {
- notification.warning({
- top: 92,
- message: '浣跨敤绯荤粺鎺ュ彛鏃讹紝鎵嶅彲浠ュ垱寤烘帴鍙ｏ紒',
- duration: 5
- })
- this.setState({loading: false})
- reject()
- return
- }
-
this.setState({
setting: res
}, () => {
@@ -295,23 +287,13 @@
})
} else if (activeKey === 'scripts') {
return new Promise((resolve, reject) => {
- if (trigger === 'func' && setting.interType !== 'inner') {
- notification.warning({
- top: 92,
- message: '浣跨敤鍐呴儴鎺ュ彛锛屾墠鍙互鍒涘缓瀛樺偍杩囩▼锛�',
- duration: 5
- })
+ this.sqlverify(() => {
+ this.setState({loading: false})
+ resolve({...setting, scripts, preScripts, cbScripts})
+ }, () => {
this.setState({loading: false})
reject()
- } else {
- this.sqlverify(() => {
- this.setState({loading: false})
- resolve({...setting, scripts, preScripts, cbScripts})
- }, () => {
- this.setState({loading: false})
- reject()
- }, 'submit')
- }
+ }, 'submit')
})
} else {
this.setState({loading: false})
@@ -341,15 +323,16 @@
} else if (type === 'scripts' && _scripts.length === 0) {
_resolve()
} else { // type 涓� submit 銆� verify 锛屼互鍙婂叾浠栭渶瑕侀獙璇佺殑鍦烘櫙
- let r = SettingUtils.getDebugSql(setting, _scripts, arr_field, regoptions, search)
+ let timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ let r = SettingUtils.getDebugSql(setting, _scripts, arr_field, regoptions, search, timestamp)
let param = {
func: 's_debug_sql',
exec_type: 'y',
LText: r.sql
}
param.LText = Utils.formatOptions(param.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt('', param.timestamp)
+ param.timestamp = timestamp
+ param.secretkey = Utils.encrypt('', timestamp)
let sumParam = null
if (r.sumSql) {
@@ -503,6 +486,42 @@
})
}
+ triggerConfirm = () => {
+ const { script, scriptValue, scripts } = this.state
+ let _scripts = fromJS(scripts).toJS()
+
+ if (!scriptValue) {
+ notification.warning({
+ top: 92,
+ message: '璇疯緭鍏ql!',
+ duration: 5
+ })
+ return
+ }
+
+ if (script) {
+ _scripts = _scripts.map(item => {
+ if (script.uuid === item.uuid) {
+ item.sql = scriptValue
+ }
+ return item
+ })
+ } else {
+ let _script = {
+ uuid: Utils.getuuid(),
+ sql: scriptValue,
+ $index: _scripts.length + 1,
+ status: 'true'
+ }
+
+ _scripts.push(_script)
+ }
+
+ this.setState({loading: true})
+
+ this.sqlverify(() => {this.setState({scripts: _scripts, script: null, scriptValue: '', loading: false})}, () => {this.setState({loading: false})}, 'verify', _scripts)
+ }
+
// 鑷畾涔夎剼鏈洿鏂�
scriptsUpdate = (scripts) => {
this.setState({scripts})
@@ -518,13 +537,35 @@
this.setState({cbScripts})
}
+ handleDelete = (item) => {
+ const { script, scripts } = this.state
+
+ if (script && script.uuid === item.uuid) {
+ this.setState({script: null})
+ }
+ this.setState({scripts: scripts.filter(cell => cell.uuid !== item.uuid)})
+ }
+
+ handleStatus = (item) => {
+ item.status = item.status === 'false' ? 'true' : 'false'
+
+ this.setState({scripts: this.state.scripts.map(cell => {
+ if (cell.uuid === item.uuid) {
+ return item
+ }
+ return cell
+ })})
+ }
+
updateStatus = (status) => {
- this.setState({status: {...this.state.status, ...status}})
+ let _status = {...this.state.status, ...status}
+ this.setState({status: _status})
+ this.props.updRecord(_status)
}
render() {
const { config, menu, dict } = this.props
- const { loading, activeKey, setting, defaultSql, columns, scripts, preScripts, cbScripts, status, regoptions } = this.state
+ const { loading, activeKey, setting, defaultSql, columns, scripts, preScripts, cbScripts, status, regoptions, visible, script, scriptValue } = this.state
return (
<div className="model-table-setting-form-box" id="model-setting-form-body">
@@ -548,6 +589,17 @@
{scripts.length ? <span className="count-tip">{scripts.length}</span> : null}
</span>
} disabled={!(status.interType === 'system' || (status.interType === 'custom' && status.requestMode === 'system'))} key="scripts">
+ <BorderOutlined className="full-scripts" onClick={() => {
+ if (this.scriptsForm && (this.scriptsForm.state.editItem || (this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))))) {
+ notification.warning({
+ top: 92,
+ message: '璇蜂繚瀛樿嚜瀹氫箟鑴氭湰锛�',
+ duration: 5
+ })
+ return
+ }
+ this.setState({visible: true, script: null, scriptValue: ''})
+ }}/>
<CustomScript
dict={dict}
setting={setting}
@@ -592,6 +644,63 @@
/>
</TabPane>
</Tabs>
+ <Modal
+ wrapClassName="model-custom-table-scripts-modal"
+ title="鑷畾涔夎剼鏈�"
+ visible={visible}
+ width={'95vw'}
+ maskClosable={false}
+ destroyOnClose
+ >
+ <img className="unfull-scripts" src={MinView} onClick={() => this.setState({visible: false, script: null})} alt=""/>
+ <div className="script-table-wrap">
+ {scripts.map(item => {
+ let title = item.sql.match(/^\s*\/\*.+\*\//)
+ title = title && title[0] ? title[0] : ''
+ let _text = title ? item.sql.replace(title, '') : item.sql
+
+ return (
+ <div className={'script-item ' + (script && script.uuid === item.uuid ? 'active' : '') } key={item.uuid}>
+ <div style={{cursor: 'pointer'}} onClick={() => {
+ this.setState({script: item, scriptValue: item.sql})
+ }}>
+ {title ? <div style={{color: '#a50', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis'}}>{title}</div> : null}
+ <Paragraph copyable={{ text: item.sql }} ellipsis={{ rows: 4 }}>{_text}</Paragraph>
+ <div>{item.status === 'false' ?
+ <span style={{color: '#ff4d4f', marginLeft: '20px'}}>
+ 绂佺敤
+ <StopOutlined style={{marginLeft: '5px'}} />
+ </span> :
+ <span style={{color: '#26C281', marginLeft: '20px'}}>
+ 鍚敤
+ <CheckCircleOutlined style={{marginLeft: '5px'}}/>
+ </span>}
+ </div>
+ </div>
+ <div style={{textAlign: 'right'}}>
+ <span className="operation-btn" onClick={() => this.handleStatus(item)} style={{color: '#8E44AD'}}><SwapOutlined /></span>
+ <Popconfirm
+ overlayClassName="popover-confirm"
+ title={this.props.dict['model.query.delete']}
+ onConfirm={() => this.handleDelete(item)
+ }>
+ <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
+ </Popconfirm>
+ </div>
+ </div>
+ )
+ })}
+ </div>
+ <div className="script-button">
+ <Button onClick={this.triggerConfirm} loading={loading} className="mk-green" style={{marginBottom: 15, marginLeft: 40}}>
+ {script ? '淇濆瓨' : '娣诲姞'}
+ </Button>
+ <Button onClick={() => {this.setState({script: null, scriptValue: ''})}} style={{marginBottom: 15, marginLeft: 10}}>
+ 鍙栨秷
+ </Button>
+ </div>
+ <CodeMirror value={scriptValue} onChange={(val) => {this.setState({scriptValue: val})}}></CodeMirror>
+ </Modal>
</div>
)
}
--
Gitblit v1.8.0