xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1 feat(navigation): 统一添加返回按钮并调整导航宽度

Browse Source 
2
   3 - 为VariableTableView和DeviceDetailView添加返回上级页面的按钮
   4 - 将VariableHistoryView的返回按钮改为图标样式，保持一致性
   5 - 调整MainView中NavigationView的展开宽度，从500减小到200
   6 - 清理未使用的命名空间引用
This commit is contained in:
David P.G
2025-10-03 23:06:04 +08:00
parent 609c4741c1
commit f86a2abed6
6 changed files with 121 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
DMS.WPF/Views/DeviceDetailView.xaml
View File

@@ -73,25 +73,49 @@
</UserControl.Resources>
<ikw:SimpleStackPanel Spacing="10">
<!-- Command Bar for Variable Tables -->
<ui:CommandBar Grid.Row="1" DefaultLabelPosition="Right" IsOpen="False" VerticalAlignment="Top">
<ui:AppBarButton Command="{Binding AddVariableTableCommand}" Label="添加变量表">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Add}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:AppBarButton Command="{Binding EditVariableTableCommand}" Label="编辑变量表">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:AppBarButton Command="{Binding DeleteVariableTableCommand}" Label="删除变量表">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Delete}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<!-- Add more variable table-specific commands here if needed -->
</ui:CommandBar>
<Border Margin="10" Padding="5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<!-- 返回设备列表按钮 -->
<Button Grid.Column="0"
Command="{Binding NavigateToDevicesListCommand}"
Style="{StaticResource ButtonDefault}"
ToolTip="返回设备列表"
Margin="0,0,10,0">
<Button.Content>
<StackPanel Orientation="Horizontal">
<ui:FontIcon
Icon="{x:Static ui:SegoeFluentIcons.ArrowLeft8}" />
</StackPanel>
</Button.Content>
</Button>
<!-- Command Bar for Variable Tables -->
<ui:CommandBar Grid.Column="1" DefaultLabelPosition="Right" IsOpen="False" VerticalAlignment="Top">
<ui:AppBarButton Command="{Binding AddVariableTableCommand}" Label="添加变量表">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Add}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:AppBarButton Command="{Binding EditVariableTableCommand}" Label="编辑变量表">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<ui:AppBarButton Command="{Binding DeleteVariableTableCommand}" Label="删除变量表">
<ui:AppBarButton.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Delete}" />
</ui:AppBarButton.Icon>
</ui:AppBarButton>
<!-- Add more variable table-specific commands here if needed -->
</ui:CommandBar>
</Grid>
</Border>
<!-- Device Details Section -->
<StackPanel Grid.Row="0" Margin="10">