From 2188694b8aca0139463a7bcdc876ab0a1208417c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 13 十二月 2023 16:13:44 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/mobdesign/index.jsx | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 338e13c..b3dca30 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -568,6 +568,7 @@
config.uuid = MenuId
config.MenuID = MenuId
+ config.Template = 'webPage'
config.open_edition = result.open_edition || ''
config.direction = config.direction || sessionStorage.getItem('direction') || 'vertical'
window.GLOB.urlFields = config.urlFields || []
@@ -686,6 +687,7 @@
config.uuid = MenuId
config.MenuID = MenuId
+ config.Template = 'webPage'
config.open_edition = result.open_edition || ''
this.setState({
@@ -825,6 +827,7 @@
config.uuid = MenuId
config.MenuID = MenuId
config.open_edition = ''
+ config.Template = 'webPage'
config.MenuName = urlParam.MenuName || ''
// config.MenuNo = urlParam.MenuNo || ''
config.MenuNo = ''
@@ -2055,6 +2058,24 @@
window.GLOB.customMenu = config
}
+ checklog = () => {
+ const { oriConfig, config } = this.state
+
+ return is(fromJS(oriConfig), fromJS(config))
+ }
+
+ updateLogConfig = (config) => {
+ this.setState({
+ config: null
+ }, () => {
+ this.setState({
+ config: config
+ })
+ })
+
+ window.GLOB.customMenu = config
+ }
+
render () {
const { view, viewType, comloading, loading, settingshow, controlshow, activeKey, MenuId, config, menuloading, adapters, eyeopen, needUpdate } = this.state
@@ -2130,7 +2151,7 @@
<Button className="mk-border-purple set-login" onClick={this.setLoginView}><LoginOutlined /> 璁句负鐧诲綍椤�</Button>
<ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
<Transfer MenuID={MenuId} />
- <Versions MenuId={MenuId} open_edition={config ? config.open_edition : ''}/>
+ {config ? <Versions MenuId={MenuId} Template="webPage" checklog={this.checklog} updateConfig={this.updateLogConfig}/> : null}
<Button type="default" onClick={this.closeView}>鍏抽棴</Button>
</div>
</div>
--
Gitblit v1.8.0