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 | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/index.jsx b/src/templates/sharecomponent/settingcomponent/index.jsx
index bad5664..eaf65ba 100644
--- a/src/templates/sharecomponent/settingcomponent/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Modal, Button } from 'antd'
+import { Modal, Button } from 'antd'
+import { SettingOutlined } from '@ant-design/icons'
import Utils, { FuncUtils } from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/model.js'
@@ -59,7 +60,8 @@
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
@@ -83,7 +85,8 @@
const { menu } = this.state
this.settingRef.handleConfirm('func').then(setting => {
- let _config = {...config, setting: 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
@@ -103,7 +106,8 @@
const { menu } = this.state
this.settingRef.handleConfirm('interface').then(setting => {
- let _config = {...config, setting: setting}
+ let res = this.resetSetting(setting)
+ let _config = {...config, setting: res}
let _menu = {
type: config.Template === 'CommonTable' ? 'main' : 'subtable',
MenuID: menu.MenuID,
@@ -113,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) {
@@ -134,7 +173,7 @@
return (
<div className="model-menu-setting">
- <Icon type="setting" onClick={this.changeSetting} />
+ <SettingOutlined onClick={this.changeSetting} />
{/* 璁剧疆鍏ㄥ眬閰嶇疆鍙婂垪琛ㄦ暟鎹簮 */}
<Modal
wrapClassName="model-table-setting-verify-modal"
--
Gitblit v1.8.0