diff --git a/SuperCom/AvalonEdit/SearchPanel/SearchPanel.xaml b/SuperCom/AvalonEdit/SearchPanel/SearchPanel.xaml
index c3a7ed9..2c6280c 100644
--- a/SuperCom/AvalonEdit/SearchPanel/SearchPanel.xaml
+++ b/SuperCom/AvalonEdit/SearchPanel/SearchPanel.xaml
@@ -255,7 +255,7 @@
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Data="M610.218667 505.6l398.08-387.413333a49.664 49.664 0 0 0 0-71.338667l-2.133334-2.133333a52.992 52.992 0 0 0-73.301333 0L534.784 432.64 136.704 44.373333a52.992 52.992 0 0 0-73.386667 0L61.269333 46.592a48.810667 48.810667 0 0 0 0 71.338667l398.165334 387.669333-398.165334 387.498667a49.664 49.664 0 0 0 0 71.253333l2.218667 2.133333c20.48 19.626667 52.821333 19.626667 73.301333 0l398.08-387.413333 398.08 387.413333c20.48 19.626667 52.906667 19.626667 73.386667 0l2.048-2.133333a49.664 49.664 0 0 0 0-71.253333l-398.08-387.413334z"
-                                        Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                        Fill="{DynamicResource Window.Foreground}" />
                                 </Viewbox>
                             </Button>
                         </Grid>
diff --git a/SuperCom/Config/UrlManager.cs b/SuperCom/Config/UrlManager.cs
index 3034f22..95ffca6 100644
--- a/SuperCom/Config/UrlManager.cs
+++ b/SuperCom/Config/UrlManager.cs
@@ -16,6 +16,7 @@ public static class UrlManager
         public static Dictionary<string, UpgradeSource> UpgradeSourceDict = new Dictionary<string, UpgradeSource>()
         {
             {"Github",new UpgradeSource("https://superstudio.github.io/","https://github.com/SuperStudio/SuperCom/releases","SuperCom-Upgrade") },
+            {"StormGit加速",new UpgradeSource("https://venomplum-54uhej.stormkit.dev/","https://github.com/SuperStudio/SuperCom/releases","") },
             {"Github加速",new UpgradeSource("https://cdn.jsdelivr.net/gh/SuperStudio/","https://gitee.com/SuperStudio/SuperCom/releases","SuperCom-Upgrade") },
         };
 
diff --git a/SuperCom/Config/WindowConfig/Main.cs b/SuperCom/Config/WindowConfig/Main.cs
index d649dc6..0293e61 100644
--- a/SuperCom/Config/WindowConfig/Main.cs
+++ b/SuperCom/Config/WindowConfig/Main.cs
@@ -63,6 +63,16 @@ public bool ShowRightPanel
         #region "AvalonText 相关配置"
 
 
