From 7bcddb17022cc92f0b879c66f7368feac969761c Mon Sep 17 00:00:00 2001
From: lihanbo <lihanbo@sinvo.cn>
Date: Thu, 5 Dec 2024 14:15:08 +0800
Subject: [PATCH] =?UTF-8?q?105040=20=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/CableLectotypeWindow.xaml            |   2 +-
 .../View/LayoutHelperWindow.xaml              | 145 +++++++++---------
 .../View/LectotypeWindow.xaml                 |  13 +-
 .../View/LectotypeWindow.xaml.cs              |  32 +++-
 4 files changed, 112 insertions(+), 80 deletions(-)

diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotypeWindow.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotypeWindow.xaml
index 7692caa..9f8aee4 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotypeWindow.xaml
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotypeWindow.xaml
@@ -227,7 +227,7 @@
                 VirtualizingPanel.ScrollUnit="Pixel">
                 <DataGrid.RowStyle>
                     <Style BasedOn="{StaticResource DataGridRowStyle}" TargetType="DataGridRow">
-                        <Setter Property="Foreground" Value="White" />
+                        <Setter Property="Foreground" Value="{StaticResource LightPrimaryBrush}" />
                         <Setter Property="Background" Value="#18a05d" />
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding DrawingNo}" Value="">
diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/LayoutHelperWindow.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/View/LayoutHelperWindow.xaml
index 8ba1bad..0cfbf4c 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/View/LayoutHelperWindow.xaml
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/LayoutHelperWindow.xaml
@@ -1,4 +1,4 @@
-<Window
+<hc:GlowWindow
     x:Class="Sinvo.EplanHpD.Plugin.WPFUI.View.LayoutHelperWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -11,6 +11,8 @@
     Height="230"
     MinWidth="450"
     MinHeight="230"
+    ActiveGlowColor="{DynamicResource PrimaryColor}"
+    Background="White"
     mc:Ignorable="d">
     <Window.Resources>
         <ResourceDictionary>
