From d59f518f466274b2caeb2e01c10c92deafe7c93b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 二月 2022 11:48:29 +0800
Subject: [PATCH] 2022-02-09
---
src/templates/sharecomponent/settingcomponent/index.jsx | 143 ++++++++++++++++++++++-------------------------
1 files changed, 67 insertions(+), 76 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/index.jsx b/src/templates/sharecomponent/settingcomponent/index.jsx
index 4e0ac05..eaf65ba 100644
--- a/src/templates/sharecomponent/settingcomponent/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/index.jsx
@@ -1,13 +1,12 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Modal, Button, notification } from 'antd'
+import { Modal, Button } from 'antd'
+import { SettingOutlined } from '@ant-design/icons'
-import Utils from '@/utils/utils.js'
-import DevUtils from '@/utils/devutils.js'
+import Utils, { FuncUtils } from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
-import { getSettingForm } from '@/templates/zshare/formconfig'
import SettingForm from './settingform'
import CreateFunc from '@/templates/zshare/createfunc'
@@ -17,18 +16,16 @@
class SettingComponent extends Component {
static propTpyes = {
- type: PropTypes.string, // 鑿滃崟绫诲瀷
mainsearch: PropTypes.any, // 涓昏〃鐨勬悳绱㈡潯浠讹紝褰撳瓙琛ㄨ缃帴鏀朵富琛ㄦ潯浠舵椂鏈夋晥
MenuID: PropTypes.string, // 鑿滃崟ID
config: PropTypes.object, // 鑿滃崟閰嶇疆淇℃伅
- permFuncField: PropTypes.array, // 瀛樺偍杩囩▼鍙敤寮�澶村瓧娈�
- menuformRef: PropTypes.any, // 鑿滃崟鍩烘湰淇℃伅琛ㄥ崟
updatesetting: PropTypes.func
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
menu: null, // 鑿滃崟淇℃伅
+ search: null, // 鎼滅储鏉′欢锛屽寘鎷富琛ㄦ悳绱�
formlist: null, // 琛ㄥ崟淇℃伅
visible: false, // 妯℃�佹鎺у埗
loading: false // 璁剧疆淇℃伅楠岃瘉淇濆瓨涓�
@@ -38,45 +35,19 @@
* @description 鍏ㄥ眬璁剧疆瑙﹀彂
*/
changeSetting = () => {
- const { menuformRef, MenuID, config, type, permFuncField, mainsearch } = this.props
- let menu = {MenuID: MenuID}
+ const { MenuID, config, mainsearch } = this.props
+ let menu = { MenuID: MenuID, MenuName: config.MenuName || config.tabName || '', MenuNo: config.MenuNo || config.tabNo || '' }
- if (menuformRef) {
- menu = {MenuID: MenuID, MenuName: menuformRef.props.form.getFieldValue('MenuName') || '', MenuNo: menuformRef.props.form.getFieldValue('MenuNo') || ''}
- }
-
- let _columns = fromJS(config.columns).toJS()
-
- let primaryKey = config.setting.primaryKey || ''
-
- if (!primaryKey || _columns.filter(column => column.field === primaryKey).length === 0) {
- _columns.forEach(col => {
- if (col.field.toLowerCase() === 'id') {
- primaryKey = col.field
- }
- })
- }
- _columns = _columns.filter(item => item.field && item.type !== 'colspan')
- _columns = _columns.map(item => {
- return {
- value: item.field,
- text: item.label
- }
- })
-
- // _columns.unshift({value: '', text: '鏈缃�'})
-
- let _config = fromJS(config).toJS()
+ let _search = fromJS(config.search).toJS()
if (mainsearch) { // 缁煎悎涓婚〉鎼滅储鍙婂瓙琛ㄦ悳绱㈡潯浠�
- _config.search = [..._config.search, ...mainsearch]
+ _search = [...mainsearch, ..._search]
}
this.setState({
visible: true,
- formlist: getSettingForm(config.setting, permFuncField, MenuID, primaryKey, _columns, type),
- menu: menu,
- config: _config
+ search: _search,
+ menu: menu
})
}
@@ -89,11 +60,15 @@
this.setState({
loading: true
})
- this.settingRef.handleConfirm().then(res => {
+ this.settingRef.handleConfirm().then(setting => {
+ let res = this.resetSetting(setting)
this.setState({
visible: false,
loading: false
})
+ res.actionfixed = res.actionfixed === 'true'
+ res.columnfixed = res.columnfixed === 'true'
+
this.props.updatesetting({...config, setting: res})
}, () => {
this.setState({
@@ -109,20 +84,11 @@
const { config } = this.props
const { menu } = this.state
- this.settingRef.handleConfirm().then(setting => {
-
- if (!(setting.interType === 'inner') || !setting.innerFunc) {
- notification.warning({
- top: 92,
- message: '鎺ュ彛绫诲瀷涓�-鍐呴儴锛屼笖瀛樺湪鍐呴儴鍑芥暟鏃讹紝鎵嶅彲浠ュ垱寤哄瓨鍌ㄨ繃绋嬶紒',
- duration: 5
- })
- return
- }
-
- let _config = {...config, setting: setting}
- let newLText = Utils.formatOptions(DevUtils.getTableFunc(setting, menu, _config)) // 鍒涘缓瀛樺偍杩囩▼sql
- let DelText = Utils.formatOptions(DevUtils.dropfunc(setting.innerFunc)) // 鍒犻櫎瀛樺偍杩囩▼sql
+ this.settingRef.handleConfirm('func').then(setting => {
+ let res = this.resetSetting(setting)
+ let _config = {...config, setting: res}
+ let newLText = Utils.formatOptions(FuncUtils.getTableFunc(setting, menu, _config)) // 鍒涘缓瀛樺偍杩囩▼sql
+ let DelText = Utils.formatOptions(FuncUtils.dropfunc(setting.innerFunc)) // 鍒犻櫎瀛樺偍杩囩▼sql
this.refs.funcCreatComponent.exec(setting.innerFunc, newLText, DelText).then(result => {
if (result === 'success') {
@@ -136,22 +102,14 @@
* @description 鍒涘缓琛ㄦ牸鎺ュ彛锛堣鍑猴級
*/
tableCreatInterface = () => {
- const { config, type } = this.props
+ const { config } = this.props
const { menu } = this.state
- this.settingRef.handleConfirm().then(setting => {
- if (setting.interType !== 'inner' || setting.innerFunc) {
- notification.warning({
- top: 92,
- message: '鎺ュ彛绫诲瀷涓�-鍐呴儴锛屼笖涓嶅瓨鍦ㄥ唴閮ㄥ嚱鏁版椂锛屾墠鍙互鍒涘缓鎺ュ彛锛�',
- duration: 5
- })
- return
- }
-
- let _config = {...config, setting: setting}
+ this.settingRef.handleConfirm('interface').then(setting => {
+ let res = this.resetSetting(setting)
+ let _config = {...config, setting: res}
let _menu = {
- type: type,
+ type: config.Template === 'CommonTable' ? 'main' : 'subtable',
MenuID: menu.MenuID,
menuName: menu.MenuName,
menuNo: menu.MenuNo
@@ -159,6 +117,41 @@
this.refs.tableCreatInterface.triggerOutInterface(_menu, _config)
})
+ }
+
+ resetSetting = (s) => {
+ let setting = fromJS(s).toJS()
+ let maxScript = 0
+
+ if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
+ window.GLOB.funcs.forEach(m => {
+ let reg = new RegExp('\\$ex@' + m.func_code + '@ex\\$', 'ig')
+ setting.scripts.forEach(item => {
+ item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`)
+
+ if (item.status === 'false') return
+
+ if (/exec\s/ig.test(item.sql)) {
+ maxScript = 1000
+ } else if (item.sql.length > maxScript) {
+ maxScript = item.sql.length
+ }
+ })
+ setting.preScripts.forEach(item => {
+ item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`)
+ })
+ setting.cbScripts.forEach(item => {
+ item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`)
+ })
+ if (setting.dataresource) {
+ setting.dataresource = setting.dataresource.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`)
+ }
+ })
+ }
+
+ setting.maxScript = maxScript
+
+ return setting
}
shouldComponentUpdate (nextProps, nextState) {
@@ -175,12 +168,12 @@
}
render() {
- const { type } = this.props
- const { dict, visible, config } = this.state
+ const { config } = this.props
+ const { dict, visible, search, menu } = this.state
return (
<div className="model-menu-setting">
- <Icon type="setting" onClick={this.changeSetting} />
+ <SettingOutlined onClick={this.changeSetting} />
{/* 璁剧疆鍏ㄥ眬閰嶇疆鍙婂垪琛ㄦ暟鎹簮 */}
<Modal
wrapClassName="model-table-setting-verify-modal"
@@ -190,7 +183,7 @@
maskClosable={false}
onCancel={() => { this.setState({ visible: false, loading: false })}}
footer={[
- <CreateInterface key="interface" dict={dict} ref="tableCreatInterface" trigger={this.tableCreatInterface}/>,
+ <CreateInterface key="interface" loading={this.state.interloading} dict={dict} ref="tableCreatInterface" trigger={this.tableCreatInterface}/>,
<CreateFunc key="create" dict={dict} ref="funcCreatComponent" trigger={this.tableCreatFunc}/>,
<Button key="cancel" onClick={() => { this.setState({ visible: false, loading: false }) }}>{this.state.dict['model.cancel']}</Button>,
<Button key="confirm" type="primary" loading={this.state.loading} onClick={this.settingSave}>{this.state.dict['model.confirm']}</Button>
@@ -198,12 +191,10 @@
destroyOnClose
>
<SettingForm
- type={type}
dict={dict}
+ menu={menu}
config={config}
- menu={this.state.menu}
- inputSubmit={this.settingSave}
- formlist={this.state.formlist}
+ search={search}
wrappedComponentRef={(inst) => this.settingRef = inst}
/>
</Modal>
--
Gitblit v1.8.0