fix: 修复在课表编辑界面选中含有正在删除科目的课程时，使 SubjectId 为 null 导致主循环异常的问题 ClassIslan…

…d#376
LyRin-owo · Sep 30, 2024 · f6115cd · f6115cd
1 parent 1b9d396
commit f6115cd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ClassIsland.Shared/Models/Profile/ClassInfo.cs b/ClassIsland.Shared/Models/Profile/ClassInfo.cs
@@ -61,7 +61,7 @@ public string SubjectId
         set
         {
             if (value == _subjectId) return;
-            _subjectId = value;
+            _subjectId = value ?? "";
             OnPropertyChanged();
         }
     }

diff --git a/ClassIsland/Services/LessonsService.cs b/ClassIsland/Services/LessonsService.cs
@@ -321,7 +321,7 @@ private void ProcessLessons()
             {
                 NextClassTimeLayoutItem = nextClassTimeLayoutItem;
                 var i0 = GetSubjectIndex(currentLayout.IndexOf(nextClassTimeLayoutItem));
-                var index = CurrentClassPlan.Classes[i0].SubjectId;
+                var index = CurrentClassPlan.Classes[i0].SubjectId ?? "";
                 Profile.Subjects.TryGetValue(index, out var subject);
                 NextClassSubject = subject ?? Subject.Empty;
             }

diff --git a/ClassIsland/Views/ProfileSettingsWindow.xaml b/ClassIsland/Views/ProfileSettingsWindow.xaml
@@ -1111,7 +1111,7 @@
                                                         <ListBox
                                                             Grid.Row="0"
                                                             SelectedValuePath="Key"
-                                                            SelectedValue="{Binding ViewModel.SelectedClassInfo.SubjectId, RelativeSource={RelativeSource FindAncestor, AncestorType=local:ProfileSettingsWindow}, FallbackValue=''}"
+                                                            SelectedValue="{Binding ViewModel.SelectedClassInfo.SubjectId, RelativeSource={RelativeSource FindAncestor, AncestorType=local:ProfileSettingsWindow}, FallbackValue='', Converter={StaticResource PreventNullConverter}}"
                                                             ItemsSource="{Binding ProfileService.Profile.Subjects, RelativeSource={RelativeSource FindAncestor, AncestorType=local:ProfileSettingsWindow}}"
                                                             Style="{StaticResource MaterialDesignNavigationPrimaryListBox}">
                                                             <ListBox.ItemContainerStyle>