Merge remote-tracking branch 'origin/main' into fix/password

masastack · Apr 13, 2024 · 3b4b5a0 · 3b4b5a0
2 parents 4160d20 + 5a27f12
commit 3b4b5a0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -4,37 +4,11 @@
   </a>
 </p>
 
-## 介绍
+## Introduction
 
-MASA Auth是MASA Stack中最核心的功能之一，它统一负责了所有产品的权限、菜单、用户等。它包含了单点登录、用户管理、RBAC3、第三方平台接入、Ldap等企业级功能。除了可以用在企业内部管理系统，它还可以帮助管理C端用户。
-![Auth](http://cdn.masastack.com/stack/doc/auth/introduce.png)
+MASA Auth is one of the most central features of the MASA Stack, responsible for permissions, menus, and users across all products. It encompasses single sign-on, user management, RBAC3, third-party platform integration, LDAP, and other enterprise-grade features.
 
-## MASA Stack 概览
-[传送门](https://github.com/masastack/MASA.Stack)
+## Code of Conduct
 
-## 特性
-- 待补充
-
-## 安装
-- 待补充
-
-
-## 本地开发
-- 待补充
-
-## 开发路线
-- 待补充
-
-## 贡献者
-
-感谢所有为本项目做出过贡献的朋友。
-
-<a href="https://github.com/masastack/MASA.Auth/graphs/contributors"> 
-    <img src="https://contrib.rocks/image?repo=masastack/MASA.Auth" /> 
-</a>
-
-## 行为准则
-
-本项目采用了《贡献者公约》所定义的行为准则，以明确我们社区的预期行为。
-更多信息请见 [MASA Stack Community Code of Conduct](https://github.com/masastack/community/blob/main/CODE-OF-CONDUCT.md).
+Please refer to our [MASA Stack Community Code of Conduct](https://github.com/masastack/community/blob/main/CODE-OF-CONDUCT.md).
 
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Masa.Auth.Web.Admin.Rcl.csproj b/src/Web/Masa.Auth.Web.Admin.Rcl/Masa.Auth.Web.Admin.Rcl.csproj
@@ -18,7 +18,7 @@
 		<PackageReference Include="Humanizer.Core" Version="2.14.1" />
 		<PackageReference Include="Humanizer.Core.zh-CN" Version="2.14.1" />
 		<PackageReference Include="Mapster" Version="7.3.0" />
-		<PackageReference Include="Masa.Stack.Components" Version="0.0.441" />
+		<PackageReference Include="Masa.Stack.Components" Version="0.0.445" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.7" />
 		<!--Support GB2312-->
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/PermissionsConfigure.razor b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Component/Permissions/PermissionsConfigure.razor
@@ -9,14 +9,14 @@
     }
     else
     {
-        <ExpansionMenuWrapper Value="Menu" />
+        <ExpansionMenuWrapper CssForScroll="permission-view" Value="Menu" />
     }
 
     <DefaultSheetDialog Value="Preview" ValueChanged="PreviewChanged" Title="@T("Preview Permissions")">
         <AutoHeight>
             <AutoHeightContent>
                 <div class="global-nav" style="max-height:calc(100vh - 230px);">
-                    <ExpansionMenuWrapper Value="PreviewMenu" />
+                    <ExpansionMenuWrapper CssForScroll="permission-view3" Value="PreviewMenu" />
                 </div>
             </AutoHeightContent>
             <FooterContent>
@@ -32,5 +32,5 @@
 }
 else
 {
-    <ExpansionMenuWrapper Value="PreviewMenu" />
+    <ExpansionMenuWrapper CssForScroll="permission-view2" Value="PreviewMenu" />
 }