优化桌面端无用菜单和地磅数据可手动功能。
This commit is contained in:
geht
@@ -6,6 +6,7 @@
|
||||
xmlns:md="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||
xmlns:consts="clr-namespace:YY.Admin.Core.Const;assembly=YY.Admin.Core"
|
||||
xmlns:ctls="clr-namespace:YY.Admin.Core.Controls;assembly=YY.Admin.Core"
|
||||
xmlns:shell="clr-namespace:System.Windows.Shell;assembly=PresentationFramework"
|
||||
prism:ViewModelLocator.AutoWireViewModel="True"
|
||||
Icon="/Resources/Icon/logo.ico"
|
||||
Title="{Binding Title}"
|
||||
@@ -17,6 +18,28 @@
|
||||
KeyDown="Window_KeyDown"
|
||||
FontSize="{StaticResource FontSize }">
|
||||
|
||||
<hc:Window.NonClientAreaContent>
|
||||
<!-- 与最小化/关闭同一标题栏行，靠右紧贴系统按钮左侧 -->
|
||||
<Grid HorizontalAlignment="Stretch">
|
||||
<Button
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,2,0"
|
||||
Width="34"
|
||||
Height="26"
|
||||
Padding="0"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
Cursor="Hand"
|
||||
Focusable="False"
|
||||
shell:WindowChrome.IsHitTestVisibleInChrome="True"
|
||||
Command="{Binding OpenServerSettingsCommand}"
|
||||
ToolTip="服务器设置">
|
||||
<ctls:FontAwesomeIcon Icon="" IconFamily="Solid" Foreground="{DynamicResource PrimaryTextBrush}"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</hc:Window.NonClientAreaContent>
|
||||
|
||||
<Window.Resources>
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
@@ -38,16 +61,6 @@
|
||||
|
||||
<Border Grid.Column="1">
|
||||
<Grid>
|
||||
<Button
|
||||
Command="{Binding OpenServerSettingsCommand}"
|
||||
Width="34"
|
||||
Height="34"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
Margin="0,8,8,0"
|
||||
ToolTip="服务器设置">
|
||||
<ctls:FontAwesomeIcon Icon="" IconFamily="Solid"/>
|
||||
</Button>
|
||||
<StackPanel Margin="20 0 20 20">
|
||||
<!-- Logo和标题 -->
|
||||
<StackPanel HorizontalAlignment="Center" Margin="0,20,0,40">
|
||||
|
||||
@@ -61,11 +61,53 @@
|
||||
|
||||
<Border Grid.Column="0" CornerRadius="4" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Padding="4">
|
||||
<DockPanel LastChildFill="True">
|
||||
<TextBlock DockPanel.Dock="Top" Margin="4,0,4,8" Text="菜单树（点击选中后在右侧编辑）" TextWrapping="Wrap" Opacity="0.85"/>
|
||||
<StackPanel DockPanel.Dock="Top" Margin="4,0,4,8">
|
||||
<TextBlock Text="菜单树（点击选中后在右侧编辑，有子节点时可点箭头折叠/展开）" TextWrapping="Wrap" Opacity="0.85"/>
|
||||
<hc:UniformSpacingPanel Spacing="6" Margin="0,6,0,0">
|
||||
<Button Content="全部展开" Padding="8,2" Style="{StaticResource ButtonInfo}"
|
||||
Command="{Binding ExpandAllCommand}"/>
|
||||
<Button Content="全部折叠" Padding="8,2" Style="{StaticResource ButtonInfo}"
|
||||
Command="{Binding CollapseAllCommand}"/>
|
||||
</hc:UniformSpacingPanel>
|
||||
</StackPanel>
|
||||
<ListBox ItemsSource="{Binding FlatRows}"
|
||||
SelectedItem="{Binding SelectedRow, Mode=TwoWay}"
|
||||
DisplayMemberPath="IndentTitle"
|
||||
VirtualizingStackPanel.IsVirtualizing="True"/>
|
||||
VirtualizingStackPanel.IsVirtualizing="True">
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Grid Margin="{Binding LeadingMargin}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="22"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Button Grid.Column="0"
|
||||
Width="20" Height="20" Padding="0"
|
||||
Focusable="False"
|
||||
VerticalAlignment="Center"
|
||||
Cursor="Hand"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
Command="{Binding DataContext.ToggleExpandCommand, RelativeSource={RelativeSource AncestorType=ListBox}}"
|
||||
CommandParameter="{Binding}"
|
||||
Visibility="{Binding HasChildren, Converter={StaticResource Boolean2VisibilityConverter}}">
|
||||
<md:PackIcon Width="16" Height="16" VerticalAlignment="Center">
|
||||
<md:PackIcon.Style>
|
||||
<Style TargetType="md:PackIcon">
|
||||
<Setter Property="Kind" Value="ChevronRight"/>
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding IsExpanded}" Value="True">
|
||||
<Setter Property="Kind" Value="ChevronDown"/>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</md:PackIcon.Style>
|
||||
</md:PackIcon>
|
||||
</Button>
|
||||
<TextBlock Grid.Column="1" Text="{Binding TitleText}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
</DockPanel>
|
||||
</Border>
|
||||
|
||||
@@ -199,6 +241,12 @@
|
||||
<hc:Col Layout="{hc:ColLayout Xs=12, Sm=12, Md=4, Lg=4, Xl=4}">
|
||||
<CheckBox Content="固定页签" IsChecked="{Binding IsAffix}" Margin="0,6,0,0"/>
|
||||
</hc:Col>
|
||||
<hc:Col Layout="{hc:ColLayout Xs=12, Sm=12, Md=8, Lg=8, Xl=8}">
|
||||
<CheckBox Content="默认首页（桌面登录后自动打开此菜单）"
|
||||
IsChecked="{Binding IsDefaultDesktopHome}"
|
||||
IsEnabled="{Binding CanSetDefaultDesktopHome}"
|
||||
Margin="0,6,0,0"/>
|
||||
</hc:Col>
|
||||
<hc:Col Layout="{hc:ColLayout Xs=12, Sm=12, Md=4, Lg=4, Xl=4}">
|
||||
<CheckBox Content="缓存页面" IsChecked="{Binding IsKeepAlive}" Margin="0,6,0,0"/>
|
||||
</hc:Col>
|
||||
|
||||
@@ -540,9 +540,14 @@
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,0,0,4">
|
||||
<StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,0,0,4" VerticalAlignment="Center">
|
||||
<Border Width="4" Height="18" CornerRadius="2" Background="{StaticResource SectionBorderBrush}"/>
|
||||
<TextBlock Text="重量信息" Style="{StaticResource SectionTitleStyle}"/>
|
||||
<CheckBox Margin="16,0,0,0" VerticalAlignment="Center"
|
||||
Content="手动输入重量"
|
||||
IsChecked="{Binding IsManualWeightEntry, Mode=TwoWay}"/>
|
||||
<TextBlock Margin="8,0,0,0" VerticalAlignment="Center"
|
||||
FontSize="11" Foreground="#ff9800" Text="（仅限测试）"/>
|
||||
</StackPanel>
|
||||
|
||||
<!-- 毛重 / 皮重并排 -->
|
||||
@@ -568,20 +573,44 @@
|
||||
<TextBlock Text="毛 重（KG）" FontSize="12" Foreground="{DynamicResource SecondaryTextBrush}"
|
||||
Margin="0,0,0,4" HorizontalAlignment="Center"/>
|
||||
<Border CornerRadius="8" Padding="10,10" Background="{DynamicResource RegionBrush}">
|
||||
<TextBlock Text="{Binding GrossWeight, StringFormat=N2, FallbackValue=—, TargetNullValue=—}"
|
||||
HorizontalAlignment="Center" FontSize="20" FontWeight="Bold"
|
||||
FontFamily="Consolas">
|
||||
<TextBlock.Style>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="Foreground" Value="{DynamicResource SecondaryTextBrush}"/>
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding GrossWeightCaptured}" Value="True">
|
||||
<Setter Property="Foreground" Value="#4caf50"/>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</TextBlock.Style>
|
||||
</TextBlock>
|
||||
<Grid MinHeight="40">
|
||||
<TextBlock HorizontalAlignment="Center" FontSize="20" FontWeight="Bold"
|
||||
FontFamily="Consolas" VerticalAlignment="Center">
|
||||
<TextBlock.Text>
|
||||
<Binding Path="GrossWeight" StringFormat="N2" TargetNullValue="—"/>
|
||||
</TextBlock.Text>
|
||||
<TextBlock.Style>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="Foreground" Value="{DynamicResource SecondaryTextBrush}"/>
|
||||
<Setter Property="Visibility" Value="Visible"/>
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding GrossWeightCaptured}" Value="True">
|
||||
<Setter Property="Foreground" Value="#4caf50"/>
|
||||
</DataTrigger>
|
||||
<DataTrigger Binding="{Binding IsManualWeightEntry}" Value="True">
|
||||
<Setter Property="Visibility" Value="Collapsed"/>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</TextBlock.Style>
|
||||
</TextBlock>
|
||||
<hc:NumericUpDown Value="{Binding GrossWeight, Mode=TwoWay}"
|
||||
Minimum="0"
|
||||
DecimalPlaces="2"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Center">
|
||||
<hc:NumericUpDown.Style>
|
||||
<Style TargetType="hc:NumericUpDown" BasedOn="{StaticResource NumericUpDownPlus}">
|
||||
<Setter Property="Visibility" Value="Collapsed"/>
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding IsManualWeightEntry}" Value="True">
|
||||
<Setter Property="Visibility" Value="Visible"/>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</hc:NumericUpDown.Style>
|
||||
</hc:NumericUpDown>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Border Margin="0,6,0,0" Height="32" CornerRadius="6">
|
||||
<Border.Style>
|
||||
@@ -632,12 +661,44 @@
|
||||
<TextBlock Text="皮 重（KG）" FontSize="12" Foreground="{DynamicResource SecondaryTextBrush}"
|
||||
Margin="0,0,0,4" HorizontalAlignment="Center"/>
|
||||
<Border CornerRadius="8" Padding="10,10" Background="{DynamicResource RegionBrush}">
|
||||
<TextBlock HorizontalAlignment="Center" FontSize="20" FontWeight="Bold"
|
||||
FontFamily="Consolas" Foreground="{DynamicResource SecondaryTextBrush}">
|
||||
<TextBlock.Text>
|
||||
<Binding Path="TareWeight" StringFormat="N2" FallbackValue="—" TargetNullValue="—"/>
|
||||
</TextBlock.Text>
|
||||
</TextBlock>
|
||||
<Grid MinHeight="40">
|
||||
<TextBlock HorizontalAlignment="Center" FontSize="20" FontWeight="Bold"
|
||||
FontFamily="Consolas" VerticalAlignment="Center">
|
||||
<TextBlock.Text>
|
||||
<Binding Path="TareWeight" StringFormat="N2" TargetNullValue="—"/>
|
||||
</TextBlock.Text>
|
||||
<TextBlock.Style>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="Foreground" Value="{DynamicResource SecondaryTextBrush}"/>
|
||||
<Setter Property="Visibility" Value="Visible"/>
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding TareWeightCaptured}" Value="True">
|
||||
<Setter Property="Foreground" Value="#4caf50"/>
|
||||
</DataTrigger>
|
||||
<DataTrigger Binding="{Binding IsManualWeightEntry}" Value="True">
|
||||
<Setter Property="Visibility" Value="Collapsed"/>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</TextBlock.Style>
|
||||
</TextBlock>
|
||||
<hc:NumericUpDown Value="{Binding TareWeight, Mode=TwoWay}"
|
||||
Minimum="0"
|
||||
DecimalPlaces="2"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Center">
|
||||
<hc:NumericUpDown.Style>
|
||||
<Style TargetType="hc:NumericUpDown" BasedOn="{StaticResource NumericUpDownPlus}">
|
||||
<Setter Property="Visibility" Value="Collapsed"/>
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding IsManualWeightEntry}" Value="True">
|
||||
<Setter Property="Visibility" Value="Visible"/>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</hc:NumericUpDown.Style>
|
||||
</hc:NumericUpDown>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Border Margin="0,6,0,0" Height="32" CornerRadius="6">
|
||||
<Border.Style>
|
||||
|
||||
Reference in New Issue
Block a user