wenxiangchao
4 天以前 559890c482f5973f06aafdfec9550fee5ba3c7f2
HMI.DataViewer/DataViewer.xaml
@@ -10,9 +10,15 @@
             xmlns:pw="https://opensource.panuon.com/wpf"
             xmlns:pu="https://opensource.panuon.com/wpf-ui"
             xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
             Background="{StaticResource WorkspaceBackground}"
             Background="{DynamicResource WorkspaceBackground}"
             Loaded="PluginControl_Loaded"
             d:DesignHeight="450" d:DesignWidth="800">
    <UserControl.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>
    </UserControl.Resources>
    <Border Style="{StaticResource CardBoarder}">
        <Grid dp:GridHelper.Space="10">
            <Grid.RowDefinitions>
@@ -49,15 +55,17 @@
                <ComboBox x:Name="programInput" 
                          MinWidth="180"
                          SelectionChanged="programInput_SelectionChanged"/>
                <TextBlock Style="{StaticResource TitleBox}" FontSize="{StaticResource ContentFontSize2}" 
                           Text="{DynamicResource App.StartTime}"/>
                <pu:DateTimePicker Style="{StaticResource TimePicker}" SelectedDateTime="{x:Null}" x:Name="startTimeInput"/>
                <pu:DateTimePicker Style="{StaticResource TimePicker}"
                                   SelectedDateTime="{x:Null}" x:Name="startTimeInput"/>
                <TextBlock Style="{StaticResource TitleBox}" FontSize="{StaticResource ContentFontSize2}" 
                           Text="{DynamicResource App.EndTime}"/>
                <pu:DateTimePicker Style="{StaticResource TimePicker}" SelectedDateTime="{x:Null}" x:Name="endTimeInput"/>
                <pu:DateTimePicker Style="{StaticResource TimePicker}"
                                   SelectedDateTime="{x:Null}" x:Name="endTimeInput"/>
                <Button Style="{StaticResource QueryBtn}"
                        x:Name="srhBtn" Click="Button_Click"/>
@@ -80,7 +88,7 @@
                <pu:Drawer DockPanel.Dock="Left" x:Name="DrwMenu" MinWidth="35" MaxWidth="400"
                           Padding="0"
                           ShadowColor="{x:Null}"
                           AnimationDuration="0" BorderThickness="2,0,0,2" BorderBrush="{StaticResource CommonBoarder}">
                           AnimationDuration="0" BorderThickness="2,0,0,2" BorderBrush="{DynamicResource CommonBoarder}">
                    <Grid>
                        <Grid.RowDefinitions>
                            <RowDefinition Height="Auto"/>
@@ -91,14 +99,14 @@
                            <ColumnDefinition Width="Auto"/>
                        </Grid.ColumnDefinitions>
                        <Border Grid.ColumnSpan="2" BorderThickness="2" BorderBrush="{StaticResource CommonBoarder}" Background="{StaticResource VerBar}">
                        <Border Grid.ColumnSpan="2" BorderThickness="2" BorderBrush="{DynamicResource CommonBoarder}" Background="{DynamicResource VerBar}">
                            <DockPanel Height="35">
                                <ToggleButton x:Name="drawerBtn" BorderThickness="0"
                  DockPanel.Dock="Right"
                  Background="Transparent"
                  Width="35" Height="35" HorizontalAlignment="Right"
                  RenderTransformOrigin="0.5,0.5"
                                              Foreground="{StaticResource PrimaryColorContract}"
                                              Foreground="{DynamicResource PrimaryColorContract}"
                  FontFamily="{StaticResource iconfont}"
                  Content="&#xe60e;" IsChecked="{Binding IsOpen, ElementName=DrwMenu, Mode=TwoWay}">
                                    <ToggleButton.Style>
@@ -128,11 +136,11 @@
                                </ToggleButton>
                                <TextBlock Text="{DynamicResource Dv.Advanced}" FontSize="16" 
                                           Foreground="{StaticResource PrimaryColorContract}"
                                           Foreground="{DynamicResource PrimaryColorContract}"
                                           VerticalAlignment="Center" HorizontalAlignment="Center"/>
                            </DockPanel>
                        </Border>
                        <Grid Grid.Row="1">
                            <Grid.RowDefinitions>
@@ -164,13 +172,13 @@
                                        </DataGridTemplateColumn.CellTemplate>
                                    </DataGridTemplateColumn>
                                    <DataGridTextColumn IsReadOnly="True" Width="*" Binding="{Binding Key}">
                                    <DataGridTextColumn IsReadOnly="True" Width="80" Binding="{Binding Name}">
                                        <DataGridTextColumn.Header>
                                            <TextBlock Text="{DynamicResource Dv.Field}"/>
                                        </DataGridTextColumn.Header>
                                    </DataGridTextColumn>
                                    <DataGridTemplateColumn Width="*">
                                    <DataGridTemplateColumn Width="60">
                                        <DataGridTemplateColumn.Header>
                                            <TextBlock Text="{DynamicResource Dv.Condition}"/>
                                        </DataGridTemplateColumn.Header>
@@ -236,11 +244,11 @@
                    </Grid>
                </pu:Drawer>
                <DataGrid BorderThickness="2" BorderBrush="{StaticResource CommonBoarder}" x:Name="dataTable"
                <!-- SelectionUnit="CellOrRowHeader"
SelectionMode="Extended" -->
                <DataGrid BorderThickness="2" BorderBrush="{DynamicResource CommonBoarder}" x:Name="dataTable"
                          Style="{StaticResource DefaultDataGrid}"
                          SelectionUnit="CellOrRowHeader"
                          SelectionMode="Extended"
                          pu:DataGridHelper.CellSelectedBackground="{StaticResource PrimaryColor}"
                          EnableRowVirtualization="True"
                          PreviewMouseLeftButtonDown="dataTable_PreviewMouseLeftButtonDown">
                    <DataGrid.Columns>
                        <DataGridTemplateColumn Header="#" IsReadOnly="True" CanUserResize="False">