From c4a3f8db90530a727ffab77c3bb5bb7d782792bf Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 25 八月 2025 15:50:27 +0800
Subject: [PATCH] 上传代码；
---
Plugin.SeqEditor/SeqEditor.xaml | 107 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 80 insertions(+), 27 deletions(-)
diff --git a/Plugin.SeqEditor/SeqEditor.xaml b/Plugin.SeqEditor/SeqEditor.xaml
index 0867528..0120dad 100644
--- a/Plugin.SeqEditor/SeqEditor.xaml
+++ b/Plugin.SeqEditor/SeqEditor.xaml
@@ -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:Plugin.SeqEditor"
+ xmlns:sp="clr-namespace:Plugin.SeqEditor.SettingPanel"
mc:Ignorable="d"
xmlns:hcu="clr-namespace:HMI.Core.Util;assembly=HMI.Core"
xmlns:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
@@ -30,6 +31,8 @@
<ResourceDictionary Source="/HMI.UI;component/Controls/TreeGrid/Themes/TreeItemContentControl.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Controls/TreeGrid/Themes/TreeGrid.xaml"/>
</ResourceDictionary.MergedDictionaries>
+
+ <x:Static x:Key="runModeResource" Member="util:RunModeData.ItemSource"/>
<uic:IndentConverter x:Key="IndentConverter"/>
@@ -156,8 +159,8 @@
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0"/>
- <ColumnDefinition Width="8*"/>
- <ColumnDefinition Width="2*"/>
+ <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">
@@ -379,6 +382,8 @@
<ui:TreeListView Grid.Row="1" Grid.Column="1" ItemsSource="{Binding AllSteps}"
dd:DragDrop.IsDragSource="True"
+ FontSize="14"
+ pu:TreeViewHelper.ItemsHeight="{DynamicResource nanD}"
dd:DragDrop.IsDropTarget="True"
dd:DragDrop.DropTargetAdornerBrush="Red"
dd:DragDrop.DropHandler="{Binding StepDropHandler}"
@@ -393,11 +398,12 @@
</i:Interaction.Triggers>
<ui:TreeListView.Resources>
<Style x:Key="CellBorder" TargetType="Border">
- <Setter Property="Padding" Value="5"/>
+ <Setter Property="Padding" Value="2"/>
<Setter Property="BorderBrush" Value="{DynamicResource CommonBoarder}"/>
<Setter Property="BorderThickness" Value="1,0,0,1"/>
<Setter Property="Margin" Value="-6,0"/>
</Style>
+ <Style TargetType="ScrollBar" BasedOn="{StaticResource ScrollStyle_Mobile}"/>
</ui:TreeListView.Resources>
<ui:TreeListView.Style>
@@ -405,6 +411,7 @@
<Setter Property="pu:TreeViewHelper.ToggleArrowToggleButtonStyle" Value="{StaticResource TreeTogg}"/>
<Setter Property="pu:TreeViewHelper.ItemsPadding" Value="0"/>
<Setter Property="Background" Value="#FFF"/>
+ <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
<Setter Property="ColumnHeaderContainerStyle" Value="{StaticResource gvh}"/>
<Setter Property="Template">
<Setter.Value>
@@ -437,19 +444,20 @@
</ui:TreeListView.Style>
<ui:TreeListView.Columns>
- <GridViewColumn Header="鍚嶇О" HeaderContainerStyle="{StaticResource gvh}"
+ <GridViewColumn Header="搴忓彿" HeaderContainerStyle="{StaticResource gvh}"
+ Width="80"
HeaderTemplate="{StaticResource gvht}">
<GridViewColumn.CellTemplate>
<DataTemplate>
<Border Style="{StaticResource CellBorder}">
- <StackPanel Orientation="Horizontal">
+ <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<ToggleButton x:Name="Expander"
Style="{StaticResource ExpandCollapseToggleStyle}"
Margin="{Binding level,Converter={StaticResource IndentConverter},RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ui:TreeListViewItem,AncestorLevel=1}}"
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 Name}"/>
+ <TextBlock Margin="5,0,0,0" Padding="6,0" Text="{Binding CustomIndex}"/>
</StackPanel>
</Border>
@@ -465,8 +473,62 @@
</GridViewColumn.CellTemplate>
</GridViewColumn>
- <GridViewColumn Header="绫诲瀷" HeaderContainerStyle="{StaticResource gvh}"
+ <GridViewColumn Header="鍚嶇О" HeaderContainerStyle="{StaticResource gvh}"
+ Width="200"
HeaderTemplate="{StaticResource gvht}">
+ <GridViewColumn.CellTemplate>
+ <DataTemplate>
+ <Border Style="{StaticResource CellBorder}">
+ <TextBlock Margin="5,0,0,0" Padding="6,0" Text="{Binding Name}"/>
+ </Border>
+ </DataTemplate>
+ </GridViewColumn.CellTemplate>
+ </GridViewColumn>
+
+ <GridViewColumn Header="{DynamicResource se.runMode}"
+ Width="100"
+ HeaderContainerStyle="{StaticResource gvh}"
+ HeaderTemplate="{StaticResource gvht}">
+ <GridViewColumn.CellTemplate>
+ <DataTemplate>
+ <Border Style="{StaticResource CellBorder}">
+ <!--<TextBlock Padding="6,0" Text="{Binding RunMode}"/>-->
+ <ui:TableComboBox CanEdit="True"
+ DisplayMemberPath="DisplayName" SelectedValuePath="DataValue"
+ ItemsSource="{StaticResource runModeResource}"
+ Value="{Binding RunMode,Mode=TwoWay}"/>
+ </Border>
+ </DataTemplate>
+ </GridViewColumn.CellTemplate>
+ </GridViewColumn>
+
+ <GridViewColumn Header="Low" HeaderContainerStyle="{StaticResource gvh}"
+ Width="300"
+ HeaderTemplate="{StaticResource gvht}">
+ <GridViewColumn.CellTemplate>
+ <DataTemplate>
+ <Border Style="{StaticResource CellBorder}">
+ <ui:EditBox Value="{Binding Low,Mode=TwoWay}" CanEdit="{Binding HasLow}"/>
+ </Border>
+ </DataTemplate>
+ </GridViewColumn.CellTemplate>
+ </GridViewColumn>
+
+ <GridViewColumn Header="High" HeaderContainerStyle="{StaticResource gvh}"
+ Width="300"
+HeaderTemplate="{StaticResource gvht}">
+ <GridViewColumn.CellTemplate>
+ <DataTemplate>
+ <Border Style="{StaticResource CellBorder}">
+ <ui:EditBox Value="{Binding High,Mode=TwoWay}" CanEdit="{Binding HasHigh}"/>
+ </Border>
+ </DataTemplate>
+ </GridViewColumn.CellTemplate>
+ </GridViewColumn>
+
+ <GridViewColumn Header="绫诲瀷" HeaderContainerStyle="{StaticResource gvh}"
+ Width="120"
+ HeaderTemplate="{StaticResource gvht}">
<GridViewColumn.CellTemplate>
<DataTemplate>
<Border Style="{StaticResource CellBorder}">
@@ -477,24 +539,12 @@
</GridViewColumn>
<GridViewColumn Header="鎻忚堪" HeaderContainerStyle="{StaticResource gvh}"
- HeaderTemplate="{StaticResource gvht}">
- <GridViewColumn.CellTemplate>
- <DataTemplate>
- <Border Style="{StaticResource CellBorder}">
- <TextBlock Padding="6,0" Text="{Binding Description}"/>
- </Border>
- </DataTemplate>
- </GridViewColumn.CellTemplate>
- </GridViewColumn>
-
- <GridViewColumn Header="{DynamicResource se.runMode}"
- Width="80"
- HeaderContainerStyle="{StaticResource gvh}"
- HeaderTemplate="{StaticResource gvht}">
+ Width="400"
+ HeaderTemplate="{StaticResource gvht}">
<GridViewColumn.CellTemplate>
<DataTemplate>
<Border Style="{StaticResource CellBorder}" BorderThickness="1,0,1,1">
- <TextBlock Padding="6,0" Text="{Binding RunMode}"/>
+ <TextBlock Padding="6,0" Text="{Binding Description}"/>
</Border>
</DataTemplate>
</GridViewColumn.CellTemplate>
@@ -513,11 +563,14 @@
</pu:FormGroup>
- <pu:FormGroup Header="{DynamicResource se.propertySetting}" Orientation="Vertical"
- Grid.Row="2" Padding="0,10" Grid.Column="2">
- <Border x:Name="editPanelContainer" Background="#FFF">
- </Border>
- </pu:FormGroup>
+ <StackPanel Grid.Row="2" Grid.Column="2">
+ <pu:FormGroup Header="{DynamicResource se.propertySetting}" Orientation="Vertical"
+ Padding="0,10" >
+ <Border x:Name="editPanelContainer" Background="#FFF">
+ </Border>
+ </pu:FormGroup>
+ <sp:LoopPanel x:Name="loopPanel" DataContext="{Binding CurrentStepUI}"/>
+ </StackPanel>
</Grid>
</Border>
</hb:PluginControl>
--
Gitblit v1.9.1