From fa381753ef2a2b25b1c0722549ac17e333da79be Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 22:50:54 +0800
Subject: [PATCH] 2022-09-06
---
src/menu/datasource/verifycard/index.jsx | 148 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 132 insertions(+), 16 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 51338af..df624b3 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -1,8 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Tabs, Popconfirm, notification, Modal, Typography, Spin, message } from 'antd'
-import { StopOutlined, CheckCircleOutlined, EditOutlined, SwapOutlined, DeleteOutlined, CopyOutlined } from '@ant-design/icons'
+import { Form, Tabs, Popconfirm, notification, Modal, Typography, Spin, message, Button } from 'antd'
+import { StopOutlined, CheckCircleOutlined, EditOutlined, SwapOutlined, DeleteOutlined, CopyOutlined, BorderOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -13,11 +13,13 @@
import CustomScriptsForm from './customscript'
import SettingForm from './settingform'
import SettingUtils from './utils'
+import MinView from '@/assets/img/minview.png'
import './index.scss'
const { TabPane } = Tabs
const { Paragraph } = Typography
+const CodeMirror = asyncComponent(() => import('@/templates/zshare/codemirror'))
const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent'))
const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
@@ -36,6 +38,9 @@
defaultsql: '', // 榛樿Sql
defaultSearch: '',
systemScripts: [],
+ visible: false,
+ script: null,
+ scriptValue: '',
colColumns: [
{
title: '鍚嶇О',
@@ -122,13 +127,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>
)
@@ -238,7 +243,7 @@
})
}
- columnChange = (values) => {
+ columnChange = (values, resolve) => {
const { columns } = this.state
let fields = columns.map(item => item.field.toLowerCase())
@@ -251,13 +256,21 @@
return
}
+ resolve()
+
values.uuid = Utils.getuuid()
this.setState({ columns: [...columns, values] })
}
deleteScript = (record) => {
- this.setState({ scripts: this.state.scripts.filter(item => item.uuid !== record.uuid) })
+ const { script, scripts } = this.state
+
+ if (script && script.uuid === record.uuid) {
+ this.setState({script: null})
+ }
+
+ this.setState({ scripts: scripts.filter(item => item.uuid !== record.uuid) })
}
handleEdit = (record) => {
@@ -572,16 +585,15 @@
}
if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) {
- let r = SettingUtils.getDebugSql(setting, _scripts, columns, searches, defaultSearch)
+ let timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ let r = SettingUtils.getDebugSql(setting, _scripts, columns, searches, defaultSearch, timestamp)
- if (r.error) {
+ if (r.errors) {
notification.warning({
top: 92,
- message: r.error,
+ message: r.errors,
duration: 5
})
- reject()
- return
}
let param = {
@@ -590,8 +602,8 @@
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) {
@@ -605,10 +617,10 @@
sumParam.secretkey = Utils.encrypt('', sumParam.timestamp)
}
- Api.getLocalConfig(param).then(result => {
+ Api.genericInterface(param).then(result => {
if (result.status) {
if (sumParam) {
- Api.getLocalConfig(sumParam).then(res => {
+ Api.genericInterface(sumParam).then(res => {
if (res.status) {
resolve()
} else {
@@ -631,6 +643,42 @@
} else {
resolve()
}
+ }
+
+ 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})}, false, _scripts)
}
updatefields = (columns) => {
@@ -671,7 +719,7 @@
render() {
const { config } = this.props
- const { columns, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql } = this.state
+ const { columns, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, script, scriptValue } = this.state
return (
<div id="model-data-source-wrap">
@@ -703,6 +751,17 @@
{scripts.length ? <span className="count-tip">{scripts.length}</span> : null}
</span>
} 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: ''})
+ }}/>
<CustomScriptsForm
setting={setting}
searches={searches}
@@ -718,6 +777,63 @@
<EditTable actions={['move']} data={scripts} columns={scriptsColumns} onChange={this.changeScripts}/>
</TabPane>
</Tabs>
+ <Modal
+ wrapClassName="model-custom-view-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.deleteScript(item)
+ }>
+ <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
+ </Popconfirm>
+ </div>
+ </div>
+ )
+ })}
+ </div>
+ <div className="script-button">
+ <Button onClick={this.triggerConfirm} loading={this.state.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