From 7ce770404c911b40a94bbb0d67fd4d8cce93ba9d Mon Sep 17 00:00:00 2001 From: sonlt Date: Mon, 22 Dec 2025 19:45:25 +0700 Subject: [PATCH] save --- .../Pages/Order/JsonOutputPanel.razor | 33 +++++++++++++-- RobotApp.Client/Pages/Order/OrderMess.razor | 41 +++++++++---------- RobotApp.Client/Services/UiEdge.cs | 4 +- 3 files changed, 52 insertions(+), 26 deletions(-) diff --git a/RobotApp.Client/Pages/Order/JsonOutputPanel.razor b/RobotApp.Client/Pages/Order/JsonOutputPanel.razor index 7e9ff0c..b37af07 100644 --- a/RobotApp.Client/Pages/Order/JsonOutputPanel.razor +++ b/RobotApp.Client/Pages/Order/JsonOutputPanel.razor @@ -16,13 +16,14 @@ - Cancel + @CancelButtonText + Icons.Material.Filled.Error, _ => Icons.Material.Filled.Send }; + + private string CancelButtonText => + CancelSuccess switch + { + true => "Done", + false => "Error", + _ => "Cancel" + }; + + private Color CancelButtonColor => + CancelSuccess switch + { + true => Color.Success, + false => Color.Error, + _ => Color.Error + }; + + private string CancelButtonIcon => + CancelSuccess switch + { + true => Icons.Material.Filled.CheckCircle, + false => Icons.Material.Filled.Error, + _ => Icons.Material.Filled.Cancel + }; + } diff --git a/RobotApp.Client/Pages/Order/OrderMess.razor b/RobotApp.Client/Pages/Order/OrderMess.razor index bc73b0a..7f3b732 100644 --- a/RobotApp.Client/Pages/Order/OrderMess.razor +++ b/RobotApp.Client/Pages/Order/OrderMess.razor @@ -8,7 +8,6 @@ @inject IJSRuntime JS @inject IDialogService DialogService -@inject ISnackbar Snackbar @inject HttpClient Http @@ -50,6 +49,7 @@ + { + await Task.Delay(2000); + cancelSuccess = null; + await InvokeAsync(StateHasChanged); + }); } + async Task CopyJsonToClipboard() { _copyCts?.Cancel(); diff --git a/RobotApp.Client/Services/UiEdge.cs b/RobotApp.Client/Services/UiEdge.cs index 987a580..048d3dc 100644 --- a/RobotApp.Client/Services/UiEdge.cs +++ b/RobotApp.Client/Services/UiEdge.cs @@ -131,7 +131,7 @@ public class OrderMessage public string Version { get; set; } = "v1"; public string Manufacturer { get; set; } = "PNKX"; public string SerialNumber { get; set; } = "T800-002"; - public string OrderId { get; set; } = Guid.NewGuid().ToString(); + public string OrderId { get; set; } public int OrderUpdateId { get; set; } public string? ZoneSetId { get; set; } @@ -419,7 +419,7 @@ public class OrderMessage manufacturer = Manufacturer, serialNumber = SerialNumber, - orderId = OrderId, + orderId = OrderId= Guid.NewGuid().ToString(), orderUpdateId = OrderUpdateId, zoneSetId = string.IsNullOrWhiteSpace(ZoneSetId)