From 57e752aa5b8dd5f0f745a248f0340e6bbc917549 Mon Sep 17 00:00:00 2001 From: "Jack.Gao" Date: Sun, 4 Oct 2020 22:07:59 +0800 Subject: [PATCH 1/2] Appended the missed account chinese resources. --- .../Volo/Abp/Account/Localization/Resources/zh-Hans.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json index a7be7fd0b8..d0c81b4253 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json @@ -52,6 +52,8 @@ "ResetPassword_Information": "请输入您的新密码.", "YourPasswordIsSuccessfullyReset": "您的密码已经被重置成功.", "GoToTheApplication": "转到应用程序", - "BackToLogin": "返回登录" + "BackToLogin": "返回登录", + "ProfileTab:Password": "修改密码", + "ProfileTab:PersonalInfo": "个人资料" } } From 9451a6420d50674f75c3373324ac94dd1a64d1d1 Mon Sep 17 00:00:00 2001 From: gaojianzhuang Date: Wed, 16 Dec 2020 09:14:58 +0800 Subject: [PATCH 2/2] [dev-issue-6369]Added the "scrollable" feature for the Bootstrap Modal tag helper. --- .../TagHelpers/Modal/AbpModalTagHelper.cs | 2 ++ .../TagHelpers/Modal/AbpModalTagHelperService.cs | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelper.cs index 51688afceb..ece8916dc9 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelper.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelper.cs @@ -6,6 +6,8 @@ public bool? Centered { get; set; } = false; + public bool? Scrollable { get; set; } = false; + public bool? Static { get; set; } = false; public AbpModalTagHelper(AbpModalTagHelperService tagHelperService) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs index 78d664b562..3f83cd0710 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs @@ -78,6 +78,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal classNames.Append("modal-dialog-centered"); } + if (TagHelper.Scrollable ?? false) + { + classNames.Append(" "); + classNames.Append("modal-dialog-scrollable"); + } + if (TagHelper.Size != AbpModalSize.Default) { classNames.Append(" ");