105040 更新多个控件的属性和删除注释代码
在 <hc:Card> 和 <TabControl> 中添加 FontSize="14" 属性。 在 <DataGrid> 中修改虚拟化相关属性，添加 IsReadOnly="True"。 在 <DataGrid.RowStyle> 中添加 BorderBrush="#CC002255" 属性。 在 <Expander> 中调整 BorderThickness，添加子元素属性。 删除 <DataGrid> 和 <ListView> 的注释代码块。 在 <ListView> 中删除多个属性。
This commit is contained in:
lihanbo
parent
4d856bbfe5
commit
4a997baa0e
|
|
@ -120,9 +120,8 @@
|
|||
Content="{Binding}"
|
||||
ContentTemplate="{StaticResource LoadingMask}"
|
||||
Visibility="Collapsed" />
|
||||
<hc:Card Grid.Row="0">
|
||||
<hc:Card Grid.Row="0" FontSize="14">
|
||||
<hc:SimpleStackPanel Orientation="Horizontal">
|
||||
|
||||
<hc:SimpleStackPanel
|
||||
Margin="10,0,0,0"
|
||||
VerticalAlignment="Center"
|
||||
|
|
@ -153,25 +152,28 @@
|
|||
Style="{StaticResource ButtonPrimary}" />
|
||||
</hc:SimpleStackPanel>
|
||||
</hc:Card>
|
||||
<TabControl Grid.Row="1">
|
||||
<TabControl Grid.Row="1" FontSize="14">
|
||||
<TabItem Header="整理后的数据">
|
||||
<!--
|
||||
-->
|
||||
<DataGrid
|
||||
x:Name="LettotypeListView"
|
||||
AutoGenerateColumns="False"
|
||||
CanUserSortColumns="False"
|
||||
EnableColumnVirtualization="True"
|
||||
EnableRowVirtualization="True"
|
||||
EnableColumnVirtualization="False"
|
||||
EnableRowVirtualization="False"
|
||||
IsReadOnly="True"
|
||||
ItemsSource="{Binding Source={StaticResource LettotypeData}, IsAsync=True}"
|
||||
RowDetailsVisibilityChanged="LettotypeListView_RowDetailsVisibilityChanged"
|
||||
RowDetailsVisibilityMode="Visible"
|
||||
RowDetailsVisibilityMode="{Binding DetailsShowMode}"
|
||||
RowHeight="NaN"
|
||||
ScrollViewer.CanContentScroll="False"
|
||||
SelectedItem="{Binding SelectedItem}"
|
||||
SelectionMode="Single"
|
||||
VirtualizingPanel.IsContainerVirtualizable="True"
|
||||
VirtualizingPanel.IsVirtualizing="True"
|
||||
VirtualizingPanel.IsContainerVirtualizable="False"
|
||||
VirtualizingPanel.IsVirtualizing="False"
|
||||
VirtualizingPanel.ScrollUnit="Item"
|
||||
VirtualizingPanel.VirtualizationMode="Recycling">
|
||||
VirtualizingPanel.VirtualizationMode="Standard">
|
||||
<DataGrid.Resources>
|
||||
<Style BasedOn="{StaticResource DataGridCellStyle}" TargetType="DataGridCell">
|
||||
<Setter Property="Height" Value="Auto" />
|
||||
|
|
@ -192,6 +194,7 @@
|
|||
</DataGrid.ContextMenu>
|
||||
<DataGrid.RowStyle>
|
||||
<Style BasedOn="{StaticResource DataGridRowStyle}" TargetType="DataGridRow">
|
||||
<Setter Property="BorderBrush" Value="#CC002255" />
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding IsError}" Value="True">
|
||||
<Setter Property="Background" Value="#dc4d41" />
|
||||
|
|
@ -258,17 +261,21 @@
|
|||
<Expander
|
||||
Background="#CC112255"
|
||||
BorderBrush="#CC002255"
|
||||
BorderThickness="1,1,1,5"
|
||||
BorderThickness="1,1,1,1"
|
||||
Foreground="#FFEEEEEE"
|
||||
IsExpanded="True">
|
||||
<Expander.Header>
|
||||
<DockPanel>
|
||||
<DockPanel Height="30">
|
||||
<TextBlock
|
||||
Width="100"
|
||||
Margin="5,0,0,0"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="Bold"
|
||||
Text="{Binding Path=Name, StringFormat=轴号：{0}}" />
|
||||
<TextBlock FontWeight="Bold" Text="{Binding Path=ItemCount, StringFormat=线总数量：{0}}" />
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="Bold"
|
||||
Text="{Binding Path=ItemCount, StringFormat=线总数量：{0}}" />
|
||||
</DockPanel>
|
||||
</Expander.Header>
|
||||
<Grid>
|
||||
|
|
@ -361,151 +368,21 @@
|
|||
</DataGrid.Columns>
|
||||
<DataGrid.RowDetailsTemplate>
|
||||
<DataTemplate>
|
||||
<!--<DataGrid
|
||||
Width="Auto"
|
||||
Height="Auto"
|
||||
MinHeight="100"
|
||||
Margin="40,0,0,0"
|
||||
AutoGenerateColumns="False"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="2,0,0,0"
|
||||
CanUserSortColumns="False"
|
||||
EnableColumnVirtualization="True"
|
||||
EnableRowVirtualization="True"
|
||||
HeadersVisibility="Column"
|
||||
IsReadOnly="True"
|
||||
ScrollViewer.VerticalScrollBarVisibility="Auto"
|
||||
SelectionChanged="SubDetailsDataGrid_SelectionChanged"
|
||||
SelectionMode="Single"
|
||||
SelectionUnit="FullRow"
|
||||
VirtualizingPanel.IsContainerVirtualizable="True"
|
||||
VirtualizingPanel.IsVirtualizing="True"
|
||||
VirtualizingPanel.ScrollUnit="Item"
|
||||
VirtualizingPanel.VirtualizationMode="Recycling">
|
||||
<DataGrid.ContextMenu>
|
||||
<ContextMenu>
|
||||
<MenuItem Click="SubToSourceMenuItem_Click" Header="在3D中查看（转至源）" />
|
||||
</ContextMenu>
|
||||
</DataGrid.ContextMenu>
|
||||
<DataGrid.Resources>
|
||||
<Style
|
||||
x:Key="DataGridCheckBoxCellStyle"
|
||||
BasedOn="{StaticResource {x:Type DataGridCell}}"
|
||||
TargetType="DataGridCell">
|
||||
<Setter Property="VerticalAlignment" Value="Center" />
|
||||
<Setter Property="HorizontalAlignment" Value="Center" />
|
||||
<Setter Property="Foreground" Value="Black" />
|
||||
</Style>
|
||||
</DataGrid.Resources>
|
||||
<DataGrid.RowStyle>
|
||||
<Style BasedOn="{StaticResource DataGridRowStyle}" TargetType="DataGridRow">
|
||||
<Style.Triggers>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter Property="Background" Value="#aa326cf3" />
|
||||
<Setter Property="Foreground" Value="Black" />
|
||||
</Trigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</DataGrid.RowStyle>
|
||||
<DataGrid.ColumnHeaderStyle>
|
||||
<Style BasedOn="{StaticResource DataGridColumnHeaderStyle}" TargetType="DataGridColumnHeader">
|
||||
<Setter Property="MinHeight" Value="35" />
|
||||
<Setter Property="Margin" Value="0" />
|
||||
</Style>
|
||||
</DataGrid.ColumnHeaderStyle>
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Binding="{Binding Name}" Header="名称" />
|
||||
<DataGridTextColumn Binding="{Binding CableName}" Header="线材名称" />
|
||||
<DataGridTextColumn Binding="{Binding AxisNo}" Header="轴号" />
|
||||
<DataGridTextColumn Binding="{Binding Length}" Header="长度" />
|
||||
<DataGridTextColumn Binding="{Binding CableType}" Header="线材类型" />
|
||||
<DataGridTextColumn Binding="{Binding CableConnectionClass}" Header="线材连接方式" />
|
||||
|
||||
</DataGrid.Columns>
|
||||
<ListView
|
||||
Width="Auto"
|
||||
Height="Auto"
|
||||
MinHeight="100"
|
||||
Margin="40,0,0,0"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="2,0,0,0"
|
||||
ScrollViewer.VerticalScrollBarVisibility="Auto"
|
||||
SelectionChanged="SubDetailsDataGrid_SelectionChanged"
|
||||
SelectionMode="Single"
|
||||
VirtualizingPanel.IsVirtualizing="True"
|
||||
VirtualizingPanel.VirtualizationMode="Recycling">
|
||||
<ListView.ContextMenu>
|
||||
<ContextMenu>
|
||||
<MenuItem Click="SubToSourceMenuItem_Click" Header="在3D中查看（转至源）" />
|
||||
</ContextMenu>
|
||||
</ListView.ContextMenu>
|
||||
<ListView.Resources>
|
||||
<Style
|
||||
x:Key="ListViewItemStyle"
|
||||
BasedOn="{StaticResource {x:Type ListViewItem}}"
|
||||
TargetType="ListViewItem">
|
||||
<Setter Property="Height" Value="Auto" />
|
||||
<Setter Property="MaxHeight" Value="9999" />
|
||||
<Style.Triggers>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter Property="Background" Value="#aa326cf3" />
|
||||
<Setter Property="Foreground" Value="Black" />
|
||||
</Trigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</ListView.Resources>
|
||||
<ListView.ItemContainerStyle>
|
||||
<Style BasedOn="{StaticResource ListViewItemStyle}" TargetType="ListViewItem" />
|
||||
</ListView.ItemContainerStyle>
|
||||
<ListView.View>
|
||||
<GridView>
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding CableName}" Header="线材名称" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding AxisNo}" Header="轴号" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Length}" Header="长度" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding CableType}" Header="线材类型" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding CableConnectionClass}" Header="线材连接方式" />
|
||||
</GridView>
|
||||
</ListView.View>
|
||||
</ListView>
|
||||
</DataGrid>-->
|
||||
<ListView
|
||||
Width="Auto"
|
||||
Height="Auto"
|
||||
MinHeight="100"
|
||||
Margin="40,0,0,0"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="2,0,0,0"
|
||||
ItemsSource="{Binding SubLines}"
|
||||
ScrollViewer.VerticalScrollBarVisibility="Auto"
|
||||
SelectionChanged="SubDetailsDataGrid_SelectionChanged"
|
||||
SelectionMode="Single"
|
||||
VirtualizingPanel.IsVirtualizing="True"
|
||||
VirtualizingPanel.VirtualizationMode="Recycling"
|
||||
Visibility="{Binding IsComplexLine, Converter={StaticResource Boolean2VisibilityConverter}}">
|
||||
SelectionMode="Single">
|
||||
<ListView.ContextMenu>
|
||||
<ContextMenu>
|
||||
<MenuItem Click="SubToSourceMenuItem_Click" Header="在3D中查看（转至源）" />
|
||||
</ContextMenu>
|
||||
</ListView.ContextMenu>
|
||||
<!--<ListView.Resources>
|
||||
<Style
|
||||
x:Key="ListViewItemStyle"
|
||||
BasedOn="{StaticResource {x:Type ListViewItem}}"
|
||||
TargetType="ListViewItem">
|
||||
<Setter Property="Height" Value="Auto" />
|
||||
<Setter Property="MaxHeight" Value="9999" />
|
||||
<Style.Triggers>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter Property="Background" Value="#aa326cf3" />
|
||||
<Setter Property="Foreground" Value="Black" />
|
||||
</Trigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</ListView.Resources>
|
||||
<ListView.ItemContainerStyle>
|
||||
<Style BasedOn="{StaticResource ListViewItemStyle}" TargetType="ListViewItem" />
|
||||
</ListView.ItemContainerStyle>-->
|
||||
<ListView.View>
|
||||
<GridView>
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue