From c8804ceb1fe2dea76f9949c5ea04423876ee2c81 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 六月 2024 14:02:47 +0800
Subject: [PATCH] 2024-06-28
---
src/views/pcdesign/index.jsx | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 0f54aaf..d998c92 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -3,7 +3,7 @@
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'
@@ -11,7 +11,6 @@
import Api from '@/api'
import Utils, { setGLOBFuncs } 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'
@@ -116,6 +115,10 @@
sessionStorage.removeItem('applangList')
}
+ if (param.wxAppId) {
+ sessionStorage.setItem('wxAppId', param.wxAppId)
+ }
+
this.getAppMessage(param.MenuID)
} else if (param.type === 'view') {
this.setState({
@@ -152,6 +155,10 @@
MKEmitter.addListener('changePopview', this.initPopview)
MKEmitter.addListener('changeEditMenu', this.changeEditMenu)
MKEmitter.addListener('triggerMenuSave', this.triggerMenuSave)
+
+ if (sessionStorage.getItem('wxAppId')) {
+ window.GLOB.WXAppID = sessionStorage.getItem('wxAppId')
+ }
setTimeout(() => {
this.getRoleFields()
@@ -249,7 +256,8 @@
MenuID: menu.MenuID,
copyMenuId: menu.copyMenuId || '',
clearMenu: menu.clearMenu !== 'false',
- type: 'view'
+ type: 'view',
+ lang: sessionStorage.getItem('lang')
}
// param.MenuNo = menu.MenuNo || ''
@@ -1722,7 +1730,7 @@
const { view, loading, comloading, activeKey, settingshow, controlshow, MenuId, config, menuloading, eyeopen, needUpdate } = 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}
@@ -1799,7 +1807,7 @@
<StyleController />
<StyleCombController />
<ModalController />
- </ConfigProvider>
+ </>
)
}
}
--
Gitblit v1.8.0