From 4590502dd26419fd190045d84fbf11eccb6093f7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 07 五月 2022 15:53:12 +0800
Subject: [PATCH] 2022-05-07
---
src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 368 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 277 insertions(+), 91 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
index 3012249..6ef30e6 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
@@ -7,18 +7,19 @@
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 = {
dict: PropTypes.object, // 瀛楀吀椤�
menu: PropTypes.object, // 鑿滃崟淇℃伅
config: PropTypes.object, // 椤甸潰閰嶇疆淇℃伅
- permFuncField: PropTypes.array, // 鑷畾涔夊嚱鏁板彲鐢ㄥ瓧娈�
search: PropTypes.array // 鎼滅储鏉′欢
}
@@ -30,7 +31,8 @@
arr_field: '',
regoptions: [],
setting: null,
- defaultSql: ''
+ defaultSql: '',
+ status: {}
}
UNSAFE_componentWillMount() {
@@ -38,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' // 鏄惁涓虹郴缁熸帴鍙�
@@ -70,10 +74,6 @@
})
}
- // 鎼滅储鏉′欢锛屾鍒欐浛鎹�
- let allSearch = Utils.initMainSearch(search)
- allSearch = Utils.getAllSearchOptions(allSearch)
-
// 鎼滅储鐨剋here鏉′欢
let _search = this.formatSearch(search)
_search = Utils.joinMainSearchkey(_search)
@@ -81,14 +81,103 @@
_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$`)
+ }
+ })
+ }
+
this.setState({
setting: _setting,
search: _search,
arr_field: arr_field.join(','),
- regoptions: allSearch,
+ regoptions: regoptions, // 鎼滅储鏉′欢锛屾鍒欐浛鎹�
columns: columns,
- scripts: _scripts
+ scripts: _scripts,
+ preScripts: _preScripts,
+ cbScripts: _cbScripts,
+ 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
}
/**
@@ -100,6 +189,8 @@
let newsearches = []
searches.forEach(search => {
+ if (!search.field) return
+
let item = {
key: search.field,
match: search.match,
@@ -108,32 +199,26 @@
value: search.initval,
required: search.required === 'true'
}
+
if (item.type === 'group') {
- let copy = fromJS(item).toJS()
- copy.key = search.datefield
+ item.key = search.datefield
+ item.type = 'daterange'
+ item.match = 'between'
+ item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',')
- item.value = search.initval && search.initval[0] ? search.initval[0] : '@$@'
- item.match = '='
-
- copy.type = 'daterange'
- copy.match = 'between'
- copy.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
-
- if (search.transfer === 'true') {
- newsearches.push(item)
- }
- newsearches.push(copy)
+ 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().startOf('week').format('YYYY-MM-DD'), moment().endOf('week').format('YYYY-MM-DD')]
+ item.value = moment().format('YYYY-MM-DD')
} else if (item.type === 'daterange') {
- item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
- } else if (item.type === 'multiselect') {
- item.value = ['@$@']
+ 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 = '@$@'
}
@@ -144,13 +229,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') && !/^\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: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
+ duration: 5
+ })
+ return Promise.reject()
+ }
if (trigger) {
this.setState({loading: true})
}
-
- let _scripts = scripts.filter(script => script.status !== 'false')
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
if (activeKey === 'setting') {
@@ -174,14 +275,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({
@@ -189,7 +282,7 @@
}, () => {
this.sqlverify(() => {
this.setState({loading: false})
- resolve({...res, scripts})
+ resolve({...res, scripts, preScripts, cbScripts})
}, () => {
this.setState({loading: false})
reject()
@@ -200,15 +293,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,
@@ -217,31 +303,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})
})
}
}
@@ -249,7 +324,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
}
@@ -266,17 +341,44 @@
} else if (type === 'scripts' && _scripts.length === 0) {
_resolve()
} else { // type 涓� submit 銆� verify 锛屼互鍙婂叾浠栭渶瑕侀獙璇佺殑鍦烘櫙
+ let r = SettingUtils.getDebugSql(setting, _scripts, arr_field, regoptions, search)
let param = {
func: 's_debug_sql',
- LText: SettingUtils.getDebugSql(setting, _scripts, arr_field, regoptions, search)
+ 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.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.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 => {
if (result.status) {
- _resolve()
+ if (sumParam) {
+ Api.getLocalConfig(sumParam).then(res => {
+ if (res.status) {
+ _resolve()
+ } else {
+ _reject()
+ Modal.error({
+ title: res.message
+ })
+ }
+ })
+ } else {
+ _resolve()
+ }
} else {
_reject()
Modal.error({
@@ -289,15 +391,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') && !/^\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: '瀛樺湪鏈繚瀛樿剼鏈紝璇风偣鍑荤‘瀹氫繚瀛橈紝鎴栫偣鍑诲彇娑堟斁寮冧慨鏀癸紒',
+ 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
@@ -325,28 +470,13 @@
})
}, () => { // 楠岃瘉澶辫触
this.setState({
+ activeKey: val,
loading: false
})
}, activeKey)
})
})
} 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({
@@ -355,9 +485,14 @@
})
}, () => { // 楠岃瘉澶辫触
this.setState({
+ activeKey: val,
loading: false
})
}, activeKey)
+ } else {
+ this.setState({
+ activeKey: val
+ })
}
}
@@ -372,39 +507,90 @@
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, permFuncField } = this.props
- const { loading, activeKey, setting, defaultSql, columns, scripts } = this.state
+ const { config, menu, dict } = this.props
+ 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">
{loading && <Spin size="large" />}
- <Tabs activeKey={activeKey} className="verify-card-box" onChange={this.changeTab}>
+ <Tabs activeKey={activeKey} onChange={this.changeTab}>
<TabPane tab="鏁版嵁婧�" key="setting">
<DataSource
- type={config.Template === 'CommonTable' ? 'main' : ''}
menu={menu}
dict={dict}
+ config={config}
columns={columns}
setting={setting}
scripts={scripts}
- permFuncField={permFuncField}
+ updateStatus={this.updateStatus}
wrappedComponentRef={(inst) => this.settingForm = inst}
/>
</TabPane>
- <TabPane tab="鑷畾涔夎剼鏈�" key="scripts">
+ <TabPane tab={
+ <span>
+ 鑷畾涔夎剼鏈�
+ {scripts.length ? <span className="count-tip">{scripts.length}</span> : null}
+ </span>
+ } disabled={!(status.interType === 'system' || (status.interType === 'custom' && status.requestMode === 'system'))} key="scripts">
<CustomScript
dict={dict}
setting={setting}
scripts={scripts}
defaultSql={defaultSql}
+ urlFields={config.urlFields}
searches={this.props.search}
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>
</div>
)
--
Gitblit v1.8.0