修复筛选后，空白问题、打开图片、小说错误问题 (#447)

2025-01-09 04:09:57 +08:00 · 2024-04-29 16:12:15 +08:00 · 2024-04-29 16:12:15 +08:00 · 7ce22d536c
commit 7ce22d536c
parent ee041ddc16
10 changed files with 141 additions and 92 deletions
--- a/src/Pixeval.Controls/RiverFlowLayout/RiverFlowLayoutState.cs
+++ b/src/Pixeval.Controls/RiverFlowLayout/RiverFlowLayoutState.cs
@ -73,6 +73,7 @@ internal class RiverFlowLayoutState(VirtualizingLayoutContext context)
        foreach (var item in _items.Skip(index))
        {
            item.Measure = null;
+            item.Position = null;
        }
    }

@ -81,6 +82,7 @@ internal class RiverFlowLayoutState(VirtualizingLayoutContext context)
        foreach (var item in _items)
        {
            item.Measure = null;
+            item.Position = null;
        }
    }

--- a/src/Pixeval/ClassDiagrams/DataProvider.cd
+++ b/src/Pixeval/ClassDiagrams/DataProvider.cd
@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
  <Class Name="Pixeval.Controls.IllustrationViewDataProvider" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="17" Y="1.75" Width="1.5" />
+    <Position X="6.25" Y="5.25" Width="5.5" />
    <TypeIdentifier>
-      <HashCode>BCAEIAEAAiAAAACAAAAAAAIAAAABAgAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAg=</HashCode>
      <FileName>Controls\IllustrationView\IllustrationViewDataProvider.cs</FileName>
    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
  </Class>
  <Class Name="Pixeval.Controls.IllustratorViewDataProvider" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="18.75" Y="1.75" Width="1.5" />
+    <Position X="24.25" Y="0.75" Width="1.5" />
    <TypeIdentifier>
      <HashCode>AAAEAAEAAiAEAAAAAAAAAAAAAAABAAAAAAAAAAAAAAA=</HashCode>
      <FileName>Controls\IllustratorView\IllustratorViewDataProvider.cs</FileName>
@ -17,7 +16,7 @@
    <Lollipop Position="0.2" Collapsed="true" />
  </Class>
  <Class Name="Pixeval.Controls.SpotlightArticleView.SpotlightArticleViewDataProvider" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="20.5" Y="1.75" Width="1.5" />
+    <Position X="20.75" Y="1.75" Width="1.5" />
    <TypeIdentifier>
      <HashCode>AAAEAAEAAiAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAA=</HashCode>
      <FileName>Controls\SpotlightArticleView\SpotlightArticleViewDataProvider.cs</FileName>
@ -25,21 +24,21 @@
    <Lollipop Position="0.2" Collapsed="true" />
  </Class>
  <Class Name="Pixeval.Controls.SpotlightArticleView.SpotlightArticleFetchEngineIncrementalSource" Collapsed="true">
-    <Position X="1.75" Y="2" Width="4.5" />
+    <Position X="5.5" Y="2" Width="4.5" />
    <TypeIdentifier>
      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAA=</HashCode>
      <FileName>Controls\SpotlightArticleView\SpotlightArticleFetchEngineIncrementalSource.cs</FileName>
    </TypeIdentifier>
  </Class>
  <Class Name="Pixeval.Controls.IllustrationFetchEngineIncrementalSource" Collapsed="true">
-    <Position X="7" Y="2" Width="4.25" />
+    <Position X="10.75" Y="2" Width="4.25" />
    <TypeIdentifier>
      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAA=</HashCode>
      <FileName>Controls\IllustrationView\IllustrationFetchEngineIncrementalSource.cs</FileName>
    </TypeIdentifier>
  </Class>
  <Class Name="Pixeval.Pages.Download.DownloadListEntryIncrementalSource" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="20.5" Y="0.75" Width="1.5" />
+    <Position X="22.5" Y="0.75" Width="1.5" />
    <TypeIdentifier>
      <HashCode>AAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
      <FileName>Pages\Download\DownloadListEntryIncrementalSource.cs</FileName>
@ -47,7 +46,7 @@
    <Lollipop Position="0.2" Collapsed="true" />
  </Class>
  <Class Name="Pixeval.Pages.Download.DownloadListEntryDataProvider" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="18.75" Y="0.75" Width="1.5" />
