From 11b6387d74467f81e33eba8f882bff610f240115 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 18 九月 2023 20:01:09 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/header/index.jsx | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/menu/header/index.jsx b/src/menu/header/index.jsx
index c1234dd..9617900 100644
--- a/src/menu/header/index.jsx
+++ b/src/menu/header/index.jsx
@@ -1,5 +1,4 @@
import React, {Component} from 'react'
-import { is, fromJS } from 'immutable'
import avatar from '@/assets/img/avatar.jpg'
import MainLogo from '@/assets/img/main-logo.png'
@@ -11,21 +10,19 @@
userName: sessionStorage.getItem('CloudUserName')
}
- shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState))
- }
-
render () {
+ const { menuName } = this.props
return (
<header className="menu-header-container">
<div className="header-logo"><img src={MainLogo} alt=""/></div>
- <div className="header-setting">
- <img src={this.state.avatar} alt=""/>
- <span>
- <span className="username">{this.state.userName}</span>
- </span>
- </div>
+ <div className="menu-name">{menuName}</div>
+ <div className="header-setting">
+ <img src={this.state.avatar} alt=""/>
+ <span>
+ <span className="username">{this.state.userName}</span>
+ </span>
+ </div>
</header>
)
}
--
Gitblit v1.8.0