Merge pull request #177 from EasyAbp/abp8.1

Upgrade to ABP 8.1.3
EasyAbp · May 19, 2024 · d8eb235 · d8eb235
2 parents 4e79be0 + 3755ef4
commit d8eb235
Show file tree

Hide file tree

Showing 40 changed files with 7,178 additions and 13,159 deletions.
diff --git a/AbpHelper.CLI b/AbpHelper.CLI
diff --git a/dotnet/Directory.Build.props b/dotnet/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>8.0.0</AbpVersion>
-    <AbpLeptonXThemeVersion>3.0.0</AbpLeptonXThemeVersion>
-    <BlazoriseVersion>1.3.2</BlazoriseVersion>
+    <AbpVersion>8.1.3</AbpVersion>
+    <AbpLeptonXThemeVersion>3.1.*-*</AbpLeptonXThemeVersion>
+    <BlazoriseVersion>1.5.0</BlazoriseVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/dotnet/common.props b/dotnet/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.11.0</Version>
+    <Version>2.12.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
 	<AbpProjectType>app</AbpProjectType>
   </PropertyGroup>

diff --git a/...c/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/Switch/Dtos/AbpSwitchToPreRcInput.cs b/...c/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/Switch/Dtos/AbpSwitchToPreRcInput.cs
@@ -0,0 +1,18 @@
+using System;
+using EasyAbp.AbpHelper.Gui.Shared.Dtos;
+using JetBrains.Annotations;
+
+namespace EasyAbp.AbpHelper.Gui.AbpCli.Switch.Dtos
+{
+    [Serializable]
+    public class AbpSwitchToPreRcInput : InputDtoWithDirectory
+    {
+        public AbpSwitchToPreRcInput()
+        {
+        }
+
+        public AbpSwitchToPreRcInput([NotNull] string directory) : base(directory)
+        {
+        }
+    }
+}
diff --git a/.../src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/Switch/IAbpCliSwitchAppService.cs b/.../src/EasyAbp.AbpHelper.Gui.Application.Contracts/AbpCli/Switch/IAbpCliSwitchAppService.cs
@@ -13,6 +13,8 @@ public interface IAbpCliSwitchAppService : IApplicationService
 
         Task<ServiceExecutionResult> SwitchToStableAsync(AbpSwitchToStableInput input);
 
+        Task<ServiceExecutionResult> SwitchToPreRcAsync(AbpSwitchToPreRcInput input);
+
         Task<ServiceExecutionResult> SwitchToLocalAsync(AbpSwitchToLocalInput input);
     }
 }
diff --git a/...bpHelper.Gui.Application.Contracts/AbpCli/Translate/Dtos/AbpCreateTranslationFileInput.cs b/...bpHelper.Gui.Application.Contracts/AbpCli/Translate/Dtos/AbpCreateTranslationFileInput.cs
@@ -11,26 +11,33 @@ public class AbpCreateTranslationFileInput : InputDtoWithDirectory
         [Required]
         [NotNull]
         public virtual string Culture { get; set; }
-        
+
         [CanBeNull]
         public virtual string ReferenceCulture { get; set; }
-        
+
         [CanBeNull]
         public virtual string Output { get; set; }
-        
+
         public virtual bool AllValues { get; set; }
 
+        public virtual bool Online { get; set; }
+
+        [CanBeNull]
+        public virtual string DeeplAuthKey { get; set; }
+
         public AbpCreateTranslationFileInput()
         {
         }
 
-        public AbpCreateTranslationFileInput([NotNull] string directory, [NotNull] string culture,
-            [CanBeNull] string referenceCulture, [CanBeNull] string output, bool allValues) : base(directory)
+        public AbpCreateTranslationFileInput([NotNull] string culture, [CanBeNull] string referenceCulture,
+            [CanBeNull] string output, bool allValues, bool online, [CanBeNull] string deeplAuthKey)
         {
             Culture = culture;
             ReferenceCulture = referenceCulture;
             Output = output;
             AllValues = allValues;
+            Online = online;
+            DeeplAuthKey = deeplAuthKey;
         }
     }
 }
diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/Localization/Gui/en.json b/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/Localization/Gui/en.json
@@ -133,6 +133,7 @@
     "AbpCli_Proxy:ServiceType:All": "All",
     "AbpCli_Switch:SwitchToPreview": "To preview",
     "AbpCli_Switch:SwitchToNightly": "To nightly",
+    "AbpCli_Switch:SwitchToPreRc": "To pre-RC",
     "AbpCli_Switch:SwitchToStable": "To stable",
     "AbpCli_Switch:SwitchToLocal": "To local",
     "AbpCli_Switch:Paths": "Paths",
@@ -142,6 +143,8 @@
     "AbpCli_Translate:ReferenceCulture": "Reference culture",
     "AbpCli_Translate:Output": "Output",
     "AbpCli_Translate:AllValues": "All values",
