Merge pull request #8 from WCKYWCKF/pr8

优化预览页面的UI，修复一些BUG

Author: WCKYWCKF

WCKYWCKF.Model2ViewModel.Editor/ViewModels/MainWindowViewModel.cs

@@ -14,6 +14,7 @@
 using Avalonia.Controls.Notifications;
 using DynamicData;
 using DynamicData.Binding;
+using FuzzySharp;
 using Irihi.Mantra.Markdown.Plugin.AvaloniaHybrid.MarkdigPlugins;
 using Markdig;
 using Markdig.Syntax;
@@ -149,6 +150,9 @@ public partial class TF : ObservableObject;
     private readonly SourceCache<M2VMReplaceGenerationInfo, string> _replaceGenerationInfos = new(y => y.GetKey());
     private readonly ReadOnlyObservableCollection<MetadataTDGItemViewModel> _selection;
 
+    [BindableDerivedList]
+    private readonly ReadOnlyObservableCollection<ViewModelCodeFile> _filterPreviewGeneratedCodeFiles;
+
     static MainWindowViewModel()
     {
         MDPipeline = new MarkdownPipelineBuilder()
@@ -335,6 +339,16 @@ y is FilterAccessibility.None ||
         PreviewGeneratedCodeFiles = [];
         SummaryGeneratedBorderMdDocument = new MarkdownDocument();
         RootTypePartialCodeBorderMdDocument = new MarkdownDocument();
+
+        this.WhenAnyValue(x => x.PreviewGeneratedCodeFiles)
+            .Select(x =>
+                x is null ? Array.Empty<ViewModelCodeFile>().AsObservableChangeSet() : x.AsObservableChangeSet())
+            .Switch()
+            .AutoRefreshOnObservable(_ => this.WhenAnyValue(x => x.PreviewGeneratedCodeFilesFilterByFileName))
+            .Sort(SortExpressionComparer<ViewModelCodeFile>.Descending(x =>
+                Fuzz.WeightedRatio(PreviewGeneratedCodeFilesFilterByFileName ?? "", x.FileName)))
+            .Bind(out _filterPreviewGeneratedCodeFiles)
+            .Subscribe();
         return;
 
         void TryAdd<T>(List<T> target, T newItem)
@@ -380,6 +394,7 @@ void TryAdd<T>(List<T> target, T newItem)
     [Reactive] public partial string? LoadingMessage { get; set; }
 
     [Reactive] public partial IReadOnlyList<ViewModelCodeFile>? PreviewGeneratedCodeFiles { get; set; }
+    [Reactive] public partial string? PreviewGeneratedCodeFilesFilterByFileName { get; set; }
 
     [ReactiveCommand(CanExecute = nameof(_metadataIsNotEmpty))]
     [RequiresDynamicCode(

WCKYWCKF.Model2ViewModel.Editor/Views/MainWindow.axaml.cs

@@ -94,7 +94,7 @@ protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs
 
     private void OpenEditMemberBuildTypeDialog(OpenEditMemberBuildTypeDialogEvent e)
     {
-        OverlayDialogOptions _overlayDialogOptions = new OverlayDialogOptions
+        var _overlayDialogOptions = new OverlayDialogOptions
         {
             Title = "编辑成员构建类型",
             CanResize = false,
@@ -166,7 +166,7 @@ private async void MenuItem_OnClick(object? sender, RoutedEventArgs e)
         {
             if (ViewModel is null) return;
             await ViewModel.PreviewGeneratedCodeCommand.Execute();
-            OverlayDialogOptions _overlayDialogOptions = new OverlayDialogOptions
+            var _overlayDialogOptions = new OverlayDialogOptions
             {
                 Title = "正在预览将会构建的代码",
                 CanResize = false,

WCKYWCKF.Model2ViewModel.Editor/Views/PreviewGeneratedCodeDialog.axaml

@@ -13,40 +13,63 @@
     x:Class="WCKYWCKF.Model2ViewModel.Editor.Views.PreviewGeneratedCodeDialog"
     x:DataType="vm:MainWindowViewModel">
     <Grid
-        RowDefinitions="65*,35*"
+        RowDefinitions="30*,35*,35*"
         ColumnDefinitions="35*,65*">
         <mantra:MarkdownView
             Grid.Row="0"
             Grid.Column="0"
             Margin="5"
             Document="{Binding SummaryGeneratedBorderMdDocument}" />
-        <mantra:MarkdownView
+        <ursa:LoadingContainer
             Grid.Row="1"
             Grid.Column="0"
-            Grid.ColumnSpan="2"
             Margin="5"
-            Document="{Binding RootTypePartialCodeBorderMdDocument}" />
+            LoadingMessage="{Binding LoadingMessage}"
+            IsLoading="{Binding LoadingMessage,Converter={x:Static ObjectConverters.IsNotNull}}"
+            HorizontalContentAlignment="Stretch"
+            VerticalContentAlignment="Stretch">
+            <DockPanel>
+                <TextBox
+                    DockPanel.Dock="Top"
+                    Classes="clearButton"
+                    Margin="0,5,0,5"
+                    Text="{Binding PreviewGeneratedCodeFilesFilterByFileName}" />
+                <ListBox
+                    Name="ListBox"
+                    DockPanel.Dock="Bottom"
+                    SelectionMode="AlwaysSelected"
+                    ItemsSource="{Binding FilterPreviewGeneratedCodeFiles}">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding FileName}" />
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+            </DockPanel>
+        </ursa:LoadingContainer>
         <ursa:LoadingContainer
             Grid.Row="0"
+            Grid.RowSpan="2"
             Grid.Column="1"
             Margin="5"
             LoadingMessage="{Binding LoadingMessage}"
             IsLoading="{Binding LoadingMessage,Converter={x:Static ObjectConverters.IsNotNull}}"
             HorizontalContentAlignment="Stretch"
             VerticalContentAlignment="Stretch">
-            <TabControl
-                ItemsSource="{Binding PreviewGeneratedCodeFiles}">
-                <TabControl.ItemTemplate>
-                    <DataTemplate>
-                        <Label Content="{Binding FileName}" />
-                    </DataTemplate>
-                </TabControl.ItemTemplate>
-                <TabControl.ContentTemplate>
-                    <DataTemplate DataType="vm:ViewModelCodeFile">
-                        <mantra:MarkdownView Document="{Binding CodeMdDocument}" />
-                    </DataTemplate>
-                </TabControl.ContentTemplate>
-            </TabControl>
+            <mantra:MarkdownView Document="{Binding #ListBox.((vm:ViewModelCodeFile)SelectedItem).CodeMdDocument}" />
+        </ursa:LoadingContainer>
+        <ursa:LoadingContainer
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="5"
+            LoadingMessage="{Binding LoadingMessage}"
+            IsLoading="{Binding LoadingMessage,Converter={x:Static ObjectConverters.IsNotNull}}"
+            HorizontalContentAlignment="Stretch"
+            VerticalContentAlignment="Stretch">
+            <mantra:MarkdownView
+                Margin="5"
+                Document="{Binding RootTypePartialCodeBorderMdDocument}" />
         </ursa:LoadingContainer>
     </Grid>
 </UserControl>

WCKYWCKF.Model2ViewModel.Share/SourceInfo/M2VMGenerationInfo.cs

@@ -190,7 +190,7 @@ public List<ViewModelBuildInfo> CreateViewModelBuildInfos(out HashSet<M2VMConver
             {
                 GlobalSourceFQType = m2VmTypeInfo.GlobalTypeFullName,
                 ViewModelName = $"{m2VmTypeInfo.Name}SGVM",
-                Namespace = m2VmTypeInfo.NameSpace,
+                Namespace = NameSpace,
                 Properties = properties
             });
         }