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 | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 656728e..52a036f 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Tabs, Popconfirm, notification, Modal, Typography, Spin, message, Button } 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'
@@ -71,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)' },
@@ -127,13 +128,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>
)
@@ -201,6 +202,13 @@
}
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)
@@ -219,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
@@ -243,7 +249,7 @@
})
}
- columnChange = (values) => {
+ columnChange = (values, resolve) => {
const { columns } = this.state
let fields = columns.map(item => item.field.toLowerCase())
@@ -255,6 +261,8 @@
})
return
}
+
+ resolve()
values.uuid = Utils.getuuid()
@@ -274,7 +282,8 @@
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)
@@ -583,16 +592,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 = {
@@ -601,8 +609,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) {
@@ -616,10 +624,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 {
@@ -721,7 +729,8 @@
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">
@@ -734,14 +743,18 @@
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}
/>
- <CopyOutlined 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" wrappedComponentRef={(inst) => this.datasource = inst} data={columns} columns={colColumns} onChange={(columns) => this.setState({columns})}/>
</TabPane>
<TabPane tab={
@@ -749,8 +762,8 @@
鑷畾涔夎剼鏈�
{scripts.length ? <span className="count-tip">{scripts.length}</span> : null}
</span>
- } key="scripts">
- <BorderOutlined className="full-scripts" onClick={() => {
+ } 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,
@@ -760,7 +773,7 @@
return
}
this.setState({visible: true, script: null, scriptValue: ''})
- }}/>
+ }}/> : null}
<CustomScriptsForm
setting={setting}
searches={searches}
@@ -838,4 +851,4 @@
}
}
-export default Form.create()(VerifyCard)
\ No newline at end of file
+export default VerifyCard
\ No newline at end of file
--
Gitblit v1.8.0