105040 Update 优化选型界面布局
This commit is contained in:
lihanbo
parent
588679c3a1
commit
90a766d606
|
|
@ -41,7 +41,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Datas
|
|||
5. 数据表中Sheet名称: 安川
|
||||
*/
|
||||
{ANCHUAN,
|
||||
new BrandData{
|
||||
new BrandData {
|
||||
Name = ANCHUAN,
|
||||
ComplexLine = false,
|
||||
SheetName = ANCHUAN,
|
||||
|
|
@ -61,7 +61,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Datas
|
|||
5. 数据表中Sheet名称: 汇川
|
||||
*/
|
||||
{HUICHUAN,
|
||||
new BrandData{
|
||||
new BrandData {
|
||||
Name = HUICHUAN,
|
||||
ComplexLine = false,
|
||||
SheetName = HUICHUAN,
|
||||
|
|
@ -81,7 +81,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Datas
|
|||
5. 数据表中Sheet名称: HK_KT
|
||||
*/
|
||||
{SANLING_HK_KT,
|
||||
new BrandData{
|
||||
new BrandData {
|
||||
Name = SANLING_HK_KT,
|
||||
ComplexLine = true,
|
||||
SheetName = SANLING_HK_KT,
|
||||
|
|
|
|||
|
|
@ -25,102 +25,207 @@
|
|||
<TabItem Header="多芯线选型">
|
||||
<Grid Margin="0">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="180" />
|
||||
<RowDefinition Height="210" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Border
|
||||
Grid.Row="0"
|
||||
Margin="0"
|
||||
Margin="10"
|
||||
VerticalAlignment="Top"
|
||||
Style="{StaticResource BorderRegion}">
|
||||
<hc:SimpleStackPanel Orientation="Vertical">
|
||||
<hc:SimpleStackPanel.Resources>
|
||||
<Style BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
|
||||
<Setter Property="MinWidth" Value="80" />
|
||||
</Style>
|
||||
</hc:SimpleStackPanel.Resources>
|
||||
<hc:SimpleStackPanel HorizontalAlignment="Left" Orientation="Horizontal">
|
||||
<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>
|
||||
<Style BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
|
||||
<Setter Property="MinWidth" Value="80" />
|
||||
</Style>
|
||||
</hc:SimpleStackPanel.Resources>
|
||||
<hc:SimpleStackPanel HorizontalAlignment="Left" Orientation="Horizontal">
|
||||
<hc:SimpleStackPanel
|
||||
MinWidth="200"
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock VerticalAlignment="Center" Text="应用场景:" />
|
||||
<hc:ComboBox
|
||||
MinWidth="100"
|
||||
Margin="10,0"
|
||||
ItemsSource="{Binding ApplicationScenarios}"
|
||||
SelectedValue="{Binding ApplicationScenario}" />
|
||||
</hc:SimpleStackPanel>
|
||||
<!--<hc:SimpleStackPanel
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock VerticalAlignment="Center" Text="类型:" />
|
||||
<hc:ComboBox
|
||||
MinWidth="100"
|
||||
Margin="10,0"
|
||||
SelectedValue="{Binding WireType, Mode=TwoWay}"
|
||||
SelectedValuePath="Content">
|
||||
<ComboBoxItem Content="插头+端子" />
|
||||
<ComboBoxItem Content="端子+端子" />
|
||||
</hc:ComboBox>
|
||||
</hc:SimpleStackPanel>-->
|
||||
</hc:SimpleStackPanel>
|
||||
<hc:SimpleStackPanel HorizontalAlignment="Left" Orientation="Horizontal">
|
||||
<hc:SimpleStackPanel
|
||||
MinWidth="200"
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock VerticalAlignment="Center" Text="线径规格:" />
|
||||
<hc:ComboBox
|
||||
MinWidth="100"
|
||||
Margin="10,0"
|
||||
ItemsSource="{Binding WireDiameterSpecifications}"
|
||||
SelectedValue="{Binding WireDiameterSpecification}" />
|
||||
</hc:SimpleStackPanel>
|
||||
</hc:SimpleStackPanel>
|
||||
<hc:SimpleStackPanel HorizontalAlignment="Left" Orientation="Horizontal">
|
||||
<hc:SimpleStackPanel
|
||||
MinWidth="200"
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock VerticalAlignment="Center" Text="是否高柔:" />
|
||||
<hc:ComboBox
|
||||
MinWidth="100"
|
||||
Margin="10,0"
|
||||
SelectedValue="{Binding HighFlexibility, Mode=TwoWay}"
|
||||
SelectedValuePath="Content">
|
||||
<ComboBoxItem Content="是" />
|
||||
<ComboBoxItem Content="否" />
|
||||
<ComboBoxItem Content="" />
|
||||
</hc:ComboBox>
|
||||
</hc:SimpleStackPanel>
|
||||
</hc:SimpleStackPanel>
|
||||
<hc:SimpleStackPanel
|
||||
MinWidth="200"
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock VerticalAlignment="Center" Text="应用场景:" />
|
||||
<hc:ComboBox
|
||||
MinWidth="100"
|
||||
Margin="10,0"
|
||||
ItemsSource="{Binding ApplicationScenarios}"
|
||||
SelectedValue="{Binding ApplicationScenario}" />
|
||||
</hc:SimpleStackPanel>
|
||||
<hc:SimpleStackPanel
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock VerticalAlignment="Center" Text="类型:" />
|
||||
<hc:ComboBox
|
||||
MinWidth="100"
|
||||
Margin="10,0"
|
||||
SelectedValue="{Binding WireType, Mode=TwoWay}"
|
||||
SelectedValuePath="Content">
|
||||
<ComboBoxItem Content="插头+端子" />
|
||||
<ComboBoxItem Content="端子+端子" />
|
||||
</hc:ComboBox>
|
||||
</hc:SimpleStackPanel>
|
||||
</hc:SimpleStackPanel>
|
||||
<hc:SimpleStackPanel HorizontalAlignment="Left" Orientation="Horizontal">
|
||||
<hc:SimpleStackPanel
|
||||
MinWidth="200"
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock VerticalAlignment="Center" Text="线径规格:" />
|
||||
<hc:ComboBox
|
||||
MinWidth="60"
|
||||
Margin="10,0"
|
||||
ItemsSource="{Binding WireDiameterSpecifications}"
|
||||
SelectedValue="{Binding WireDiameterSpecification}" />
|
||||
</hc:SimpleStackPanel>
|
||||
<hc:SimpleStackPanel
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock VerticalAlignment="Center" Text="是否高柔:" />
|
||||
<hc:ComboBox
|
||||
MinWidth="50"
|
||||
Margin="10,0"
|
||||
SelectedValue="{Binding HighFlexibility, Mode=TwoWay}"
|
||||
SelectedValuePath="Content">
|
||||
<ComboBoxItem Content="是" />
|
||||
<ComboBoxItem Content="否" />
|
||||
<ComboBoxItem Content="" />
|
||||
</hc:ComboBox>
|
||||
<hc:SimpleStackPanel
|
||||
MinWidth="200"
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock VerticalAlignment="Center" Text="线芯数量:" />
|
||||
<hc:ComboBox
|
||||
MinWidth="100"
|
||||
Margin="10,0"
|
||||
ItemsSource="{Binding WireCores}"
|
||||
SelectedValue="{Binding WireCoreCount}" />
|
||||
</hc:SimpleStackPanel>
|
||||
|
||||
</hc:SimpleStackPanel>
|
||||
</hc:SimpleStackPanel>
|
||||
<hc:SimpleStackPanel
|
||||
Grid.Row="0"
|
||||
Grid.Column="1"
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock VerticalAlignment="Center" Text="线芯数量:" />
|
||||
<hc:ComboBox
|
||||
MinWidth="30"
|
||||
Margin="10,0"
|
||||
ItemsSource="{Binding WireCores}"
|
||||
SelectedValue="{Binding WireCoreCount}" />
|
||||
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
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock
|
||||
MinWidth="70"
|
||||
VerticalAlignment="Center"
|
||||
Text="线材型号:" />
|
||||
<hc:ComboBox
|
||||
MinWidth="300"
|
||||
Margin="10,0"
|
||||
AutoComplete="True"
|
||||
IsEditable="True"
|
||||
ItemsSource="{Binding WireModelSpecifications}"
|
||||
SelectedValue="{Binding WireModelSpecification}" />
|
||||
</hc:SimpleStackPanel>
|
||||
</hc:SimpleStackPanel>
|
||||
<hc:SimpleStackPanel
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock VerticalAlignment="Center" Text="线材型号:" />
|
||||
<hc:ComboBox
|
||||
MinWidth="100"
|
||||
Margin="10,0"
|
||||
AutoComplete="True"
|
||||
IsEditable="True"
|
||||
ItemsSource="{Binding WireModelSpecifications}"
|
||||
SelectedValue="{Binding WireModelSpecification}" />
|
||||
</hc:SimpleStackPanel>
|
||||
<DockPanel>
|
||||
<DockPanel
|
||||
Grid.Row="1"
|
||||
Grid.Column="0"
|
||||
Grid.ColumnSpan="2">
|
||||
<hc:SimpleStackPanel
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
|
|
@ -145,7 +250,7 @@
|
|||
Style="{StaticResource ButtonDanger}" />
|
||||
</hc:SimpleStackPanel>
|
||||
</DockPanel>
|
||||
</hc:SimpleStackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
<DataGrid
|
||||
Grid.Row="1"
|
||||
|
|
@ -218,7 +323,6 @@
|
|||
Margin="10,0"
|
||||
BorderBrush="{Binding WireColorHex}"
|
||||
BorderThickness="0,0,0,2">
|
||||
|
||||
<hc:SimpleStackPanel>
|
||||
<TextBlock Margin="2">
|
||||
<Run Text="线芯名称：" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue