fix: ClassIsland#375

LyRin-owo · Sep 30, 2024 · 59591f1 · 59591f1
1 parent f6115cd
commit 59591f1
Showing 1 changed file with 3 additions and 14 deletions.
diff --git a/ClassIsland/Views/ProfileSettingsWindow.xaml b/ClassIsland/Views/ProfileSettingsWindow.xaml
@@ -57,19 +57,7 @@
             <Setter Property="ItemTemplate">
                 <Setter.Value>
                     <DataTemplate>
-                        <ContentPresenter>
-                            <ContentPresenter.ContentTemplate>
-                                <DataTemplate DataType="{x:Type profile:Subject}">
-                                    <TextBlock Text="{Binding Name, Mode=OneWay}"/>
-                                </DataTemplate>
-                            </ContentPresenter.ContentTemplate>
-                            <ContentPresenter.Content>
-                                <MultiBinding Converter="{StaticResource SubjectIdToSubjectConverter}">
-                                    <Binding Path="ProfileService.Profile.Subjects" RelativeSource="{RelativeSource FindAncestor, AncestorType=local:ProfileSettingsWindow}"/>
-                                    <Binding />
-                                </MultiBinding>
-                            </ContentPresenter.Content>
-                        </ContentPresenter>
+                        <TextBlock Text="{Binding Value.Name, Mode=OneWay}"/>
                     </DataTemplate>
                 </Setter.Value>
             </Setter>
@@ -1080,8 +1068,9 @@
                                                         </DataGridTemplateColumn.CellTemplate>
                                                     </DataGridTemplateColumn>
                                                     <materialDesign:DataGridComboBoxColumn Header="科目"
-                                                        ItemsSourceBinding="{Binding MainViewModel.Profile.Subjects.Keys, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:ProfileSettingsWindow}}, UpdateSourceTrigger=PropertyChanged}"
+                                                        ItemsSourceBinding="{Binding MainViewModel.Profile.Subjects, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:ProfileSettingsWindow}}, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
                                                         SelectedValueBinding="{Binding SubjectId}"
+                                                        SelectedValuePath="Key"
                                                         ElementStyle="{StaticResource ClassPlanDataGridComboBoxStyle}"
                                                         EditingElementStyle="{StaticResource ClassPlanDataGridComboBoxStyle}" />
                                                 </DataGrid.Columns>