From 58826d6f4eab9f8c9acf9fa8696f60039c645cfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 八月 2024 18:18:00 +0800
Subject: [PATCH] 2024-08-20
---
src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 406 +++++++++++----------------------------------------------
1 files changed, 79 insertions(+), 327 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
index eb8577c..ff665b9 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
@@ -3,10 +3,10 @@
import { fromJS } from 'immutable'
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'
import Utils from '@/utils/utils.js'
+import { formatSearch, joinMainSearchkey } from '@/utils/utils-custom.js'
import SettingUtils from './utils.jsx'
import asyncComponent from '@/utils/asyncComponent'
import DataSource from './datasource'
@@ -17,11 +17,9 @@
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, // 鎼滅储鏉′欢
@@ -32,9 +30,8 @@
formlist: [],
btnloading: false,
activeKey: 'setting',
- search: '',
+ searches: [],
arr_field: '',
- regoptions: [],
setting: null,
defaultSql: '',
visible: false,
@@ -48,8 +45,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' // 鏄惁涓虹郴缁熸帴鍙�
@@ -82,56 +77,26 @@
})
}
- // 鎼滅储鐨剋here鏉′欢
- let _search = this.formatSearch(search)
- _search = Utils.joinMainSearchkey(_search)
-
- _search = _search.replace(/@\$@/ig, '')
- _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) {
- config.urlFields.forEach(field => {
- regoptions.push({
- key: field,
- value: '0',
- type: 'url'
- })
- })
- }
-
- if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
- window.GLOB.funcs.forEach(m => {
- let reg = new RegExp(`\\/\\*\\$ex@${m.func_code}-begin\\*\\/[\\s\\S]+\\/\\*@ex\\$-end\\*\\/`, 'ig')
- _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$`)
- }
- })
- }
+ // if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
+ // window.GLOB.funcs.forEach(m => {
+ // let reg = new RegExp(`\\/\\*\\$ex@${m.func_code}-begin\\*\\/[\\s\\S]+\\/\\*@ex\\$-end\\*\\/`, 'ig')
+ // _scripts.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$`)
+ // }
+ // })
+ // }
this.setState({
setting: _setting,
- search: _search,
+ searches: formatSearch(search),
arr_field: arr_field.join(','),
- regoptions: regoptions, // 鎼滅储鏉′欢锛屾鍒欐浛鎹�
columns: columns,
scripts: _scripts,
- preScripts: _preScripts,
- cbScripts: _cbScripts,
status
})
}
@@ -140,119 +105,10 @@
this.props.updRecord(this.state.status)
}
- getRegOptions = (searches) => {
- if (!searches || searches.length === 0) return []
-
- let options = []
- let fieldmap = new Map()
- searches.forEach(search => {
- let item = {
- key: search.field,
- value: '0'
- }
-
- if (fieldmap.has(item.key)) {
- item.key = item.key + '1'
- }
-
- fieldmap.set(item.key, true)
-
- if (search.type === 'group') {
- options.push({
- key: search.field,
- value: '0'
- })
- options.push({
- key: search.datefield,
- value: '0'
- })
- options.push({
- key: search.datefield + '1',
- value: '0'
- })
- options.push(item)
- } else if (['datemonth', 'dateweek', 'daterange'].includes(search.type)) {
- options.push(item)
- options.push({
- key: item.key + '1',
- value: '0'
- })
- } else if (search.type === 'text' || search.type === 'select') {
- item.key.split(',').forEach(field => {
- let cell = JSON.parse(JSON.stringify(item))
- cell.key = field
-
- options.push(cell)
- })
- } else {
- options.push(item)
- }
- })
-
- return options
- }
-
- /**
- * @description 鑾峰彇鍏ㄩ儴鎼滅储鏉′欢
- * @param {Array} searches 鎼滅储鏉′欢鏁扮粍
- */
- formatSearch (searches) {
- if (!searches || searches.length === 0) return []
-
- let newsearches = []
- searches.forEach(search => {
- if (!search.field) return
-
- let item = {
- key: search.field,
- match: search.match,
- type: search.type,
- label: search.label,
- value: search.initval,
- required: search.required === 'true'
- }
-
- if (item.type === 'group') {
- item.key = search.datefield
- item.type = 'daterange'
- item.match = 'between'
- item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',')
-
- newsearches.push(item)
- return
- } else if (item.type === 'date') {
- item.value = moment().format('YYYY-MM-DD')
- } else if (item.type === 'datemonth') {
- item.value = moment().format('YYYY-MM')
- } else if (item.type === 'dateweek') {
- item.value = moment().format('YYYY-MM-DD')
- } else if (item.type === 'daterange') {
- item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',')
- } else if (item.type === 'multiselect' || (item.type === 'checkcard' && search.multiple === 'true')) {
- item.type = 'multi'
- item.value = '@$@'
- } else {
- item.value = '@$@'
- }
- newsearches.push(item)
- })
-
- return newsearches
- }
-
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: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
@@ -274,7 +130,7 @@
}, () => {
this.sqlverify(() => {
this.setState({loading: false})
- resolve({...res, scripts, preScripts, cbScripts})
+ resolve({...res, scripts})
}, () => {
this.setState({loading: false})
reject()
@@ -289,7 +145,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()
@@ -298,15 +154,16 @@
} else {
this.setState({loading: false})
return new Promise((resolve) => {
- resolve({...setting, scripts, preScripts, cbScripts})
+ resolve({...setting, scripts})
})
}
}
sqlverify = (_resolve, _reject, type, uscripts) => {
- const { setting, scripts, arr_field, regoptions, search } = this.state
+ const { config } = this.props
+ const { setting, scripts, arr_field, searches } = this.state
- if (setting.interType !== 'system' && setting.requestMode !== 'system') { // 涓嶄娇鐢ㄧ郴缁熸帴鍙ｆ椂锛屼笉闇�瑕乻ql楠岃瘉
+ if (setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熸帴鍙ｆ椂锛屼笉闇�瑕乻ql楠岃瘉
_resolve()
return
}
@@ -323,16 +180,7 @@
} else if (type === 'scripts' && _scripts.length === 0) {
_resolve()
} else { // type 涓� submit 銆� verify 锛屼互鍙婂叾浠栭渶瑕侀獙璇佺殑鍦烘櫙
- 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 = timestamp
- param.secretkey = Utils.encrypt('', timestamp)
+ let r = SettingUtils.getDebugSql(setting, _scripts, arr_field, searches, config.urlFields)
if (r.errors) {
notification.warning({
@@ -341,35 +189,10 @@
duration: 5
})
}
-
- 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.genericInterface(param).then(result => {
- if (result.status) {
- if (sumParam) {
- Api.genericInterface(sumParam).then(res => {
- if (res.status) {
- _resolve()
- } else {
- _reject()
- Modal.error({
- title: res.message
- })
- }
- })
- } else {
- _resolve()
- }
+ Api.sDebug(r.sql).then(result => {
+ if (result.status || result.ErrCode === '-2') {
+ _resolve()
} else {
_reject()
Modal.error({
@@ -382,71 +205,29 @@
// 鏍囩鍒囨崲
changeTab = (val) => {
- const { activeKey, search, arr_field, setting } = this.state
+ const { activeKey, searches, 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: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
+ message: '瀛樺湪鏈繚瀛樼殑鑴氭湰锛�',
duration: 5
})
- 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
+
+ let _search = joinMainSearchkey(searches)
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
}
- _defaultSql = `select top @pageSize@ ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by @orderBy@) as rows from ${_dataresource} ${search}) tmptable where rows > (@pageSize@ * (@pageIndex@ - 1)) order by tmptable.rows`
+ _defaultSql = `select top @pageSize@ ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by @orderBy@) as rows from ${_dataresource} ${_search}) tmptable where rows > (@pageSize@ * (@pageIndex@ - 1)) order by tmptable.rows`
}
this.setState({
@@ -534,16 +315,6 @@
scriptsUpdate = (scripts) => {
this.setState({scripts})
}
-
- // 鍓嶇疆鑴氭湰鏇存柊
- preScriptsUpdate = (preScripts) => {
- this.setState({preScripts})
- }
-
- // 鍚庣疆鑴氭湰鏇存柊
- cbScriptsUpdate = (cbScripts) => {
- this.setState({cbScripts})
- }
handleDelete = (item) => {
const { script, scripts } = this.state
@@ -572,17 +343,16 @@
}
render() {
- const { config, menu, dict } = this.props
- const { loading, activeKey, setting, defaultSql, columns, scripts, preScripts, cbScripts, status, regoptions, visible, script, scriptValue } = 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}
@@ -596,8 +366,8 @@
鑷畾涔夎剼鏈�
{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={() => {
+ } 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,
@@ -607,48 +377,16 @@
return
}
this.setState({visible: true, script: null, scriptValue: ''})
- }}/>
+ }}/> : null}
<CustomScript
- dict={dict}
setting={setting}
scripts={scripts}
defaultSql={defaultSql}
urlFields={config.urlFields}
- searches={this.props.search}
+ searches={this.state.searches}
scriptsChange={this.scriptsChange}
scriptsUpdate={this.scriptsUpdate}
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>
@@ -667,36 +405,50 @@
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>}
+ 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 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">
--
Gitblit v1.8.0