From 90a766d606ba33f9974d71f79874d5bce24ac286 Mon Sep 17 00:00:00 2001
From: lihanbo <lihanbo@sinvo.cn>
Date: Mon, 14 Apr 2025 17:58:45 +0800
Subject: [PATCH] =?UTF-8?q?105040=20Update=20=E4=BC=98=E5=8C=96=E9=80=89?=
 =?UTF-8?q?=E5=9E=8B=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sinvo.EplanHpD.Plugin.WPFUI/Datas/Brands.cs   |   6 +-
 .../MultiCoreWire/MultiCoreWireWindow.xaml    | 270 ++++++++++++------
 2 files changed, 190 insertions(+), 86 deletions(-)

diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/Datas/Brands.cs b/Sinvo.EplanHpD.Plugin.WPFUI/Datas/Brands.cs
index b576dac..c25a734 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/Datas/Brands.cs
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/Datas/Brands.cs
@@ -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,
diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/MultiCoreWire/MultiCoreWireWindow.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/View/MultiCoreWire/MultiCoreWireWindow.xaml
index a182168..9aa4ad0 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/View/MultiCoreWire/MultiCoreWireWindow.xaml
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/MultiCoreWire/MultiCoreWireWindow.xaml
@@ -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="线芯名称：" />