From 7e46c386be5c2cfc20af3936d26839ad3fce44b0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 16 八月 2023 17:40:32 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/views/design/index.jsx |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/views/design/index.jsx b/src/views/design/index.jsx
index d357a7f..a616714 100644
--- a/src/views/design/index.jsx
+++ b/src/views/design/index.jsx
@@ -1,19 +1,23 @@
 import React, {Component} from 'react'
 import { withRouter } from 'react-router-dom'
 import { ConfigProvider } from 'antd'
-import enUS from 'antd/es/locale/en_US'
+// import enUS from 'antd/es/locale/en_US'
 import zhCN from 'antd/es/locale/zh_CN'
 
 import Header from './header'
-import { setGLOBFuncs } from '@/utils/utils.js'
 import Sidemenu from './sidemenu'
+import { setGLOBFuncs } from '@/utils/utils.js'
 
 import '@/assets/css/design.scss'
 import './index.scss'
 
-const _locale = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
-
 class Design extends Component {
+  state = {
+    editLevel: false,
+    mainMenu: null,
+    menuTree: []
+  }
+
   componentDidMount() {
     if (sessionStorage.getItem('isEditState') === 'true') {
       sessionStorage.removeItem('isEditState')
@@ -27,13 +31,27 @@
       setGLOBFuncs()
     }
   }
+
+  resetEditLevel = (level) => {
+    this.setState({editLevel: level})
+  }
+  
+  modifyMenuTree = (menulist) => {
+    this.setState({menuTree: menulist})
+  }
+
+  modifyMainMenu = (menu) => {
+    this.setState({mainMenu: menu})
+  }
   
   render () {
+    const { editLevel, menuTree, mainMenu } = this.state
+
     return (
       <div className={'mk-main-view ' + (window.GLOB.systemType || '')}>
-        <ConfigProvider locale={_locale}>
-          <Sidemenu key="sidemenu"/>
-          <Header key="header"/>
+        <ConfigProvider locale={zhCN}>
+          <Sidemenu key="sidemenu" editLevel={editLevel} menuTree={menuTree} mainMenu={mainMenu} resetEditLevel={this.resetEditLevel}/>
+          <Header key="header" editLevel={editLevel} mainMenu={mainMenu} resetEditLevel={this.resetEditLevel} modifyMenuTree={this.modifyMenuTree} modifyMainMenu={this.modifyMainMenu}/>
         </ConfigProvider>
       </div>
     )

--
Gitblit v1.8.0