+    <Position X="20.75" Y="0.75" Width="1.5" />
    <TypeIdentifier>
      <HashCode>AAAAAAEAAiAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAA=</HashCode>
      <FileName>Pages\Download\DownloadListEntryDataProvider.cs</FileName>
@ -55,22 +54,14 @@
    <Lollipop Position="0.2" Collapsed="true" />
  </Class>
  <Class Name="Pixeval.Controls.IllustratorFetchEngineIncrementalSource" Collapsed="true">
-    <Position X="12" Y="2" Width="4" />
+    <Position X="15.75" Y="2" Width="4" />
    <TypeIdentifier>
      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAA=</HashCode>
-      <FileName>Controls\IllustratorItem\IllustratorItem\IllustratorFetchEngineIncrementalSource.cs</FileName>
+      <FileName>Controls\IllustratorView\IllustratorFetchEngineIncrementalSource.cs</FileName>
    </TypeIdentifier>
  </Class>
-  <Class Name="Pixeval.Pages.IllustrationViewer.CommentsIncrementalSource" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="17" Y="0.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Pages\IllustrationViewer\CommentsIncrementalSource.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" Collapsed="true" />
-  </Class>
  <Class Name="Pixeval.Pages.Tags.TagsEntryIncrementalSource" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="18.75" Y="2.75" Width="1.5" />
+    <Position X="24.25" Y="1.75" Width="1.5" />
    <TypeIdentifier>
      <HashCode>AAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
      <FileName>Pages\Tags\TagsEntryIncrementalSource.cs</FileName>
@ -78,7 +69,7 @@
    <Lollipop Position="0.2" Collapsed="true" />
  </Class>
  <Class Name="Pixeval.Pages.Tags.TagsEntryDataProvider" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="17" Y="2.75" Width="1.5" />
+    <Position X="22.5" Y="1.75" Width="1.5" />
    <TypeIdentifier>
      <HashCode>AAAAAAEAAiAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAA=</HashCode>
      <FileName>Pages\Tags\TagsEntryDataProvider.cs</FileName>
@ -86,22 +77,44 @@
    <Lollipop Position="0.2" Collapsed="true" />
  </Class>
  <Class Name="Pixeval.Controls.FetchEngineIncrementalSource&lt;T, TModel&gt;" Collapsed="true">
-    <Position X="7.5" Y="0.75" Width="3" />
+    <Position X="9" Y="0.75" Width="3" />
    <TypeIdentifier>
      <HashCode>AAAAAAIAAAAAQAAAAAgQAAAAAAAAAAAAAAAAQAAAAAA=</HashCode>
-      <FileName>Controls\Illustrate\FetchEngineIncrementalSource.cs</FileName>
+      <FileName>Controls\Entry\FetchEngineIncrementalSource.cs</FileName>
    </TypeIdentifier>
    <Lollipop Position="0.2" />
  </Class>
+  <Class Name="Pixeval.Controls.NovelFetchEngineIncrementalSource" Collapsed="true">
+    <Position X="1" Y="2" Width="3.75" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAA=</HashCode>
+      <FileName>Controls\NovelView\NovelFetchEngineIncrementalSource.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="Pixeval.Controls.EntryViewDataProvider&lt;T, TViewModel, TSelf&gt;" Collapsed="true">
+    <Position X="4.5" Y="3.75" Width="3.25" />
+    <TypeIdentifier>
+      <HashCode>EAAEAAEAAjAAAACAAAAAAAIAAAABggAAAAAAAAAAAAg=</HashCode>
+      <FileName>Controls\Entry\EntryViewDataProvider.cs</FileName>
+    </TypeIdentifier>
+    <Lollipop Position="0.2" />
+  </Class>
+  <Class Name="Pixeval.Controls.NovelViewDataProvider" Collapsed="true">
+    <Position X="0.75" Y="5.25" Width="4.75" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAg=</HashCode>
+      <FileName>Controls\NovelView\NovelViewDataProvider.cs</FileName>
+    </TypeIdentifier>
+  </Class>
  <Interface Name="Pixeval.CoreApi.Engine.IFetchEngine&lt;TE&gt;" Collapsed="true">