+    "AbpCli_Translate:Online": "Online translate - Online",
+    "AbpCli_Translate:DeeplAuthKey": "DeepL authentication key - DeeplAuthKey",
     "AbpCli_Translate:File": "File",
     "AbpCli_Login:Login": "Login",
     "AbpCli_Login:Logout": "Logout",

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/Localization/Gui/zh-Hans.json b/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/Localization/Gui/zh-Hans.json
@@ -133,6 +133,7 @@
     "AbpCli_Proxy:ServiceType:All": "所有",
     "AbpCli_Switch:SwitchToPreview": "切换为 Preview 版",
     "AbpCli_Switch:SwitchToNightly": "切换为 Nightly 版",
+    "AbpCli_Switch:SwitchToPreRc": "切换为 Pre-RC 版",
     "AbpCli_Switch:SwitchToStable": "切换为 Stable 版",
     "AbpCli_Switch:SwitchToLocal": "切换为 Local 版",
     "AbpCli_Switch:Paths": "路径 - Paths",
@@ -142,6 +143,8 @@
     "AbpCli_Translate:ReferenceCulture": "参考区域代号 - ReferenceCulture",
     "AbpCli_Translate:Output": "输出文件名 - Output",
     "AbpCli_Translate:AllValues": "包括所有值 - AllValues",
+    "AbpCli_Translate:Online": "在线翻译 - Online",
+    "AbpCli_Translate:DeeplAuthKey": "DeepL 授权秘钥 - DeeplAuthKey",
     "AbpCli_Translate:File": "指定文件 - File",
     "AbpCli_Login:Login": "登录",
     "AbpCli_Login:Logout": "登出",

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/Localization/Gui/zh-Hant.json b/dotnet/src/EasyAbp.AbpHelper.Gui.Application.Contracts/Localization/Gui/zh-Hant.json
@@ -133,6 +133,7 @@
     "AbpCli_Proxy:ServiceType:All": "所有",
     "AbpCli_Switch:SwitchToPreview": "切換為 Preview 版",
     "AbpCli_Switch:SwitchToNightly": "切換為 Nightly 版",
+    "AbpCli_Switch:SwitchToPreRc": "切換為 Pre-RC 版",
     "AbpCli_Switch:SwitchToStable": "切換為 Stable 版",
     "AbpCli_Switch:SwitchToLocal": "切換為 Local 版",
     "AbpCli_Switch:Paths": "路徑 - Paths",
@@ -142,6 +143,8 @@
     "AbpCli_Translate:ReferenceCulture": "參考區域代號 - ReferenceCulture",
     "AbpCli_Translate:Output": "輸出檔名 - Output",
     "AbpCli_Translate:AllValues": "包含所有值 - AllValues",
+    "AbpCli_Translate:Online": "線上翻譯 - Online",
+    "AbpCli_Translate:DeeplAuthKey": "DeepL 授權秘鑰 - DeeplAuthKey",
     "AbpCli_Translate:File": "指定檔案 - File",
     "AbpCli_Login:Login": "登錄",
     "AbpCli_Login:Logout": "登出",

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Application/AbpCli/Switch/AbpCliSwitchAppService.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Application/AbpCli/Switch/AbpCliSwitchAppService.cs
@@ -61,6 +61,18 @@ public virtual async Task<ServiceExecutionResult> SwitchToStableAsync(AbpSwitchT
             return new ServiceExecutionResult(true);
         }
 
