add format operation

Author: huangjia2107

src/XamlViewer/ViewModels/DataViewModel.cs

@@ -14,6 +14,8 @@
 using XamlTheme.Controls;
 using XamlViewer.Models;
 using XamlViewer.Utils;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace XamlViewer.ViewModels
 {
@@ -29,6 +31,7 @@ public class DataViewModel : BindableBase
 public DelegateCommand DelayArrivedCommand { get; private set; }
 
 public DelegateCommand ClearCommand { get; private set; }
+public DelegateCommand FormatCommand { get; private set; }
  public DelegateCommand RequestCommand { get; private set; }
 
  public DataViewModel(IContainerExtension container, IEventAggregator eventAggregator)
@@ -55,6 +58,7 @@ private void InitCommand()
  DelayArrivedCommand = new DelegateCommand(DelayArrived);
 
 ClearCommand = new DelegateCommand(Clear);
+FormatCommand = new DelegateCommand(Format);
  RequestCommand = new DelegateCommand(Request);
  }
 
@@ -99,6 +103,16 @@ private void Clear()
 _textEditor.Text = JsonString = string.Empty;
  }
 
+ private void Format()
+{
+var text = _textEditor.Text;
+if(string.IsNullOrWhiteSpace(text))
+return;
+
+JsonString = JToken.Parse(text).ToString(Formatting.Indented);
+ _textEditor.Text = JsonString;
+}
+
  private async void Request()
  {
  try
@@ -111,7 +125,11 @@ private async void Request()
 
  CanFetch = false;
 
-JsonString = await HttpUtil.GetString(RestApi);
+var json = await HttpUtil.GetString(RestApi);
+if(!string.IsNullOrWhiteSpace(json))
+json = JToken.Parse(json).ToString(Formatting.Indented);
+
+JsonString = json;
  _textEditor.Text = JsonString;
 
 CanFetch = true;
@@ -120,6 +138,10 @@ private async void Request()
  {
  System.Diagnostics.Trace.TraceError("[ Http GetString ] " + XamlUtil.Common.Common.GetExceptionStringFormat(ex));
  }
+finally
+{
+CanFetch = true;
+}
  }
 
  #endregion

src/XamlViewer/Views/DataControl.xaml

@@ -29,8 +29,9 @@
  <Grid Grid.Row="1" Margin="1,2">
  <Grid.ColumnDefinitions>
  <ColumnDefinition Width="Auto"/>
-<ColumnDefinition Width="Auto"/>
  <ColumnDefinition Width="*"/>
+<ColumnDefinition Width="Auto"/>
+<ColumnDefinition Width="Auto"/>
  <ColumnDefinition Width="Auto"/>
  </Grid.ColumnDefinitions>
  <ToggleButton Grid.Column="0" Width="30" ToolTip="Bind"
@@ -51,16 +52,9 @@
  </controls:DrawingIcon.HDPIDrawing>
  </controls:DrawingIcon>
  </ToggleButton>
-<Button Grid.Column="1" Width="30" ToolTip="Clear"
- IsEnabled="{Binding CanClear}"
- Command="{Binding ClearCommand}"
- Style="{StaticResource {x:Static themes:ResourceKeys.ToolbarButtonStyleKey}}">
- <Path Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
- Data="M1,6 L1,10 3,10 3,7 4,7 4,10 10,10 10,6 z M0,3 L4,3 4,4 1,4 1,5 10,5 10,4 7,4 7,3 11,3 11,5 11,6 11,11 0,11 0,6 0,5 z M3,0 L4,0 7,0 8,0 8,3 7,3 7,1 4,1 4,3 3,3 z"/>
- </Button>
- <Button Grid.Column="3" Width="30" ToolTip="Fetch"
- Command="{Binding RequestCommand}"
+ <Button Grid.Column="2" Width="30" ToolTip="Fetch"
  IsEnabled="{Binding CanFetch}"
+ Command="{Binding RequestCommand}"
  Style="{StaticResource {x:Static themes:ResourceKeys.ToolbarButtonStyleKey}}">
  <controls:DrawingIcon>
  <controls:DrawingIcon.Drawing>
@@ -72,6 +66,28 @@
  Geometry="M0,9 L0,11 11,11 11,9 10,9 10,10 1,10 1,9 z M4,0 L7,0 7,4 10,4 5.5,9 1,4 4,4 z" />
  </controls:DrawingIcon.HDPIDrawing>
  </controls:DrawingIcon>
+ </Button>
+<Button Grid.Column="3" Width="30" ToolTip="Format"
+ IsEnabled="{Binding CanClear}"
+ Command="{Binding FormatCommand}"
+ Style="{StaticResource {x:Static themes:ResourceKeys.ToolbarButtonStyleKey}}">
+ <controls:DrawingIcon>
+ <controls:DrawingIcon.Drawing>
+ <GeometryDrawing Brush="{Binding Foreground,RelativeSource={RelativeSource AncestorType=Button},FallbackValue={x:Static swm:Brushes.Transparent}}"
+ Geometry="M0,10 L11,10 11,11 0,11 z M5,8 L11,8 11,9 5,9 z M7,6 L11,6 11,7 7,7 z M7,4 L11,4 11,5 7,5 z M5,2 L11,2 11,3 5,3 z M0,2 L1,2 1,3 2,3 2,4 3,4 3,5 4,5 4,6 3,6 3,7 2,7 2,8 1,8 1,9 0,9 z M0,0 L11,0 11,1 0,1 z" />
+ </controls:DrawingIcon.Drawing>
+ <controls:DrawingIcon.HDPIDrawing>
+ <GeometryDrawing Brush="{Binding Foreground,RelativeSource={RelativeSource AncestorType=Button},FallbackValue={x:Static swm:Brushes.Transparent}}"
+ Geometry="M0,10 L11,10 11,11 0,11 z M5,8 L11,8 11,9 5,9 z M7,6 L11,6 11,7 7,7 z M7,4 L11,4 11,5 7,5 z M5,2 L11,2 11,3 5,3 z M0,2 L4,5.5 0,9 z M0,0 L11,0 11,1 0,1 z" />
+ </controls:DrawingIcon.HDPIDrawing>
+ </controls:DrawingIcon>
+ </Button>
+<Button Grid.Column="4" Width="30" ToolTip="Clear"
+ IsEnabled="{Binding CanClear}"
+ Command="{Binding ClearCommand}"
+ Style="{StaticResource {x:Static themes:ResourceKeys.ToolbarButtonStyleKey}}">
+ <Path Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}"
+ Data="M1,6 L1,10 3,10 3,7 4,7 4,10 10,10 10,6 z M0,3 L4,3 4,4 1,4 1,5 10,5 10,4 7,4 7,3 11,3 11,5 11,6 11,11 0,11 0,6 0,5 z M3,0 L4,0 7,0 8,0 8,3 7,3 7,1 4,1 4,3 3,3 z"/>
  </Button>
 </Grid>