-    <Position X="18.75" Y="4" Width="1.5" />
+    <Position X="22.5" Y="3" Width="1.5" />
    <TypeIdentifier />
  </Interface>
  <Interface Name="Pixeval.Controls.IDataProvider&lt;T, TViewModel&gt;" Collapsed="true">
-    <Position X="17" Y="4" Width="1.5" />
+    <Position X="20.75" Y="3" Width="1.5" />
    <TypeIdentifier>
      <HashCode>AAAEAAEAAgAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Controls\Illustrate\IDataProvider.cs</FileName>
+      <FileName>Controls\Entry\IDataProvider.cs</FileName>
    </TypeIdentifier>
  </Interface>
  <Font Name="Microsoft YaHei UI" Size="9" />
--- a/src/Pixeval/ClassDiagrams/DownloadModel.cd
+++ b/src/Pixeval/ClassDiagrams/DownloadModel.cd
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
  <Class Name="Pixeval.Download.Models.LazyInitializedUgoiraDownloadTask" Collapsed="true">
-    <Position X="15.25" Y="6" Width="2.75" />
+    <Position X="21.75" Y="6" Width="2.75" />
    <TypeIdentifier>
      <HashCode>AAAAAAAAAAAAAAAAIAAAAAAAAAAABAQAAAAAAAAAAAA=</HashCode>
      <FileName>Download\Models\LazyInitializedUgoiraDownloadTask.cs</FileName>
@ -9,7 +9,7 @@
    <Lollipop Position="0.2" />
  </Class>
  <Class Name="Pixeval.Download.Models.LazyInitializedIllustrationDownloadTask" Collapsed="true">
-    <Position X="8.25" Y="4.5" Width="3" />
+    <Position X="14.75" Y="4.5" Width="3" />
    <TypeIdentifier>
      <HashCode>AAAAAAAAAAAAAAAAIAAAAAAAAAAABAQAAAAAAAAAAAA=</HashCode>
      <FileName>Download\Models\LazyInitializedIllustrationDownloadTask.cs</FileName>
@ -17,36 +17,36 @@
    <Lollipop Position="0.2" />
  </Class>
  <Class Name="Pixeval.Download.Models.MangaDownloadTask" Collapsed="true">
-    <Position X="20.75" Y="4.5" Width="2" />
+    <Position X="27.25" Y="4.5" Width="2" />
    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAIAAAgAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAEAAIAAAgAAABACAAAAQBAAAAAAABAA=</HashCode>
      <FileName>Download\Models\MangaDownloadTask.cs</FileName>
    </TypeIdentifier>
  </Class>
-  <Class Name="Pixeval.Download.Models.IllustrationDownloadTaskBase" Collapsed="true">
-    <Position X="13.75" Y="1.75" Width="2.25" />
+  <Class Name="Pixeval.Download.Models.DownloadTaskBase" Collapsed="true">
+    <Position X="17.25" Y="1.75" Width="1.5" />
    <TypeIdentifier>
-      <HashCode>IAACAACAAAAAAMAAIAAAACACAAAAAAQEAAAAAAIEBAA=</HashCode>
-      <FileName>Download\Models\IllustrationDownloadTaskBase.cs</FileName>
+      <HashCode>IAACAACAAAAAAIAAIAAAACACFAAAAAQUAQAAIAIEBAA=</HashCode>
+      <FileName>Download\Models\DownloadTaskBase.cs</FileName>
    </TypeIdentifier>
    <Lollipop Position="0.2" />
  </Class>
  <Class Name="Pixeval.Download.Models.IllustrationDownloadTask" Collapsed="true">
-    <Position X="13.75" Y="3.25" Width="2.25" />
+    <Position X="20" Y="3.25" Width="2.25" />
    <TypeIdentifier>
-      <HashCode>AAAAAAAgAAAIAAAAIAAAAAAAAAAAAAEACAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAgAAAIAAAAIAAAAAAAFAAAAAEQAAAAAAAAAAA=</HashCode>
      <FileName>Download\Models\IllustrationDownloadTask.cs</FileName>
    </TypeIdentifier>
  </Class>
  <Class Name="Pixeval.Download.Models.UgoiraDownloadTask" Collapsed="true">
-    <Position X="14" Y="4.5" Width="2" />
+    <Position X="20.5" Y="4.5" Width="2" />
    <TypeIdentifier>
