Merge pull request #44 from zhaofenglee/dev

Merge branch master with dev
zhaofenglee · Jun 27, 2024 · e245063 · e245063
2 parents 2ceb433 + 72b0f07
commit e245063
Show file tree

Hide file tree

Showing 151 changed files with 50,557 additions and 12,426 deletions.
diff --git a/JS.Abp.DataPermission.sln b/JS.Abp.DataPermission.sln
@@ -65,10 +65,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "framework", "framework", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JS.Abp.DataPermission.Authorization", "framework\JS.Abp.DataPermission.Authorization\JS.Abp.DataPermission.Authorization.csproj", "{969E06BD-91D8-4C47-A1C4-7D88172D62B4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JS.DataPermission.Abstractions", "framework\JS.DataPermission.Abstractions\JS.DataPermission.Abstractions.csproj", "{6AF87958-01F1-4649-9480-43F42724C97A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JS.Abp.DataPermission.Abstractions", "framework\JS.Abp.DataPermission.Abstractions\JS.Abp.DataPermission.Abstractions.csproj", "{6AF87958-01F1-4649-9480-43F42724C97A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JS.Abp.DataPermission.Authorization.Tests", "test\JS.Abp.DataPermission.Authorization.Tests\JS.Abp.DataPermission.Authorization.Tests.csproj", "{8531BDE4-9E88-472A-A9E8-8AF13F00CB07}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JS.Abp.DataPermission.Blazor.Host.Client", "host\JS.Abp.DataPermission.Blazor.Host.Client\JS.Abp.DataPermission.Blazor.Host.Client.csproj", "{318D1671-1130-4C42-9F24-EED4198C00E5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -191,6 +193,10 @@ Global
 		{8531BDE4-9E88-472A-A9E8-8AF13F00CB07}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8531BDE4-9E88-472A-A9E8-8AF13F00CB07}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8531BDE4-9E88-472A-A9E8-8AF13F00CB07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{318D1671-1130-4C42-9F24-EED4198C00E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{318D1671-1130-4C42-9F24-EED4198C00E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{318D1671-1130-4C42-9F24-EED4198C00E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{318D1671-1130-4C42-9F24-EED4198C00E5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -225,6 +231,7 @@ Global
 		{969E06BD-91D8-4C47-A1C4-7D88172D62B4} = {87177AF8-9D17-4D25-ADA1-637A1EE33009}
 		{6AF87958-01F1-4649-9480-43F42724C97A} = {87177AF8-9D17-4D25-ADA1-637A1EE33009}
 		{8531BDE4-9E88-472A-A9E8-8AF13F00CB07} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
+		{318D1671-1130-4C42-9F24-EED4198C00E5} = {E400416D-2895-4512-9D17-90681EEC7E0A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB9B78FB-4F30-1794-15F4-D615ADA46FCA}

diff --git a/README.md b/README.md
@@ -7,6 +7,10 @@
 </div>
 
 ---
+## 8.2.0更新说明
+* abp8.2版本升级,blazorwasm修改为blazorapp
+* 修改framework包命名规则
+
 ## 8.0.5更新说明
 * (重大变更) 修改实体数据权限判断方式，无设定的用户默认无权，如需要开通所有数据权限需进行设定
 参考：https://github.com/zhaofenglee/DataPermission/issues/30

diff --git a/angular/.nx/cache/18.3.5-nx.win32-x64-msvc.node b/angular/.nx/cache/18.3.5-nx.win32-x64-msvc.node
diff --git a/angular/angular.json b/angular/angular.json
@@ -145,18 +145,18 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "dev-app:build:production"
+              "buildTarget": "dev-app:build:production"
             },
             "development": {
-              "browserTarget": "dev-app:build:development"
+              "buildTarget": "dev-app:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "dev-app:build"
+            "buildTarget": "dev-app:build"
           }
         },
         "test": {
@@ -188,6 +188,5 @@
         }
       }
     }
-  },
-  "defaultProject": "dev-app"
+  }
 }