From 06374112d89b2eca863f3661338c2cd761e1a8c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Thu, 28 Sep 2023 16:04:57 +0800
Subject: [PATCH] =?UTF-8?q?header=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/tpm/NewHeader.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index 892288ca0..66e9ed43a 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -48,6 +48,7 @@ class NewHeader extends Component {
       mygetHelmetapi2: null,
       goshowqqgtounp: false,
       visiblemyss: false,
+      navbar: []
     }
   }
   componentDidMount() {
@@ -536,6 +537,11 @@ class NewHeader extends Component {
       this.setState({
         mygetHelmetapi2: chromesettingArray
       });
+      if (mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.length) {
+        this.setState({ navbar: mygetHelmetapi2.navbar.sort((a, b) => {return a.index - b.index}) }, () => {
+          console.log('');
+        });
+      }
       if (chromesettingArray.tab_logo_url) {
         this.gettablogourldata(chromesettingresponseArray);
       } else {
@@ -553,6 +559,11 @@ class NewHeader extends Component {
         this.setState({ mygetHelmetapi2: response.data.setting }, () => {
           console.log('');
         });
+        if (response.data.setting.navbar && response.data.setting.navbar.length) {
+          this.setState({ navbar: response.data.setting.navbar.sort((a, b) => {return a.index - b.index}) }, () => {
+            console.log('');
+          });
+        }
         // localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
         // localStorage.setItem('chromesettingresponse', JSON.stringify(response));
         try {
@@ -633,6 +644,7 @@ class NewHeader extends Component {
       isRender,
       mygetHelmetapi2,
       goshowqqgtounp,
+      navbar
     } = this.state;
     
     const filterPersonal = mygetHelmetapi2 && mygetHelmetapi2.personal && mygetHelmetapi2.personal.filter(i=>i.key === "userinfo");
@@ -668,10 +680,10 @@ class NewHeader extends Component {
           </a>
           <div className="head-nav pr" id={"head-navpre1"}>
             {
-              mygetHelmetapi2 && mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.length > 0 ?
+              navbar && navbar.length > 0 ?
               <ul id="header-nav">
                 {
-                  mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.map((item, key) => {
+                  navbar && navbar.map((item, key) => {
                     var new_link = item.link;
                     var user_login = this.props.user && this.props.user.login;
                     var is_hidden = item.hidden