-      <HashCode>AAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAA=</HashCode>
+      <HashCode>AAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAEAAA=</HashCode>
      <FileName>Download\Models\UgoiraDownloadTask.cs</FileName>
    </TypeIdentifier>
  </Class>
  <Class Name="Pixeval.Download.Models.LazyInitializedMangaDownloadTask" Collapsed="true">
-    <Position X="22" Y="6" Width="2.75" />
+    <Position X="28.5" Y="6" Width="2.75" />
    <TypeIdentifier>
      <HashCode>AAAAAAAAAAAAAAAAIAAAAAAAAAAABAQAAAAAAAAAAAA=</HashCode>
      <FileName>Download\Models\LazyInitializedMangaDownloadTask.cs</FileName>
@ -54,25 +54,47 @@
    <Lollipop Position="0.2" />
  </Class>
  <Class Name="Pixeval.Download.Models.IntrinsicMangaDownloadTask" Collapsed="true">
-    <Position X="18.75" Y="6" Width="2.5" />
+    <Position X="25.25" Y="6" Width="2.5" />
    <TypeIdentifier>
      <HashCode>AAABAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
      <FileName>Download\Models\IntrinsicMangaDownloadTask.cs</FileName>
    </TypeIdentifier>
  </Class>
  <Class Name="Pixeval.Download.Models.IntrinsicIllustrationDownloadTask" Collapsed="true">
-    <Position X="4.75" Y="4.5" Width="2.75" />
+    <Position X="11.25" Y="4.5" Width="2.75" />
    <TypeIdentifier>
      <HashCode>AAAAAAAAAAAIAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAA=</HashCode>
      <FileName>Download\Models\IntrinsicIllustrationDownloadTask.cs</FileName>
    </TypeIdentifier>
  </Class>
  <Class Name="Pixeval.Download.Models.IntrinsicUgoiraDownloadTask" Collapsed="true">
-    <Position X="12" Y="6" Width="2.5" />
+    <Position X="18.5" Y="6" Width="2.5" />
    <TypeIdentifier>
      <HashCode>AAAAAAAAAAAIAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAA=</HashCode>
      <FileName>Download\Models\IntrinsicUgoiraDownloadTask.cs</FileName>
    </TypeIdentifier>
  </Class>
+  <Class Name="Pixeval.Download.Models.NovelDownloadTask" Collapsed="true">
+    <Position X="6.75" Y="3.25" Width="1.75" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAEAgEAIAAAAIAAAAAAAFACAAAAQBAAAAAAABAA=</HashCode>
+      <FileName>Download\Models\NovelDownloadTask.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="Pixeval.Download.Models.IntrinsicNovelDownloadTask" Collapsed="true">
+    <Position X="4.75" Y="4.5" Width="2.25" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>Download\Models\IntrinsicNovelDownloadTask.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="Pixeval.Download.Models.LazyInitializedNovelDownloadTask" Collapsed="true">
+    <Position X="7.75" Y="4.5" Width="2.75" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAIAAIAAAAAAAAAAABAAAAAAAAAAAAAA=</HashCode>
+      <FileName>Download\Models\LazyInitializedNovelDownloadTask.cs</FileName>
+    </TypeIdentifier>
+    <Lollipop Position="0.2" />
+  </Class>
  <Font Name="Microsoft YaHei UI" Size="9" />
 </ClassDiagram>
--- a/src/Pixeval/ClassDiagrams/ViewModel.cd
+++ b/src/Pixeval/ClassDiagrams/ViewModel.cd
@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="Pixeval.Controls.IllustrateViewModel&lt;T&gt;" Collapsed="true">
-    <Position X="11" Y="1.25" Width="2" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAACAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Controls\Illustrate\IIllustrateViewModel.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
  <Class Name="Pixeval.Pages.Tags.TagsEntryViewModel" Collapsed="true">
-    <Position X="19.25" Y="1.25" Width="1.5" />
+    <Position X="24.5" Y="0.5" Width="1.5" />
    <TypeIdentifier>
      <HashCode>CACAAAAAACAAAABAQAAAAAQAAAAAAEAEAAAAQIAAEAA=</HashCode>
      <FileName>Pages\Tags\TagsEntryViewModel.cs</FileName>
