mirror of
https://gitee.com/wang-yin1/wpf-visual-process-framework
synced 2026-03-03 08:10:49 +08:00
2025-07-15 19:13
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:VisionFrame.Views"
|
||||
xmlns:extensions="clr-namespace:VisionFrame.Extensions"
|
||||
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
|
||||
xmlns:n="clr-namespace:VisionFrame.Nodes"
|
||||
xmlns:base="clr-namespace:VisionFrame.Base.TemplateSelector;assembly=VisionFrame.Base"
|
||||
@@ -457,11 +458,46 @@
|
||||
<TabControl Grid.Row="1" Margin="0,5,0,0"
|
||||
BorderThickness="0,1,0,0" BorderBrush="#1f71e5"
|
||||
Background="#5FFF" Padding="0">
|
||||
|
||||
<TabItem Style="{StaticResource NormalTabStyle}">
|
||||
<TabItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="" FontFamily="{StaticResource Iconfont}"
|
||||
FontSize="16" VerticalAlignment="Center" Margin="0,0,3,0"/>
|
||||
<TextBlock Text="运行日志" VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
<ScrollViewer extensions:ScrollViewerExtensions.AlwaysScrollToEnd="True" VerticalScrollBarVisibility="Hidden">
|
||||
<ItemsControl ItemsSource="{Binding LogList}">
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate>
|
||||
|
||||
<Grid Height="28" Margin="3,1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="50"/>
|
||||
<ColumnDefinition Width="80"/>
|
||||
<ColumnDefinition/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="{Binding Time ,StringFormat=HH:mm:ss}"
|
||||
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||
Foreground="#888"/>
|
||||
<TextBlock Text="{Binding NodeName}" Foreground="#333"
|
||||
Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
|
||||
<TextBlock Text="{Binding LogMessage}" Grid.Column="2" Foreground="#333"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</ScrollViewer>
|
||||
</TabItem>
|
||||
|
||||
<TabItem Style="{StaticResource NormalTabStyle}">
|
||||
<TabItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="" FontFamily="{StaticResource Iconfont}"
|
||||
FontSize="16" VerticalAlignment="Center" Margin="0,0,3,0"/>
|
||||
FontSize="16" VerticalAlignment="Center" Margin="0,0,3,0"/>
|
||||
<TextBlock Text="流程参数管理" VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
@@ -471,7 +507,7 @@
|
||||
<RowDefinition Height="auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<ListBox Background="Transparent" BorderThickness="0"
|
||||
ItemsSource="{Binding ArgumentList}">
|
||||
ItemsSource="{Binding ArgumentList}">
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Grid Height="30">
|
||||
@@ -483,25 +519,25 @@
|
||||
|
||||
<Border Margin="3,3,1,3" CornerRadius="3" Background="#FFF">
|
||||
<TextBox Text="{Binding ArgName,UpdateSourceTrigger=PropertyChanged}"
|
||||
VerticalContentAlignment="Center"
|
||||
BorderThickness="0"
|
||||
Background="Transparent"
|
||||
Margin="2" FontWeight="Normal"
|
||||
Foreground="#555"/>
|
||||
VerticalContentAlignment="Center"
|
||||
BorderThickness="0"
|
||||
Background="Transparent"
|
||||
Margin="2" FontWeight="Normal"
|
||||
Foreground="#555"/>
|
||||
</Border>
|
||||
|
||||
<ComboBox Grid.Column="1" SelectedItem="{Binding ArgType}"
|
||||
Margin="1,3" BorderThickness="0"
|
||||
ItemsSource="{Binding DataContext.ArgTypeList,RelativeSource={RelativeSource AncestorType=UserControl}}">
|
||||
Margin="1,3" BorderThickness="0"
|
||||
ItemsSource="{Binding DataContext.ArgTypeList,RelativeSource={RelativeSource AncestorType=UserControl}}">
|
||||
|
||||
</ComboBox>
|
||||
|
||||
<Button Content="" FontFamily="{StaticResource Iconfont}"
|
||||
Grid.Column="2" Style="{StaticResource DeleteElementButtonStyle}"
|
||||
FontSize="10" Width="22" Height="22"
|
||||
Margin="0" Background="Transparent"
|
||||
Command="{Binding DataContext.DelArgumentCommand,RelativeSource={RelativeSource AncestorType=UserControl}}"
|
||||
CommandParameter="{Binding}"/>
|
||||
Grid.Column="2" Style="{StaticResource DeleteElementButtonStyle}"
|
||||
FontSize="10" Width="22" Height="22"
|
||||
Margin="0" Background="Transparent"
|
||||
Command="{Binding DataContext.DelArgumentCommand,RelativeSource={RelativeSource AncestorType=UserControl}}"
|
||||
CommandParameter="{Binding}"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
@@ -522,44 +558,13 @@
|
||||
</ListBox>
|
||||
|
||||
<Border Height="1" Background="#DDD" VerticalAlignment="Top"
|
||||
Grid.Row="1" Margin="5,0"/>
|
||||
Grid.Row="1" Margin="5,0"/>
|
||||
<Button Grid.Row="1" Height="30" Content="添加参数" Width="120"
|
||||
HorizontalAlignment="Right"
|
||||
Margin="5" Command="{Binding AddArgumentCommand}"/>
|
||||
HorizontalAlignment="Right"
|
||||
Margin="5" Command="{Binding AddArgumentCommand}"/>
|
||||
</Grid>
|
||||
|
||||
</TabItem>
|
||||
|
||||
<TabItem Style="{StaticResource NormalTabStyle}">
|
||||
<TabItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="" FontFamily="{StaticResource Iconfont}"
|
||||
FontSize="16" VerticalAlignment="Center" Margin="0,0,3,0"/>
|
||||
<TextBlock Text="运行日志" VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
|
||||
<ItemsControl ItemsSource="{Binding LogList}">
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Grid Height="28" Margin="3,1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="50"/>
|
||||
<ColumnDefinition Width="80"/>
|
||||
<ColumnDefinition/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="{Binding Time ,StringFormat=HH:mm:ss}"
|
||||
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||
Foreground="#888"/>
|
||||
<TextBlock Text="{Binding NodeName}" Foreground="#333"
|
||||
Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
|
||||
<TextBlock Text="{Binding LogMessage}" Grid.Column="2" Foreground="#333"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
Reference in New Issue
Block a user