+        public virtual async Task<ServiceExecutionResult> SwitchToPreRcAsync(AbpSwitchToPreRcInput input)
+        {
+            var args = CreateCommandLineArgs(input, "abp switch-to-prerc");
+
+            using (_currentDirectoryHelper.Change(input.Directory))
+            {
+                await _switchToStableCommand.ExecuteAsync(args);
+            }
+
+            return new ServiceExecutionResult(true);
+        }
+
         public virtual async Task<ServiceExecutionResult> SwitchToLocalAsync(AbpSwitchToLocalInput input)
         {
             var args = CreateCommandLineArgs(input, "abp switch-to-local");

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/GuiBlazorModule.cs b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/GuiBlazorModule.cs
@@ -165,7 +165,7 @@ private void ConfigureSwaggerServices(IServiceCollection services)
 
         private void ConfigureAutoApiControllers()
         {
-            Configure<AbpAspNetCoreMvcOptions>(options =>
+            PreConfigure<AbpAspNetCoreMvcOptions>(options =>
             {
                 options.ConventionalControllers.Create(typeof(GuiApplicationModule).Assembly);
             });

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/Pages/AbpCli/Components/Switch/SwitchToPreRc.razor b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/Pages/AbpCli/Components/Switch/SwitchToPreRc.razor
@@ -0,0 +1,41 @@
+@using Volo.Abp.AspNetCore.Components.Web
+@using EasyAbp.AbpHelper.Gui.Localization
+@using EasyAbp.AbpHelper.Gui.AbpCli.Switch.Dtos;
+@using EasyAbp.AbpHelper.Gui.Blazor.Pages.Shared;
+@inherits ExecutableComponentBaseWithDirectory<AbpSwitchToPreRcInput>
+@inject AbpBlazorMessageLocalizerHelper<GuiResource> Lh
+
+<Card Class="mb-4">
+    <CardBody>
+        <Alert Color="Color.Info"  Visible>
+            <AlertDescription>
+                <Icon Name="IconName.QuestionCircle" /> @L["Info:FunctionIsBasedOnAbpCliPart1"]
+            </AlertDescription>
+            <AlertMessage>
+                <Icon Name="IconName.ExternalLinkSquareAlt"/>
+                <Link To="https://docs.abp.io/en/abp/latest/CLI#switch-to-prerc" Target="Target.Blank" Style="text-decoration: none">
+                @L["Info:FunctionIsBasedOnAbpCliPart2_Document"]
+                </Link>
+            </AlertMessage>
+            <AlertDescription>
+                @L["Info:FunctionIsBasedOnAbpCliPart3"]
+            </AlertDescription>
+        </Alert>
+        <Form>
+            <Validations @ref="ValidationsRef" Model="Input" ValidateOnLoad="false">
+                <Validation MessageLocalizer="@Lh.Localize">
+                    <Field>
+                        <FieldLabel>@L["Directory"]</FieldLabel>
+                        <TextEdit @bind-Text="Input.Directory" Autofocus="true">
+                            <Feedback>
+                                <ValidationError/>
+                            </Feedback>
+                        </TextEdit>
+                    </Field>
+                </Validation>
+
+                <SubmitButton Block="true" Clicked="@ExecuteAsync" SaveResourceKey="Button:Execute" />
+            </Validations>
+        </Form>
+    </CardBody>
+</Card>
diff --git a/...et/src/EasyAbp.AbpHelper.Gui.Blazor/Pages/AbpCli/Components/Switch/SwitchToPreRc.razor.cs b/...et/src/EasyAbp.AbpHelper.Gui.Blazor/Pages/AbpCli/Components/Switch/SwitchToPreRc.razor.cs
@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+using EasyAbp.AbpHelper.Gui.AbpCli.Switch;
+using Microsoft.AspNetCore.Components;
+
+namespace EasyAbp.AbpHelper.Gui.Blazor.Pages.AbpCli.Components.Switch
+{
+    public partial class SwitchToPreRc
+    {
+        [Inject]
+        private IAbpCliSwitchAppService Service { get; set; }
+
+        protected override async Task InternalExecuteAsync()
+        {
+            await Service.SwitchToPreRcAsync(Input);
+        }
+    }
+}
diff --git a/...asyAbp.AbpHelper.Gui.Blazor/Pages/AbpCli/Components/Translate/CreateTranslationFile.razor b/...asyAbp.AbpHelper.Gui.Blazor/Pages/AbpCli/Components/Translate/CreateTranslationFile.razor
@@ -66,6 +66,19 @@
                 <Field>
                     <Check TValue="bool" @bind-Checked="@Input.AllValues">@L["AbpCli_Translate:AllValues"]</Check>
                 </Field>
+                <Field>
+                    <Check TValue="bool" @bind-Checked="@Input.Online">@L["AbpCli_Translate:Online"]</Check>
+                </Field>
+                <Validation MessageLocalizer="@Lh.Localize">
+                    <Field>
+                        <FieldLabel>@L["AbpCli_Translate:DeeplAuthKey"]</FieldLabel>
+                        <TextEdit @bind-Text="Input.DeeplAuthKey" Disabled="@(!Input.Online)">
+                            <Feedback>
+                                <ValidationError/>
+                            </Feedback>
+                        </TextEdit>
+                    </Field>
+                </Validation>
 
                 <SubmitButton Block="true" Clicked="@ExecuteAsync" SaveResourceKey="Button:Execute" />
             </Validations>

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/Pages/AbpCli/Index.razor b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/Pages/AbpCli/Index.razor
@@ -132,6 +132,7 @@
                 <Items>
                     <Tab Name="SwitchToPreview">@L["AbpCli_Switch:SwitchToPreview"]</Tab>
                     <Tab Name="SwitchToNightly">@L["AbpCli_Switch:SwitchToNightly"]</Tab>
+                    <Tab Name="SwitchToPreRc">@L["AbpCli_Switch:SwitchToPreRc"]</Tab>
                     <Tab Name="SwitchToStable">@L["AbpCli_Switch:SwitchToStable"]</Tab>
                     <Tab Name="SwitchToLocal">@L["AbpCli_Switch:SwitchToLocal"]</Tab>
                 </Items>
@@ -142,6 +143,9 @@
                     <TabPanel Name="SwitchToNightly">
                         <SwitchToNightly></SwitchToNightly>
                     </TabPanel>
+                    <TabPanel Name="SwitchToPreRc">
+                        <SwitchToPreRc></SwitchToPreRc>
+                    </TabPanel>
                     <TabPanel Name="SwitchToStable">
                         <SwitchToStable></SwitchToStable>
                     </TabPanel>

diff --git a/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/package.json b/dotnet/src/EasyAbp.AbpHelper.Gui.Blazor/package.json
@@ -1,9 +1,9 @@
 {
-  "version": "2.11.0",
+  "version": "2.12.0",
   "name": "easyabp-abphelper-gui",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0",
-    "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.0.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.1.0",
+    "@abp/aspnetcore.components.server.leptonxlitetheme": "~3.1.0"
   }
 }