@ -17,46 +9,55 @@
    <Lollipop Position="0.2" />
  </Class>
  <Class Name="Pixeval.Controls.SpotlightArticleView.SpotlightArticleViewModel" Collapsed="true">
-    <Position X="5.75" Y="2.75" Width="2.5" />
+    <Position X="10.75" Y="2" Width="2.25" />
    <TypeIdentifier>
-      <HashCode>AAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>ABAAAAAAACAAAAAgAAAAAAAAAAACAAAAAAAAAAAAAAA=</HashCode>
      <FileName>Controls\SpotlightArticleView\SpotlightArticleViewModel.cs</FileName>
    </TypeIdentifier>
  </Class>
-  <Class Name="Pixeval.Controls.IllustrationItemViewModel" Collapsed="true">
-    <Position X="9" Y="2.75" Width="2.25" />
+  <Class Name="Pixeval.Controls.IllustratorItemViewModel" Collapsed="true">
+    <Position X="7.75" Y="2" Width="2.25" />
    <TypeIdentifier>
-      <HashCode>AgEDIFAEBKBAAAgYiMATEIGCGgAUAYAABAQAZBL0EAg=</HashCode>
+      <HashCode>ABAAIAAAAKAQQAAoAQIAABgCAACCAAAAAAIAAAEAAAA=</HashCode>
+      <FileName>Controls\IllustratorItem\IllustratorItemViewModel.Commands.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="Pixeval.Controls.EntryViewModel&lt;T&gt;" Collapsed="true">
+    <Position X="15" Y="0.5" Width="1.75" />
+    <TypeIdentifier>
+      <HashCode>ABAQIAAAAKAIAAAgAAAAEAGACAAGBCAAAAAAAAAgAAg=</HashCode>
+      <FileName>Controls\Entry\EntryViewModel.cs</FileName>
+    </TypeIdentifier>
+    <Lollipop Position="0.2" />
+  </Class>
+  <Class Name="Pixeval.Controls.IllustrationItemViewModel" Collapsed="true">
+    <Position X="17.5" Y="3.25" Width="2.75" />
+    <TypeIdentifier>
+      <HashCode>AhAAAAAAAAAAAAAwAIASAAAABoACAACAACAAYASAAAA=</HashCode>
      <FileName>Controls\IllustrationItem\IllustrationItemViewModel.Commands.cs</FileName>
    </TypeIdentifier>
  </Class>
-  <Class Name="Pixeval.Controls.UserItemViewModel&lt;T&gt;" Collapsed="true">
-    <Position X="14.25" Y="2.75" Width="2" />
+  <Class Name="Pixeval.Controls.NovelItemViewModel" Collapsed="true">
+    <Position X="21" Y="3.25" Width="2.5" />
    <TypeIdentifier>
-      <HashCode>AAAAIAAAAKAQQAAIAUIAEAmCCAAEAAAAAAIAAAAgAAg=</HashCode>
-      <FileName>Controls\IllustratorItem\UserItemViewModel.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="Pixeval.Controls.IllustratorItemViewModel" Collapsed="true">
-    <Position X="12.25" Y="4" Width="2.25" />
-    <TypeIdentifier>
-      <HashCode>AAAAIAAAAAAAAAAIAQAAAAgAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Controls\IllustratorItem\IllustratorItem\IllustratorItemViewModel.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="Pixeval.Controls.RecommendIllustratorItemViewModel" Collapsed="true">
-    <Position X="15.25" Y="4" Width="3" />
-    <TypeIdentifier>
-      <HashCode>AAAAIAAIAAAAAAAIAQIAAAgAAAAAAAAAAAAgAAAAAAA=</HashCode>
-      <FileName>Controls\IllustratorItem\RecommendIllustratorItem\RecommendIllustratorItemViewModel.cs</FileName>
+      <HashCode>ABAAAAAAAEAAACAgAAAAAAAAAoACAACAACAABAQAAAA=</HashCode>
+      <FileName>Controls\NovelItem\NovelItemViewModel.Commands.cs</FileName>
    </TypeIdentifier>
  </Class>
  <Class Name="Pixeval.Pages.Download.DownloadListEntryViewModel" Collapsed="true">
