tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #8522 from abpframework/auto-merge/rel-4-3/274 

Merge branch dev with rel-4.3
pull/8550/head
Mehmet Erim 5 years ago
committed by GitHub
parent
4fcbaf29ef 938f679ab9
commit
ca081aa4c2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 42 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      common.props
  2. 3
      framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor
  3. 14
      framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor.cs
  4. 8
      framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
  5. 2
      framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureManager.cs
  6. 8
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
  7. 6
      modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
  8. 5
      modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json
  9. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
  10. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
  11. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
  12. 4
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj

4
common.props
View File

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>4.4.0</Version>
<LangVersion>latest</LangVersion>
<Version>4.4.0</Version>
<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
<PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
<PackageProjectUrl>https://abp.io/</PackageProjectUrl>

3
framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor
View File

@ -12,7 +12,8 @@
ValueField="item=>item.Value"
SelectedValue="@SelectedValue"
SelectedValueChanged="@SelectedValueChanged"
SearchChanged="@SearchFilterChangedAsync">
SearchChanged="@SearchFilterChangedAsync"
MinLength="0">
</Autocomplete>
</Field>

14
framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor.cs
View File

@ -96,14 +96,26 @@ namespace Volo.Abp.BlazoriseUI.Components.ObjectExtending
return selectItems;
}
protected virtual void SelectedValueChanged(object selectedItem)
protected virtual Task SelectedValueChanged(object selectedItem)
{
SelectedValue = selectedItem;
return Task.CompletedTask;
}
protected async Task SearchFilterChangedAsync(string filter)
{
lookupItems = await GetLookupItemsAsync(filter);
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
await base.OnAfterRenderAsync(firstRender);
if (firstRender)
{
await SearchFilterChangedAsync(string.Empty);
}
}
}
}

8
framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
View File

@ -14,10 +14,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Blazorise" Version="0.9.3.3" />
<PackageReference Include="Blazorise.DataGrid" Version="0.9.3.3" />
<PackageReference Include="Blazorise.Snackbar" Version="0.9.3.3" />
<PackageReference Include="Blazorise.Components" Version="0.9.3.3" />
<PackageReference Include="Blazorise" Version="0.9.3.4" />
<PackageReference Include="Blazorise.DataGrid" Version="0.9.3.4" />
<PackageReference Include="Blazorise.Snackbar" Version="0.9.3.4" />
<PackageReference Include="Blazorise.Components" Version="0.9.3.4" />
</ItemGroup>
</Project>

2
framework/src/Volo.Abp.GlobalFeatures/Volo/Abp/GlobalFeatures/GlobalFeatureManager.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using JetBrains.Annotations;

8
modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
View File

@ -92,7 +92,7 @@ namespace Volo.CmsKit.Admin.Web
toolbar =>
{
toolbar.AddButton(
LocalizableString.Create<CmsKitResource>("New"),
LocalizableString.Create<CmsKitResource>("NewTag"),
icon: "plus",
name: "NewButton",
requiredPolicyName: CmsKitAdminPermissions.Tags.Create
@ -104,7 +104,7 @@ namespace Volo.CmsKit.Admin.Web
toolbar =>
{
toolbar.AddButton(
LocalizableString.Create<CmsKitResource>("New"),
LocalizableString.Create<CmsKitResource>("NewPage"),
icon: "plus",
name: "CreatePage",
requiredPolicyName: CmsKitAdminPermissions.Pages.Create
@ -115,7 +115,7 @@ namespace Volo.CmsKit.Admin.Web
toolbar =>
{
toolbar.AddButton(
LocalizableString.Create<CmsKitResource>("New"),
LocalizableString.Create<CmsKitResource>("NewBlog"),
icon: "plus",
name: "CreateBlog",
id: "CreateBlog",
@ -127,7 +127,7 @@ namespace Volo.CmsKit.Admin.Web
toolbar =>
{
toolbar.AddButton(
LocalizableString.Create<CmsKitResource>("New"),
LocalizableString.Create<CmsKitResource>("NewBlogPost"),
icon: "plus",
name: "CreateBlogPost",
id: "CreateBlogPost",

6
modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
View File

@ -52,8 +52,10 @@
"Menu:CMS": "CMS",
"Message": "Message",
"MessageDeletionConfirmationMessage": "This comment will be deleted completely.",
"Name": "Name",
"New": "New",
"NewPage": "New Page",
"NewBlog": "New Blog",
"NewBlogPost": "New Blog Post",
"NewTag": "New Tag",
"OK": "OK",
"PageDeletionConfirmationMessage": "Are you sure to delete this page?",
"Pages": "Pages",

5
modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json
View File

@ -54,7 +54,10 @@
"Message": "Mesaj",
"MessageDeletionConfirmationMessage": "Bu yorum tamamen silinecektir",
"Name": "Ad",
"New": "Yeni",
"NewPage": "Yeni Sayfa",
"NewBlog": "Yeni Blog",
"NewBlogPost": "Yeni Blog Yazısı",
"NewTag": "Yeni Etiket",
"OK": "Tamam",
"PageDeletionConfirmationMessage": "Bu sayfayı silmek istediğinize emin misiniz?",
"PageSlugInformation": "Etiket URL'de kullanılır. Url şöyle görünür: '/pages/{{slug}}'.",

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
View File

@ -12,8 +12,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.3" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.3" />
<PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.4" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.4" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" />

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
View File

@ -12,8 +12,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.3" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.3" />
<PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.4" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.4" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
</ItemGroup>

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
View File

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.3" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.3" />
<PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.4" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.4" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.*" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.*" />
</ItemGroup>

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj
View File

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.3" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.3" />
<PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.4" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.4" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.*" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.*" />
</ItemGroup>

Write Preview
Loading…
Cancel
Save