+        private bool _AutoWrap = false;
+        public bool AutoWrap
+        {
+            get { return _AutoWrap; }
+            set
+            {
+                _AutoWrap = value;
+                RaisePropertyChanged();
+            }
+        }
         private bool _ShowEndOfLine = false;
         public bool ShowEndOfLine
         {
diff --git a/SuperCom/Entity/CustomSerialPort.cs b/SuperCom/Entity/CustomSerialPort.cs
index b459b51..7c6ba4b 100644
--- a/SuperCom/Entity/CustomSerialPort.cs
+++ b/SuperCom/Entity/CustomSerialPort.cs
@@ -12,6 +12,9 @@ namespace SuperCom.Entity
 {
     public class CustomSerialPort : SerialPort, INotifyPropertyChanged
     {
+
+        public const int CLOSE_TIME_OUT = 5;
+
         public event PropertyChangedEventHandler PropertyChanged;
         protected void RaisePropertyChanged([CallerMemberName] string name = null)
         {
diff --git a/SuperCom/MainWindow.xaml b/SuperCom/MainWindow.xaml
index a54840d..e6b9f79 100644
--- a/SuperCom/MainWindow.xaml
+++ b/SuperCom/MainWindow.xaml
@@ -129,9 +129,14 @@
                                 Style="{StaticResource TitleButton}">
                                 <Button.ContextMenu>
                                     <ContextMenu
+                                        Background="{DynamicResource Menu.Background}"
                                         HorizontalOffset="-40"
                                         StaysOpen="True"
                                         VerticalOffset="10">
+                                        <MenuItem
+                                            Header="自动换行"
+                                            IsCheckable="True"
+                                            IsChecked="{Binding AutoWrap, Source={x:Static config:ConfigManager.Main}}" />
                                         <MenuItem
                                             Name="FontMenuItem"
                                             Header="字体"
@@ -213,10 +218,10 @@
                                             Header="侧边栏"
                                             IsCheckable="True"
                                             IsChecked="True" />
-                                        <MenuItem
+                                        <!--<MenuItem
                                             Header="右侧功能栏"
                                             IsCheckable="True"
-                                            IsChecked="{Binding ShowRightPanel, Source={x:Static config:ConfigManager.Main}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                            IsChecked="{Binding ShowRightPanel, Source={x:Static config:ConfigManager.Main}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />-->
 
                                     </ContextMenu>
                                 </Button.ContextMenu>
@@ -301,7 +306,7 @@
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Data="M585.246075 875.340272l408.227201-447.966132c57.440818-63.040395 12.824837-164.374669-72.613865-164.374669H104.224378c-85.25807 0-130.054683 101.334274-72.613865 164.374669l408.407832 447.7855c39.016405 42.809667 106.211325 42.809667 145.22773 0.180632z"
-                                        Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                        Fill="{DynamicResource Window.Foreground}" />
                                 </Viewbox>
                             </Button>
 
@@ -560,7 +565,7 @@
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Data="M758.35 121.71H704.7c-14.19 0-27.88 6.14-37.04 17.11-27.48 32.81-106.09 54.05-155.61 54.05s-128.13-21.24-155.61-54.05c-9.26-10.98-22.85-17.11-37.04-17.11h-53.75c-13.08 0-25.57 5.23-34.83 14.7L52.56 317.69c-11.48 11.67-11.48 30.5 0 42.17l108.7 110.62c11.48 11.68 30 11.68 41.47 0l3.62-3.62c3.93-3.93 10.57-1.21 10.57 4.43V856.9c0 25.06 19.93 45.39 44.59 45.39h500.95c24.66 0 44.59-20.33 44.59-45.39V471.19c0-5.64 6.64-8.46 10.57-4.43l3.62 3.63c11.48 11.67 30 11.67 41.47 0l108.7-110.62c11.48-11.67 11.48-30.5 0-42.17L793.18 136.31c-9.26-9.36-21.84-14.6-34.83-14.6z"
-                                    Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                    Fill="{DynamicResource Window.Foreground}" />
                             </Viewbox>
                         </Button>
 
@@ -581,7 +586,7 @@
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Data="M512 0h6144c307.2 0 512 204.8 512 512s-204.8 512-512 512H512c-307.2 0-512-204.8-512-512s204.8-512 512-512z"
-                                    Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                    Fill="{DynamicResource Window.Foreground}" />
                             </Viewbox>
                         </Button>
                         <Button
@@ -602,7 +607,7 @@
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Data="M834.688 1024H189.312A189.568 189.568 0 0 1 0 834.688V189.312A189.568 189.568 0 0 1 189.312 0h645.376A189.568 189.568 0 0 1 1024 189.312v645.376A189.482667 189.482667 0 0 1 834.688 1024zM189.312 99.712a89.6 89.6 0 0 0-89.6 89.6v645.376a89.6 89.6 0 0 0 89.6 89.6h645.376a89.6 89.6 0 0 0 89.6-89.6V189.312a89.6 89.6 0 0 0-89.6-89.6z"
-                                    Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                    Fill="{DynamicResource Window.Foreground}" />
                             </Viewbox>
                         </Button>
                         <Button
@@ -621,7 +626,7 @@
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Data="M610.218667 505.6l398.08-387.413333a49.664 49.664 0 0 0 0-71.338667l-2.133334-2.133333a52.992 52.992 0 0 0-73.301333 0L534.784 432.64 136.704 44.373333a52.992 52.992 0 0 0-73.386667 0L61.269333 46.592a48.810667 48.810667 0 0 0 0 71.338667l398.165334 387.669333-398.165334 387.498667a49.664 49.664 0 0 0 0 71.253333l2.218667 2.133333c20.48 19.626667 52.821333 19.626667 73.301333 0l398.08-387.413333 398.08 387.413333c20.48 19.626667 52.906667 19.626667 73.386667 0l2.048-2.133333a49.664 49.664 0 0 0 0-71.253333l-398.08-387.413334z"
-                                    Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                    Fill="{DynamicResource Window.Foreground}" />
                             </Viewbox>
                         </Button>
                     </StackPanel>
@@ -664,7 +669,7 @@
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Data="M848.738462 608.137846c-8.467692 178.097231-155.963077 319.881846-336.659693 319.881846-186.171077 0-337.132308-150.449231-337.132307-336.068923 0-180.145231 142.178462-327.168 320.787692-335.675077v159.82277l353.122461-192.039385L495.734154 0v160.098462C263.995077 168.684308 78.769231 358.754462 78.769231 591.872 78.769231 830.542769 272.777846 1024 512.157538 1024 746.062769 1024 936.644923 839.286154 945.230769 608.137846h-96.492307z"
-                                        Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                        Fill="{DynamicResource Window.Foreground}" />
                                 </Viewbox>
                             </Border>
 
@@ -684,7 +689,7 @@
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Data="M464 144H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16z m-52 268H212V212h200v200z m452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16z m-52 268H612V212h200v200zM464 544H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16z m-52 268H212V612h200v200z m452-268H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16z m-52 268H612V612h200v200z"
-                                        Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                        Fill="{DynamicResource Window.Foreground}" />
                                 </Viewbox>
                             </Border>
                             <Border
@@ -710,7 +715,7 @@
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Data="M768 362.666667a21.333333 21.333333 0 0 1 21.333333 21.333333v387.648l61.418667-61.397333a21.333333 21.333333 0 0 1 30.165333 0l30.165334 30.165333a21.333333 21.333333 0 0 1 0 30.165333l-116.053334 116.053334a53.333333 53.333333 0 0 1-90.922666-34.218667L704 848.917333V384a21.333333 21.333333 0 0 1 21.333333-21.333333h42.666667zM554.666667 789.333333a21.333333 21.333333 0 0 1 21.333333 21.333334v42.666666a21.333333 21.333333 0 0 1-21.333333 21.333334H128a21.333333 21.333333 0 0 1-21.333333-21.333334v-42.666666a21.333333 21.333333 0 0 1 21.333333-21.333334h426.666667z m0-320a21.333333 21.333333 0 0 1 21.333333 21.333334v42.666666a21.333333 21.333333 0 0 1-21.333333 21.333334H128a21.333333 21.333333 0 0 1-21.333333-21.333334v-42.666666a21.333333 21.333333 0 0 1 21.333333-21.333334h426.666667zM896 149.333333a21.333333 21.333333 0 0 1 21.333333 21.333334v42.666666a21.333333 21.333333 0 0 1-21.333333 21.333334H128a21.333333 21.333333 0 0 1-21.333333-21.333334V170.666667a21.333333 21.333333 0 0 1 21.333333-21.333334h768z"
-                                        Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                        Fill="{DynamicResource Window.Foreground}" />
                                 </Viewbox>
                             </Border>
 
@@ -850,7 +855,7 @@
                                                 Click="OpenDonate"
                                                 Header="为我充电"
                                                 Icon="/Resources/Pictures/donate.png"
-                                                Visibility="{Binding ShowDonate, Converter={StaticResource bool2VisibilityConverter}}" />
+                                                Visibility="Collapsed" />
                                         </MenuItem>
                                         <MenuItem Click="OpenSetting" Header="设置" />
                                         <MenuItem Header="高级">
@@ -866,7 +871,7 @@
                                     Width="20"
                                     Height="auto"
                                     VerticalAlignment="Center">
-                                    <Path Data="M940 596l-76-57.6c0.8-8 1.6-16.8 1.6-26.4s-0.8-18.4-1.6-26.4l76-57.6c20.8-16 26.4-44 12.8-68l-84.8-143.2c-9.6-16.8-28-27.2-47.2-27.2-6.4 0-12 0.8-18.4 3.2L712 228c-15.2-10.4-31.2-19.2-47.2-26.4l-13.6-92c-4-26.4-26.4-45.6-53.6-45.6H426.4c-27.2 0-49.6 19.2-53.6 44.8L360 201.6c-16 7.2-31.2 16-47.2 26.4l-90.4-35.2c-6.4-2.4-12.8-3.2-19.2-3.2-19.2 0-37.6 9.6-46.4 26.4L71.2 360c-13.6 22.4-8 52 12.8 68l76 57.6c-0.8 9.6-1.6 18.4-1.6 26.4s0 16.8 1.6 26.4l-76 57.6c-20.8 16-26.4 44-12.8 68l84.8 143.2c9.6 16.8 28 27.2 47.2 27.2 6.4 0 12-0.8 18.4-3.2L312 796c15.2 10.4 31.2 19.2 47.2 26.4l13.6 92c3.2 25.6 26.4 45.6 53.6 45.6h171.2c27.2 0 49.6-19.2 53.6-44.8l13.6-92.8c16-7.2 31.2-16 47.2-26.4l90.4 35.2c6.4 2.4 12.8 3.2 19.2 3.2 19.2 0 37.6-9.6 46.4-26.4l85.6-144.8c12.8-23.2 7.2-51.2-13.6-67.2zM704 512c0 105.6-86.4 192-192 192S320 617.6 320 512s86.4-192 192-192 192 86.4 192 192z" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                    <Path Data="M940 596l-76-57.6c0.8-8 1.6-16.8 1.6-26.4s-0.8-18.4-1.6-26.4l76-57.6c20.8-16 26.4-44 12.8-68l-84.8-143.2c-9.6-16.8-28-27.2-47.2-27.2-6.4 0-12 0.8-18.4 3.2L712 228c-15.2-10.4-31.2-19.2-47.2-26.4l-13.6-92c-4-26.4-26.4-45.6-53.6-45.6H426.4c-27.2 0-49.6 19.2-53.6 44.8L360 201.6c-16 7.2-31.2 16-47.2 26.4l-90.4-35.2c-6.4-2.4-12.8-3.2-19.2-3.2-19.2 0-37.6 9.6-46.4 26.4L71.2 360c-13.6 22.4-8 52 12.8 68l76 57.6c-0.8 9.6-1.6 18.4-1.6 26.4s0 16.8 1.6 26.4l-76 57.6c-20.8 16-26.4 44-12.8 68l84.8 143.2c9.6 16.8 28 27.2 47.2 27.2 6.4 0 12-0.8 18.4-3.2L312 796c15.2 10.4 31.2 19.2 47.2 26.4l13.6 92c3.2 25.6 26.4 45.6 53.6 45.6h171.2c27.2 0 49.6-19.2 53.6-44.8l13.6-92.8c16-7.2 31.2-16 47.2-26.4l90.4 35.2c6.4 2.4 12.8 3.2 19.2 3.2 19.2 0 37.6-9.6 46.4-26.4l85.6-144.8c12.8-23.2 7.2-51.2-13.6-67.2zM704 512c0 105.6-86.4 192-192 192S320 617.6 320 512s86.4-192 192-192 192 86.4 192 192z" Fill="{DynamicResource Window.Foreground}" />
                                 </Viewbox>
                             </Border>
                         </Grid>
@@ -1095,7 +1100,7 @@
                                     Width="15"
                                     Height="auto"
                                     VerticalAlignment="Center">
-                                    <Path Data="M187.690667 874.709333h-0.277334a37.504 37.504 0 0 1-26.602666-11.264 37.845333 37.845333 0 0 1-3.904-49.877333l166.762666-229.76-125.013333-125.056a38.229333 38.229333 0 0 1-6.058667-46.336 140.8 140.8 0 0 1 53.504-45.674667 154.24 154.24 0 0 1 67.84-15.552 161.792 161.792 0 0 1 51.84 8.533334l6.4 0.661333c5.781333 0.405333 10.901333 0.981333 15.701334 1.749333a161.877333 161.877333 0 0 0 104.277333-47.253333 144.874667 144.874667 0 0 0 58.474667-90.346667c0-5.802667 0-11.904-0.234667-17.664a80.576 80.576 0 0 1 15.658667-74.858666A84.949333 84.949333 0 0 1 626.858667 106.666667a85.525333 85.525333 0 0 1 54.08 19.328l1.962666 1.941333c18.88 18.432 207.253333 206.933333 209.066667 208.746667A85.930667 85.930667 0 0 1 917.333333 397.888a85.973333 85.973333 0 0 1-25.6 61.205333 67.456 67.456 0 0 1-46.549333 16.874667 199.210667 199.210667 0 0 1-30.229333-3.008 226.176 226.176 0 0 0-15.701334-0.362667h-1.493333a115.605333 115.605333 0 0 0-77.930667 45.205334 210.752 210.752 0 0 0-59.456 118.976c0.917333 7.850667 2.56 21.333333 2.858667 23.125333a144.298667 144.298667 0 0 1-57.258667 165.056 38.229333 38.229333 0 0 1-20.138666 5.717333 38.058667 38.058667 0 0 1-27.093334-11.2l-123.562666-123.733333L209.92 866.986667a36.266667 36.266667 0 0 1-22.229333 7.722666z" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                    <Path Data="M187.690667 874.709333h-0.277334a37.504 37.504 0 0 1-26.602666-11.264 37.845333 37.845333 0 0 1-3.904-49.877333l166.762666-229.76-125.013333-125.056a38.229333 38.229333 0 0 1-6.058667-46.336 140.8 140.8 0 0 1 53.504-45.674667 154.24 154.24 0 0 1 67.84-15.552 161.792 161.792 0 0 1 51.84 8.533334l6.4 0.661333c5.781333 0.405333 10.901333 0.981333 15.701334 1.749333a161.877333 161.877333 0 0 0 104.277333-47.253333 144.874667 144.874667 0 0 0 58.474667-90.346667c0-5.802667 0-11.904-0.234667-17.664a80.576 80.576 0 0 1 15.658667-74.858666A84.949333 84.949333 0 0 1 626.858667 106.666667a85.525333 85.525333 0 0 1 54.08 19.328l1.962666 1.941333c18.88 18.432 207.253333 206.933333 209.066667 208.746667A85.930667 85.930667 0 0 1 917.333333 397.888a85.973333 85.973333 0 0 1-25.6 61.205333 67.456 67.456 0 0 1-46.549333 16.874667 199.210667 199.210667 0 0 1-30.229333-3.008 226.176 226.176 0 0 0-15.701334-0.362667h-1.493333a115.605333 115.605333 0 0 0-77.930667 45.205334 210.752 210.752 0 0 0-59.456 118.976c0.917333 7.850667 2.56 21.333333 2.858667 23.125333a144.298667 144.298667 0 0 1-57.258667 165.056 38.229333 38.229333 0 0 1-20.138666 5.717333 38.058667 38.058667 0 0 1-27.093334-11.2l-123.562666-123.733333L209.92 866.986667a36.266667 36.266667 0 0 1-22.229333 7.722666z" Fill="{DynamicResource Window.Foreground}" />
                                 </Viewbox>
                             </ToggleButton>
 
@@ -1222,7 +1227,7 @@
                                     Width="15"
                                     Height="auto"
                                     VerticalAlignment="Center">
-                                    <Path Data="M187.690667 874.709333h-0.277334a37.504 37.504 0 0 1-26.602666-11.264 37.845333 37.845333 0 0 1-3.904-49.877333l166.762666-229.76-125.013333-125.056a38.229333 38.229333 0 0 1-6.058667-46.336 140.8 140.8 0 0 1 53.504-45.674667 154.24 154.24 0 0 1 67.84-15.552 161.792 161.792 0 0 1 51.84 8.533334l6.4 0.661333c5.781333 0.405333 10.901333 0.981333 15.701334 1.749333a161.877333 161.877333 0 0 0 104.277333-47.253333 144.874667 144.874667 0 0 0 58.474667-90.346667c0-5.802667 0-11.904-0.234667-17.664a80.576 80.576 0 0 1 15.658667-74.858666A84.949333 84.949333 0 0 1 626.858667 106.666667a85.525333 85.525333 0 0 1 54.08 19.328l1.962666 1.941333c18.88 18.432 207.253333 206.933333 209.066667 208.746667A85.930667 85.930667 0 0 1 917.333333 397.888a85.973333 85.973333 0 0 1-25.6 61.205333 67.456 67.456 0 0 1-46.549333 16.874667 199.210667 199.210667 0 0 1-30.229333-3.008 226.176 226.176 0 0 0-15.701334-0.362667h-1.493333a115.605333 115.605333 0 0 0-77.930667 45.205334 210.752 210.752 0 0 0-59.456 118.976c0.917333 7.850667 2.56 21.333333 2.858667 23.125333a144.298667 144.298667 0 0 1-57.258667 165.056 38.229333 38.229333 0 0 1-20.138666 5.717333 38.058667 38.058667 0 0 1-27.093334-11.2l-123.562666-123.733333L209.92 866.986667a36.266667 36.266667 0 0 1-22.229333 7.722666z" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                    <Path Data="M187.690667 874.709333h-0.277334a37.504 37.504 0 0 1-26.602666-11.264 37.845333 37.845333 0 0 1-3.904-49.877333l166.762666-229.76-125.013333-125.056a38.229333 38.229333 0 0 1-6.058667-46.336 140.8 140.8 0 0 1 53.504-45.674667 154.24 154.24 0 0 1 67.84-15.552 161.792 161.792 0 0 1 51.84 8.533334l6.4 0.661333c5.781333 0.405333 10.901333 0.981333 15.701334 1.749333a161.877333 161.877333 0 0 0 104.277333-47.253333 144.874667 144.874667 0 0 0 58.474667-90.346667c0-5.802667 0-11.904-0.234667-17.664a80.576 80.576 0 0 1 15.658667-74.858666A84.949333 84.949333 0 0 1 626.858667 106.666667a85.525333 85.525333 0 0 1 54.08 19.328l1.962666 1.941333c18.88 18.432 207.253333 206.933333 209.066667 208.746667A85.930667 85.930667 0 0 1 917.333333 397.888a85.973333 85.973333 0 0 1-25.6 61.205333 67.456 67.456 0 0 1-46.549333 16.874667 199.210667 199.210667 0 0 1-30.229333-3.008 226.176 226.176 0 0 0-15.701334-0.362667h-1.493333a115.605333 115.605333 0 0 0-77.930667 45.205334 210.752 210.752 0 0 0-59.456 118.976c0.917333 7.850667 2.56 21.333333 2.858667 23.125333a144.298667 144.298667 0 0 1-57.258667 165.056 38.229333 38.229333 0 0 1-20.138666 5.717333 38.058667 38.058667 0 0 1-27.093334-11.2l-123.562666-123.733333L209.92 866.986667a36.266667 36.266667 0 0 1-22.229333 7.722666z" Fill="{DynamicResource Window.Foreground}" />
                                 </Viewbox>
                             </ToggleButton>
 
@@ -1432,7 +1437,7 @@
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="*" MinHeight="100" />
                                         <RowDefinition Height="5" />
-                                        <RowDefinition Height="auto" />
+                                        <RowDefinition Height="auto" MaxHeight="300" />
                                     </Grid.RowDefinitions>
 
 
@@ -1471,7 +1476,7 @@
                                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                                 SyntaxHighlighting="ComLog"
                                                 TextChanged="TextBox_TextChanged"
-                                                WordWrap="True">
+                                                WordWrap="{Binding AutoWrap, Source={x:Static config:ConfigManager.Main}, Mode=OneWay}">
                                                 <avalonEdit:TextEditor.ContextMenu>
                                                     <ContextMenu>
                                                         <MenuItem Command="ApplicationCommands.SelectAll" Header="全选" />
@@ -1494,7 +1499,8 @@
                                             Grid.Column="1"
                                             HorizontalAlignment="Right"
                                             VerticalAlignment="Top"
-                                            Visibility="{Binding ShowRightPanel, Source={x:Static config:ConfigManager.Main}, Mode=OneWay, Converter={StaticResource bool2VisibilityConverter}}">
+                                            Visibility="Collapsed">
+                                            <!--Visibility="{Binding ShowRightPanel, Source={x:Static config:ConfigManager.Main}, Mode=OneWay, Converter={StaticResource bool2VisibilityConverter}}">-->
                                             <StackPanel
                                                 Grid.Column="1"
                                                 HorizontalAlignment="Right"
@@ -1519,7 +1525,7 @@
                                                             HorizontalAlignment="Center"
                                                             VerticalAlignment="Center"
                                                             Data="M610.218667 505.6l398.08-387.413333a49.664 49.664 0 0 0 0-71.338667l-2.133334-2.133333a52.992 52.992 0 0 0-73.301333 0L534.784 432.64 136.704 44.373333a52.992 52.992 0 0 0-73.386667 0L61.269333 46.592a48.810667 48.810667 0 0 0 0 71.338667l398.165334 387.669333-398.165334 387.498667a49.664 49.664 0 0 0 0 71.253333l2.218667 2.133333c20.48 19.626667 52.821333 19.626667 73.301333 0l398.08-387.413333 398.08 387.413333c20.48 19.626667 52.906667 19.626667 73.386667 0l2.048-2.133333a49.664 49.664 0 0 0 0-71.253333l-398.08-387.413334z"
-                                                            Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                                            Fill="{DynamicResource Window.Foreground}" />
                                                     </Viewbox>
                                                 </Button>
                                                 <ToggleButton
@@ -1785,7 +1791,7 @@
                                                     VerticalAlignment="Center">
                                                     <Path
                                                         Data="M854.016 739.328l-313.344-309.248-313.344 309.248q-14.336 14.336-32.768 21.504t-37.376 7.168-36.864-7.168-32.256-21.504q-29.696-28.672-29.696-68.608t29.696-68.608l376.832-373.76q14.336-14.336 34.304-22.528t40.448-9.216 39.424 5.12 31.232 20.48l382.976 379.904q28.672 28.672 28.672 68.608t-28.672 68.608q-14.336 14.336-32.768 21.504t-37.376 7.168-36.864-7.168-32.256-21.504z"
-                                                        Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                                        Fill="{DynamicResource Window.Foreground}"
                                                         RenderTransformOrigin="0.5,0.5">
                                                         <Path.RenderTransform>
                                                             <TransformGroup>
@@ -1811,7 +1817,7 @@
                                                     VerticalAlignment="Center">
                                                     <Path
                                                         Data="M854.016 739.328l-313.344-309.248-313.344 309.248q-14.336 14.336-32.768 21.504t-37.376 7.168-36.864-7.168-32.256-21.504q-29.696-28.672-29.696-68.608t29.696-68.608l376.832-373.76q14.336-14.336 34.304-22.528t40.448-9.216 39.424 5.12 31.232 20.48l382.976 379.904q28.672 28.672 28.672 68.608t-28.672 68.608q-14.336 14.336-32.768 21.504t-37.376 7.168-36.864-7.168-32.256-21.504z"
-                                                        Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                                        Fill="{DynamicResource Window.Foreground}"
                                                         RenderTransformOrigin="0.5,0.5">
                                                         <Path.RenderTransform>
                                                             <TransformGroup>
@@ -1890,7 +1896,7 @@
                                                         Width="20"
                                                         Height="auto"
                                                         VerticalAlignment="Center">
-                                                        <Path Data="M187.690667 874.709333h-0.277334a37.504 37.504 0 0 1-26.602666-11.264 37.845333 37.845333 0 0 1-3.904-49.877333l166.762666-229.76-125.013333-125.056a38.229333 38.229333 0 0 1-6.058667-46.336 140.8 140.8 0 0 1 53.504-45.674667 154.24 154.24 0 0 1 67.84-15.552 161.792 161.792 0 0 1 51.84 8.533334l6.4 0.661333c5.781333 0.405333 10.901333 0.981333 15.701334 1.749333a161.877333 161.877333 0 0 0 104.277333-47.253333 144.874667 144.874667 0 0 0 58.474667-90.346667c0-5.802667 0-11.904-0.234667-17.664a80.576 80.576 0 0 1 15.658667-74.858666A84.949333 84.949333 0 0 1 626.858667 106.666667a85.525333 85.525333 0 0 1 54.08 19.328l1.962666 1.941333c18.88 18.432 207.253333 206.933333 209.066667 208.746667A85.930667 85.930667 0 0 1 917.333333 397.888a85.973333 85.973333 0 0 1-25.6 61.205333 67.456 67.456 0 0 1-46.549333 16.874667 199.210667 199.210667 0 0 1-30.229333-3.008 226.176 226.176 0 0 0-15.701334-0.362667h-1.493333a115.605333 115.605333 0 0 0-77.930667 45.205334 210.752 210.752 0 0 0-59.456 118.976c0.917333 7.850667 2.56 21.333333 2.858667 23.125333a144.298667 144.298667 0 0 1-57.258667 165.056 38.229333 38.229333 0 0 1-20.138666 5.717333 38.058667 38.058667 0 0 1-27.093334-11.2l-123.562666-123.733333L209.92 866.986667a36.266667 36.266667 0 0 1-22.229333 7.722666z" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                                        <Path Data="M187.690667 874.709333h-0.277334a37.504 37.504 0 0 1-26.602666-11.264 37.845333 37.845333 0 0 1-3.904-49.877333l166.762666-229.76-125.013333-125.056a38.229333 38.229333 0 0 1-6.058667-46.336 140.8 140.8 0 0 1 53.504-45.674667 154.24 154.24 0 0 1 67.84-15.552 161.792 161.792 0 0 1 51.84 8.533334l6.4 0.661333c5.781333 0.405333 10.901333 0.981333 15.701334 1.749333a161.877333 161.877333 0 0 0 104.277333-47.253333 144.874667 144.874667 0 0 0 58.474667-90.346667c0-5.802667 0-11.904-0.234667-17.664a80.576 80.576 0 0 1 15.658667-74.858666A84.949333 84.949333 0 0 1 626.858667 106.666667a85.525333 85.525333 0 0 1 54.08 19.328l1.962666 1.941333c18.88 18.432 207.253333 206.933333 209.066667 208.746667A85.930667 85.930667 0 0 1 917.333333 397.888a85.973333 85.973333 0 0 1-25.6 61.205333 67.456 67.456 0 0 1-46.549333 16.874667 199.210667 199.210667 0 0 1-30.229333-3.008 226.176 226.176 0 0 0-15.701334-0.362667h-1.493333a115.605333 115.605333 0 0 0-77.930667 45.205334 210.752 210.752 0 0 0-59.456 118.976c0.917333 7.850667 2.56 21.333333 2.858667 23.125333a144.298667 144.298667 0 0 1-57.258667 165.056 38.229333 38.229333 0 0 1-20.138666 5.717333 38.058667 38.058667 0 0 1-27.093334-11.2l-123.562666-123.733333L209.92 866.986667a36.266667 36.266667 0 0 1-22.229333 7.722666z" Fill="{DynamicResource Window.Foreground}" />
                                                     </Viewbox>
                                                 </ToggleButton>
 
@@ -1999,7 +2005,8 @@
                                         <Grid
                                             Grid.Row="0"
                                             Grid.Column="1"
-                                            HorizontalAlignment="Right">
+                                            HorizontalAlignment="Right"
+                                            Visibility="Collapsed">
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="auto" />
                                                 <ColumnDefinition Width="auto" />
@@ -2404,19 +2411,42 @@
                                                         </Style.Triggers>
                                                     </Style>
                                                 </Border.Style>
-                                                <TextBox
-                                                    Name="sendTextBox"
-                                                    Grid.Column="0"
-                                                    AcceptsReturn="False"
-                                                    Background="Transparent"
-                                                    BorderThickness="0"
-                                                    CaretBrush="{DynamicResource Window.Foreground}"
-                                                    ContextMenu="{StaticResource TextBoxContextMenu}"
-                                                    Foreground="{DynamicResource Window.Foreground}"
-                                                    PreviewKeyDown="SendTextBox_PreviewKeyDown"
-                                                    ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                                    Text="{Binding WriteData, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                    TextChanged="SendTextBox_TextChanged" />
+                                                <Grid>
+                                                    <TextBox
+                                                        Name="sendTextBox"
+                                                        VerticalAlignment="Stretch"
+                                                        AcceptsReturn="False"
+                                                        Background="Transparent"
+                                                        BorderThickness="0"
+                                                        CaretBrush="{DynamicResource Window.Foreground}"
+                                                        ContextMenu="{StaticResource TextBoxContextMenu}"
+                                                        Foreground="{DynamicResource Window.Foreground}"
+                                                        PreviewKeyDown="SendTextBox_PreviewKeyDown"
+                                                        ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                                        Text="{Binding WriteData, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                        TextChanged="SendTextBox_TextChanged" />
+
+                                                    <ToggleButton
+                                                        Margin="0"
+                                                        Padding="5"
+                                                        HorizontalAlignment="Left"
+                                                        VerticalAlignment="Bottom"
+                                                        Click="ToggleButton_Click"
+                                                        Opacity="0.8"
+                                                        Style="{StaticResource FlatToggleButton}">
+                                                        <Viewbox
+                                                            Width="15"
+                                                            Height="auto"
+                                                            VerticalAlignment="Center">
+                                                            <Viewbox
+                                                                Width="15"
+                                                                Height="auto"
+                                                                VerticalAlignment="Center">
+                                                                <Path Data="M896 160C896 177.664 881.664 192 864 192l-768 0C78.336 192 64 177.664 64 160l0 0C64 142.336 78.336 128 96 128l768 0C881.664 128 896 142.336 896 160L896 160zM896 352C896 334.336 881.664 320 864 320l-768 0C78.336 320 64 334.336 64 352l0 0C64 369.664 78.336 384 96 384l768 0C881.664 384 896 369.664 896 352L896 352zM384 736C384 718.336 369.664 704 352 704l-256 0C78.336 704 64 718.336 64 736l0 0C64 753.664 78.336 768 96 768l256 0C369.664 768 384 753.664 384 736L384 736zM735.168 512 732.8 512 599.232 512 96 512C78.336 512 64 526.336 64 544S78.336 576 96 576l503.232 0 133.568 0 2.368 0c52.928 0 96 43.072 96 96s-43.072 96-96 96L568.96 768l0-2.112L568.576 765.888l64.128-64.128c12.8-12.8 12.8-33.664 0-46.528-12.864-12.864-33.6-12.864-46.528 0l-120.192 120.192c-6.208 6.208-9.6 14.592-9.6 23.296 0 8.704 3.456 17.024 9.6 23.232l120.192 120.128c12.864 12.736 33.6 12.736 46.528 0 12.864-12.864 12.864-33.6 0-46.592L569.024 832l166.208 0c88.256 0 160-71.744 160-160S823.424 512 735.168 512z" Fill="{DynamicResource Window.Foreground}" />
+                                                            </Viewbox>
+                                                        </Viewbox>
+                                                    </ToggleButton>
+                                                </Grid>
                                             </Border>
 
                                             <Popup
@@ -2527,7 +2557,7 @@
                                                         Width="20"
                                                         Height="auto"
                                                         VerticalAlignment="Center">
-                                                        <Path Data="M896 160C896 177.664 881.664 192 864 192l-768 0C78.336 192 64 177.664 64 160l0 0C64 142.336 78.336 128 96 128l768 0C881.664 128 896 142.336 896 160L896 160zM896 352C896 334.336 881.664 320 864 320l-768 0C78.336 320 64 334.336 64 352l0 0C64 369.664 78.336 384 96 384l768 0C881.664 384 896 369.664 896 352L896 352zM384 736C384 718.336 369.664 704 352 704l-256 0C78.336 704 64 718.336 64 736l0 0C64 753.664 78.336 768 96 768l256 0C369.664 768 384 753.664 384 736L384 736zM735.168 512 732.8 512 599.232 512 96 512C78.336 512 64 526.336 64 544S78.336 576 96 576l503.232 0 133.568 0 2.368 0c52.928 0 96 43.072 96 96s-43.072 96-96 96L568.96 768l0-2.112L568.576 765.888l64.128-64.128c12.8-12.8 12.8-33.664 0-46.528-12.864-12.864-33.6-12.864-46.528 0l-120.192 120.192c-6.208 6.208-9.6 14.592-9.6 23.296 0 8.704 3.456 17.024 9.6 23.232l120.192 120.128c12.864 12.736 33.6 12.736 46.528 0 12.864-12.864 12.864-33.6 0-46.592L569.024 832l166.208 0c88.256 0 160-71.744 160-160S823.424 512 735.168 512z" Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                                        <Path Data="M896 160C896 177.664 881.664 192 864 192l-768 0C78.336 192 64 177.664 64 160l0 0C64 142.336 78.336 128 96 128l768 0C881.664 128 896 142.336 896 160L896 160zM896 352C896 334.336 881.664 320 864 320l-768 0C78.336 320 64 334.336 64 352l0 0C64 369.664 78.336 384 96 384l768 0C881.664 384 896 369.664 896 352L896 352zM384 736C384 718.336 369.664 704 352 704l-256 0C78.336 704 64 718.336 64 736l0 0C64 753.664 78.336 768 96 768l256 0C369.664 768 384 753.664 384 736L384 736zM735.168 512 732.8 512 599.232 512 96 512C78.336 512 64 526.336 64 544S78.336 576 96 576l503.232 0 133.568 0 2.368 0c52.928 0 96 43.072 96 96s-43.072 96-96 96L568.96 768l0-2.112L568.576 765.888l64.128-64.128c12.8-12.8 12.8-33.664 0-46.528-12.864-12.864-33.6-12.864-46.528 0l-120.192 120.192c-6.208 6.208-9.6 14.592-9.6 23.296 0 8.704 3.456 17.024 9.6 23.232l120.192 120.128c12.864 12.736 33.6 12.736 46.528 0 12.864-12.864 12.864-33.6 0-46.592L569.024 832l166.208 0c88.256 0 160-71.744 160-160S823.424 512 735.168 512z" Fill="{DynamicResource Window.Foreground}" />
                                                     </Viewbox>
                                                 </ToggleButton>
 
diff --git a/SuperCom/MainWindow.xaml.cs b/SuperCom/MainWindow.xaml.cs
index a6c02be..ce17f64 100644
--- a/SuperCom/MainWindow.xaml.cs
+++ b/SuperCom/MainWindow.xaml.cs
@@ -284,13 +284,13 @@ private void CloseTabItem(object sender, RoutedEventArgs e)
             Border border = grid.Parent as Border;
             string portName = border.Tag.ToString();
             if (string.IsNullOrEmpty(portName) || vieModel.PortTabItems?.Count <= 0) return;
-            RemovePortTabItem(portName);
+            RemovePortTabItem(portName, button);
             // 默认选中 0
             if (vieModel.PortTabItems.Count > 0)
                 SetPortTabSelected(vieModel.PortTabItems[0].Name);
         }
 
-        private async void RemovePortTabItem(string portName)
+        private async void RemovePortTabItem(string portName, Button button = null)
         {
             if (vieModel.PortTabItems == null || string.IsNullOrEmpty(portName)) return;
             SaveComSettings();
@@ -307,8 +307,11 @@ private async void RemovePortTabItem(string portName)
                 }
                 if (idx >= 0 && idx < vieModel.PortTabItems.Count)
                 {
-                    await ClosePort(portName);
-                    vieModel.PortTabItems.RemoveAt(idx);
+                    if (button != null) button.IsEnabled = false;
+                    bool success = await ClosePort(portName);
+                    if (success)
+                        vieModel.PortTabItems.RemoveAt(idx);
+                    if (button != null) button.IsEnabled = true;
                 }
             }
             catch (Exception ex)
@@ -485,20 +488,45 @@ private async Task<bool> ClosePort(string portName)
             CustomSerialPort serialPort = portTabItem.SerialPort;
             if (serialPort != null && serialPort.IsOpen)
             {
-                try
+                bool success = await AsynClosePort(serialPort);
+                if (success)
                 {
-                    serialPort.Close();
-                    serialPort.Dispose();
                     portTabItem.StopFilterTask();
                     portTabItem.StopMonitorTask();
+                    return SetPortConnectStatus(portName, false);
                 }
-                catch (Exception ex)
+                else
                 {
-                    MessageNotify.Error(ex.Message);
+                    MessageNotify.Error($"{serialPort.PortName} 关闭串口超时");
+                    return false;
                 }
             }
-            await Task.Delay(1);
-            return SetPortConnectStatus(portName, false);
+            else
+            {
+                return true;
+            }
+        }
+
+        public async Task<bool> AsynClosePort(CustomSerialPort serialPort)
+        {
+            try
+            {
+                return await Task.Run(() =>
+              {
+                  serialPort.Close();
+                  serialPort.Dispose();
+                  return true;
+              }).TimeoutAfter(TimeSpan.FromSeconds(CustomSerialPort.CLOSE_TIME_OUT));
+            }
+            catch (TimeoutException ex)
+            {
+                Console.WriteLine(ex.Message);
+            }
+            catch (Exception ex)
+            {
+                MessageNotify.Error(ex.Message);
+            }
+            return false;
         }
 
 
@@ -656,7 +684,6 @@ private void TextBox_TextChanged(object sender, EventArgs e)
 
         private void ShowAbout(object sender, RoutedEventArgs e)
         {
-            //new CustomWindows.About(this).ShowDialog();
             Dialog_About about = new Dialog_About();
             string local = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
             local = local.Substring(0, local.Length - ".0.0".Length);
@@ -1613,7 +1640,7 @@ private void SendTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
 
 
             TextBox textBox = sender as TextBox;
-            Grid grid = (textBox.Parent as Border).Parent as Grid;
+            Grid grid = ((textBox.Parent as Grid).Parent as Border).Parent as Grid;
             string text = textBox.Text.Trim();
             List<string> list = vieModel.SendHistory.Where(arg => arg.ToLower().IndexOf(text.ToLower()) >= 0).ToList();
             Popup popup = grid.Children.OfType<Popup>().FirstOrDefault();
@@ -2856,6 +2883,13 @@ private void MenuItem_SubmenuOpened(object sender, RoutedEventArgs e)
         private void OnShowRightPanel(object sender, RoutedEventArgs e)
         {
             ConfigManager.Main.ShowRightPanel = false;
+            StackPanel panel = (sender as Button).Parent as StackPanel;
+            Grid grid = panel.Parent as Grid;
+            Grid rootGrid = grid.Parent as Grid;
+            Grid monitorGrid = rootGrid.FindName("monitorGrid") as Grid;
+            monitorGrid.Visibility = Visibility.Collapsed;
+            ToggleButton toggleButton = panel.Children.OfType<ToggleButton>().FirstOrDefault();
+            toggleButton.IsChecked = false;
         }
 
         private void AddNewVarMonitor(object sender, RoutedEventArgs e)
@@ -2947,5 +2981,21 @@ private void SaveVarMonitor(object sender, RoutedEventArgs e)
                 }
             }
         }