@@ -19,71 +21,76 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
-    <Grid Margin="2">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="15" />
-            <RowDefinition Height="30" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="30" />
-            <RowDefinition Height="30" />
-        </Grid.RowDefinitions>
-        <hc:SimpleStackPanel Grid.Row="0" Orientation="Horizontal">
-            <TextBlock FontSize="14" TextWrapping="Wrap">
-                <Run Text="选中的电机：" />
-                <Run Foreground="{StaticResource DangerBrush}" Text="HK-KT103WJK" />
-            </TextBlock>
-            <TextBlock
-                Margin="5,0,0,0"
-                FontSize="14"
-                TextWrapping="Wrap">
-                <Run Text="当前布线的电机：" />
-                <Run Foreground="{StaticResource DangerBrush}" Text="HK-KT103WJK" />
-            </TextBlock>
-        </hc:SimpleStackPanel>
-        <StackPanel Grid.Row="1" VerticalAlignment="Center">
-            <TextBlock VerticalAlignment="Center" FontSize="14">
-                <Run Text="当前线段：" />
-                <Run Foreground="{StaticResource DangerBrush}" Text="前段" />
-                <Run Text="当前线类型：" />
-                <Run Foreground="{StaticResource DangerBrush}" Text="编码器线+动力线" />
-                <Run Text="轴号：" />
-                <Run Foreground="{StaticResource DangerBrush}" Text="MRJ001" />
-            </TextBlock>
-        </StackPanel>
-        <ListView Grid.Row="2">
-            <ListView.View>
-                <GridView hc:GridViewAttach.ColumnHeaderHeight="15">
-                    <GridViewColumn Width="100" Header="线类型" />
-                    <GridViewColumn Width="100" Header="线型号" />
-                    <GridViewColumn Width="100" Header="查看图纸" />
-                </GridView>
-            </ListView.View>
-            <ListViewItem Content="12312" />
-        </ListView>
-        <hc:SimpleStackPanel Grid.Row="3">
-            <TextBlock TextWrapping="Wrap">
-                <Run Text="选中的线：" />
-            </TextBlock>
-            <TextBlock>
-                <Run Text="三菱伺服编码器线 TRVVSP3×2×0.2-2000W-CE／定制(带DB9公头)电机" />
-            </TextBlock>
-        </hc:SimpleStackPanel>
-        <hc:SimpleStackPanel Grid.Row="4" VerticalAlignment="Bottom">
-            <DockPanel HorizontalAlignment="Stretch">
-                <Button
-                    Content="上一根线"
-                    DockPanel.Dock="Left"
-                    Style="{StaticResource ButtonDanger}" />
-                <Button
-                    HorizontalAlignment="Right"
-                    Content="下一根线"
-                    DockPanel.Dock="Right"
-                    Style="{StaticResource ButtonPrimary}" />
-                <Button
-                    Content="MRJ001-1"
-                    DockPanel.Dock="Right"
-                    Style="{StaticResource ButtonSuccess}" />
-            </DockPanel>
-        </hc:SimpleStackPanel>
-    </Grid>
-</Window>
+    <Border Background="{DynamicResource MainContentForegroundDrawingBrush}">
+        <Grid Margin="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="15" />
+                <RowDefinition Height="30" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="30" />
+                <RowDefinition Height="30" />
+            </Grid.RowDefinitions>
+            <hc:SimpleStackPanel Grid.Row="0" Orientation="Horizontal">
+                <TextBlock FontSize="14" TextWrapping="Wrap">
+                    <Run Text="选中的电机：" />
+                    <Run Foreground="{StaticResource DangerBrush}" Text="HK-KT103WJK" />
+                </TextBlock>
+                <TextBlock
+                    Margin="5,0,0,0"
+                    FontSize="14"
+                    TextWrapping="Wrap">
+                    <Run Text="当前布线的电机：" />
+                    <Run Foreground="{StaticResource DangerBrush}" Text="HK-KT103WJK" />
+                </TextBlock>
+            </hc:SimpleStackPanel>
+            <StackPanel Grid.Row="1" VerticalAlignment="Center">
+                <TextBlock VerticalAlignment="Center" FontSize="14">
+                    <Run Text="当前线段：" />
+                    <Run Foreground="{StaticResource DangerBrush}" Text="前段" />
+                    <Run Text="当前线类型：" />
+                    <Run Foreground="{StaticResource DangerBrush}" Text="编码器线+动力线" />
+                    <Run Text="轴号：" />
+                    <Run Foreground="{StaticResource DangerBrush}" Text="MRJ001" />
+                </TextBlock>
+            </StackPanel>
+            <ListView
+                Grid.Row="2"
+                hc:GridViewAttach.ColumnHeaderHeight="10"
+                Style="{StaticResource ListView.Small}">
+                <ListView.View>
+                    <GridView>
+                        <GridViewColumn Width="100" Header="线类型" />
+                        <GridViewColumn Width="200" Header="线型号" />
+                        <GridViewColumn Width="50" Header="图纸" />
+                    </GridView>
+                </ListView.View>
+                <ListViewItem Content="1231211111111111111" />
+            </ListView>
+            <hc:SimpleStackPanel Grid.Row="3">
+                <TextBlock TextWrapping="Wrap">
+                    <Run Text="选中的线：" />
+                </TextBlock>
+                <TextBlock>
+                    <Run Text="三菱伺服编码器线 TRVVSP3×2×0.2-2000W-CE／定制(带DB9公头)电机" />
+                </TextBlock>
+            </hc:SimpleStackPanel>
+            <hc:SimpleStackPanel Grid.Row="4" VerticalAlignment="Bottom">
+                <DockPanel HorizontalAlignment="Stretch">
+                    <Button
+                        Content="上一根线"
+                        DockPanel.Dock="Left"
+                        Style="{StaticResource ButtonDanger}" />
+                    <Button
+                        HorizontalAlignment="Right"
+                        Content="下一根线"
+                        DockPanel.Dock="Right"
+                        Style="{StaticResource ButtonPrimary}" />
+                    <Button
+                        Content="MRJ001-1"
+                        DockPanel.Dock="Right"
+                        Style="{StaticResource ButtonSuccess}" />
+                </DockPanel>
+            </hc:SimpleStackPanel>
+        </Grid>
+    </Border>
+</hc:GlowWindow>
diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml
index 328f6ef..4c3da21 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml
@@ -184,6 +184,7 @@
                         x:Name="MotorListView"
                         Padding="0"
                         HorizontalContentAlignment="Stretch"
