From 3d4d3fc5b2ef7fc3904e2e79f0c0896241919958 Mon Sep 17 00:00:00 2001
From: chr <chr@chr.com>
Date: 星期五, 30 八月 2024 19:20:52 +0800
Subject: [PATCH] 新增richbox转base64
---
PdmSwPlugin.DrawApprove/DrawApprove.xaml | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/PdmSwPlugin.DrawApprove/DrawApprove.xaml b/PdmSwPlugin.DrawApprove/DrawApprove.xaml
index fd35c23..60504fb 100644
--- a/PdmSwPlugin.DrawApprove/DrawApprove.xaml
+++ b/PdmSwPlugin.DrawApprove/DrawApprove.xaml
@@ -46,6 +46,48 @@
</Style.Triggers>
</Style>
+ <Style x:Key="GLink" TargetType="{x:Type Button}" >
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type ButtonBase}">
+ <ContentPresenter x:Name="buttonContent" TextBlock.FontSize="{TemplateBinding FontSize}"
+ TextBlock.FontFamily="{StaticResource iconfont}"
+ TextBlock.Foreground="Green"
+ Margin="0,0,5,0"
+ VerticalAlignment="Center"
+ HorizontalAlignment="Center"
+ Content="{TemplateBinding Content}"/>
+ <ControlTemplate.Triggers>
+ <Trigger Property="IsMouseOver" Value="True">
+ <Setter TargetName="buttonContent" Property="TextBlock.Foreground" Value="Purple"/>
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+ <Style x:Key="RLink" TargetType="{x:Type Button}" >
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type ButtonBase}">
+ <ContentPresenter x:Name="buttonContent" TextBlock.FontSize="{TemplateBinding FontSize}"
+ TextBlock.FontFamily="{StaticResource iconfont}"
+ TextBlock.Foreground="Red"
+ Margin="0,0,5,0"
+ VerticalAlignment="Center"
+ HorizontalAlignment="Center"
+ Content="{TemplateBinding Content}"/>
+ <ControlTemplate.Triggers>
+ <Trigger Property="IsMouseOver" Value="True">
+ <Setter TargetName="buttonContent" Property="TextBlock.Foreground" Value="Purple"/>
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
<treeData:TreeItemDataConverter x:Key="TreeItemDataConverter"/>
<ResourceDictionary.MergedDictionaries>
@@ -74,7 +116,14 @@
AutoGenerateColumns="False"
CanUserAddRows="False"
CanUserSortColumns="False"
+ FontSize="18"
CanUserDeleteRows="False">
+ <treeData:TreeDataGrid.CellStyle>
+ <Style TargetType="DataGridCell" >
+ <Setter Property="TextBox.Margin" Value="0"/>
+ </Style>
+ </treeData:TreeDataGrid.CellStyle>
+
<treeData:TreeDataGrid.Columns>
<DataGridTemplateColumn Width="25">
<DataGridTemplateColumn.Header>
@@ -99,12 +148,12 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
- <DataGridTextColumn Header="鐢宠浜�" Width="80" IsReadOnly="True" Binding="{Binding Data.requestUser}"/>
- <DataGridTextColumn Header="娴佹按鍗曞彿" Width="80" IsReadOnly="True" Binding="{Binding Data.orderCode}"/>
- <DataGridTextColumn Header="鍓嶄竴瀹℃牳浜�" Width="80" IsReadOnly="True" Binding="{Binding Data.auditUser}"/>
- <DataGridTextColumn Header="鎻愪氦鏃堕棿" Width="130" IsReadOnly="True" Binding="{Binding Data.updateTime}"/>
+ <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 Header="鐘舵��" Width="60" IsReadOnly="True">
+ <DataGridTemplateColumn Header="鐘舵��" Width="80" IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Style="{StaticResource statusSlot}" DataContext="{Binding Data}"
@@ -113,14 +162,14 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
- <DataGridTemplateColumn Header="鎿嶄綔" Width="200" IsReadOnly="True">
+ <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>
- <Button Style="{StaticResource LinkButton}" DataContext="{Binding Data}" Click="Resolve_Click">閫氳繃</Button>
- <Button Style="{StaticResource LinkButton}" DataContext="{Binding Data}" Margin="0" Click="Reject_Click">涓嶉�氳繃</Button>
+ <Button Style="{StaticResource GLink}" DataContext="{Binding Data}" Click="Resolve_Click">閫氳繃</Button>
+ <Button Style="{StaticResource RLink}" DataContext="{Binding Data}" Margin="0" Click="Reject_Click">涓嶉�氳繃</Button>
</StackPanel>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
--
Gitblit v1.9.1