From 140adf41ca32aafcbc1f0d32dace9da81aa5ef3f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 三月 2023 17:57:05 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/calendarconfig/index.jsx | 65 ++++++++++++--------------------
1 files changed, 24 insertions(+), 41 deletions(-)
diff --git a/src/templates/calendarconfig/index.jsx b/src/templates/calendarconfig/index.jsx
index 2284223..2bb9117 100644
--- a/src/templates/calendarconfig/index.jsx
+++ b/src/templates/calendarconfig/index.jsx
@@ -422,19 +422,19 @@
return
}
- let tabParam = { // 娣诲姞鑿滃崟tab椤�
- func: 'sPC_sMenusTab_AddUpt',
- MenuID: menu.MenuID
- }
+ // let tabParam = { // 娣诲姞鑿滃崟tab椤�
+ // func: 'sPC_sMenusTab_AddUpt',
+ // MenuID: menu.MenuID
+ // }
- if (_config.tab) {
- tabParam.LText = Utils.formatOptions(`select '${menu.MenuID}' as MenuID ,'${_config.tab.linkTab}' as Tabid,'${_config.tab.label}' as TabName ,'0' as Sort`)
- } else {
- tabParam.LText = Utils.formatOptions(`select '${menu.MenuID}' as MenuID ,'' as Tabid,'' as TabName ,'0' as Sort`)
- }
+ // if (_config.tab) {
+ // tabParam.LText = Utils.formatOptions(`select '${menu.MenuID}' as MenuID ,'${_config.tab.linkTab}' as Tabid,'${_config.tab.label}' as TabName ,'0' as Sort`)
+ // } else {
+ // tabParam.LText = Utils.formatOptions(`select '${menu.MenuID}' as MenuID ,'' as Tabid,'' as TabName ,'0' as Sort`)
+ // }
- tabParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- tabParam.secretkey = Utils.encrypt(tabParam.LText, tabParam.timestamp)
+ // tabParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ // tabParam.secretkey = Utils.encrypt(tabParam.LText, tabParam.timestamp)
let _vals = this.getFuncNames(_config.funcs, [], [])
let _tables = Array.from(new Set(_vals.table))
@@ -478,41 +478,14 @@
this.setState({
config: _config,
openEdition: response.open_edition || '',
- originMenu: fromJS(_config).toJS()
+ originMenu: fromJS(_config).toJS(),
+ menuloading: false,
+ menucloseloading: false
}, () => {
reload && MKEmitter.emit('revert')
})
this.props.reloadmenu()
-
- // 鏍囩淇℃伅淇濆瓨
- Api.getSystemConfig(tabParam).then(result => {
- if (result.status) {
- notification.success({
- top: 92,
- message: '淇濆瓨鎴愬姛',
- duration: 2
- })
- if (this.state.closeVisible) {
- this.handleViewBack()
- } else {
- this.setState({
- menuloading: false,
- menucloseloading: false
- })
- }
- } else {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- this.setState({
- menuloading: false,
- menucloseloading: false
- })
- }
- })
localParam.func = 'sPC_TrdMenu_AddUpt_For_Local'
delete localParam.LongParam
@@ -523,6 +496,16 @@
delete localParam.open_edition
Api.genericInterface(localParam)
+
+ notification.success({
+ top: 92,
+ message: '淇濆瓨鎴愬姛',
+ duration: 2
+ })
+
+ if (this.state.closeVisible) {
+ this.handleViewBack()
+ }
} else {
this.setState({
menuloading: false,
--
Gitblit v1.8.0