+
+        private void ToggleButton_Click(object sender, RoutedEventArgs e)
+        {
+            ToggleButton toggleButton = sender as ToggleButton;
+            Grid grid = toggleButton.Parent as Grid;
+            TextBox textBox = grid.Children.OfType<TextBox>().FirstOrDefault();
+            if ((bool)toggleButton.IsChecked)
+            {
+                textBox.TextWrapping = TextWrapping.Wrap;
+
+            }
+            else
+            {
+                textBox.TextWrapping = TextWrapping.NoWrap;
+            }
+        }
     }
 }
diff --git a/SuperCom/Properties/AssemblyInfo.cs b/SuperCom/Properties/AssemblyInfo.cs
index 3b40826..de2a252 100644
--- a/SuperCom/Properties/AssemblyInfo.cs
+++ b/SuperCom/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.8.0.0")]
-[assembly: AssemblyFileVersion("2.8.0.0")]
+[assembly: AssemblyVersion("2.9.0.0")]
+[assembly: AssemblyFileVersion("2.9.0.0")]
diff --git a/SuperCom/References/ICSharpCode.AvalonEdit.dll b/SuperCom/References/ICSharpCode.AvalonEdit.dll
index fa7c447..e2a4f39 100644
Binary files a/SuperCom/References/ICSharpCode.AvalonEdit.dll and b/SuperCom/References/ICSharpCode.AvalonEdit.dll differ
diff --git a/SuperCom/References/Newtonsoft.Json.dll b/SuperCom/References/Newtonsoft.Json.dll
index b57b61a..85c394c 100644
Binary files a/SuperCom/References/Newtonsoft.Json.dll and b/SuperCom/References/Newtonsoft.Json.dll differ
diff --git a/SuperCom/References/SuperControls.Style.dll b/SuperCom/References/SuperControls.Style.dll
index fed11df..53ac61d 100644
Binary files a/SuperCom/References/SuperControls.Style.dll and b/SuperCom/References/SuperControls.Style.dll differ
diff --git a/SuperCom/References/SuperUtils.dll b/SuperCom/References/SuperUtils.dll
index ddbbf22..92c289f 100644
Binary files a/SuperCom/References/SuperUtils.dll and b/SuperCom/References/SuperUtils.dll differ
diff --git a/SuperCom/SuperCom.csproj b/SuperCom/SuperCom.csproj
index cfd3714..458fd70 100644
--- a/SuperCom/SuperCom.csproj
+++ b/SuperCom/SuperCom.csproj
@@ -299,6 +299,12 @@ XCOPY  "$(ProjectDir)Files\app_config.json" "$(ProjectDir)bin\Release"    /E /Y
   <PropertyGroup>
     <PreBuildEvent>XCOPY  "D:\SuperStudio\Newtonsoft.Json\Src\Newtonsoft.Json\bin\Release\net472\Newtonsoft.Json.dll" "$(ProjectDir)References"    /E /Y /i
 XCOPY  "D:\SuperStudio\SuperUtils\SuperUtils\bin\Debug\SuperUtils.dll" "$(ProjectDir)References"    /E /Y /i
