From 2ccd33975abf91f9a7929ca8ed6fc03d74ee424d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 08 十月 2022 10:10:07 +0800
Subject: [PATCH] 2022-10-08
---
src/menu/datasource/verifycard/index.jsx | 335 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 225 insertions(+), 110 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index e98c763..52a036f 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Tabs, Popconfirm, Icon, notification, Modal, Typography, Spin, message } from 'antd'
+import { 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'
@@ -12,18 +13,19 @@
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'))
class VerifyCard extends Component {
static propTpyes = {
dict: PropTypes.object, // 瀛楀吀椤�
- menu: PropTypes.object, // 鑿滃崟閰嶇疆淇℃伅
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
}
@@ -36,6 +38,9 @@
defaultsql: '', // 榛樿Sql
defaultSearch: '',
systemScripts: [],
+ visible: false,
+ script: null,
+ scriptValue: '',
colColumns: [
{
title: '鍚嶇О',
@@ -51,6 +56,10 @@
editable: true,
unique: true,
copy: true,
+ rules: [{
+ pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
+ message: '瀛楁鍚嶅彧鍏佽鍖呭惈鏁板瓧銆佸瓧姣嶃�佹眽瀛椾互鍙奯'
+ }],
width: '28%'
},
{
@@ -62,6 +71,7 @@
{ value: 'Nvarchar(20)', text: 'Nvarchar(20)' },
{ value: 'Nvarchar(50)', text: 'Nvarchar(50)' },
{ value: 'Nvarchar(100)', text: 'Nvarchar(100)' },
+ { value: 'Nvarchar(256)', text: 'Nvarchar(256)' },
{ value: 'Nvarchar(512)', text: 'Nvarchar(512)' },
{ value: 'Nvarchar(1024)', text: 'Nvarchar(1024)' },
{ value: 'Nvarchar(2048)', text: 'Nvarchar(2048)' },
@@ -101,12 +111,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>
)
}
@@ -117,15 +127,15 @@
width: '13%',
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>
)
},
@@ -136,14 +146,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['model.status.change']} onClick={() => this.handleStatus(record)} style={{color: '#8E44AD'}}><Icon type="swap" /></span>
+ <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['model.status.change']} onClick={() => this.handleStatus(record)} style={{color: '#8E44AD'}}><SwapOutlined /></span>
<Popconfirm
overlayClassName="popover-confirm"
title={this.props.dict['model.query.delete']}
onConfirm={() => this.deleteScript(record)
}>
- <span className="operation-btn" style={{color: '#ff4d4f'}}><Icon type="delete" /></span>
+ <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
</div>)
}
@@ -151,7 +161,7 @@
}
UNSAFE_componentWillMount() {
- const { config, mainSearch, menu } = this.props
+ const { config, mainSearch } = this.props
let search = config.search || []
@@ -159,47 +169,8 @@
search = [...search, ...mainSearch]
}
- let Marks = []
- let getcomponentmarks = (box, conf) => {
- if (!conf.parentId && box.Template === 'CustomPage') {
- box.components.forEach(item => {
- if (item.type === 'group') {
- item.components.forEach(cell => {
- if (cell.uuid !== conf.uuid && cell.setting && cell.setting.varMark) {
- Marks.push(cell.setting.varMark.toLowerCase())
- }
- })
- } else if (item.uuid !== conf.uuid && item.setting && item.setting.varMark) {
- Marks.push(item.setting.varMark.toLowerCase())
- }
- })
- } else if (conf.parentId === box.parentId && conf.tabId === box.uuid) {
- box.components.forEach(item => {
- if (item.type === 'group') {
- item.components.forEach(cell => {
- if (cell.uuid !== conf.uuid && cell.setting && cell.setting.varMark) {
- Marks.push(cell.setting.varMark.toLowerCase())
- }
- })
- } else if (item.uuid !== conf.uuid && item.setting && item.setting.varMark) {
- Marks.push(item.setting.varMark.toLowerCase())
- }
- })
- } else {
- box.components.forEach(item => {
- if (item.type !== 'tabs') return
-
- item.subtabs.forEach(tab => {
- getcomponentmarks(tab, conf)
- })
- })
- }
- }
-
- getcomponentmarks(menu, config)
-
let _setting = fromJS(config.setting).toJS()
- let scripts = fromJS(config.scripts).toJS()
+ let scripts = config.scripts ? fromJS(config.scripts).toJS() : []
if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
window.GLOB.funcs.forEach(m => {
@@ -221,17 +192,23 @@
this.setState({
scripts,
- columns: fromJS(config.columns).toJS(),
+ columns: config.columns ? fromJS(config.columns).toJS() : [],
setting: _setting,
searches: search,
- defaultSearch: _search,
- varMarks: Marks
+ defaultSearch: _search
})
this.getsysScript()
}
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)
@@ -250,16 +227,14 @@
Api.getSystemConfig(_sParam).then(res => {
if (res.status) {
- let _scripts = []
-
- res.data.forEach(item => {
- let _item = {
+ let _scripts = res.data.map(item => {
+ return {
name: item.funcname,
value: window.decodeURIComponent(window.atob(item.longparam))
}
-
- _scripts.push(_item)
})
+
+ sessionStorage.setItem('mk_sys_scripts', JSON.stringify(_scripts))
this.setState({
systemScripts: _scripts
@@ -274,7 +249,7 @@
})
}
- columnChange = (values) => {
+ columnChange = (values, resolve) => {
const { columns } = this.state
let fields = columns.map(item => item.field.toLowerCase())
@@ -287,19 +262,28 @@
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) => {
this.scriptsForm.edit(record)
- let node = document.getElementById('model-data-source-wrap').parentNode
+ // let node = document.getElementById('mk-scripts-tabpane').parentNode
+ let node = document.getElementById('mk-scripts-tabpane')
if (node && node.scrollTop) {
let inter = Math.ceil(node.scrollTop / 10)
@@ -375,7 +359,7 @@
changeTab = (val) => {
const { config, mainSearch } = this.props
- const { activeKey, varMarks } = this.state
+ const { activeKey } = this.state
this.setState({loading: true})
if (activeKey === 'setting') {
@@ -384,18 +368,6 @@
if (res.useMSearch === 'true') { // 浣跨敤涓绘悳绱㈡潯浠�
search = [...search, ...mainSearch]
- }
-
- if (res.varMark && varMarks.includes(res.varMark.toLowerCase())) {
- notification.warning({
- top: 92,
- message: '鍙橀噺鏍囪瘑涓嶅彲閲嶅锛�',
- duration: 5
- })
- this.setState({
- loading: false
- })
- return
}
let _search = this.formatSearch(search)
@@ -427,6 +399,18 @@
this.setState({loading: false})
})
} else if (activeKey === 'columns') {
+ if (this.datasource && this.datasource.state.editingKey) {
+ notification.warning({
+ top: 92,
+ message: '瀛楁鏈繚瀛橈紝璇蜂繚瀛樺悗鍒囨崲锛�',
+ duration: 5
+ })
+ this.setState({
+ loading: false
+ })
+ return
+ }
+
this.setState({
activeKey: val,
loading: false
@@ -528,7 +512,7 @@
submitDataSource = () => {
const { config, mainSearch } = this.props
- const { activeKey, setting, columns, scripts, varMarks } = this.state
+ const { activeKey, setting, columns, scripts } = this.state
return new Promise((resolve, reject) => {
if (activeKey === 'setting') {
@@ -537,16 +521,6 @@
if (res.useMSearch === 'true') { // 浣跨敤涓绘悳绱㈡潯浠�
search = [...search, ...mainSearch]
- }
-
- if (res.varMark && varMarks.includes(res.varMark.toLowerCase())) {
- notification.warning({
- top: 92,
- message: '鍙橀噺鏍囪瘑涓嶅彲閲嶅锛�',
- duration: 5
- })
- reject()
- return
}
let _search = this.formatSearch(search)
@@ -566,6 +540,15 @@
reject()
})
} else if (activeKey === 'columns') {
+ if (this.datasource && this.datasource.state.editingKey) {
+ notification.warning({
+ top: 92,
+ message: '瀛楁鏈繚瀛橈紝璇蜂繚瀛樺悗鎻愪氦锛�',
+ duration: 5
+ })
+ reject()
+ return
+ }
this.sqlverify(() => { resolve({setting, columns, scripts }) }, reject, false)
} else if (activeKey === 'scripts') {
let _loading = false
@@ -609,30 +592,54 @@
}
if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) {
- let result = 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 (result.error) {
+ if (r.errors) {
notification.warning({
top: 92,
- message: result.error,
+ message: r.errors,
duration: 5
})
- reject()
- return
}
let param = {
func: 's_debug_sql',
exec_type: 'y',
- LText: result.sql
+ 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) {
+ sumParam = {
+ func: 's_debug_sql',
+ exec_type: 'y',
+ LText: r.sumSql
+ }
+ sumParam.LText = Utils.formatOptions(sumParam.LText)
+ sumParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ sumParam.secretkey = Utils.encrypt('', sumParam.timestamp)
+ }
- Api.getLocalConfig(param).then(result => {
+ Api.genericInterface(param).then(result => {
if (result.status) {
- resolve()
+ if (sumParam) {
+ Api.genericInterface(sumParam).then(res => {
+ if (res.status) {
+ resolve()
+ } else {
+ reject()
+ Modal.error({
+ title: res.message
+ })
+ }
+ })
+ } else {
+ resolve()
+ }
} else {
reject()
Modal.error({
@@ -643,6 +650,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) => {
@@ -682,16 +725,16 @@
}
render() {
- const { menu, config } = this.props
- const { columns, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql } = this.state
+ const { config } = this.props
+ const { columns, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, script, scriptValue } = this.state
return (
- <div id="model-data-source-wrap">
+ <div className="model-data-source-wrap">
+ {config.name ? <div className="mk-com-name">{config.name} - 鏁版嵁婧�</div> : null}
{loading && <Spin size="large" />}
<Tabs activeKey={activeKey} className="data-source-card-box" onChange={this.changeTab}>
<TabPane tab="鏁版嵁婧�" key="setting">
<SettingForm
- menu={menu}
dict={this.props.dict}
config={config}
columns={columns}
@@ -700,22 +743,37 @@
wrappedComponentRef={(inst) => this.settingForm = inst}
/>
</TabPane>
- <TabPane tab="瀛楁闆�" key="columns">
+ <TabPane tab={
+ <span>
+ 瀛楁闆�
+ <CopyOutlined title="浠ラ�楀彿鎷兼帴褰㈠紡澶嶅埗瀛楁" className="mk-copy-fields" onClick={this.copyColumns}/>
+ </span>
+ } key="columns">
<ColForm dict={this.props.dict} columnChange={this.columnChange}/>
<FieldsComponent
config={{...config, columns}}
type="fields"
updatefield={this.updatefields}
/>
- <Icon type="copy" title="浠ラ�楀彿鎷兼帴褰㈠紡澶嶅埗瀛楁" onClick={this.copyColumns} style={{position: 'absolute', cursor: 'pointer', zIndex: 1, top: '-35px', right: '0px', color: '#1890ff'}} />
- <EditTable actions={['edit', 'move', 'copy', 'del', 'clear']} type="datasourcefield" data={columns} columns={colColumns} onChange={(columns) => this.setState({columns})}/>
+ <EditTable actions={['edit', 'move', 'copy', 'del', 'clear']} type="datasourcefield" wrappedComponentRef={(inst) => this.datasource = inst} data={columns} columns={colColumns} onChange={(columns) => this.setState({columns})}/>
</TabPane>
<TabPane tab={
<span>
鑷畾涔夎剼鏈�
{scripts.length ? <span className="count-tip">{scripts.length}</span> : null}
</span>
- } key="scripts">
+ } key="scripts" id="mk-scripts-tabpane">
+ {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}
<CustomScriptsForm
setting={setting}
searches={searches}
@@ -731,9 +789,66 @@
<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>
)
}
}
-export default Form.create()(VerifyCard)
\ No newline at end of file
+export default VerifyCard
\ No newline at end of file
--
Gitblit v1.8.0