Egalware/egwcorelib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/UpdateSorter_01'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-06-30 19:43:27 +02:00
parent c786587a36 3aee8ec236
commit 6f56cd6758
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgwCoreLib.BlazorTest/Pages/TestCalendario.razor.cs
+1 -1
View File
@@ -25,7 +25,7 @@ namespace EgwCoreLib.BlazorTest.Pages
DateTime newDate = dtCurr.AddDays(rnd.Next(-5, 10)).Date;
if (!DateCheck.ContainsKey(newDate))
{
DateCheck.Add(newDate, "bg-success text-light rounded-circle p-2");
DateCheck.Add(newDate, "bg-danger text-light rounded-circle p-2");
}
else
{
EgwCoreLib.Razor/BarcodeReader.razor.cs
+5 -5
View File
@@ -21,7 +21,7 @@ namespace EgwCoreLib.Razor
/// Close button title
/// </summary>
[Parameter]
public string CloseBtnTitle { get; set; } = "关闭";
public string CloseBtnTitle { get; set; } = "Close";
/// <summary>
/// Decode All Formats, performance is poor, you can set options.formats to customize
@@ -68,7 +68,7 @@ namespace EgwCoreLib.Razor
/// Reset button title
/// </summary>
[Parameter]
public string ResetBtnTitle { get; set; } = "复位";
public string ResetBtnTitle { get; set; } = "Reset";
/// <summary>
/// Save the last used device ID to be called automatically next time
@@ -80,7 +80,7 @@ namespace EgwCoreLib.Razor
/// Scan button title
/// </summary>
[Parameter]
public string ScanBtnTitle { get; set; } = "扫码";
public string ScanBtnTitle { get; set; } = "Scan";
/// <summary>
/// Scan result callback method
@@ -92,7 +92,7 @@ namespace EgwCoreLib.Razor
/// Select device button title
/// </summary>
[Parameter]
public string SelectDeviceBtnTitle { get; set; } = "选择设备";
public string SelectDeviceBtnTitle { get; set; } = "Select Device";
/// <summary>
/// Use builtin Div
@@ -172,10 +172,10 @@ namespace EgwCoreLib.Razor
{
if (!firstRender) return;
Storage = new StorageService(JS);
module = await JS.InvokeAsync<IJSObjectReference>("import", "./_content/EgwCoreLib.Razor/BarcodeReader.razor.js");
#if false
module = await JS.InvokeAsync<IJSObjectReference>("import", "./_content/EgwCoreLib.Razor/BarcodeReader.razor.js" + "?v=" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
#endif
module = await JS.InvokeAsync<IJSObjectReference>("import", "./_content/EgwCoreLib.Razor/BarcodeReader.razor.js" + "?v=" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
Instance = DotNetObjectReference.Create(this);
if (Options == null)
{
EgwCoreLib.Razor/Sorter.razor.cs
+3 -3
View File
@@ -58,8 +58,8 @@ namespace EgwCoreLib.Razor
/// </summary>
protected override void OnParametersSet()
{
isCurrent=ParamName.Equals(CurrParam);
cssStyle= isCurrent ? "text-primary" : "text-secondary opacity-25";
isCurrent = ParamName.Equals(CurrParam);
cssStyle = isCurrent ? "text-primary" : "text-secondary opacity-25";
currIcon = isCurrent ? (IsAsc ? SortAscCss : SortDescCss) : UnsortCss;
}
@@ -93,7 +93,7 @@ namespace EgwCoreLib.Razor
#region Private Methods
private async void sortAct()
private async Task sortAct()
{
IsAsc = !IsAsc;
await sortReq.InvokeAsync(new SortCallBack() { ParamName = ParamName, IsAscending = IsAsc });