Compare commits

..

2 Commits

Author SHA1 Message Date
c3d3a5b518 Merge branch 'dev' 2026-05-09 14:58:25 +08:00
aa4e0df403 test 2026-05-09 14:58:03 +08:00
3 changed files with 3 additions and 3 deletions

View File

@@ -114,7 +114,7 @@
<DataGridTemplateColumn Header="{DynamicResource testReport12}" Width="100"> <DataGridTemplateColumn Header="{DynamicResource testReport12}" Width="100">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<Button Content="{DynamicResource testReport111}" <Button Content="{DynamicResource FlowReport2}"
Click="DeleteButton_Click" Click="DeleteButton_Click"
Background="#FF5252" Background="#FF5252"
Foreground="White" Foreground="White"

View File

@@ -114,7 +114,7 @@
<DataGridTemplateColumn Header="{DynamicResource testReport12}" Width="100"> <DataGridTemplateColumn Header="{DynamicResource testReport12}" Width="100">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<Button Content="{DynamicResource testReport111}" <Button Content="{DynamicResource FlowReport2}"
Click="DeleteButton_Click" Click="DeleteButton_Click"
Background="#FF5252" Background="#FF5252"
Foreground="White" Foreground="White"

View File

@@ -117,7 +117,7 @@
<DataGridTemplateColumn Header="{DynamicResource testReport12}" Width="100"> <DataGridTemplateColumn Header="{DynamicResource testReport12}" Width="100">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<Button Content="{DynamicResource testReport12}" <Button Content="{DynamicResource FlowReport2}"
Click="DeleteButton_Click" Click="DeleteButton_Click"
Background="#FF5252" Background="#FF5252"
Foreground="White" Foreground="White"