Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correzione display XML files

Browse Source
This commit is contained in:
Samuele Locatelli
2024-10-22 10:28:37 +02:00
parent 5cea4857dd
commit f92d2f7f27
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Prog/Components/DiffView.razor
+2 -2
View File
@@ -31,12 +31,12 @@
<div class="row" style=" height: @(pHeight)em; overflow-y: scroll;">
<div class="col-6 table-primary">
<div class="border border-primary p-2 bg-light">
<p style="max-width: 70em;">@((MarkupString)StrFix(oldResult))</p>
<p style="max-width: 70em;">@StrFix(oldResult)</p>
</div>
</div>
<div class="col-6 table-warning">
<div class="border border-warning p-2 bg-light">
<p style="max-width: 70em;">@((MarkupString)StrFix(newResult))</p>
<p style="max-width: 70em;">@StrFix(newResult)</p>
</div>
</div>
</div>
MP.Prog/Components/DiffView.razor.cs
+19 -8
View File
@@ -4,6 +4,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using System.Web;
namespace MP.Prog.Components
{
@@ -77,21 +78,26 @@ namespace MP.Prog.Components
StringBuilder sbOld = new StringBuilder();
foreach (var item in diff)
{
// se fosse testo vuoto --> metto spazio!
if (string.IsNullOrEmpty(item.text))
{
item.text = " ";
}
switch (item.operation)
{
case Operation.DELETE:
sbOld.Append($"<span class=\"border border-success table-success\">{item.text}</span>");
sbOld.Append($"<span class=\"border border-success table-success\">{HttpUtility.HtmlEncode(item.text)}</span>");
numChanges++;
break;
case Operation.INSERT:
sbNew.Append($"<span class=\"border border-danger table-danger\">{item.text}</span>");
sbNew.Append($"<span class=\"border border-danger table-danger\">{HttpUtility.HtmlEncode(item.text)}</span>");
numChanges++;
break;
case Operation.EQUAL:
sbNew.Append($"<span class=\"text-dark\">{item.text}</span>");
sbOld.Append($"<span class=\"text-dark\">{item.text}</span>");
sbNew.Append($"<span class=\"text-dark\">{HttpUtility.HtmlEncode(item.text)}</span>");
sbOld.Append($"<span class=\"text-dark\">{HttpUtility.HtmlEncode(item.text)}</span>");
break;
default:
@@ -99,8 +105,8 @@ namespace MP.Prog.Components
}
}
newResult = sbNew.ToString().Trim();
oldResult = sbOld.ToString().Trim();
newResult = sbNew.ToString();
oldResult = sbOld.ToString();
var pUpd = Task.Run(async () =>
{
await diffDone.InvokeAsync(numChanges);
@@ -118,9 +124,14 @@ namespace MP.Prog.Components
#region Private Methods
private string StrFix(string origVal)
private MarkupString StrFix(string origVal)
{
return origVal.Replace(" ", "&nbsp;").Replace(Environment.NewLine, sepDest).Replace("\n", sepDest).Replace("\r", sepDest);
string fixVal = origVal.Trim()
.Replace(" ", "&nbsp;&nbsp;")
.Replace(Environment.NewLine, sepDest);
//.Replace("\r", sepDest)
//.Replace("\n", sepDest);
return new MarkupString(fixVal);
}
#endregion Private Methods