Ling
/
EPLAN_PROD_Plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

105040 Update 优化选型界面布局

This commit is contained in:
lihanbo 2025-04-14 17:58:45 +08:00
parent 588679c3a1
commit 90a766d606
2 changed files with 190 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Sinvo.EplanHpD.Plugin.WPFUI/Datas/Brands.cs
View File

@ -41,7 +41,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Datas
5. 数据表中Sheet名称: 安川 5. 数据表中Sheet名称: 安川
*/ */
{ANCHUAN, {ANCHUAN,
new BrandData{ new BrandData {
Name = ANCHUAN, Name = ANCHUAN,
ComplexLine = false, ComplexLine = false,
SheetName = ANCHUAN, SheetName = ANCHUAN,
@ -61,7 +61,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Datas
5. 数据表中Sheet名称: 汇川 5. 数据表中Sheet名称: 汇川
*/ */
{HUICHUAN, {HUICHUAN,
new BrandData{ new BrandData {
Name = HUICHUAN, Name = HUICHUAN,
ComplexLine = false, ComplexLine = false,
SheetName = HUICHUAN, SheetName = HUICHUAN,
@ -81,7 +81,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Datas
5. 数据表中Sheet名称: HK_KT 5. 数据表中Sheet名称: HK_KT
*/ */
{SANLING_HK_KT, {SANLING_HK_KT,
new BrandData{ new BrandData {
Name = SANLING_HK_KT, Name = SANLING_HK_KT,
ComplexLine = true, ComplexLine = true,
SheetName = SANLING_HK_KT, SheetName = SANLING_HK_KT,

130
Sinvo.EplanHpD.Plugin.WPFUI/View/MultiCoreWire/MultiCoreWireWindow.xaml
View File

@ -25,15 +25,27 @@
<TabItem Header="多芯线选型"> <TabItem Header="多芯线选型">
<Grid Margin="0"> <Grid Margin="0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="180" /> <RowDefinition Height="210" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border <Border
Grid.Row="0" Grid.Row="0"
Margin="0" Margin="10"
VerticalAlignment="Top" VerticalAlignment="Top"
Style="{StaticResource BorderRegion}"> Style="{StaticResource BorderRegion}">
<hc:SimpleStackPanel Orientation="Vertical"> <Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="30" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="200" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<hc:SimpleStackPanel
Grid.Column="0"
VerticalAlignment="Top"
Orientation="Vertical">
<hc:SimpleStackPanel.Resources> <hc:SimpleStackPanel.Resources>
<Style BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock"> <Style BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
<Setter Property="MinWidth" Value="80" /> <Setter Property="MinWidth" Value="80" />
@ -52,7 +64,7 @@
ItemsSource="{Binding ApplicationScenarios}" ItemsSource="{Binding ApplicationScenarios}"
SelectedValue="{Binding ApplicationScenario}" /> SelectedValue="{Binding ApplicationScenario}" />
</hc:SimpleStackPanel> </hc:SimpleStackPanel>
<hc:SimpleStackPanel <!--<hc:SimpleStackPanel
Margin="2" Margin="2"
VerticalAlignment="Center" VerticalAlignment="Center"
Orientation="Horizontal"> Orientation="Horizontal">
@ -65,7 +77,7 @@
<ComboBoxItem Content="插头+端子" /> <ComboBoxItem Content="插头+端子" />
<ComboBoxItem Content="端子+端子" /> <ComboBoxItem Content="端子+端子" />
</hc:ComboBox> </hc:ComboBox>
</hc:SimpleStackPanel> </hc:SimpleStackPanel>-->
</hc:SimpleStackPanel> </hc:SimpleStackPanel>
<hc:SimpleStackPanel HorizontalAlignment="Left" Orientation="Horizontal"> <hc:SimpleStackPanel HorizontalAlignment="Left" Orientation="Horizontal">
<hc:SimpleStackPanel <hc:SimpleStackPanel
@ -75,18 +87,21 @@
Orientation="Horizontal"> Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="线径规格:" /> <TextBlock VerticalAlignment="Center" Text="线径规格:" />
<hc:ComboBox <hc:ComboBox
MinWidth="60" MinWidth="100"
Margin="10,0" Margin="10,0"
ItemsSource="{Binding WireDiameterSpecifications}" ItemsSource="{Binding WireDiameterSpecifications}"
SelectedValue="{Binding WireDiameterSpecification}" /> SelectedValue="{Binding WireDiameterSpecification}" />
</hc:SimpleStackPanel> </hc:SimpleStackPanel>
</hc:SimpleStackPanel>
<hc:SimpleStackPanel HorizontalAlignment="Left" Orientation="Horizontal">
<hc:SimpleStackPanel <hc:SimpleStackPanel
MinWidth="200"
Margin="2" Margin="2"
VerticalAlignment="Center" VerticalAlignment="Center"
Orientation="Horizontal"> Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="是否高柔:" /> <TextBlock VerticalAlignment="Center" Text="是否高柔:" />
<hc:ComboBox <hc:ComboBox
MinWidth="50" MinWidth="100"
Margin="10,0" Margin="10,0"
SelectedValue="{Binding HighFlexibility, Mode=TwoWay}" SelectedValue="{Binding HighFlexibility, Mode=TwoWay}"
SelectedValuePath="Content"> SelectedValuePath="Content">
@ -97,30 +112,120 @@
</hc:SimpleStackPanel> </hc:SimpleStackPanel>
</hc:SimpleStackPanel> </hc:SimpleStackPanel>
<hc:SimpleStackPanel <hc:SimpleStackPanel
MinWidth="200"
VerticalAlignment="Center"
Orientation="Horizontal">
<hc:SimpleStackPanel
MinWidth="200"
Margin="2" Margin="2"
VerticalAlignment="Center" VerticalAlignment="Center"
Orientation="Horizontal"> Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="线芯数量:" /> <TextBlock VerticalAlignment="Center" Text="线芯数量:" />
<hc:ComboBox <hc:ComboBox
MinWidth="30" MinWidth="100"
Margin="10,0" Margin="10,0"
ItemsSource="{Binding WireCores}" ItemsSource="{Binding WireCores}"
SelectedValue="{Binding WireCoreCount}" /> SelectedValue="{Binding WireCoreCount}" />
</hc:SimpleStackPanel> </hc:SimpleStackPanel>
</hc:SimpleStackPanel>
</hc:SimpleStackPanel>
<hc:SimpleStackPanel
Grid.Row="0"
Grid.Column="1"
Margin="2"
VerticalAlignment="Top"
Orientation="Vertical">
<Grid VerticalAlignment="Top">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<GroupBox Grid.Row="0" Grid.Column="0">
<GroupBox.Header>
<TextBlock Text="前" />
</GroupBox.Header>
<hc:SimpleStackPanel
Grid.Row="0"
Grid.Column="0"
Margin="2"
VerticalAlignment="Top"
Orientation="Vertical">
<hc:SimpleStackPanel Orientation="Horizontal">
<TextBlock
MinWidth="70"
VerticalAlignment="Center"
Text="连接物:" />
<hc:ComboBox MinWidth="100" Margin="10,0">
<ComboBoxItem Content="端子" />
<ComboBoxItem Content="插头" />
</hc:ComboBox>
</hc:SimpleStackPanel>
<hc:SimpleStackPanel Orientation="Horizontal">
<TextBlock
MinWidth="70"
VerticalAlignment="Center"
Text="型号:" />
<hc:ComboBox MinWidth="100" Margin="10,0">
<ComboBoxItem Content="端子" />
<ComboBoxItem Content="插头" />
</hc:ComboBox>
</hc:SimpleStackPanel>
</hc:SimpleStackPanel>
</GroupBox>
<GroupBox Grid.Row="0" Grid.Column="1">
<GroupBox.Header>
<TextBlock Text="后" />
</GroupBox.Header>
<hc:SimpleStackPanel Margin="2" Orientation="Vertical">
<hc:SimpleStackPanel Orientation="Horizontal">
<TextBlock
MinWidth="70"
VerticalAlignment="Center"
Text="连接物:" />
<hc:ComboBox MinWidth="100" Margin="10,0">
<ComboBoxItem Content="端子" />
<ComboBoxItem Content="插头" />
</hc:ComboBox>
</hc:SimpleStackPanel>
<hc:SimpleStackPanel Orientation="Horizontal">
<TextBlock
MinWidth="70"
VerticalAlignment="Center"
Text="型号:" />
<hc:ComboBox MinWidth="100" Margin="10,0">
<ComboBoxItem Content="端子" />
<ComboBoxItem Content="插头" />
</hc:ComboBox>
</hc:SimpleStackPanel>
</hc:SimpleStackPanel>
</GroupBox>
</Grid>
<hc:SimpleStackPanel <hc:SimpleStackPanel
Margin="2" Margin="2"
VerticalAlignment="Center" VerticalAlignment="Center"
Orientation="Horizontal"> Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="线材型号:" /> <TextBlock
MinWidth="70"
VerticalAlignment="Center"
Text="线材型号:" />
<hc:ComboBox <hc:ComboBox
MinWidth="100" MinWidth="300"
Margin="10,0" Margin="10,0"
AutoComplete="True" AutoComplete="True"
IsEditable="True" IsEditable="True"
ItemsSource="{Binding WireModelSpecifications}" ItemsSource="{Binding WireModelSpecifications}"
SelectedValue="{Binding WireModelSpecification}" /> SelectedValue="{Binding WireModelSpecification}" />
</hc:SimpleStackPanel> </hc:SimpleStackPanel>
<DockPanel> </hc:SimpleStackPanel>
<DockPanel
Grid.Row="1"
Grid.Column="0"
Grid.ColumnSpan="2">
<hc:SimpleStackPanel <hc:SimpleStackPanel
Margin="2" Margin="2"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -145,7 +250,7 @@
Style="{StaticResource ButtonDanger}" /> Style="{StaticResource ButtonDanger}" />
</hc:SimpleStackPanel> </hc:SimpleStackPanel>
</DockPanel> </DockPanel>
</hc:SimpleStackPanel> </Grid>
</Border> </Border>
<DataGrid <DataGrid
Grid.Row="1" Grid.Row="1"
@ -218,7 +323,6 @@
Margin="10,0" Margin="10,0"
BorderBrush="{Binding WireColorHex}" BorderBrush="{Binding WireColorHex}"
BorderThickness="0,0,0,2"> BorderThickness="0,0,0,2">
<hc:SimpleStackPanel> <hc:SimpleStackPanel>
<TextBlock Margin="2"> <TextBlock Margin="2">
<Run Text="线芯名称：" /> <Run Text="线芯名称：" />