From 559890c482f5973f06aafdfec9550fee5ba3c7f2 Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 09 十一月 2026 17:02:15 +0800
Subject: [PATCH] feat: CAN 模拟器 TCP 化 + 多设备并发调试 + 后台生命周期管理
---
Plugin.SeqEditor/SeqEditor.xaml | 66 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/Plugin.SeqEditor/SeqEditor.xaml b/Plugin.SeqEditor/SeqEditor.xaml
index 0120dad..aa95341 100644
--- a/Plugin.SeqEditor/SeqEditor.xaml
+++ b/Plugin.SeqEditor/SeqEditor.xaml
@@ -36,6 +36,8 @@
<uic:IndentConverter x:Key="IndentConverter"/>
+ <local:RowNumberConverter x:Key="treeNumber"/>
+
<Style TargetType="pu:FormGroup">
<Setter Property="Padding" Value="0,10"/>
<Setter Property="HeaderFontSize" Value="14"/>
@@ -125,18 +127,9 @@
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
- <Setter Property="Background" Value="{StaticResource PrimaryColor}"/>
+ <Setter Property="Background" Value="{DynamicResource PrimaryColor}"/>
</Trigger>
</Style.Triggers>
- </Style>
-
- <Style x:Key="sb" TargetType="ui:TreeDataGrid" BasedOn="{StaticResource DefaultDataGrid}">
- <Setter Property="pu:DataGridHelper.RowHeaderSeparatorVisibility" Value="Visible"/>
- <Setter Property="pu:DataGridHelper.RowHeaderSeparatorBrush" Value="#FFF"/>
- <Setter Property="AreRowDetailsFrozen" Value="False"/>
- <Setter Property="HeadersVisibility" Value="Column"/>
- <Setter Property="DataGridCell.VerticalContentAlignment" Value="Center"/>
- <Setter Property="DataGridCell.HorizontalContentAlignment" Value="Left"/>
</Style>
<Style x:Key="gvh" TargetType="GridViewColumnHeader">
@@ -154,18 +147,16 @@
<Grid dp:GridHelper.Space="10" Cursor="">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
- <RowDefinition Height="Auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
- <ColumnDefinition Width="0"/>
<ColumnDefinition Width="8.5*"/>
<ColumnDefinition Width="1.5*"/>
</Grid.ColumnDefinitions>
- <DockPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Margin="0,0,0,10">
+ <DockPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,0,10">
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal"
- dp:StackPanelHelper.ChildSpace="10">
+ dp:StackPanelHelper.ChildSpace="10" Margin="0,5">
<Button Style="{StaticResource AddBtn}" Content="{DynamicResource se.open}" Command="{Binding OpenSeqFileCommand}"/>
<Button Style="{StaticResource SaveBtn}" Content="{DynamicResource se.save}" Command="{Binding SaveSeqFileCommand}"/>
<Button Style="{StaticResource SaveBtn}" pu:ButtonHelper.Icon=""
@@ -174,13 +165,13 @@
<Button Style="{StaticResource DelBtn}" Content="{DynamicResource se.close}"
pu:ButtonHelper.Icon=""
Command="{Binding CloseSeqFileCommand}"/>
+ <!--<Button Style="{StaticResource DelBtn}" Content="涓�閿睍寮�"
+ x:Name="treeAll"
+ Click="Button_Click"/>-->
</StackPanel>
- <TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}"
- VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource se.title}"/>
-
- <TextBlock DockPanel.Dock="Left" FontSize="{StaticResource ContentFontSize2}"
- Margin="20,0,0,0"
+ <TextBlock DockPanel.Dock="Right" FontSize="{StaticResource ContentFontSize2}"
+ Margin="20,0,20,0"
VerticalAlignment="Bottom" LineHeight="{StaticResource TitleFontSize}" HorizontalAlignment="Left">
<Run Text="{Binding CurrentFileName}"/>
<Run DataContext="{Binding CurrentSeqUI}">
@@ -195,6 +186,20 @@
</Run.Style>
</Run>
</TextBlock>
+
+ <!--<TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}"
+ VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource se.title}"/>-->
+
+ <pu:FormGroup DockPanel.Dock="Left" Header="姝ラ绫诲瀷" Style="{StaticResource InputFormGroupStyle}">
+ <StackPanel Orientation="Horizontal">
+ <ui:MultiComboBox SelectedValues="{Binding TargetType}"
+ pu:ComboBoxHelper.ClearButtonVisibility="Collapsed"
+ Width="450" Margin="0,0,10,0" x:Name="CbFilter" IsEditable="True" IsReadOnly="True" >
+
+ </ui:MultiComboBox>
+ <Button Style="{StaticResource RfhBtn}" Command="{Binding RefreshCommand}"/>
+ </StackPanel>
+ </pu:FormGroup>
</DockPanel>
<!--<pu:FormGroup Header="{DynamicResource se.seq}" Orientation="Vertical" Grid.Row="1" Grid.Column="0">
@@ -208,19 +213,10 @@
</DataGrid.Columns>
</DataGrid>
</pu:FormGroup>-->
- <pu:FormGroup Grid.Row="1" Grid.Column="1" Header="姝ラ绫诲瀷" Style="{StaticResource InputFormGroupStyle}">
- <StackPanel Orientation="Horizontal">
- <ui:MultiComboBox SelectedValues="{Binding TargetType}"
- pu:ComboBoxHelper.ClearButtonVisibility="Collapsed"
- Width="450" Margin="0,0,10,0" x:Name="CbFilter" IsEditable="True" IsReadOnly="True" >
-
- </ui:MultiComboBox>
- <Button Style="{StaticResource RfhBtn}" Command="{Binding RefreshCommand}"/>
- </StackPanel>
- </pu:FormGroup>
- <pu:FormGroup Header="{Binding CurrentSeqTitle}" Orientation="Vertical" Grid.Row="2" Grid.Column="1">
+
+ <pu:FormGroup Header="{Binding CurrentSeqTitle}" Orientation="Vertical" Grid.Row="1" Grid.Column="0">
<!--<DataGrid ItemsSource="{Binding Source={StaticResource cvs}}"
RowStyle="{StaticResource StepRow}"
SelectedItem="{Binding CurrentStepUI}">
@@ -380,9 +376,10 @@
</ui:TreeDataGrid>-->
- <ui:TreeListView Grid.Row="1" Grid.Column="1" ItemsSource="{Binding AllSteps}"
+ <ui:TreeListView Grid.Row="1" Grid.Column="0" ItemsSource="{Binding AllSteps}"
dd:DragDrop.IsDragSource="True"
FontSize="14"
+ x:Name="treeList"
pu:TreeViewHelper.ItemsHeight="{DynamicResource nanD}"
dd:DragDrop.IsDropTarget="True"
dd:DragDrop.DropTargetAdornerBrush="Red"
@@ -457,7 +454,8 @@
Grid.Column="0"
IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ui:TreeListViewItem,AncestorLevel=1}}"
ClickMode="Press"/>
- <TextBlock Margin="5,0,0,0" Padding="6,0" Text="{Binding CustomIndex}"/>
+ <TextBlock Margin="5,0,0,0" Padding="6,0"
+ Text="{Binding CustomIndex}"/>
</StackPanel>
</Border>
@@ -539,7 +537,7 @@
</GridViewColumn>
<GridViewColumn Header="鎻忚堪" HeaderContainerStyle="{StaticResource gvh}"
- Width="400"
+ Width="500"
HeaderTemplate="{StaticResource gvht}">
<GridViewColumn.CellTemplate>
<DataTemplate>
@@ -563,7 +561,7 @@
</pu:FormGroup>
- <StackPanel Grid.Row="2" Grid.Column="2">
+ <StackPanel Grid.Row="1" Grid.Column="1">
<pu:FormGroup Header="{DynamicResource se.propertySetting}" Orientation="Vertical"
Padding="0,10" >
<Border x:Name="editPanelContainer" Background="#FFF">
--
Gitblit v1.9.1