Merge branch 'master' into positec

king

2023-09-18 11b6387d74467f81e33eba8f882bff610f240115

 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,15 +10,13 @@
    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="menu-name">{menuName}</div>
          <div className="header-setting">
            <img src={this.state.avatar} alt=""/>
            <span>