From 1f645778ae80a3a8801b8bb4d0fcf8feb244ad43 Mon Sep 17 00:00:00 2001 From: chr <chr@mailcom> Date: 星期三, 09 十月 2024 11:51:23 +0800 Subject: [PATCH] 完善项目,新增插件启用检测; --- PdmSwPlugin.DrawApprove/DrawApprove.xaml | 240 ++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 139 insertions(+), 101 deletions(-) diff --git a/PdmSwPlugin.DrawApprove/DrawApprove.xaml b/PdmSwPlugin.DrawApprove/DrawApprove.xaml index ded5c69..a33fedc 100644 --- a/PdmSwPlugin.DrawApprove/DrawApprove.xaml +++ b/PdmSwPlugin.DrawApprove/DrawApprove.xaml @@ -99,125 +99,163 @@ </ResourceDictionary> </UserControl.Resources> <AdornerDecorator> - <Grid x:Name="sb"> - <DockPanel x:Name="content" LastChildFill="True"> + <Grid x:Name="content"> + <Grid.RowDefinitions> + <RowDefinition Height="30"/> + <RowDefinition Height="30"/> + <RowDefinition Height="*"/> + <RowDefinition Height="20"/> + </Grid.RowDefinitions> + + <ToolBarTray Grid.Row="0" DockPanel.Dock="Top" Background="#FFF" ToolBarTray.IsLocked="True" > + <ToolBar Style="{StaticResource CommonToolBar}" ToolBar.OverflowMode="Never" Band="1" BandIndex="1" Height="30" Background="#FFF"> + <Button ToolTip="鍒锋柊" Content="鍒锋柊" FontFamily="{StaticResource iconfont}" FontSize="16" + Click="Button_Click"/> + </ToolBar> + </ToolBarTray> - <ToolBarTray DockPanel.Dock="Top" Background="#FFF" ToolBarTray.IsLocked="True" > - <ToolBar Style="{StaticResource CommonToolBar}" ToolBar.OverflowMode="Never" Band="1" BandIndex="1" Height="30" Background="#FFF"> - <Button ToolTip="鍒锋柊" Content="鍒锋柊" FontFamily="{StaticResource iconfont}" FontSize="16" - Click="Button_Click"/> - </ToolBar> - </ToolBarTray> + <StackPanel Grid.Row="1" Orientation="Horizontal" DockPanel.Dock="Top" VerticalAlignment="Center"> + <Label FontSize="16">鐘舵��</Label> + <CheckBox FontSize="16" Margin="0,0,10,0" VerticalContentAlignment="Center" x:Name="subcb" IsChecked="True">寰呭鏍�</CheckBox> + <CheckBox FontSize="16" Margin="0,0,10,0" VerticalContentAlignment="Center" x:Name="resubcb" IsChecked="True">閲嶆柊瀹℃牳</CheckBox> + <CheckBox FontSize="16" Margin="0,0,10,0" VerticalContentAlignment="Center" x:Name="comcb">宸插畬鎴�</CheckBox> + <CheckBox FontSize="16" Margin="0,0,20,0" VerticalContentAlignment="Center" x:Name="rejcb">宸查┏鍥�</CheckBox> + </StackPanel> - <!-- 鏍戠粨鏋� --> - <treeData:TreeDataGrid x:Name="treeDataGrid" DockPanel.Dock="Top" - ColumnWidth="*" - ItemsSource="{Binding dataSource,Converter={StaticResource TreeItemDataConverter},ConverterParameter=children}" - AutoGenerateColumns="False" - CanUserAddRows="False" - CanUserSortColumns="False" - RowHeaderWidth="0" - FontSize="18" - CanUserDeleteRows="False"> + <!-- 鏍戠粨鏋� --> + <treeData:TreeDataGrid x:Name="treeDataGrid" DockPanel.Dock="Top" Grid.Row="2" + ColumnWidth="*" + ItemsSource="{Binding dataSource,Converter={StaticResource TreeItemDataConverter},ConverterParameter=children}" + AutoGenerateColumns="False" + CanUserAddRows="False" + CanUserSortColumns="False" + RowHeaderWidth="0" + FontSize="18" + FrozenColumnCount="1" + HorizontalScrollBarVisibility="Auto" + CanUserDeleteRows="False"> - <treeData:TreeDataGrid.Resources> - <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="Transparent"/> - </treeData:TreeDataGrid.Resources> + <treeData:TreeDataGrid.Resources> + <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="Transparent"/> + </treeData:TreeDataGrid.Resources> - <treeData:TreeDataGrid.RowStyle> - - - <Style TargetType="DataGridRow"> - <Style.Triggers> - <DataTrigger Binding="{Binding Path=Data.IsOpening}" Value="True"> - <Setter Property="Background" Value="Orange"/> - </DataTrigger> - </Style.Triggers> - </Style> - </treeData:TreeDataGrid.RowStyle> + <treeData:TreeDataGrid.RowStyle> - <treeData:TreeDataGrid.CellStyle> - <Style TargetType="DataGridCell" > - <Style.Triggers> - <MultiDataTrigger> - <MultiDataTrigger.Conditions> - <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridCell}}, Path=IsSealed}" Value="True"/> - <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=IsKeyboardFocusWithin}" Value="False"/> - </MultiDataTrigger.Conditions> - <Setter Property="Background" Value="RED"/> - </MultiDataTrigger> - </Style.Triggers> - </Style> - </treeData:TreeDataGrid.CellStyle> - <treeData:TreeDataGrid.Columns> - <DataGridTemplateColumn Width="25"> - <DataGridTemplateColumn.Header> - <CheckBox Checked="GlobalCheckBox_Checked" Unchecked="GlobalCheckBox_Checked" /> - </DataGridTemplateColumn.Header> + <Style TargetType="DataGridRow"> + <Style.Triggers> + <DataTrigger Binding="{Binding Path=Data.IsOpening}" Value="True"> + <Setter Property="Background" Value="Orange"/> + </DataTrigger> + </Style.Triggers> + </Style> + </treeData:TreeDataGrid.RowStyle> - <DataGridTemplateColumn.CellTemplate> - <DataTemplate> - <CheckBox DataContext="{Binding Data}" - IsChecked="{Binding selected}" Checked="SingleCheckBox_Event" Unchecked="SingleCheckBox_Event"/> - </DataTemplate> - </DataGridTemplateColumn.CellTemplate> - </DataGridTemplateColumn> + <treeData:TreeDataGrid.CellStyle> + <Style TargetType="DataGridCell" > + <Style.Triggers> + <MultiDataTrigger> + <MultiDataTrigger.Conditions> + <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGridCell}}, Path=IsSealed}" Value="True"/> + <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=IsKeyboardFocusWithin}" Value="False"/> + </MultiDataTrigger.Conditions> + <Setter Property="Background" Value="RED"/> + </MultiDataTrigger> + </Style.Triggers> + </Style> + </treeData:TreeDataGrid.CellStyle> - <DataGridTemplateColumn Header="鐗╂枡缂栧彿" IsReadOnly="True"> - <DataGridTemplateColumn.CellTemplate> - <DataTemplate> - <StackPanel Orientation="Horizontal"> - <TextBox IsReadOnly="True" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Stretch" Text="{Binding Data.materialCode,Mode=OneWay}"/> - </StackPanel> - </DataTemplate> - </DataGridTemplateColumn.CellTemplate> - </DataGridTemplateColumn> + <treeData:TreeDataGrid.Columns> + <!--<DataGridTemplateColumn Width="25"> + <DataGridTemplateColumn.Header> + <CheckBox Checked="GlobalCheckBox_Checked" Unchecked="GlobalCheckBox_Checked" /> + </DataGridTemplateColumn.Header> - <DataGridTextColumn Header="鐢宠浜�" Width="100" IsReadOnly="True" Binding="{Binding Data.requestUser}"/> - <DataGridTextColumn Header="娴佹按鍗曞彿" Width="120" IsReadOnly="True" Binding="{Binding Data.orderCode}"/> - <DataGridTextColumn Header="鍓嶄竴瀹℃牳浜�" Width="100" IsReadOnly="True" Binding="{Binding Data.auditUser}"/> - <DataGridTextColumn Header="鎻愪氦鏃堕棿" Width="180" IsReadOnly="True" Binding="{Binding Data.updateTime}"/> + <DataGridTemplateColumn.CellTemplate> + <DataTemplate> + <CheckBox DataContext="{Binding Data}" + IsChecked="{Binding selected}" Checked="SingleCheckBox_Event" Unchecked="SingleCheckBox_Event"/> + </DataTemplate> + </DataGridTemplateColumn.CellTemplate> + </DataGridTemplateColumn>--> - <DataGridTemplateColumn Header="鐘舵��" Width="80" IsReadOnly="True"> - <DataGridTemplateColumn.CellTemplate> - <DataTemplate> - <TextBlock Style="{StaticResource statusSlot}" DataContext="{Binding Data}" - MouseLeftButtonDown="TextBlock_MouseLeftButtonDown"/> - </DataTemplate> - </DataGridTemplateColumn.CellTemplate> - </DataGridTemplateColumn> + <DataGridTemplateColumn Header="鐗╂枡缂栧彿" IsReadOnly="True" Width="Auto"> + <DataGridTemplateColumn.CellTemplate> + <DataTemplate> + <StackPanel Orientation="Horizontal"> + <TextBox IsReadOnly="True" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Stretch" Text="{Binding Data.materialCode,Mode=OneWay}"/> + </StackPanel> + </DataTemplate> + </DataGridTemplateColumn.CellTemplate> + </DataGridTemplateColumn> - <DataGridTemplateColumn Header="鎿嶄綔" Width="280" IsReadOnly="True"> - <DataGridTemplateColumn.CellTemplate> - <DataTemplate> - <StackPanel Orientation="Horizontal"> - <Button Style="{StaticResource LinkButton}" DataContext="{Binding Data}" Click="OpenDrw_Click">鎵撳紑宸ョ▼鍥�</Button> - <Button Style="{StaticResource LinkButton}" DataContext="{Binding Data}" Click="OpenDoc_Click">鎵撳紑鍥剧焊</Button> + <DataGridTextColumn Header="鐢宠浜�" Width="100" IsReadOnly="True" Binding="{Binding Data.requestUser}"/> + <DataGridTextColumn Header="娴佹按鍗曞彿" Width="120" IsReadOnly="True" Binding="{Binding Data.orderCode}"/> + <DataGridTextColumn Header="鍓嶄竴瀹℃牳浜�" Width="100" IsReadOnly="True" Binding="{Binding Data.auditUser}"/> + <DataGridTextColumn Header="鎻愪氦鏃堕棿" Width="180" CanUserResize="False" IsReadOnly="True" Binding="{Binding Data.updateTime}"/> + + <DataGridTemplateColumn Header="鐘舵��" Width="80" CanUserResize="False" IsReadOnly="True"> + <DataGridTemplateColumn.CellTemplate> + <DataTemplate> + <TextBlock Style="{StaticResource statusSlot}" DataContext="{Binding Data}" + MouseLeftButtonDown="TextBlock_MouseLeftButtonDown"/> + </DataTemplate> + </DataGridTemplateColumn.CellTemplate> + </DataGridTemplateColumn> + + <DataGridTemplateColumn Header="鎿嶄綔" Width="280" IsReadOnly="True" CanUserResize="False"> + <DataGridTemplateColumn.CellTemplate> + <DataTemplate> + <StackPanel Orientation="Horizontal"> + <Button Style="{StaticResource LinkButton}" DataContext="{Binding Data}" Click="OpenDrw_Click">鎵撳紑宸ョ▼鍥�</Button> + <Button Style="{StaticResource LinkButton}" DataContext="{Binding Data}" Click="OpenDoc_Click">鎵撳紑鍥剧焊</Button> + <StackPanel Orientation="Horizontal" Name="groupStack"> <Button Style="{StaticResource LinkButton}" DataContext="{Binding Data}" Click="Resolve_Click">閫氳繃</Button> <Button Style="{StaticResource RLink}" DataContext="{Binding Data}" Margin="0" Click="Reject_Click">涓嶉�氳繃</Button> </StackPanel> - </DataTemplate> - </DataGridTemplateColumn.CellTemplate> - </DataGridTemplateColumn> + <Button Name="resetButton" Style="{StaticResource LinkButton}" DataContext="{Binding Data}" Click="Reset_Click">鎾ら攢</Button> + </StackPanel> + + <DataTemplate.Triggers> + <DataTrigger Binding="{Binding Data.status}" Value="completed"> + <Setter TargetName="groupStack" Property="Visibility" Value="Collapsed"/> + <Setter TargetName="resetButton" Property="Visibility" Value="Visible"/> + </DataTrigger> + <DataTrigger Binding="{Binding Data.status}" Value="rejected"> + <Setter TargetName="groupStack" Property="Visibility" Value="Collapsed"/> + <Setter TargetName="resetButton" Property="Visibility" Value="Visible"/> + </DataTrigger> + <DataTrigger Binding="{Binding Data.status}" Value="submitted"> + <Setter TargetName="groupStack" Property="Visibility" Value="Visible"/> + <Setter TargetName="resetButton" Property="Visibility" Value="Collapsed"/> + </DataTrigger> + <DataTrigger Binding="{Binding Data.status}" Value="resubmitted"> + <Setter TargetName="groupStack" Property="Visibility" Value="Visible"/> + <Setter TargetName="resetButton" Property="Visibility" Value="Collapsed"/> + </DataTrigger> + </DataTemplate.Triggers> + </DataTemplate> + </DataGridTemplateColumn.CellTemplate> + </DataGridTemplateColumn> - </treeData:TreeDataGrid.Columns> - </treeData:TreeDataGrid> + </treeData:TreeDataGrid.Columns> + </treeData:TreeDataGrid> - <StatusBar DockPanel.Dock="Bottom" Height="20"> - <StatusBarItem > - <TextBox x:Name="activeDocPath" IsReadOnly="True" Style="{StaticResource StatusBarTextBox}" Text="{Binding SelectBomText}"/> - </StatusBarItem> - <Separator/> - <StatusBarItem> - <TextBox x:Name="statusBarText" IsReadOnly="True" Style="{StaticResource StatusBarTextBox}" Text="{Binding StatusBarText}"/> - </StatusBarItem> - </StatusBar> - <Border></Border> - <!--<TextBox x:Name="console"></TextBox>--> - </DockPanel> + <StatusBar Grid.Row="3" DockPanel.Dock="Top" Height="20"> + <StatusBarItem > + <TextBox x:Name="activeDocPath" IsReadOnly="True" Style="{StaticResource StatusBarTextBox}" Text="{Binding SelectBomText}"/> + </StatusBarItem> + <Separator/> + <StatusBarItem> + <TextBox x:Name="statusBarText" IsReadOnly="True" Style="{StaticResource StatusBarTextBox}" Text="{Binding StatusBarText}"/> + </StatusBarItem> + </StatusBar> + <Border></Border> + <!--<DockPanel x:Name="content" LastChildFill="True"> + --><!--<TextBox x:Name="console"></TextBox>--><!-- + </DockPanel>--> </Grid> </AdornerDecorator> </UserControl> -- Gitblit v1.9.1