From ecb00f664a139939aee1b8938de426deeb186985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Mon, 5 Jul 2021 13:35:31 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=90=88=E5=B9=B6=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Service/Auth/AuthService.cs           | 8 ++++++--
 Api/Ewide.Core/Service/Menu/Dto/AntDesignTreeNode.cs | 2 ++
 Api/Ewide.Core/Service/Menu/SysMenuService.cs        | 3 ++-
 web-react/src/assets/style/dark/main.less            | 2 ++
 web-react/src/assets/style/default/main.less         | 4 +++-
 web-react/src/pages/system/menu/form.jsx             | 4 ++++
 web-react/src/views/main/index.jsx                   | 8 +++-----
 7 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Api/Ewide.Core/Service/Auth/AuthService.cs b/Api/Ewide.Core/Service/Auth/AuthService.cs
index 5728f2d..7894894 100644
--- a/Api/Ewide.Core/Service/Auth/AuthService.cs
+++ b/Api/Ewide.Core/Service/Auth/AuthService.cs
@@ -245,8 +245,12 @@ namespace Ewide.Core.Service
             // 菜单信息
             if (loginOutput.Apps.Count > 0)
             {
-                var defaultActiveAppCode = loginOutput.Apps.FirstOrDefault(u => u.Active == true).Code; // loginOutput.Apps[0].Code;
-                loginOutput.Menus = await _sysMenuService.GetLoginMenusAntDesign(userId, defaultActiveAppCode);
+                //var defaultActiveAppCode = loginOutput.Apps.FirstOrDefault(u => u.Active == true).Code; // loginOutput.Apps[0].Code;
+                //loginOutput.Menus = await _sysMenuService.GetLoginMenusAntDesign(userId, defaultActiveAppCode);
+                foreach (var app in loginOutput.Apps)
+                {
+                    loginOutput.Menus.AddRange(await _sysMenuService.GetLoginMenusAntDesign(userId, app.Code));
+                }
             }
 
             return loginOutput;
diff --git a/Api/Ewide.Core/Service/Menu/Dto/AntDesignTreeNode.cs b/Api/Ewide.Core/Service/Menu/Dto/AntDesignTreeNode.cs
index 8739f9e..11644ca 100644
--- a/Api/Ewide.Core/Service/Menu/Dto/AntDesignTreeNode.cs
+++ b/Api/Ewide.Core/Service/Menu/Dto/AntDesignTreeNode.cs
@@ -49,6 +49,8 @@
         /// 打开方式
         /// </summary>
         public int OpenType { get; set; }
+
+        public string Application { get; set; }
     }
 
     /// <summary>
diff --git a/Api/Ewide.Core/Service/Menu/SysMenuService.cs b/Api/Ewide.Core/Service/Menu/SysMenuService.cs
index 52cc6cf..6d25c62 100644
--- a/Api/Ewide.Core/Service/Menu/SysMenuService.cs
+++ b/Api/Ewide.Core/Service/Menu/SysMenuService.cs
@@ -116,7 +116,8 @@ namespace Ewide.Core.Service
                         Show = u.Visible,
                         Link = u.Link,
                         Target = u.OpenType == (int)MenuOpenType.OUTER ? "_blank" : ""
-                    }
+                    },
+                    Application = u.Application
                 }).ToList();
 
 #if DEBUG
diff --git a/web-react/src/assets/style/dark/main.less b/web-react/src/assets/style/dark/main.less
index c6ea34e..d264d6b 100644
--- a/web-react/src/assets/style/dark/main.less
+++ b/web-react/src/assets/style/dark/main.less
@@ -496,8 +496,10 @@
       transition-property: opacity;
 
       opacity: 0;
+      border-radius: @border-radius-base;
     }
     .swiper-scrollbar-drag {
+      border-radius: @border-radius-base;
       background-color: fade(@white, 30%);
     }
     &:hover {
diff --git a/web-react/src/assets/style/default/main.less b/web-react/src/assets/style/default/main.less
index 68cd631..112f21b 100644
--- a/web-react/src/assets/style/default/main.less
+++ b/web-react/src/assets/style/default/main.less
@@ -490,9 +490,11 @@
       transition-property: opacity;
 
       opacity: 0;
+      border-radius: @border-radius-base;
     }
     .swiper-scrollbar-drag {
-      background-color: fade(@white, 30%);
+      border-radius: @border-radius-base;
+      background-color: fade(@black, 30%);
     }
     &:hover {
       .swiper-scrollbar {
diff --git a/web-react/src/pages/system/menu/form.jsx b/web-react/src/pages/system/menu/form.jsx
index bbc7dea..88dfd54 100644
--- a/web-react/src/pages/system/menu/form.jsx
+++ b/web-react/src/pages/system/menu/form.jsx
@@ -116,6 +116,10 @@ export default class form extends Component {
                 postData.id = this.record.id
             }
             //#region 从前段转换后端所需格式
+            // 目录的pic必须为空
+            if (!postData.type) {
+                postData.pid = EMPTY_ID
+            }
             //#endregion
             return postData
         }
diff --git a/web-react/src/views/main/index.jsx b/web-react/src/views/main/index.jsx
index d848dfd..1cb0b84 100644
--- a/web-react/src/views/main/index.jsx
+++ b/web-react/src/views/main/index.jsx
@@ -30,15 +30,13 @@ const serializeMenu = menus => {
 const setNav = async nav => {
     const getNav = []
     nav.apps.forEach(app => {
+        const menu = serializeMenu(nav.menus.filter(p => p.application === app.code))
+
         getNav.push({
             app,
+            menu,
         })
     })
-
-    const menus = await Promise.all(getNav.map(p => api.sysMenuChange({ application: p.app.code })))
-    menus.forEach((menu, i) => {
-        getNav[i].menu = serializeMenu(menu.data)
-    })
     return getNav
 }