-XCOPY  "D:\SuperStudio\SuperControls\SuperControls.Style\bin\Debug\SuperControls.Style.dll" "$(ProjectDir)References"    /E /Y /i</PreBuildEvent>
+XCOPY  "D:\SuperStudio\SuperControls\SuperControls.Style\bin\Debug\SuperControls.Style.dll" "$(ProjectDir)References"    /E /Y /i
+XCOPY  "D:\SuperStudio\AvalonEdit\ICSharpCode.AvalonEdit\bin\Release\net462\ICSharpCode.AvalonEdit.dll" "$(ProjectDir)References"    /E /Y /i
+
+
+
+
+</PreBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/SuperCom/ViewModel/VieModel_AdvancedSend.cs b/SuperCom/ViewModel/VieModel_AdvancedSend.cs
index 297018b..95eafe6 100644
--- a/SuperCom/ViewModel/VieModel_AdvancedSend.cs
+++ b/SuperCom/ViewModel/VieModel_AdvancedSend.cs
@@ -23,11 +23,14 @@ public class VieModel_AdvancedSend : ViewModelBase
         public Action<bool> OnRunCommand { get; set; }
         private static SqliteMapper<AdvancedSend> mapper { get; set; }
 
-        private ObservableCollection<AdvancedSend> _Projects;
-        public ObservableCollection<AdvancedSend> Projects
+
+        public List<AdvancedSend> AllProjects { get; set; }
+
+        private ObservableCollection<AdvancedSend> _CurrentProjects;
+        public ObservableCollection<AdvancedSend> CurrentProjects
         {
-            get { return _Projects; }
-            set { _Projects = value; RaisePropertyChanged(); }
+            get { return _CurrentProjects; }
+            set { _CurrentProjects = value; RaisePropertyChanged(); }
         }
 
         private ObservableCollection<SendCommand> _SendCommands;
