From 58826d6f4eab9f8c9acf9fa8696f60039c645cfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 八月 2024 18:18:00 +0800
Subject: [PATCH] 2024-08-20
---
src/views/pcdesign/index.jsx | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 0f54aaf..db2af66 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -3,15 +3,14 @@
import { withRouter } from 'react-router'
import { is, fromJS } from 'immutable'
import HTML5Backend from 'react-dnd-html5-backend'
-import { ConfigProvider, notification, Modal, Collapse, Switch, Button, message, Spin, Typography } from 'antd'
+import { notification, Modal, Collapse, Switch, Button, message, Spin, Typography } from 'antd'
import { DoubleLeftOutlined, DoubleRightOutlined, HomeOutlined, LoginOutlined, ArrowLeftOutlined, EyeOutlined, EyeInvisibleOutlined } from '@ant-design/icons'
import moment from 'moment'
import md5 from 'md5'
import Api from '@/api'
-import Utils, { setGLOBFuncs } from '@/utils/utils.js'
+import Utils from '@/utils/utils.js'
import { getTables, getFuncsAndInters, getLangTrans } from '@/utils/utils-custom.js'
-import antdZhCN from 'antd/es/locale/zh_CN'
import MKEmitter from '@/utils/events.js'
import MenuUtils from '@/utils/utils-custom.js'
import asyncComponent from '@/utils/asyncComponent'
@@ -69,7 +68,9 @@
eyeopen: false,
view: '',
popConfig: null,
- needUpdate: false
+ needUpdate: false,
+ appLoginId: '',
+ appHomeId: ''
}
UNSAFE_componentWillMount() {
@@ -116,10 +117,33 @@
sessionStorage.removeItem('applangList')
}
+ if (param.wxAppId) {
+ sessionStorage.setItem('wxAppId', param.wxAppId)
+ }
+
this.getAppMessage(param.MenuID)
} else if (param.type === 'view') {
+ let appLoginId = ''
+ let appHomeId = ''
+ if (sessionStorage.getItem('appViewList')) {
+ try {
+ let appMenus = JSON.parse(sessionStorage.getItem('appViewList'))
+ appMenus.forEach(item => {
+ if (item.keys_type === 'login') {
+ appLoginId = item.keys_id
+ } else if (item.keys_type === 'index') {
+ appHomeId = item.keys_id
+ }
+ })
+ } catch (e) {
+
+ }
+ }
+
this.setState({
- MenuId: param.MenuID
+ MenuId: param.MenuID,
+ appLoginId: appLoginId,
+ appHomeId: appHomeId
}, () => {
this.getMenuParam(param)
})
@@ -153,9 +177,13 @@
MKEmitter.addListener('changeEditMenu', this.changeEditMenu)
MKEmitter.addListener('triggerMenuSave', this.triggerMenuSave)
+ if (sessionStorage.getItem('wxAppId')) {
+ window.GLOB.WXAppID = sessionStorage.getItem('wxAppId')
+ }
+
setTimeout(() => {
this.getRoleFields()
- setGLOBFuncs()
+ // setGLOBFuncs()
}, 1000)
document.onkeydown = (event) => {
@@ -249,7 +277,8 @@
MenuID: menu.MenuID,
copyMenuId: menu.copyMenuId || '',
clearMenu: menu.clearMenu !== 'false',
- type: 'view'
+ type: 'view',
+ lang: sessionStorage.getItem('lang')
}
// param.MenuNo = menu.MenuNo || ''
@@ -1617,6 +1646,8 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
+ const that = this
+
confirm({
title: '纭畾璁剧疆鏈〉闈负棣栭〉鍚楋紵',
content: '',
@@ -1630,6 +1661,10 @@
})
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+
+ that.setState({
+ appHomeId: config.MenuID
+ })
}
})
},
@@ -1677,6 +1712,7 @@
param.secretkey = Utils.encrypt('', param.timestamp)
let hasLogin = config.components.findIndex(item => item.type === 'login') > -1
+ const that = this
confirm({
title: '纭畾璁剧疆鏈〉闈负鐧诲綍椤靛悧锛�',
@@ -1691,6 +1727,10 @@
})
} else {
sessionStorage.setItem('appViewList', JSON.stringify(appViewList))
+
+ that.setState({
+ appLoginId: config.MenuID
+ })
}
})
},
@@ -1719,10 +1759,10 @@
}
render () {
- const { view, loading, comloading, activeKey, settingshow, controlshow, MenuId, config, menuloading, eyeopen, needUpdate } = this.state
+ const { view, loading, comloading, activeKey, settingshow, controlshow, MenuId, config, menuloading, eyeopen, needUpdate, appLoginId, appHomeId } = this.state
return (
- <ConfigProvider locale={antdZhCN}>
+ <>
<DndProvider backend={HTML5Backend}>
{view !== 'popview' ? <div className={'mk-pc-view '} id="mk-pc-design-view">
{loading ? <Spin className="view-spin" size="large" /> : null}
@@ -1780,8 +1820,8 @@
<PictureController/>
<Quotecomponent config={config} updateConfig={this.updateConfig}/>
<StyleCombControlButton menu={config} />
- <Button className="mk-border-green" onClick={this.setHomeView}><HomeOutlined /> 璁句负棣栭〉</Button>
- <Button className="mk-border-purple" onClick={this.setLoginView}><LoginOutlined/> 璁句负鐧诲綍椤�</Button>
+ <Button className="mk-border-green" disabled={MenuId === appHomeId} onClick={this.setHomeView}><HomeOutlined /> 璁句负棣栭〉</Button>
+ <Button className="mk-border-purple" disabled={MenuId === appLoginId} onClick={this.setLoginView}><LoginOutlined/> 璁句负鐧诲綍椤�</Button>
<ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
<Transfer MenuID={MenuId} />
{config ? <Versions MenuId={MenuId} Template="webPage" checklog={this.checklog} updateConfig={this.updateLogConfig}/> : null}
@@ -1799,7 +1839,7 @@
<StyleController />
<StyleCombController />
<ModalController />
- </ConfigProvider>
+ </>
)
}
}
--
Gitblit v1.8.0