-    <Position X="9" Y="4" Width="2.5" />
+    <Position X="14" Y="3.25" Width="2.75" />
    <TypeIdentifier>
-      <HashCode>AAAAAAQAAAAAgAAAAAgAAAgAAAARAAAABAAgAAAAAAA=</HashCode>
+      <HashCode>ABAAAAQAAAAAgAAgAAgAAAgAAIATAACABCAgAAQAAAA=</HashCode>
      <FileName>Pages\Download\DownloadListEntryViewModel.cs</FileName>
    </TypeIdentifier>
  </Class>
+  <Class Name="Pixeval.Controls.ThumbnailEntryViewModel&lt;T&gt;" Collapsed="true">
+    <Position X="17.75" Y="2" Width="2.25" />
+    <TypeIdentifier>
+      <HashCode>AAADBAAARCAAAEEAiAQAAoABAAAAAcAEDQQAABJUEAA=</HashCode>
+      <FileName>Controls\Work\ThumbnailEntryViewModel.cs</FileName>
+    </TypeIdentifier>
+    <Lollipop Position="0.2" />
+  </Class>
  <Font Name="Microsoft YaHei UI" Size="9" />
 </ClassDiagram>
--- a/src/Pixeval/ClassDiagrams/ViewViewModel.cd
+++ b/src/Pixeval/ClassDiagrams/ViewViewModel.cd
@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
  <Class Name="Pixeval.Controls.IllustratorViewViewModel" Collapsed="true">
-    <Position X="6" Y="3.75" Width="3.5" />
+    <Position X="3.75" Y="3.75" Width="3.5" />
    <TypeIdentifier>
      <HashCode>AAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAA=</HashCode>
      <FileName>Controls\IllustratorView\IllustratorViewViewModel.cs</FileName>
    </TypeIdentifier>
  </Class>
-  <Class Name="Pixeval.Controls.IllustrateViewViewModel&lt;T, TViewModel&gt;" Collapsed="true">
-    <Position X="3.75" Y="2.25" Width="3" />
+  <Class Name="Pixeval.Controls.EntryViewViewModel&lt;T, TViewModel&gt;" Collapsed="true">
+    <Position X="8.75" Y="2.25" Width="2.75" />
    <TypeIdentifier>
      <HashCode>AAAAAAEAACAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Controls\Illustrate\IllustrateViewViewModel.cs</FileName>
+      <FileName>Controls\Entry\EntryViewViewModel.cs</FileName>
    </TypeIdentifier>
    <Lollipop Position="0.2" />
  </Class>
  <Class Name="Pixeval.Pages.Download.DownloadListPageViewModel" Collapsed="true">
-    <Position X="10.5" Y="2.25" Width="1.5" />
+    <Position X="17.75" Y="2.25" Width="1.5" />
    <TypeIdentifier>
      <HashCode>AAAAAAAgASgCAAAAAAABCABBBAAAgAAAAAABAAIAAAg=</HashCode>
      <FileName>Pages\Download\DownloadListPageViewModel.cs</FileName>
@ -24,25 +24,33 @@
    <Lollipop Position="0.2" />
  </Class>
  <Class Name="Pixeval.Controls.IllustrationViewViewModel" Collapsed="true">
-    <Position X="0.75" Y="5" Width="4.5" />
+    <Position X="8" Y="5" Width="4.25" />
    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAABAAAMAAAAEAAAAAAAAAAI=</HashCode>
+      <HashCode>AAAAAAAAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAA=</HashCode>
      <FileName>Controls\IllustrationView\IllustrationViewViewModel.cs</FileName>
    </TypeIdentifier>
  </Class>
  <Class Name="Pixeval.Pages.Tags.TagsPageViewModel" Collapsed="true">
-    <Position X="12.25" Y="2.25" Width="1.5" />
+    <Position X="19.5" Y="2.25" Width="1.5" />
    <TypeIdentifier>
      <HashCode>AAAAAAEAACAAAAAAAAAAAABAAAAAAAAAAAAAAAQCAAA=</HashCode>
      <FileName>Pages\Tags\TagsPageViewModel.cs</FileName>
    </TypeIdentifier>
    <Lollipop Position="0.2" />
  </Class>