@@ -175,15 +178,16 @@ static VieModel_AdvancedSend()
 
         private void Init()
         {
-            Projects = new ObservableCollection<AdvancedSend>();
+            CurrentProjects = new ObservableCollection<AdvancedSend>();
             SendCommands = new ObservableCollection<SendCommand>();
+            AllProjects = new List<AdvancedSend>();
             // �����ݿ��ж�ȡ
             if (mapper != null)
             {
-                List<AdvancedSend> advancedSends = mapper.SelectList();
-                foreach (var item in advancedSends)
+                AllProjects = mapper.SelectList();
+                foreach (var item in AllProjects)
                 {
-                    Projects.Add(item);
+                    CurrentProjects.Add(item);
                 }
             }
             foreach (Window window in App.Current.Windows)
@@ -197,6 +201,30 @@ private void Init()
             LoadSideComports();
         }
 
+        public void SearchProject(string name)
+        {
+            CurrentProjects = new ObservableCollection<AdvancedSend>();
+            if (string.IsNullOrEmpty(name))
+            {
+                AllProjects = mapper.SelectList();
+                foreach (var item in AllProjects)
+                    CurrentProjects.Add(item);
+            }
+            else
+            {
+                foreach (var item in AllProjects.Where(arg => arg.ProjectName
+                    .ToLower().IndexOf(name.ToLower()) >= 0))
+                {
+                    CurrentProjects.Add(item);
+                }
+            }
+        }
+
+        public void LoadAllProject()
+        {
+            AllProjects = mapper.SelectList();
+        }
+
 
 
 