+                        Focusable="True"
                         ItemsSource="{Binding Motors}"
                         ScrollViewer.CanContentScroll="False"
                         VirtualizingPanel.ScrollUnit="Pixel">
@@ -191,7 +192,11 @@
                             <Style BasedOn="{StaticResource ListBoxItemBaseStyle}" TargetType="ListBoxItem">
                                 <Setter Property="Padding" Value="0" />
                                 <Setter Property="Margin" Value="0" />
-
+                                <Style.Triggers>
+                                    <Trigger Property="IsSelected" Value="True">
+                                        <Setter Property="Background" Value="#f5f5f5" />
+                                    </Trigger>
+                                </Style.Triggers>
                             </Style>
                         </ListBox.ItemContainerStyle>
                         <ListBox.Resources>
@@ -202,7 +207,7 @@
 
                                 <Style.Triggers>
                                     <Trigger Property="IsExpanded" Value="True">
-                                        <Setter Property="Foreground" Value="{StaticResource LightPrimaryBrush}" />
+                                        <Setter Property="Foreground" Value="{StaticResource PrimaryTextBrush}" />
                                         <Setter Property="Background" Value="Transparent" />
                                     </Trigger>
                                     <DataTrigger Binding="{Binding IsError}" Value="True">
@@ -267,6 +272,10 @@
                                                 Orientation="Horizontal">
                                                 <!--  Click="SelectedLectotype_Click"  -->
                                                 <ToggleButton Content="展开线材选型" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=Expander}}" />
+                                                <Button
+                                                    Margin="10,0,0,0"
+                                                    Click="MotorListViewToMotorSourceMenuItem_Click"
+                                                    Content="查看3D中电机" />
                                             </StackPanel>
                                         </Grid>
                                     </Expander.Header>
diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs
index 4286bbb..b059ee9 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs
@@ -86,14 +86,14 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI
             LoadingMask.Visibility = Visibility.Visible;
             ViewModel.GetMotors().ContinueWith(x =>
             {
-                ViewModel.LoadData()
-                   .ContinueWith(x =>
-                   {
-                       this.Dispatcher.BeginInvoke(delegate ()
-                       {
-                           LoadingMask.Visibility = Visibility.Collapsed;
-                       });
-                   });
+                //ViewModel.LoadData()
+                //   .ContinueWith(x =>
+                //   {
+                this.Dispatcher.BeginInvoke(delegate ()
+                {
+                    LoadingMask.Visibility = Visibility.Collapsed;
+                });
+                //});
             });
 
         }
@@ -393,7 +393,23 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI
 
         private void MotorListViewToMotorSourceMenuItem_Click(object sender, RoutedEventArgs e)
         {
+            var selectItem = MotorListView.SelectedItem;
+            if (selectItem is MotorModel motor)
+            {
+                var motorModelPartId = motor?.OccPartId;
 
+                //var cableName = model.IsComplexLine ? model.CableName.Split('/')[1] : model.CableName;
+                //if (string.IsNullOrEmpty(motorModelPartId))
+                //{
+                //    FlexMessageBox.ShowText(FlexMessageBox.Type.INFO, "未获取到电机名称");
+                //}
+                //else
+                {
+
+                    ViewModel.ToMotorSource(motorModelPartId, "");
+                }
+                //}
+            }
         }
 
         private void MotorListViewToCableLectotype_Click(object sender, RoutedEventArgs e)