-  <Class Name="Pixeval.Controls.SortableIllustrateViewViewModel&lt;T, TViewModel&gt;" Collapsed="true">
-    <Position X="1.25" Y="3.75" Width="3.5" />
+  <Class Name="Pixeval.Controls.SortableEntryViewViewModel&lt;T, TViewModel&gt;" Collapsed="true">
+    <Position X="10.75" Y="3.75" Width="3.25" />
    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAEAAAAAA=</HashCode>
-      <FileName>Controls\Illustrate\SortableIllustrateViewViewModel.cs</FileName>
+      <HashCode>BAAAAAEAAggAIABAAAAAAAAAIBMBAIAAAAAAEAAAAAA=</HashCode>
+      <FileName>Controls\Work\SortableEntryViewViewModel.cs</FileName>
+    </TypeIdentifier>
+    <Lollipop Position="0.2" />
+  </Class>
+  <Class Name="Pixeval.Controls.NovelViewViewModel" Collapsed="true">
+    <Position X="13" Y="5" Width="3.75" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>Controls\NovelView\NovelViewViewModel.cs</FileName>
    </TypeIdentifier>
  </Class>
  <Font Name="Microsoft YaHei UI" Size="9" />
--- a/src/Pixeval/Controls/Entry/EntryViewDataProvider.cs
+++ b/src/Pixeval/Controls/Entry/EntryViewDataProvider.cs
@ -97,7 +97,7 @@ public abstract class EntryViewDataProvider<T, TViewModel, TSelf> : ObservableOb
        var dataProvider = new TSelf();
        dataProvider.FetchEngineRef = FetchEngineRef?.MakeShared(dataProvider);
        dataProvider.EntrySourceRef = EntrySourceRef.MakeShared(dataProvider);
-        dataProvider.View.Filter = View.Filter;
+        // dataProvider.View.Filter = View.Filter;
        foreach (var viewSortDescription in View.SortDescriptions)
            dataProvider.View.SortDescriptions.Add(viewSortDescription);
        return dataProvider;
--- a/src/Pixeval/Controls/IllustrationView/IllustrationViewViewModel.cs
+++ b/src/Pixeval/Controls/IllustrationView/IllustrationViewViewModel.cs
@ -26,6 +26,7 @@ public sealed class IllustrationViewViewModel : SortableEntryViewViewModel<Illus
 {
    public IllustrationViewViewModel(IllustrationViewViewModel viewModel) : this(viewModel.DataProvider.CloneRef())
    {
+        Filter = viewModel.Filter;
    }

    public IllustrationViewViewModel() : this(new IllustrationViewDataProvider())
--- a/src/Pixeval/Controls/NovelView/NovelViewViewModel.cs
+++ b/src/Pixeval/Controls/NovelView/NovelViewViewModel.cs
@ -28,6 +28,7 @@ public sealed class NovelViewViewModel : SortableEntryViewViewModel<Novel, Novel
 {
    public NovelViewViewModel(NovelViewViewModel viewModel) : this(viewModel.DataProvider.CloneRef())
    {
+        Filter = viewModel.Filter;
    }

    public NovelViewViewModel() : this(new NovelViewDataProvider())
--- a/src/Pixeval/Controls/Work/WorkContainer.xaml.cs
+++ b/src/Pixeval/Controls/Work/WorkContainer.xaml.cs
@ -189,9 +189,9 @@ public partial class WorkContainer : IScrollViewProvider
        if (settings is not var (
            includeTags, excludeTags,
            leastBookmark, maximumBookmark,
-            _, 
-            illustratorName, illustratorId, 
-            illustrationName, illustrationId, 
+            _,
+            illustratorName, illustratorId,
+            illustrationName, illustrationId,
            publishDateStart, publishDateEnd))
            return;

--- a/src/Pixeval/Pages/Login/LoginPageViewModel.cs
+++ b/src/Pixeval/Pages/Login/LoginPageViewModel.cs
@ -149,6 +149,7 @@ public partial class LoginPageViewModel(UIElement owner) : ObservableObject
        var fakeCertMgr = new CertificateManager(cert);
        fakeCertMgr.Install(StoreName.Root, StoreLocation.CurrentUser);
    }
+
    private static int NegotiatePort(int preferPort = 49152)
    {
        var unavailable = IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections().Select(t => t.LocalEndPoint.Port).ToHashSet();