@@ -254,7 +282,10 @@ public void AddProject(string projectName)
             send.ProjectName = projectName;
             bool success = mapper.Insert(send);
             if (success)
-                Projects.Add(send);
+            {
+                CurrentProjects.Add(send);
+                AllProjects.Add(send);
+            }
         }
 
         public void SetCurrentSendCommands()
diff --git a/SuperCom/Windows/Window_AdvancedSend.xaml b/SuperCom/Windows/Window_AdvancedSend.xaml
index 4216085..2ad1682 100644
--- a/SuperCom/Windows/Window_AdvancedSend.xaml
+++ b/SuperCom/Windows/Window_AdvancedSend.xaml
@@ -126,6 +126,7 @@
 
         <Grid Background="{DynamicResource Window.Side.Background}">
             <Grid.RowDefinitions>
+                <RowDefinition Height="auto" />
                 <RowDefinition Height="auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
@@ -140,21 +141,32 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Data="M925.696 384q19.456 0 37.376 7.68t30.72 20.48 20.48 30.72 7.68 37.376q0 20.48-7.68 37.888t-20.48 30.208-30.72 20.48-37.376 7.68l-287.744 0 0 287.744q0 20.48-7.68 37.888t-20.48 30.208-30.72 20.48-37.376 7.68q-20.48 0-37.888-7.68t-30.208-20.48-20.48-30.208-7.68-37.888l0-287.744-287.744 0q-20.48 0-37.888-7.68t-30.208-20.48-20.48-30.208-7.68-37.888q0-19.456 7.68-37.376t20.48-30.72 30.208-20.48 37.888-7.68l287.744 0 0-287.744q0-19.456 7.68-37.376t20.48-30.72 30.208-20.48 37.888-7.68q39.936 0 68.096 28.16t28.16 68.096l0 287.744 287.744 0z"
-                            Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                            Fill="{DynamicResource Window.Foreground}" />
                     </Viewbox>
                 </Border>
             </StackPanel>
             <!--  SelectedIndex="{Binding Path=SideIndex, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  -->
