From aa41be24e83653077d85860cb70882551912af24 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 十月 2022 12:53:25 +0800
Subject: [PATCH] 2022-10-28
---
src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 292 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 168 insertions(+), 124 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
index b60fc7f..3ed654e 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,15 +10,16 @@
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'))
class SettingForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
menu: PropTypes.object, // 鑿滃崟淇℃伅
config: PropTypes.object, // 椤甸潰閰嶇疆淇℃伅
search: PropTypes.array, // 鎼滅储鏉′欢
@@ -33,6 +35,9 @@
regoptions: [],
setting: null,
defaultSql: '',
+ visible: false,
+ script: null,
+ scriptValue: '',
status: {}
}
@@ -41,8 +46,6 @@
let _setting = fromJS(config.setting).toJS()
let _scripts = _setting.scripts || []
- let _preScripts = _setting.preScripts || []
- let _cbScripts = _setting.cbScripts || []
_setting.default = _setting.default || 'true' // 榛樿sql
_setting.sysInterface = _setting.sysInterface || 'false' // 鏄惁涓虹郴缁熸帴鍙�
@@ -83,9 +86,6 @@
_search = _search ? 'where ' + _search : ''
let status = fromJS(_setting).toJS()
- status.requestMode = status.requestMode || 'system'
- status.procMode = status.procMode || 'script'
- status.callbackType = status.callbackType || 'script'
let regoptions = this.getRegOptions(search)
if (config.urlFields && config.urlFields.length > 0) {
@@ -104,12 +104,6 @@
_scripts.forEach(item => {
item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`)
})
- _preScripts.forEach(item => {
- item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`)
- })
- _cbScripts.forEach(item => {
- item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`)
- })
if (_setting.dataresource) {
_setting.dataresource = _setting.dataresource.replace(reg, `$ex@${m.func_code}@ex$`)
}
@@ -123,8 +117,6 @@
regoptions: regoptions, // 鎼滅储鏉′欢锛屾鍒欐浛鎹�
columns: columns,
scripts: _scripts,
- preScripts: _preScripts,
- cbScripts: _cbScripts,
status
})
}
@@ -234,18 +226,9 @@
}
handleConfirm = (trigger) => {
- const { activeKey, setting, scripts, preScripts, cbScripts } = this.state
+ const { activeKey, setting, scripts } = this.state
- let _loading = false
if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) {
- _loading = true
- } else if (this.preScriptsForm && this.preScriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.preScriptsForm.props.form.getFieldValue('sql'))) {
- _loading = true
- } else if (this.cbScriptsForm && this.cbScriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.cbScriptsForm.props.form.getFieldValue('sql'))) {
- _loading = true
- }
-
- if (_loading) {
notification.warning({
top: 92,
message: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
@@ -267,7 +250,7 @@
}, () => {
this.sqlverify(() => {
this.setState({loading: false})
- resolve({...res, scripts, preScripts, cbScripts})
+ resolve({...res, scripts})
}, () => {
this.setState({loading: false})
reject()
@@ -282,7 +265,7 @@
return new Promise((resolve, reject) => {
this.sqlverify(() => {
this.setState({loading: false})
- resolve({...setting, scripts, preScripts, cbScripts})
+ resolve({...setting, scripts})
}, () => {
this.setState({loading: false})
reject()
@@ -291,7 +274,7 @@
} else {
this.setState({loading: false})
return new Promise((resolve) => {
- resolve({...setting, scripts, preScripts, cbScripts})
+ resolve({...setting, scripts})
})
}
}
@@ -299,7 +282,7 @@
sqlverify = (_resolve, _reject, type, uscripts) => {
const { setting, scripts, arr_field, regoptions, search } = this.state
- if (setting.interType !== 'system' && setting.requestMode !== 'system') { // 涓嶄娇鐢ㄧ郴缁熸帴鍙ｆ椂锛屼笉闇�瑕乻ql楠岃瘉
+ if (setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熸帴鍙ｆ椂锛屼笉闇�瑕乻ql楠岃瘉
_resolve()
return
}
@@ -316,15 +299,24 @@
} 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)
+
+ if (r.errors) {
+ notification.warning({
+ top: 92,
+ message: r.errors,
+ duration: 5
+ })
+ }
let sumParam = null
if (r.sumSql) {
@@ -338,10 +330,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 {
@@ -366,18 +358,9 @@
// 鏍囩鍒囨崲
changeTab = (val) => {
- const { activeKey, search, arr_field, setting } = this.state
+ const { activeKey, search, arr_field } = this.state
- let _loading = false
if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) {
- _loading = true
- } else if (this.preScriptsForm && this.preScriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.preScriptsForm.props.form.getFieldValue('sql'))) {
- _loading = true
- } else if (this.cbScriptsForm && this.cbScriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.cbScriptsForm.props.form.getFieldValue('sql'))) {
- _loading = true
- }
-
- if (_loading) {
notification.warning({
top: 92,
message: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
@@ -386,43 +369,9 @@
return
}
- if (activeKey !== 'setting') {
- if (setting.interType !== 'system' && setting.requestMode !== 'system' && val === 'scripts') {
- notification.warning({
- top: 92,
- message: '浣跨敤绯荤粺鎺ュ彛鏃讹紝鎵嶅彲浠ヨ缃嚜瀹氫箟鑴氭湰锛�',
- duration: 5
- })
- return
- } else if (setting.interType !== 'custom' && (val === 'prescripts' || val === 'cbscripts')) {
- notification.warning({
- top: 92,
- message: '浣跨敤鑷畾涔夋帴鍙ｆ椂锛屾墠鍙互璁剧疆鍓嶇疆鎴栧洖璋冭剼鏈紒',
- duration: 5
- })
- return
- }
- }
-
if (activeKey === 'setting') {
let _defaultSql = ''
this.settingForm.handleConfirm().then(res => {
- if (res.interType !== 'system' && res.requestMode !== 'system' && val === 'scripts') {
- notification.warning({
- top: 92,
- message: '浣跨敤绯荤粺鎺ュ彛鏃讹紝鎵嶅彲浠ヨ缃嚜瀹氫箟鑴氭湰锛�',
- duration: 5
- })
- return
- } else if (res.interType !== 'custom' && (val === 'prescripts' || val === 'cbscripts')) {
- notification.warning({
- top: 92,
- message: '浣跨敤鑷畾涔夋帴鍙ｆ椂锛屾墠鍙互璁剧疆鍓嶇疆鎴栧洖璋冭剼鏈紒',
- duration: 5
- })
- return
- }
-
if (res.dataresource) {
let _dataresource = res.dataresource
@@ -478,19 +427,65 @@
})
}
+ 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})
}
-
- // 鍓嶇疆鑴氭湰鏇存柊
- preScriptsUpdate = (preScripts) => {
- this.setState({preScripts})
+
+ 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)})
}
-
- // 鍚庣疆鑴氭湰鏇存柊
- cbScriptsUpdate = (cbScripts) => {
- this.setState({cbScripts})
+
+ 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) => {
@@ -500,17 +495,16 @@
}
render() {
- const { config, menu, dict } = this.props
- const { loading, activeKey, setting, defaultSql, columns, scripts, preScripts, cbScripts, status, regoptions } = this.state
+ const { config, menu } = this.props
+ const { loading, activeKey, setting, defaultSql, columns, scripts, status, visible, script, scriptValue } = this.state
return (
- <div className="model-table-setting-form-box" id="model-setting-form-body">
+ <div className="model-table-setting-form-box">
{loading && <Spin size="large" />}
<Tabs activeKey={activeKey} onChange={this.changeTab}>
<TabPane tab="鏁版嵁婧�" key="setting">
<DataSource
menu={menu}
- dict={dict}
config={config}
columns={columns}
setting={setting}
@@ -524,9 +518,19 @@
鑷畾涔夎剼鏈�
{scripts.length ? <span className="count-tip">{scripts.length}</span> : null}
</span>
- } disabled={!(status.interType === 'system' || (status.interType === 'custom' && status.requestMode === 'system'))} key="scripts">
+ } disabled={status.interType !== 'system'} key="scripts" id="mk-setting-scripts">
+ {scripts.length ? <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: ''})
+ }}/> : null}
<CustomScript
- dict={dict}
setting={setting}
scripts={scripts}
defaultSql={defaultSql}
@@ -537,38 +541,78 @@
wrappedComponentRef={(inst) => this.scriptsForm = inst}
/>
</TabPane>
- <TabPane tab={
- <span>
- 鍓嶇疆鑴氭湰
- {preScripts.length ? <span className="count-tip">{preScripts.length}</span> : null}
- </span>
- } disabled={status.interType !== 'custom' || status.procMode !== 'script'} key="prescripts">
- <SimpleScript
- dict={dict}
- setting={setting}
- scripts={preScripts}
- regoptions={regoptions}
- urlFields={config.urlFields}
- searches={this.props.search}
- scriptsUpdate={this.preScriptsUpdate}
- wrappedComponentRef={(inst) => this.preScriptsForm = inst}
- />
- </TabPane>
- <TabPane tab={
- <span>
- 鍥炶皟鑴氭湰
- {cbScripts.length ? <span className="count-tip">{cbScripts.length}</span> : null}
- </span>
- } disabled={status.interType !== 'custom' || status.callbackType !== 'script'} key="cbscripts">
- <SimpleScript
- dict={dict}
- setting={setting}
- scripts={cbScripts}
- scriptsUpdate={this.cbScriptsUpdate}
- wrappedComponentRef={(inst) => this.cbScriptsForm = inst}
- />
- </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
+
+ if (item.status === 'false') {
+ return (
+ <div className="script-item" key={item.uuid}>
+ <div style={{cursor: 'not-allowed'}}>
+ {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>
+ <span style={{color: '#ff4d4f', marginLeft: '20px'}}>
+ 绂佺敤
+ <StopOutlined style={{marginLeft: '5px'}} />
+ </span>
+ </div>
+ </div>
+ <div style={{height: '24px'}}></div>
+ </div>
+ )
+ } else {
+ 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>
+ <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="纭畾鍒犻櫎鍚�?"
+ 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