From 316877c1d9e5b6d92334f30b03d97d7e833cd934 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 二月 2021 16:01:57 +0800
Subject: [PATCH] 2021-02-02
---
src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 201 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 140 insertions(+), 61 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
index f7a193e..f6474c0 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
@@ -7,11 +7,13 @@
import Api from '@/api'
import Utils from '@/utils/utils.js'
import SettingUtils from './utils.jsx'
-import CustomScript from '@/templates/zshare/customscript'
+import asyncComponent from '@/utils/asyncComponent'
import DataSource from './datasource'
import './index.scss'
const { TabPane } = Tabs
+const CustomScript = asyncComponent(() => import('@/templates/zshare/customscript'))
+const SimpleScript = asyncComponent(() => import('./simplescript'))
class SettingForm extends Component {
static propTpyes = {
@@ -29,7 +31,8 @@
arr_field: '',
regoptions: [],
setting: null,
- defaultSql: ''
+ defaultSql: '',
+ status: {}
}
UNSAFE_componentWillMount() {
@@ -37,6 +40,8 @@
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' // 鏄惁涓虹郴缁熸帴鍙�
@@ -76,13 +81,21 @@
_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'
+
this.setState({
setting: _setting,
search: _search,
arr_field: arr_field.join(','),
regoptions: Utils.getRegOptions(search), // 鎼滅储鏉′欢锛屾鍒欐浛鎹�
columns: columns,
- scripts: _scripts
+ scripts: _scripts,
+ preScripts: _preScripts,
+ cbScripts: _cbScripts,
+ status
})
}
@@ -141,13 +154,29 @@
}
handleConfirm = (trigger) => {
- const { activeKey, setting, scripts } = this.state
+ const { activeKey, setting, scripts, preScripts, cbScripts } = this.state
+
+ let _loading = false
+ if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql')) {
+ _loading = true
+ } else if (this.preScriptsForm && this.preScriptsForm.props.form.getFieldValue('sql')) {
+ _loading = true
+ } else if (this.cbScriptsForm && this.cbScriptsForm.props.form.getFieldValue('sql')) {
+ _loading = true
+ }
+
+ if (_loading) {
+ notification.warning({
+ top: 92,
+ message: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
+ duration: 5
+ })
+ return Promise.reject()
+ }
if (trigger) {
this.setState({loading: true})
}
-
- let _scripts = scripts.filter(script => script.status !== 'false')
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
if (activeKey === 'setting') {
@@ -171,14 +200,6 @@
this.setState({loading: false})
reject()
return
- } else if (res.interType === 'system' && res.default === 'false' && _scripts.length === 0) {
- notification.warning({
- top: 92,
- message: '涓嶆墽琛岄粯璁ql鏃讹紝璇锋坊鍔犺嚜瀹氫箟鑴氭湰锛�',
- duration: 5
- })
- reject()
- return
}
this.setState({
@@ -186,7 +207,7 @@
}, () => {
this.sqlverify(() => {
this.setState({loading: false})
- resolve({...res, scripts})
+ resolve({...res, scripts, preScripts, cbScripts})
}, () => {
this.setState({loading: false})
reject()
@@ -197,15 +218,8 @@
reject()
})
})
- } else {
+ } else if (activeKey === 'scripts') {
return new Promise((resolve, reject) => {
- let _loading = false
- if (this.scriptsForm && this.scriptsForm.state.editItem) {
- _loading = true
- } else if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql')) {
- _loading = true
- }
-
if (trigger === 'func' && setting.interType !== 'inner') {
notification.warning({
top: 92,
@@ -214,31 +228,20 @@
})
this.setState({loading: false})
reject()
- } else if (_loading) {
- notification.warning({
- top: 92,
- message: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
- duration: 5
- })
- this.setState({loading: false})
- reject()
- } else if (setting.interType === 'system' && setting.default === 'false' && _scripts.length === 0) {
- notification.warning({
- top: 92,
- message: '涓嶆墽琛岄粯璁ql鏃讹紝璇锋坊鍔犺嚜瀹氫箟鑴氭湰锛�',
- duration: 5
- })
- this.setState({loading: false})
- reject()
} else {
this.sqlverify(() => {
this.setState({loading: false})
- resolve({...setting, scripts})
+ resolve({...setting, scripts, preScripts, cbScripts})
}, () => {
this.setState({loading: false})
reject()
}, 'submit')
}
+ })
+ } else {
+ this.setState({loading: false})
+ return new Promise((resolve) => {
+ resolve({...setting, scripts, preScripts, cbScripts})
})
}
}
@@ -246,7 +249,7 @@
sqlverify = (_resolve, _reject, type, uscripts) => {
const { setting, scripts, arr_field, regoptions, search } = this.state
- if (setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熸帴鍙ｆ椂锛屼笉闇�瑕乻ql楠岃瘉
+ if (setting.interType !== 'system' && setting.requestMode !== 'system') { // 涓嶄娇鐢ㄧ郴缁熸帴鍙ｆ椂锛屼笉闇�瑕乻ql楠岃瘉
_resolve()
return
}
@@ -287,15 +290,58 @@
// 鏍囩鍒囨崲
changeTab = (val) => {
- const { activeKey, search, arr_field } = this.state
+ const { activeKey, search, arr_field, setting } = this.state
+
+ let _loading = false
+ if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql')) {
+ _loading = true
+ } else if (this.preScriptsForm && this.preScriptsForm.props.form.getFieldValue('sql')) {
+ _loading = true
+ } else if (this.cbScriptsForm && this.cbScriptsForm.props.form.getFieldValue('sql')) {
+ _loading = true
+ }
+
+ if (_loading) {
+ notification.warning({
+ top: 92,
+ 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') {
+ 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
@@ -330,22 +376,6 @@
})
})
} else if (activeKey === 'scripts') {
- let _loading = false
- if (this.scriptsForm && this.scriptsForm.state.editItem) {
- _loading = true
- } else if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql')) {
- _loading = true
- }
-
- if (_loading) {
- notification.warning({
- top: 92,
- message: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
- duration: 5
- })
- return
- }
-
this.setState({loading: true})
this.sqlverify(() => { // 楠岃瘉鎴愬姛
this.setState({
@@ -358,6 +388,10 @@
loading: false
})
}, activeKey)
+ } else {
+ this.setState({
+ activeKey: val
+ })
}
}
@@ -372,10 +406,24 @@
scriptsUpdate = (scripts) => {
this.setState({scripts})
}
+
+ // 鍓嶇疆鑴氭湰鏇存柊
+ preScriptsUpdate = (preScripts) => {
+ this.setState({preScripts})
+ }
+
+ // 鍚庣疆鑴氭湰鏇存柊
+ cbScriptsUpdate = (cbScripts) => {
+ this.setState({cbScripts})
+ }
+
+ updateStatus = (status) => {
+ this.setState({status: {...this.state.status, ...status}})
+ }
render() {
const { config, menu, dict } = this.props
- const { loading, activeKey, setting, defaultSql, columns, scripts } = this.state
+ const { loading, activeKey, setting, defaultSql, columns, scripts, preScripts, cbScripts, status, regoptions } = this.state
return (
<div className="model-table-setting-form-box" id="model-setting-form-body">
@@ -389,6 +437,7 @@
columns={columns}
setting={setting}
scripts={scripts}
+ updateStatus={this.updateStatus}
wrappedComponentRef={(inst) => this.settingForm = inst}
/>
</TabPane>
@@ -397,7 +446,7 @@
鑷畾涔夎剼鏈�
{scripts.length ? <span className="count-tip">{scripts.length}</span> : null}
</span>
- } key="scripts">
+ } disabled={!(status.interType === 'system' || (status.interType === 'custom' && status.requestMode === 'system'))} key="scripts">
<CustomScript
dict={dict}
setting={setting}
@@ -409,6 +458,36 @@
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}
+ 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>
</div>
)
--
Gitblit v1.8.0