+
+            <super:SearchBox
+                x:Name="projectSearchBox"
+                Grid.Row="1"
+                Margin="0,5,0,10"
+                Background="{DynamicResource Window.Title.Background}"
+                Search="SearchProjectByName"
+                SearchOnTextChanged="True"
+                ShowSearchButton="False"
+                Style="{StaticResource SearchBoxStyle}" />
             <ListBox
                 Name="sideListBox"
-                Grid.Row="1"
+                Grid.Row="2"
+                Margin="0,0,1,0"
                 VerticalAlignment="Top"
                 HorizontalContentAlignment="Stretch"
                 d:ItemsSource="{d:SampleData ItemCount=5}"
                 Background="Transparent"
                 IsEnabled="{Binding DataContext.RunningCommands, Converter={StaticResource OppositeBooleanConverter}, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                 ItemContainerStyle="{StaticResource NormalListBoxItem}"
-                ItemsSource="{Binding Projects}"
+                ItemsSource="{Binding CurrentProjects}"
                 SelectionChanged="ListBox_SelectionChanged"
                 Style="{StaticResource NormalListBox}">
                 <ListBox.ItemTemplate>
@@ -164,6 +176,7 @@
                                 <ContextMenu>
                                     <MenuItem Click="RenameProject" Header="重命名" />
                                     <MenuItem
+                                        super:CommonExt.HoverBackground="{DynamicResource Menu.Hover.Deep.Background}"
                                         Click="DeleteProjectInMenuItem"
                                         Header="删除"
                                         Tag="{Binding ProjectID}" />
@@ -236,6 +249,7 @@
                 <RowDefinition Height="auto" />
                 <RowDefinition Height="auto" />
                 <RowDefinition Height="*" />
+                <RowDefinition Height="auto" />
             </Grid.RowDefinitions>
 
             <Border
@@ -724,6 +738,16 @@
 
 
             </DataGrid>
+
+            <Button
+                Grid.Row="3"
+                MinWidth="100"
+                Margin="10"
+                HorizontalAlignment="Right"
+                Click="SaveChanges"
+                Content="保存"
+                Style="{StaticResource ButtonSuccess}"
+                Visibility="Collapsed" />
         </Grid>
     </Grid>
 </super:BaseWindow>
diff --git a/SuperCom/Windows/Window_AdvancedSend.xaml.cs b/SuperCom/Windows/Window_AdvancedSend.xaml.cs
index 47f5ad4..86fd8f8 100644
--- a/SuperCom/Windows/Window_AdvancedSend.xaml.cs
+++ b/SuperCom/Windows/Window_AdvancedSend.xaml.cs
@@ -89,9 +89,9 @@ private void BaseWindow_ContentRendered(object sender, EventArgs e)
 
 
             }
-            if (Main != null && Main.vieModel != null && vieModel.Projects?.Count > 0)
+            if (Main != null && Main.vieModel != null && vieModel.CurrentProjects?.Count > 0)
             {
-                if (SideSelectedIndex < 0 || SideSelectedIndex > vieModel.Projects.Count)
+                if (SideSelectedIndex < 0 || SideSelectedIndex > vieModel.CurrentProjects.Count)
                     SideSelectedIndex = 0;
                 sideListBox.SelectedIndex = SideSelectedIndex;
             }
@@ -122,18 +122,19 @@ private void DeleteProject(object sender, RoutedEventArgs e)
         private void DeleteProjectByID(int projectID)
         {
             int idx = -1;
-            for (int i = 0; i < vieModel.Projects.Count; i++)
+            for (int i = 0; i < vieModel.CurrentProjects.Count; i++)
             {
-                if (vieModel.Projects[i].ProjectID == projectID)
+                if (vieModel.CurrentProjects[i].ProjectID == projectID)
                 {
                     idx = i;
                     break;
                 }
             }
-            if (idx >= 0 && idx < vieModel.Projects.Count)
+            if (idx >= 0 && idx < vieModel.CurrentProjects.Count)
             {
-                vieModel.DeleteProject(vieModel.Projects[idx]);
-                vieModel.Projects.RemoveAt(idx);
+                vieModel.DeleteProject(vieModel.CurrentProjects[idx]);
+                vieModel.CurrentProjects.RemoveAt(idx);
+                vieModel.AllProjects.RemoveAll(arg => arg.ProjectID == projectID);
                 DataChanged();
             }
 
@@ -151,6 +152,7 @@ private void DeleteProjectInMenuItem(object sender, RoutedEventArgs e)
 
         public void DataChanged()
         {
+            vieModel.LoadAllProject();
             // 通知 mainWindow 更新
             MainWindow window = GetWindowByName("mainWindow") as MainWindow;
             window?.RefreshSendCommands();
@@ -164,7 +166,7 @@ public void ShowProjectById(string projectID)
         {
             if (!string.IsNullOrEmpty(projectID))
             {
-                AdvancedSend advancedSend = vieModel.Projects.Where(arg => arg.ProjectID.ToString().Equals(projectID)).FirstOrDefault();
+                AdvancedSend advancedSend = vieModel.CurrentProjects.Where(arg => arg.ProjectID.ToString().Equals(projectID)).FirstOrDefault();
                 ShowProjectBySend(advancedSend);
             }
         }
@@ -203,7 +205,7 @@ private void AddNewSendCommand(object sender, RoutedEventArgs e)
             else
                 send.Order = 1;
             send.Command = "";
-            AdvancedSend advancedSend = vieModel.Projects.Where(arg => arg.ProjectID == vieModel.CurrentProjectID).FirstOrDefault();
+            AdvancedSend advancedSend = vieModel.CurrentProjects.Where(arg => arg.ProjectID == vieModel.CurrentProjectID).FirstOrDefault();
             if (advancedSend != null)
             {
                 if (advancedSend.CommandList == null)
@@ -234,7 +236,7 @@ private void DeleteCommand(object sender, RoutedEventArgs e)
                 if (sendCommand != null)
                 {
                     vieModel.SendCommands.Remove(sendCommand);
-                    AdvancedSend advancedSend = vieModel.Projects.Where(arg => arg.ProjectID == vieModel.CurrentProjectID).FirstOrDefault();
+                    AdvancedSend advancedSend = vieModel.CurrentProjects.Where(arg => arg.ProjectID == vieModel.CurrentProjectID).FirstOrDefault();
                     if (advancedSend != null)
                     {
                         if (!string.IsNullOrEmpty(advancedSend.Commands))
@@ -264,7 +266,7 @@ private Window GetWindowByName(string name)
         private void SaveSendCommands(object sender, RoutedEventArgs e)
         {
             string commands = JsonUtils.TrySerializeObject(vieModel.SendCommands.ToList());
-            AdvancedSend advancedSend = vieModel.Projects.Where(arg => arg.ProjectID == vieModel.CurrentProjectID).FirstOrDefault();
+            AdvancedSend advancedSend = vieModel.CurrentProjects.Where(arg => arg.ProjectID == vieModel.CurrentProjectID).FirstOrDefault();
             if (advancedSend != null && !string.IsNullOrEmpty(commands))
             {
                 if (!commands.Equals(advancedSend.Commands))
@@ -307,7 +309,8 @@ private void RenameTextBoxLostFocus(object sender, RoutedEventArgs e)
                 string projectID = textBox.Tag.ToString();
                 if (!string.IsNullOrEmpty(projectID))
                 {
-                    AdvancedSend advancedSend = vieModel.Projects.Where(arg => arg.ProjectID.ToString().Equals(projectID)).FirstOrDefault();
+                    AdvancedSend advancedSend = vieModel.CurrentProjects.Where(arg => arg.ProjectID.ToString().Equals(projectID)).FirstOrDefault();
+                    if (advancedSend == null) return;
                     string oldName = advancedSend.ProjectName;
                     if (string.IsNullOrEmpty(newName))
                     {
@@ -322,12 +325,31 @@ private void RenameTextBoxLostFocus(object sender, RoutedEventArgs e)
                         TextBlock textBlock = (textBox.Parent as Grid).Children.OfType<TextBlock>().FirstOrDefault();
                         textBlock.Text = newName;
                         DataChanged();
+                        if (!string.IsNullOrEmpty(projectSearchBox.Text))
+                        {
+                            if (newName.ToLower().IndexOf(projectSearchBox.Text) < 0)
+                                RemoveProjectById(projectID);
+                        }
+
                     }
                 }
             }
+        }
 
+        private void RemoveProjectById(string id)
+        {
+            int idx = -1;
+            for (int i = 0; i < vieModel.CurrentProjects.Count; i++)
+            {
+                if (vieModel.CurrentProjects[i].ProjectID.ToString().Equals(id))
+                {
+                    idx = i;
+                    break;
+                }
+            }
 
-
+            if (idx >= 0 && idx < vieModel.CurrentProjects.Count)
+                vieModel.CurrentProjects.RemoveAt(idx);
         }
 
         private void TextBox_PreviewKeyUp(object sender, KeyEventArgs e)
@@ -641,5 +663,17 @@ private void dataGrid_SelectionChanged(object sender, SelectionChangedEventArgs
         {
 
         }
+
+        private void SearchProjectByName(object sender, RoutedEventArgs e)
+        {
+            SearchBox searchBox = sender as SearchBox;
+            vieModel.SearchProject(searchBox.Text);
+
+        }
+
+        private void SaveChanges(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }
diff --git a/SuperCom/Windows/Window_Setting.xaml b/SuperCom/Windows/Window_Setting.xaml
index 682ab83..3618b60 100644
--- a/SuperCom/Windows/Window_Setting.xaml
+++ b/SuperCom/Windows/Window_Setting.xaml
@@ -173,7 +173,7 @@
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Data="M925.696 384q19.456 0 37.376 7.68t30.72 20.48 20.48 30.72 7.68 37.376q0 20.48-7.68 37.888t-20.48 30.208-30.72 20.48-37.376 7.68l-287.744 0 0 287.744q0 20.48-7.68 37.888t-20.48 30.208-30.72 20.48-37.376 7.68q-20.48 0-37.888-7.68t-30.208-20.48-20.48-30.208-7.68-37.888l0-287.744-287.744 0q-20.48 0-37.888-7.68t-30.208-20.48-20.48-30.208-7.68-37.888q0-19.456 7.68-37.376t20.48-30.72 30.208-20.48 37.888-7.68l287.744 0 0-287.744q0-19.456 7.68-37.376t20.48-30.72 30.208-20.48 37.888-7.68q39.936 0 68.096 28.16t28.16 68.096l0 287.744 287.744 0z"
-                                    Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                                    Fill="{DynamicResource Window.Foreground}" />
                             </Viewbox>
                         </Border>
                     </StackPanel>
diff --git a/SuperCom/Windows/Window_VirtualPort.xaml b/SuperCom/Windows/Window_VirtualPort.xaml
index a6812fc..b7e5dea 100644
--- a/SuperCom/Windows/Window_VirtualPort.xaml
+++ b/SuperCom/Windows/Window_VirtualPort.xaml
@@ -92,15 +92,13 @@
             Grid.RowSpan="4"
             Panel.ZIndex="99"
             Visibility="Collapsed">
-            <Border
-                Effect="{StaticResource PopupDropShadowEffect}"
-                Opacity="0.3"
-                Style="{StaticResource InfoBorder}" />
             <Border
                 Width="500"
                 Height="240"
                 Effect="{StaticResource PopupDropShadowEffect}"
-                Style="{StaticResource InfoBorder}">
+                Opacity="1"
+                Style="{StaticResource InfoBorder}" />
+            <Border Width="500" Height="240">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
diff --git a/SuperCom/Windows/Window_VirtualPort.xaml.cs b/SuperCom/Windows/Window_VirtualPort.xaml.cs
index 3977b7b..e7c4d9d 100644
--- a/SuperCom/Windows/Window_VirtualPort.xaml.cs
+++ b/SuperCom/Windows/Window_VirtualPort.xaml.cs
@@ -135,7 +135,8 @@ public async void Init()
             if (app != null)
             {
                 IsCom0ConInstalled = true;
-                string path = System.IO.Path.Combine(app.InstallLocation, VirtualPortManager.COM_0_COM_PROGRAM_EXE_NAME);
+                string path = System.IO.Path.Combine(app.InstallLocation,
+                    VirtualPortManager.COM_0_COM_PROGRAM_EXE_NAME);
                 if (!File.Exists(Com0ConInstalledPath) && File.Exists(path))
                     Com0ConInstalledPath = path;
                 ListingPort = true;
@@ -155,18 +156,16 @@ public async void Init()
 
         private static string COM_0_COM_INSTALLED_PATH =
             System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Installer", "setup.exe");
-        private async void InstallCom0Com(object sender, RoutedEventArgs e)
+        private void InstallCom0Com(object sender, RoutedEventArgs e)
         {
             if (!File.Exists(COM_0_COM_INSTALLED_PATH))
             {
                 MessageCard.Error($"不存在：{COM_0_COM_INSTALLED_PATH}");
                 return;
             }
-            Button button = sender as Button;
-            button.IsEnabled = false;
             FileHelper.TryOpenFile(COM_0_COM_INSTALLED_PATH);
-            await Task.Delay(2000);
-            button.IsEnabled = true;
+            bool success = (bool)new MsgBox(this, "安装完成后重新打开虚拟串口").ShowDialog();
+            this.Close();
         }
 
         private void BaseWindow_ContentRendered(object sender, EventArgs e)
@@ -174,6 +173,7 @@ private void BaseWindow_ContentRendered(object sender, EventArgs e)
             Init();
         }
 
+
         private void SelectPath(object sender, RoutedEventArgs e)
         {
             string filePath = FileHelper.SelectFile("", "setupc.exe|*.exe");