diff --git a/SuperCom/App.xaml.cs b/SuperCom/App.xaml.cs
index bb1bfb8..26521c2 100644
--- a/SuperCom/App.xaml.cs
+++ b/SuperCom/App.xaml.cs
@@ -1,4 +1,6 @@
-using SuperControls.Style.Windows;
+using SuperCom.Log;
+using SuperCom.WatchDog;
+using SuperControls.Style.Windows;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -14,15 +16,37 @@ namespace SuperCom
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
+    /// 
+
     public partial class App : Application
     {
+        private static bool Error { get; set; }
+
+        public static Logger Logger = Logger.Instance;
+        private static MemoryDog memoryDog { get; set; }
+
+        public static Action OnMemoryDog;
+        public static Action<long> OnMemoryChanged;
+
+        static App()
+        {
+            memoryDog = new MemoryDog();
+            memoryDog.OnNotFeed += () =>
+            {
+                OnMemoryDog?.Invoke();
+            };
+            memoryDog.OnMemoryChanged += (memory) =>
+            {
+                OnMemoryChanged?.Invoke(memory);
+            };
+        }
 
         protected override void OnStartup(StartupEventArgs e)
         {
             // UI线程未捕获异常处理事件
-            //#if DEBUG
+#if DEBUG
 
-            //#else
+#else
             this.DispatcherUnhandledException += new DispatcherUnhandledExceptionEventHandler(App_DispatcherUnhandledException);
 
             // Task线程内未捕获异常处理事件
@@ -31,7 +55,9 @@ protected override void OnStartup(StartupEventArgs e)
             // 非UI线程未捕获异常处理事件
             AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
 
-            //#endif
+#endif
+            // 看门狗
+            memoryDog.Watch();
             base.OnStartup(e);
         }
 
@@ -39,9 +65,15 @@ void App_DispatcherUnhandledException(object sender, System.Windows.Threading.Di
         {
             try
             {
+                if (Error)
+                    return;
+                Error = true;
                 Window_ErrorMsg window_ErrorMsg = new Window_ErrorMsg();
-                window_ErrorMsg.SetError(e.Exception.ToString());
+                string error = e.Exception.ToString();
+                Logger.Error(error);
+                window_ErrorMsg.SetError(error);
                 window_ErrorMsg.ShowDialog();
+                
             }
             catch (Exception ex)
             {
@@ -59,11 +91,13 @@ void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs
 
             try
             {
-                StringBuilder builder = new StringBuilder();
-                if (e.IsTerminating)
+                if (e.IsTerminating && !Error)
                 {
+                    Error = true;
                     Window_ErrorMsg window_ErrorMsg = new Window_ErrorMsg();
-                    window_ErrorMsg.SetError(e.ExceptionObject.ToString());
+                    string error = e.ExceptionObject.ToString();
+                    Logger.Error(error);
+                    window_ErrorMsg.SetError(error);
                     window_ErrorMsg.ShowDialog();
                 }
             }
@@ -81,8 +115,8 @@ void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs
         void TaskScheduler_UnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e)
         {
             // task线程内未处理捕获
-            Console.WriteLine(e.Exception.StackTrace);
-            Console.WriteLine(e.Exception.Message);
+            Logger.Error(e.Exception.StackTrace);
+            Logger.Error(e.Exception.Message);
             e.SetObserved(); // 设置该异常已察觉（这样处理后就不会引起程序崩溃）
         }
     }
diff --git a/SuperCom/Config/ConfigManager.cs b/SuperCom/Config/ConfigManager.cs
index f79d704..c886750 100644
--- a/SuperCom/Config/ConfigManager.cs
+++ b/SuperCom/Config/ConfigManager.cs
@@ -8,7 +8,7 @@ public static class ConfigManager
     {
         public const string SQLITE_DATA_PATH = "user_data.sqlite";
 
-        public const string RELEASE_DATE = "2023-01-17";
+        public const string RELEASE_DATE = "2023-02-05";
         public static Main Main { get; set; }
         public static CommonSettings CommonSettings { get; set; }
         public static Settings Settings { get; set; }
diff --git a/SuperCom/Config/Settings.cs b/SuperCom/Config/Settings.cs
index 0e9e137..9613dd0 100644
--- a/SuperCom/Config/Settings.cs
+++ b/SuperCom/Config/Settings.cs
@@ -8,6 +8,7 @@ public class Settings : AbstractConfig
     {
 
         private const int DEFAULT_LOG_FRAG_SIZE = 40;  // MB
+        private const int DEFAULT_MEMORY_LIMIT = 1024; // MB
         private Settings() : base(ConfigManager.SQLITE_DATA_PATH, $"WindowConfig.Settings")
         {
             Width = SystemParameters.WorkArea.Width * 0.7;
@@ -17,6 +18,7 @@ private Settings() : base(ConfigManager.SQLITE_DATA_PATH, $"WindowConfig.Setting
             AutoBackup = true;
             EnabledLogFrag = true;
             LogFragSize = DEFAULT_LOG_FRAG_SIZE;
+            MemoryLimit = DEFAULT_MEMORY_LIMIT;
         }
 
         public static List<int> BackUpPeriods = new List<int> { 1, 3, 7, 15, 30 };
@@ -47,6 +49,7 @@ public static Settings CreateInstance()
         public long RemoteIndex { get; set; }
         public bool EnabledLogFrag { get; set; }
         public long LogFragSize { get; set; }
+        public long MemoryLimit { get; set; }
 
     }
 }
diff --git a/SuperCom/Entity/ComSettings.cs b/SuperCom/Entity/ComSettings.cs
index f324ee5..08fa839 100644
--- a/SuperCom/Entity/ComSettings.cs
+++ b/SuperCom/Entity/ComSettings.cs
@@ -87,7 +87,7 @@ public static void InitSqlite()
                 }
                 catch (Exception ex)
                 {
-                    Console.WriteLine(ex.Message);
+                    App.Logger.Error(ex.Message);
                 }
             }
         }
diff --git a/SuperCom/Entity/PortTabItem.cs b/SuperCom/Entity/PortTabItem.cs
index a0087aa..9c67195 100644
--- a/SuperCom/Entity/PortTabItem.cs
+++ b/SuperCom/Entity/PortTabItem.cs
@@ -1,5 +1,6 @@
 
 using ICSharpCode.AvalonEdit;
+using ICSharpCode.AvalonEdit.Highlighting;
 using SuperCom.Config;
 using SuperCom.Config.WindowConfig;
 using SuperUtils.Common;
@@ -98,7 +99,6 @@ public string WriteData
             set { _WriteData = value; RaisePropertyChanged(); }
         }
 
-        private StringBuilder Builder { get; set; }
         public TextEditor TextEditor { get; set; }
 
         private bool _AddTimeStamp = true;
@@ -126,7 +126,7 @@ public bool EnabledMonitor
         }
 
 
-        public UInt64 CurrentCharSize { get; set; }
+        public double CurrentCharSize { get; set; }
 
         private long _RX = 0L;
         public long RX
@@ -195,6 +195,30 @@ public bool Pinned
             get { return _Pinned; }
             set { _Pinned = value; RaisePropertyChanged(); }
         }
+        private bool _FixedText;
+        public bool FixedText
+        {
+            get { return _FixedText; }
+            set
+            {
+                _FixedText = value;
+                RaisePropertyChanged();
+                if (TextEditor != null)
+                {
+                    if (value)
+                        TextEditor.TextChanged -= TextBox_TextChanged;
+                    else
+                        TextEditor.TextChanged += TextBox_TextChanged;
+                }
+            }
+        }
+
+
+        public void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            TextEditor textEditor = sender as TextEditor;
+            textEditor?.ScrollToEnd();
+        }
 
         public bool RunningCommands { get; set; }
 
@@ -202,7 +226,6 @@ public bool Pinned
 
         public void ClearData()
         {
-            Builder.Clear();
             FirstSaveData = true;
         }
 
@@ -397,7 +420,7 @@ public bool IsInFilterRule(string line)
                     }
                     catch (Exception ex)
                     {
-                        Console.WriteLine(ex.Message);
+                        App.Logger.Error(ex.Message);
                         continue;
                     }
 
@@ -509,7 +532,11 @@ public void SepFile()
             if (ConfigManager.Settings.EnabledLogFrag)
             {
                 //if (CurrentCharSize >= 4096)
-                if (CurrentCharSize / 1024 >= (UInt64)ConfigManager.Settings.LogFragSize)
+#if DEBUG
+                if (CurrentCharSize / 1024 / 1024 >= (UInt64)ConfigManager.Settings.LogFragSize)
+#else
+                if (CurrentCharSize / 1024 / 1024 >= (UInt64)ConfigManager.Settings.LogFragSize)
+#endif
                 {
                     CurrentCharSize = 0;
                     ConnectTime = DateTime.Now;
@@ -533,14 +560,15 @@ public void SepFile()
         }
 
         public bool FirstSaveData;
+        private StringBuilder builder = new StringBuilder();
         public void SaveData(string line)
         {
-            RX += line.Length;
+            RX += Encoding.UTF8.GetByteCount(line);     // todo
             string value = line.Replace("\0", "\\0");
             if (AddTimeStamp)
             {
                 // 遍历字符串
-                StringBuilder builder = new StringBuilder();
+                builder.Clear();
                 // 一次遍历效率最高，使用 indexof 还额外多遍历几次
                 char c;
                 for (int i = 0; i < value.Length; i++)
@@ -567,7 +595,7 @@ public void SaveData(string line)
                 }
                 value = builder.ToString();
             }
-            CurrentCharSize += (UInt64)value.Length * sizeof(char);
+            CurrentCharSize += Encoding.UTF8.GetByteCount(value);
             MonitorLine(value);
             FilterLine(value);  // 过滤器
             SepFile();
@@ -578,7 +606,7 @@ public void SaveData(string line)
             }
             catch (Exception ex)
             {
-                Console.WriteLine(ex.Message);
+                App.Logger.Error(ex.Message);
             }
         }
 
@@ -590,7 +618,6 @@ public PortTabItem(string name, bool connected)
             Name = name;
             Connected = connected;
             Setting = new PortSetting();
-            Builder = new StringBuilder();
             SaveFileName = GetSaveFileName();
         }
     }
diff --git a/SuperCom/Entity/VirtualPort.cs b/SuperCom/Entity/VirtualPort.cs
index 0064ffc..54e4c57 100644
--- a/SuperCom/Entity/VirtualPort.cs
+++ b/SuperCom/Entity/VirtualPort.cs
@@ -103,7 +103,7 @@ await Task.Run(() =>
                         result.Add(port);
                 }, null, (ex) =>
                 {
-                    Console.WriteLine(ex.Message);
+                    App.Logger.Error(ex.Message);
                 }, () =>
                 {
                     completed = true;
@@ -140,13 +140,13 @@ await Task.Run(() =>
             {
                 CmdHelper.Run($"cmd.exe", cmdParam, (output) =>
                 {
-                    Console.WriteLine(output);
+                    App.Logger.Info(output);
                     if (output.IndexOf("logged as \"in use\"") >= 0)
                         count++;
                     completed = count == 2;
                 }, null, (ex) =>
                 {
-                    Console.WriteLine(ex.Message);
+                    App.Logger.Error(ex.Message);
                 });
             });
             // 超时
@@ -177,14 +177,14 @@ await Task.Run(() =>
             {
                 CmdHelper.Run($"cmd.exe", cmdParam, (output) =>
                 {
-                    Console.WriteLine(output);
+                    App.Logger.Info(output);
                     if (output.IndexOf($"Removed CNCA{n}") >= 0 ||
                         output.IndexOf($"Removed CNCB{n}") >= 0)
                         count++;
                     completed = count == 2;
                 }, null, (ex) =>
                 {
-                    Console.WriteLine(ex.Message);
+                    App.Logger.Error(ex.Message);
                     completed = true;
                 });
             });
@@ -211,12 +211,12 @@ public static async Task<bool> UpdatePorts(List<VirtualPort> ports)
             foreach (VirtualPort port in ports)
             {
                 string cmdParam = $"/C cd /d \"{AppDir}\" && setupc.exe change {port.ID} {port.ToUpdateString()}";
-                Console.WriteLine(cmdParam);
+                App.Logger.Info($"执行命令：{cmdParam}");
                 await Task.Run(() =>
                 {
                     CmdHelper.Run($"cmd.exe", cmdParam, (output) =>
                     {
-                        Console.WriteLine(output);
+                        App.Logger.Info(output);
                         if (output.IndexOf($"Restarted {port.ID}") >= 0)
                             completed = true;
                     });
diff --git a/SuperCom/Lang/LangManager.cs b/SuperCom/Lang/LangManager.cs
index c3db680..c4f74c0 100644
--- a/SuperCom/Lang/LangManager.cs
+++ b/SuperCom/Lang/LangManager.cs
@@ -32,7 +32,7 @@ public static bool SetLang(string lang)
                     }
                     catch (Exception ex)
                     {
-                        Console.WriteLine(ex.Message);
+                        App.Logger.Error(ex.Message);
                         return false;
                     }
                 }
diff --git a/SuperCom/Log/Logger.cs b/SuperCom/Log/Logger.cs
index 691d875..dba4f42 100644
--- a/SuperCom/Log/Logger.cs
+++ b/SuperCom/Log/Logger.cs
@@ -1,5 +1,6 @@
 using SuperUtils.Framework.Logger;
 using SuperUtils.IO;
+using SuperUtils.Time;
 using System;
 using System.IO;
 
@@ -7,7 +8,8 @@ namespace SuperCom.Log
 {
     public class Logger : AbstractLogger
     {
-        public static string FilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "app.log");
+        private static string LogDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "app_logs");
+        private static string LogFilePath = Path.Combine(LogDir, "app.log");
         private Logger() { }
 
         public static Logger Instance { get; }
@@ -15,12 +17,16 @@ private Logger() { }
         static Logger()
         {
             Instance = new Logger();
+            Instance.LogLevel = AbstractLogger.Level.Info;
+            if (!Directory.Exists(LogDir))
+                DirHelper.TryCreateDirectory(LogDir);
+            LogFilePath = Path.Combine(LogDir, $"{DateHelper.NowDate()}.log");
         }
 
         public override void LogPrint(string str)
         {
             Console.WriteLine(str);
-            FileHelper.TryAppendToFile(FilePath, str);
+            FileHelper.TryAppendToFile(LogFilePath, str, System.Text.Encoding.UTF8);
         }
     }
 }
diff --git a/SuperCom/MainWindow.xaml b/SuperCom/MainWindow.xaml
index 4a31102..46189fe 100644
--- a/SuperCom/MainWindow.xaml
+++ b/SuperCom/MainWindow.xaml
@@ -25,6 +25,20 @@
     mc:Ignorable="d">
 
     <super:BaseWindow.Resources>
+
+        <ContextMenu x:Key="TextEditorContextMenu">
+            <MenuItem Command="ApplicationCommands.SelectAll" Header="全选" />
+            <MenuItem Command="ApplicationCommands.Copy" Header="复制" />
+            <MenuItem Header="格式化">
+                <MenuItem Click="FormatJson" Header="JSON(F2)" />
+            </MenuItem>
+            <MenuItem Header="编辑">
+                <MenuItem Click="JoinLine" Header="合并为一行(F3)" />
+            </MenuItem>
+            <MenuItem Click="OpenHexTransform" Header="HEX 转换" />
+            <MenuItem Click="OpenTimeTransform" Header="时间戳" />
+        </ContextMenu>
+
         <Style x:Key="BgHoverBorder" TargetType="Border">
             <Setter Property="FocusVisualStyle" Value="{x:Null}" />
             <Setter Property="CornerRadius" Value="0" />
@@ -50,6 +64,35 @@
             Stretch="UniformToFill" />
 
 
+        <Popup
+            x:Name="ForegroundPopup"
+            AllowsTransparency="True"
+            HorizontalOffset="-80"
+            Placement="MousePoint"
+            PopupAnimation="Fade"
+            StaysOpen="True"
+            VerticalOffset="0">
+            <Grid Margin="5">
+                <Border
+                    Margin="5"
+                    Background="{DynamicResource Menu.Background}"
+                    CornerRadius="5"
+                    Effect="{StaticResource PopupDropShadowEffect}" />
+                <StackPanel Orientation="Vertical" Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}">
+                    <super:ColorPicker
+                        Name="colorPicker"
+                        SelectedColorChanged="colorPicker_SelectedColorChanged"
+                        ShowColorPalette="False" />
+                    <Button
+                        Margin="5,0,5,10"
+                        HorizontalAlignment="Center"
+                        Click="CloseForegroundSelected"
+                        Content="关闭"
+                        Style="{StaticResource ButtonDanger}" />
+                </StackPanel>
+            </Grid>
+        </Popup>
+
 
 
 
@@ -57,6 +100,7 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="30" />
                 <RowDefinition Height="*" />
+                <RowDefinition Height="auto" />
 
             </Grid.RowDefinitions>
             <Grid
@@ -80,8 +124,8 @@
                     HorizontalAlignment="Stretch"
                     Panel.ZIndex="50"
                     Background="Transparent"
-                    MouseMove="OnMoveWindow"
-                    PreviewMouseLeftButtonDown="OnMaxCurrentWindow">
+                    MouseLeftButtonDown="OnMaxCurrentWindow"
+                    MouseMove="OnMoveWindow">
 
                     <Grid>
                         <Grid.ColumnDefinitions>
@@ -106,131 +150,74 @@
                             Grid.Column="1"
                             Margin="20,0"
                             Orientation="Horizontal">
-                            <Button
-                                Width="70"
-                                super:CommonExt.HoverBackground="{DynamicResource Window.Title.Hover.Background}"
-                                Click="OpenContextMenu"
-                                Content="文件"
-                                Style="{StaticResource TitleButton}"
-                                Visibility="Collapsed">
-                                <Button.ContextMenu>
-                                    <ContextMenu
-                                        HorizontalOffset="-40"
-                                        StaysOpen="True"
-                                        VerticalOffset="10">
-                                        <MenuItem
-                                            Click="OpenLog"
-                                            Header="打开日志"
-                                            IsCheckable="False" />
-
-                                    </ContextMenu>
-                                </Button.ContextMenu>
-                            </Button>
-                            <Button
-                                Width="70"
-                                super:CommonExt.HoverBackground="{DynamicResource Window.Title.Hover.Background}"
-                                Click="OpenContextMenu"
-                                Content="编辑"
-                                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="字体"
-                                            IsCheckable="False" />
-                                        <MenuItem
-                                            Header="默认字体颜色"
-                                            IsCheckable="False"
-                                            SubmenuOpened="MenuItem_SubmenuOpened">
-                                            <MenuItem>
-                                                <MenuItem.Template>
-                                                    <ControlTemplate TargetType="{x:Type MenuItem}">
-                                                        <Grid>
-                                                            <Border
-                                                                Width="auto"
-                                                                Height="auto"
-                                                                Padding="10"
-                                                                Background="{DynamicResource Menu.Background}"
-                                                                CornerRadius="5">
-                                                                <StackPanel Orientation="Vertical" Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}">
-                                                                    <super:ColorPicker Name="colorPicker" ShowColorPalette="False" />
-                                                                    <Button
-                                                                        Margin="5"
-                                                                        HorizontalAlignment="Center"
-                                                                        Click="SetTextForeground"
-                                                                        Content="确定"
-                                                                        Style="{StaticResource ButtonPrimary}" />
-                                                                </StackPanel>
-                                                            </Border>
-                                                        </Grid>
-                                                    </ControlTemplate>
-                                                </MenuItem.Template>
-                                            </MenuItem>
-
-                                        </MenuItem>
-                                        <MenuItem
-                                            Click="SetTextViewReturn"
-                                            Header="显示换行符"
-                                            IsCheckable="True"
-                                            IsChecked="{Binding ShowEndOfLine, Source={x:Static config:ConfigManager.Main}}" />
-                                        <MenuItem
-                                            Click="SetTextViewSpace"
-                                            Header="显示空格"
-                                            IsCheckable="True"
-                                            IsChecked="{Binding ShowSpaces, Source={x:Static config:ConfigManager.Main}}" />
-                                        <MenuItem
-                                            Click="SetTextViewTab"
-                                            Header="显示Tab"
-                                            IsCheckable="True"
-                                            IsChecked="{Binding ShowTabs, Source={x:Static config:ConfigManager.Main}}" />
-                                        <MenuItem
-                                            Click="SetTextViewLineNumber"
-                                            Header="显示行号"
-                                            IsCheckable="True"
-                                            IsChecked="{Binding HighlightCurrentLine, Source={x:Static config:ConfigManager.Main}}" />
-                                        <MenuItem
-                                            Click="SetTextHighLightCurrent"
-                                            Header="高亮选中行"
-                                            IsCheckable="True"
-                                            IsChecked="{Binding ShowLineNumbers, Source={x:Static config:ConfigManager.Main}}" />
-
-
-                                    </ContextMenu>
-                                </Button.ContextMenu>
-                            </Button>
-                            <Button
-                                Width="70"
-                                super:CommonExt.HoverBackground="{DynamicResource Window.Title.Hover.Background}"
-                                Click="OpenContextMenu"
-                                Content="视图"
-                                Style="{StaticResource TitleButton}">
-                                <Button.ContextMenu>
-                                    <ContextMenu
-                                        HorizontalOffset="-40"
-                                        StaysOpen="True"
-                                        VerticalOffset="10">
-                                        <MenuItem
-                                            Name="sideGridMenuItem"
-                                            Click="HideSide"
-                                            Header="侧边栏"
-                                            IsCheckable="True"
-                                            IsChecked="True" />
-                                        <!--<MenuItem
+                            <Menu>
+                                <MenuItem
+                                    Background="{DynamicResource Window.Title.Background}"
+                                    Header="文件"
+                                    Style="{StaticResource TopMenuItemStyle}">
+                                    <MenuItem Click="OpenLog" Header="打开日志" />
+                                </MenuItem>
+                                <MenuItem
+                                    Background="{DynamicResource Window.Title.Background}"
+                                    Header="编辑"
+                                    Style="{StaticResource TopMenuItemStyle}">
+                                    <MenuItem
+                                        Header="自动换行"
+                                        IsCheckable="True"
+                                        IsChecked="{Binding AutoWrap, Source={x:Static config:ConfigManager.Main}}" />
+                                    <MenuItem
+                                        Name="FontMenuItem"
+                                        Header="字体"
+                                        IsCheckable="False" />
+                                    <MenuItem
+                                        Click="OpenForegroundSelected"
+                                        Header="字体颜色"
+                                        IsCheckable="False" />
+                                    <MenuItem
+                                        Click="SetTextViewReturn"
+                                        Header="显示换行符"
+                                        IsCheckable="True"
+                                        IsChecked="{Binding ShowEndOfLine, Source={x:Static config:ConfigManager.Main}}" />
+                                    <MenuItem
+                                        Click="SetTextViewSpace"
+                                        Header="显示空格"
+                                        IsCheckable="True"
+                                        IsChecked="{Binding ShowSpaces, Source={x:Static config:ConfigManager.Main}}" />
+                                    <MenuItem
+                                        Click="SetTextViewTab"
+                                        Header="显示Tab"
+                                        IsCheckable="True"
+                                        IsChecked="{Binding ShowTabs, Source={x:Static config:ConfigManager.Main}}" />
+                                    <MenuItem
+                                        Click="SetTextViewLineNumber"
+                                        Header="显示行号"
+                                        IsCheckable="True"
+                                        IsChecked="{Binding HighlightCurrentLine, Source={x:Static config:ConfigManager.Main}}" />
+                                    <MenuItem
+                                        Click="SetTextHighLightCurrent"
+                                        Header="高亮选中行"
+                                        IsCheckable="True"
+                                        IsChecked="{Binding ShowLineNumbers, Source={x:Static config:ConfigManager.Main}}" />
+                                </MenuItem>
+                                <MenuItem
+                                    Background="{DynamicResource Window.Title.Background}"
+                                    Header="视图"
+                                    Style="{StaticResource TopMenuItemStyle}">
+                                    <MenuItem
+                                        Name="sideGridMenuItem"
+                                        Click="HideSide"
+                                        Header="侧边栏"
+                                        IsCheckable="True"
+                                        IsChecked="True" />
+                                    <!--<MenuItem
                                             Header="右侧功能栏"
                                             IsCheckable="True"
                                             IsChecked="{Binding ShowRightPanel, Source={x:Static config:ConfigManager.Main}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />-->
 
-                                    </ContextMenu>
-                                </Button.ContextMenu>
-                            </Button>
+                                </MenuItem>
+                            </Menu>
+
+
 
                         </StackPanel>
                     </Grid>
@@ -1562,35 +1549,18 @@
                                             CornerRadius="3"
                                             PreviewMouseWheel="Border_PreviewMouseWheel">
                                             <avalonEdit:TextEditor
-                                                Name="textBox"
+                                                Name="textEditor"
                                                 Background="Transparent"
                                                 BorderThickness="0"
+                                                ContextMenu="{StaticResource TextEditorContextMenu}"
                                                 FontFamily="微软雅黑"
                                                 FontSize="{Binding SerialPort.TextFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                                 Foreground="{DynamicResource Window.Foreground}"
                                                 GotFocus="textBox_GotFocus"
                                                 IsReadOnly="True"
                                                 LostFocus="textBox_LostFocus"
-                                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                                                ScrollViewer.VerticalScrollBarVisibility="Auto"
                                                 SyntaxHighlighting="ComLog"
-                                                TextChanged="TextBox_TextChanged"
-                                                WordWrap="{Binding AutoWrap, Source={x:Static config:ConfigManager.Main}, Mode=OneWay}">
-                                                <avalonEdit:TextEditor.ContextMenu>
-                                                    <ContextMenu>
-                                                        <MenuItem Command="ApplicationCommands.SelectAll" Header="全选" />
-                                                        <MenuItem Command="ApplicationCommands.Copy" Header="复制" />
-                                                        <MenuItem Header="格式化">
-                                                            <MenuItem Click="FormatJson" Header="JSON(F2)" />
-                                                        </MenuItem>
-                                                        <MenuItem Header="编辑">
-                                                            <MenuItem Click="JoinLine" Header="合并为一行(F3)" />
-                                                        </MenuItem>
-                                                        <MenuItem Click="OpenHexTransform" Header="HEX 转换" />
-                                                        <MenuItem Click="OpenTimeTransform" Header="时间戳" />
-                                                    </ContextMenu>
-                                                </avalonEdit:TextEditor.ContextMenu>
-                                            </avalonEdit:TextEditor>
+                                                WordWrap="{Binding AutoWrap, Source={x:Static config:ConfigManager.Main}, Mode=OneWay}" />
                                         </Border>
 
                                         <Grid
@@ -1988,7 +1958,7 @@
                                                     HorizontalAlignment="Right"
                                                     VerticalAlignment="Center"
                                                     Background="Transparent"
-                                                    Click="SetTextBoxScroll"
+                                                    IsChecked="{Binding FixedText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                                     Style="{StaticResource FlatToggleButton}"
                                                     ToolTip="固定/滚屏">
                                                     <Viewbox
@@ -2049,7 +2019,7 @@
                                                 <Button
                                                     Margin="5,0"
                                                     Click="SaveToNewFile"
-                                                    Content="存到新文件" />
+                                                    Content="日志立即分片" />
 
                                                 <TextBlock
                                                     Margin="10,0,5,0"
@@ -2066,8 +2036,9 @@
                                                     FontSize="12"
                                                     ItemsSource="{Binding DataContext.HighlightingDefinitions, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                                     SelectedIndex="{Binding SerialPort.HighLightIndex, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                    SelectedItem="{Binding SyntaxHighlighting, ElementName=textBox}"
-                                                    Style="{StaticResource BorderComboBox}" />
+                                                    SelectionChanged="highlightingComboBox_SelectionChanged"
+                                                    Style="{StaticResource BorderComboBox}"
+                                                    Tag="{Binding Name}" />
 
                                                 <super:Switch
                                                     Height="20"
@@ -2684,6 +2655,21 @@
 
             </Grid>
 
+            <Grid
+                Grid.Row="2"
+                Height="30"
+                Background="{DynamicResource Window.StatusBar.Background}"
+                Visibility="Collapsed">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto" />
+                    <ColumnDefinition Width="auto" />
+                </Grid.ColumnDefinitions>
+                <TextBlock
+                    Margin="5,0"
+                    VerticalAlignment="Center"
+                    Text="{Binding MemoryUsed, StringFormat={}内存 {0}\ MB}" />
+            </Grid>
+
         </Grid>
 
     </Grid>
diff --git a/SuperCom/MainWindow.xaml.cs b/SuperCom/MainWindow.xaml.cs
index 5bf655c..93cce10 100644
--- a/SuperCom/MainWindow.xaml.cs
+++ b/SuperCom/MainWindow.xaml.cs
@@ -29,6 +29,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Markup;
 using System.Windows.Media;
@@ -71,21 +72,77 @@ public void Init()
             InitSqlite();
             ConfigManager.InitConfig(); // 读取配置
             // 注册 SuperUtils 异常事件
+
+            SuperUtils.Handler.LogHandler.Logger = App.Logger;
             SuperUtils.Handler.ExceptionHandler.OnError += (e) =>
             {
-                // MessageCard.Error(e.Message); 
-            };
-            SuperUtils.Handler.LogHandler.OnLog += (msg) =>
-            {
-                Console.WriteLine(msg);
+                App.Logger.Error(e.Message);
             };
+
             vieModel = new VieModel_Main();
             this.DataContext = vieModel;
             SetLang();      // 设置语言
             ReadConfig();   // 读取设置列表
             PathManager.Init();
+
+            // 看门狗
+
+            App.OnMemoryChanged += (memory) =>
+            {
+                vieModel.MemoryUsed = Math.Ceiling((double)memory / 1024 / 1024);
+            };
+
+            App.OnMemoryDog += () =>
+           {
+               // 找到最大的，清空
+               App.Current.Dispatcher.Invoke(() =>
+              {
+                  if (vieModel != null && vieModel.PortTabItems != null && vieModel.PortTabItems.Count > 0)
+                  {
+                      PortTabItem port = null;
+                      long maxLength = 0;
+                      foreach (var item in vieModel.PortTabItems)
+                      {
+                          if (item.TextEditor == null || !item.Connected)
+                              continue;
+                          if (item.TextEditor.Text.Length > maxLength)
+                          {
+                              maxLength = item.TextEditor.Text.Length;
+                              port = item;
+                          }
+                      }
+                      if (port != null && maxLength > 0)
+                      {
+                          TextEditor oldTextEditor = port.TextEditor;
+                          Border border = oldTextEditor.Parent as Border;
+                          TextEditor newTextEditor = new TextEditor();
+                          SetTextEditorConfig(ref newTextEditor, true);
+                          IHighlightingDefinition syntaxHighlighting = oldTextEditor.SyntaxHighlighting;
+                          double FontSize = oldTextEditor.FontSize;
+
+                          newTextEditor.SyntaxHighlighting = syntaxHighlighting;
+                          newTextEditor.FontSize = FontSize;
+                          newTextEditor.Options = oldTextEditor.Options;
+                          newTextEditor.ShowLineNumbers = oldTextEditor.ShowLineNumbers;
+                          newTextEditor.Language = oldTextEditor.Language;
+                          newTextEditor.FontFamily = oldTextEditor.FontFamily;
+                          newTextEditor.Foreground = oldTextEditor.Foreground;
+
+
+                          if (port.FixedText)
+                              newTextEditor.TextChanged -= port.TextBox_TextChanged;
+                          else
+                              newTextEditor.TextChanged += port.TextBox_TextChanged;
+                          port.TextEditor = newTextEditor;
+                          border.Child = newTextEditor;
+                          MessageCard.Warning($"内存限制，清空 {port.Name} 的日志（本地日志保留）");
+                      }
+                  }
+              });
+           };
         }
 
+
         public void ReadConfig()
         {
             SqliteMapper<ComSettings> mapper = new SqliteMapper<ComSettings>(ConfigManager.SQLITE_DATA_PATH);
@@ -230,10 +287,6 @@ private void SetPortSelected(object sender, MouseButtonEventArgs e)
             CanDrageTabItem = false;
             if (CurrentDragElement != null)
                 Mouse.Capture(CurrentDragElement, CaptureMode.None);
-            this.Cursor = Cursors.Arrow;
-
-
-
         }
         private FrameworkElement CurrentDragElement;
         private void BeginDragTabItem(object sender, MouseButtonEventArgs e)
@@ -254,9 +307,6 @@ private void Border_PreviewMouseMove(object sender, MouseEventArgs e)
         {
             if (!CanDrageTabItem)
                 return;
-            this.Cursor = Cursors.Hand;
-
-
         }
 
         public void SetPortTabSelected(string portName)
@@ -455,6 +505,19 @@ private async Task<bool> OpenPort(SideComPort sideComPort)
                 return false;
             }
 
+            await Task.Delay(DEFAULT_PORT_OPEN_INTERVAL);
+            TextEditor textEditor = portTabItem.TextEditor;
+            if (textEditor == null)
+            {
+                textEditor = FindTextBoxByPortName(portName);
+                SetTextEditorConfig(ref textEditor);
+                textEditor.TextChanged += portTabItem.TextBox_TextChanged;
+                portTabItem.TextEditor = textEditor;
+                // 设置语法高亮
+                int idx = (int)portTabItem.SerialPort.HighLightIndex;
+                if (vieModel.HighlightingDefinitions != null && idx < vieModel.HighlightingDefinitions.Count && idx >= 0)
+                    portTabItem.TextEditor.SyntaxHighlighting = vieModel.HighlightingDefinitions[idx];
+            }
             // 加载监视器
             portTabItem.VarMonitors = new System.Collections.ObjectModel.ObservableCollection<VarMonitor>();
             foreach (var item in vieModel.GetVarMonitorByPortName(portName))
@@ -463,61 +526,15 @@ private async Task<bool> OpenPort(SideComPort sideComPort)
             }
 
 
-            await Task.Delay(DEFAULT_PORT_OPEN_INTERVAL);
-            TextEditor textEditor = FindTextBoxByPortName(portName);
-            // 编辑器设置
-            TextEditorOptions textEditorOptions = new TextEditorOptions();
-            textEditorOptions.HighlightCurrentLine = ConfigManager.Main.HighlightCurrentLine;
-            textEditorOptions.ShowEndOfLine = ConfigManager.Main.ShowEndOfLine;
-            textEditorOptions.ShowSpaces = ConfigManager.Main.ShowSpaces;
-            textEditorOptions.ShowTabs = ConfigManager.Main.ShowTabs;
-            textEditor.Options = textEditorOptions;
-            textEditor.ShowLineNumbers = ConfigManager.Main.ShowLineNumbers;
-            textEditor.Language = XmlLanguage.GetLanguage(VisualHelper.ZH_CN);
-            if (!string.IsNullOrEmpty(ConfigManager.Main.TextFontName))
-                textEditor.FontFamily = new FontFamily(ConfigManager.Main.TextFontName);
-            if (!string.IsNullOrEmpty(ConfigManager.Main.TextForeground))
-            {
-                Brush brush = SuperUtils.WPF.VisualTools.VisualHelper.HexStringToBrush(ConfigManager.Main.TextForeground);
-                textEditor.Foreground = brush;
-            }
-
-
-
-            portTabItem.TextEditor = textEditor;
             // 搜索框
-            SearchPanel searchPanel = SearchPanel.Install(portTabItem.TextEditor);
-
-            Grid rootGrid = (portTabItem.TextEditor.Parent as Border).Parent as Grid;
-            ToggleButton toggleButton = rootGrid.FindName("pinToggleButton") as ToggleButton;
-
-
-            searchPanel.OnSearching += (e) =>
-            {
-                if (ConfigManager.CommonSettings.FixedOnSearch)
-                {
-                    // 将文本固定
-                    portTabItem.TextEditor.TextChanged -= TextBox_TextChanged;
-                    toggleButton.IsEnabled = false;
-                    toggleButton.IsChecked = true;
-                }
-            };
-            searchPanel.OnClosed += () =>
-            {
-                if (ConfigManager.CommonSettings.ScrollOnSearchClosed)
-                {
-                    toggleButton.IsChecked = false;
-                    portTabItem.TextEditor.TextChanged -= TextBox_TextChanged;
-                    portTabItem.TextEditor.TextChanged += TextBox_TextChanged;
-                }
-                toggleButton.IsEnabled = true;
-            };
-
             sideComPort.PortTabItem = portTabItem;
             sideComPort.PortTabItem.RX = 0;
             sideComPort.PortTabItem.TX = 0;
             sideComPort.PortTabItem.CurrentCharSize = 0;
             sideComPort.PortTabItem.FragCount = 0;
+
+
+
             await Task.Run(() =>
             {
                 try
@@ -552,11 +569,59 @@ await Task.Run(() =>
             return true;
         }
 
+
+
+        private void SetTextEditorConfig(ref TextEditor textEditor, bool createInCode = false)
+        {
+            if (createInCode)
+            {
+                // 恢复绑定
+                textEditor.Background = Brushes.Transparent;
+                textEditor.BorderThickness = new Thickness(0);
+
+                Binding binding1 = new Binding();
+                binding1.Source = vieModel.PortTabItems;
+                binding1.Path = new PropertyPath("SerialPort.TextFontSize");
+                binding1.Mode = BindingMode.TwoWay;
+                binding1.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
+                BindingOperations.SetBinding(textEditor, TextEditor.FontSizeProperty, binding1);
+
+
+                Binding binding2 = new Binding();
+                binding2.Source = ConfigManager.Main;
+                binding2.Path = new PropertyPath("AutoWrap");
+                binding2.Mode = BindingMode.OneWay;
+                BindingOperations.SetBinding(textEditor, TextEditor.WordWrapProperty, binding2);
+
+
+                textEditor.SetResourceReference(TextEditor.ForegroundProperty, "Window.Foreground");
+                textEditor.IsReadOnly = true;
+                textEditor.GotFocus += textBox_GotFocus;
+                textEditor.LostFocus += textBox_LostFocus;
+            }
+
+            textEditor.Name = "textEditor";
+            textEditor.ContextMenu = this.Resources["TextEditorContextMenu"] as ContextMenu;
+            TextEditorOptions textEditorOptions = new TextEditorOptions();
+            textEditorOptions.HighlightCurrentLine = ConfigManager.Main.HighlightCurrentLine;
+            textEditorOptions.ShowEndOfLine = ConfigManager.Main.ShowEndOfLine;
+            textEditorOptions.ShowSpaces = ConfigManager.Main.ShowSpaces;
+            textEditorOptions.ShowTabs = ConfigManager.Main.ShowTabs;
+            textEditor.Options = textEditorOptions;
+            textEditor.ShowLineNumbers = ConfigManager.Main.ShowLineNumbers;
+            textEditor.Language = XmlLanguage.GetLanguage(VisualHelper.ZH_CN);
+            SearchPanel.Install(textEditor);
+
+
+        }
+
         private async Task<bool> ClosePort(string portName)
         {
-            if (vieModel.PortTabItems == null || string.IsNullOrEmpty(portName)) return false;
+            if (vieModel.PortTabItems == null || string.IsNullOrEmpty(portName))
+                return false;
             PortTabItem portTabItem = vieModel.PortTabItems.FirstOrDefault(arg => arg.Name.Equals(portName));
-            if (portTabItem == null) return false;
+            if (portTabItem == null)
+                return false;
             CustomSerialPort serialPort = portTabItem.SerialPort;
             if (serialPort != null && serialPort.IsOpen)
             {
@@ -592,7 +657,7 @@ public async Task<bool> AsynClosePort(CustomSerialPort serialPort)
             }
             catch (TimeoutException ex)
             {
-                Console.WriteLine(ex.Message);
+                App.Logger.Error(ex.Message);
             }
             catch (Exception ex)
             {
@@ -612,7 +677,7 @@ private void HandleDataReceived(CustomSerialPort serialPort)
             }
             catch (Exception ex)
             {
-                Console.WriteLine(ex.Message);
+                App.Logger.Error(ex.Message);
             }
             string portName = serialPort.PortName;
             PortTabItem portTabItem = vieModel.PortTabItems.Where(arg => arg.Name.Equals(portName)).FirstOrDefault();
@@ -628,7 +693,7 @@ private void HandleDataReceived(CustomSerialPort serialPort)
                 }
                 catch (Exception ex)
                 {
-                    Console.WriteLine(ex.Message);
+                    App.Logger.Error(ex.Message);
                 }
             }
 
@@ -749,12 +814,6 @@ private async void Grid_PreviewMouseLeftButtonDown(object sender, MouseButtonEve
             }
         }
 
-        private void TextBox_TextChanged(object sender, EventArgs e)
-        {
-
-            (sender as TextEditor).ScrollToEnd();
-        }
-
         private void ShowAbout(object sender, RoutedEventArgs e)
         {
             Dialog_About about = new Dialog_About();
@@ -809,19 +868,19 @@ private void Border_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
 
         private void SetTextBoxScroll(object sender, RoutedEventArgs e)
         {
-            ToggleButton toggleButton = sender as ToggleButton;
-            bool fix = (bool)toggleButton.IsChecked;
-            PortTabItem portTabItem = GetPortItem(sender as FrameworkElement);
-            if (portTabItem != null && portTabItem.TextEditor != null)
-            {
-                if (fix)
-                    portTabItem.TextEditor.TextChanged -= TextBox_TextChanged;
-                else
-                {
-                    portTabItem.TextEditor.TextChanged -= TextBox_TextChanged;
-                    portTabItem.TextEditor.TextChanged += TextBox_TextChanged;
-                }
-            }
+            //ToggleButton toggleButton = sender as ToggleButton;
+            //bool fix = (bool)toggleButton.IsChecked;
+            //PortTabItem portTabItem = GetPortItem(sender as FrameworkElement);
+            //if (portTabItem != null && portTabItem.TextEditor != null)
+            //{
+            //    if (fix)
+            //        portTabItem.TextEditor.TextChanged -= TextBox_TextChanged;
+            //    else
+            //    {
+            //        portTabItem.TextEditor.TextChanged -= TextBox_TextChanged;
+            //        portTabItem.TextEditor.TextChanged += TextBox_TextChanged;
+            //    }
+            //}
         }
 
         private TextEditor FindTextBox(Grid rootGrid)
@@ -845,7 +904,7 @@ private TextEditor FindTextBoxByPortName(string portName)
                 if (presenter == null) continue;
                 Grid grid = VisualHelper.FindElementByName<Grid>(presenter, "rootGrid");
                 if (grid != null && grid.Tag != null && portName.Equals(grid.Tag.ToString())
-                    && grid.FindName("textBox") is TextEditor textEditor) return textEditor;
+                    && grid.FindName("textEditor") is TextEditor textEditor) return textEditor;
             }
             return null;
         }
@@ -946,11 +1005,9 @@ private void SendCommand(object sender, RoutedEventArgs e)
                 SendCommand(portName);
                 if (ConfigManager.CommonSettings.FixedOnSendCommand)
                 {
-                    Grid grid = ((button.Parent as Grid).Parent as Grid).Parent as Grid;
-                    Grid baseGrid = grid.Parent as Grid;
-                    (ToggleButton toggleButton, TextEditor textEditor) = FindToggleButtonByBaseGrid(baseGrid);
-                    toggleButton.IsChecked = true;
-                    textEditor.TextChanged -= TextBox_TextChanged;
+                    PortTabItem portTabItem = vieModel.PortTabItems.FirstOrDefault(arg => arg.Name.Equals(portName));
+                    if (portTabItem != null)
+                        portTabItem.FixedText = true;
                 }
             }
         }
@@ -1007,10 +1064,8 @@ public bool SendCommand(SerialPort port, PortTabItem portTabItem, string value,
             portTabItem.SaveData($"SEND >>>>>>>>>> {value}");
             try
             {
-                //Console.WriteLine($"before port write, value = {value}");
                 port.Write(value);
-                //Console.WriteLine($"after port write");
-                portTabItem.TX += value.Length;
+                portTabItem.TX += Encoding.UTF8.GetByteCount(value);
                 // todo 保存到发送历史
                 //if (saveToHistory)
                 //{
@@ -1209,7 +1264,7 @@ private void mainWindow_Closing(object sender, System.ComponentModel.CancelEvent
             }
             catch (Exception ex)
             {
-                Console.WriteLine(ex.Message);
+                App.Logger.Error(ex.Message);
             }
 
         }
@@ -1499,7 +1554,7 @@ public void SetFontFamily(string name)
 
             foreach (PortTabItem item in vieModel.PortTabItems)
             {
-                TextEditor textEditor = FindTextBoxByPortName(item.Name);
+                TextEditor textEditor = item.TextEditor;
                 if (textEditor != null)
                     textEditor.FontFamily = VisualHelper.SYSTEM_FONT_FAMILIES[name];
             }
@@ -1744,8 +1799,6 @@ private void SendTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
                     else idx++;
                     if (idx >= list.Count) idx = 0;
                     else if (idx < 0) idx = list.Count - 1;
-                    //Console.WriteLine("text=" + text);
-                    //Console.WriteLine(idx);
                     vieModel.SendHistorySelectedIndex = idx;
                     vieModel.SendHistorySelectedValue = list[idx];
                     // 设置当前选中状态
@@ -1928,7 +1981,9 @@ public void SetComboboxStatus()
         {
             foreach (PortTabItem item in vieModel.PortTabItems)
             {
-                TextEditor textEditor = FindTextBoxByPortName(item.Name);
+                TextEditor textEditor = item.TextEditor;
+                if (textEditor == null)
+                    textEditor = FindTextBoxByPortName(item.Name);
                 if (textEditor != null)
                 {
                     ComboBox comboBox = FindCombobox(textEditor);
@@ -2050,10 +2105,9 @@ private void SendCustomCommand(object sender, RoutedEventArgs e)
                     // 设置固定滚屏
                     if (ConfigManager.CommonSettings.FixedOnSendCommand)
                     {
-                        Grid baseGrid = (border.Parent as Grid).Parent as Grid;
-                        (ToggleButton toggleButton, TextEditor textEditor) = FindToggleButtonByBaseGrid(baseGrid);
-                        toggleButton.IsChecked = true;
-                        textEditor.TextChanged -= TextBox_TextChanged;
+                        PortTabItem portTabItem = vieModel.PortTabItems.FirstOrDefault(arg => arg.Name.Equals(portName));
+                        if (portTabItem != null)
+                            portTabItem.FixedText = true;
                     }
                 }
             }
@@ -2106,11 +2160,17 @@ private void StopSendCommands(object sender, RoutedEventArgs e)
 
         public void BeginSendCommands(AdvancedSend advancedSend, string portName, Button button)
         {
-            if (advancedSend == null || string.IsNullOrEmpty(advancedSend.Commands)) return;
+            if (advancedSend == null || string.IsNullOrEmpty(advancedSend.Commands))
+                return;
             advancedSend.CommandList = JsonUtils.TryDeserializeObject<List<SendCommand>>(advancedSend.Commands);
-            if (advancedSend.CommandList == null || advancedSend.CommandList.Count == 0) return;
+            if (advancedSend.CommandList == null || advancedSend.CommandList.Count == 0)
+                return;
             PortTabItem portTabItem = vieModel.PortTabItems.Where(arg => arg.Name.Equals(portName)).FirstOrDefault();
-            if (portTabItem == null) return;
+            if (portTabItem == null || !portTabItem.Connected)
+            {
+                MessageNotify.Error($"端口 {portName} 未连接");
+                return;
+            }
             portTabItem.RunningCommands = true;
             SetRunningStatus(button, true);
             Task.Run(async () =>
@@ -2124,6 +2184,8 @@ public void BeginSendCommands(AdvancedSend advancedSend, string portName, Button
                         advancedSend.CommandList[idx].Status = RunningStatus.Running;
 
                     bool success = await AsyncSendCommand(idx, portName, command, advancedSend);
+                    if (!success)
+                        break;
                     advancedSend.CommandList[idx].Status = RunningStatus.WaitingDelay;
                     if (command.Delay > 0)
                     {
@@ -2206,15 +2268,11 @@ private void Remark(object sender, RoutedEventArgs e)
                 SideComPort sideComPort = vieModel.SideComPorts.Where(arg => arg.Name.Equals(portName)).FirstOrDefault();
                 if (sideComPort != null && sideComPort.PortTabItem is PortTabItem portTabItem)
                 {
-                    string defaultContent = "请输入备注";
-                    if (!string.IsNullOrEmpty(portTabItem.Remark))
-                        defaultContent = portTabItem.Remark;
-                    DialogInput dialogInput = new DialogInput(this, defaultContent);
+                    DialogInput dialogInput = new DialogInput(this, "请输入备注", portTabItem.Remark);
                     if (dialogInput.ShowDialog() == true)
                     {
                         string value = dialogInput.Text;
                         portTabItem.Remark = value;
-                        Console.WriteLine(value);
                         portTabItem.SerialPort.SaveRemark(value);
                         sideComPort.Remark = value;
                         ComSettings comSettings = vieModel.ComSettingList.Where(arg => arg.PortName.Equals(portName)).FirstOrDefault();
@@ -2378,7 +2436,7 @@ private async void CheckUpgrade()
             }
             catch (Exception ex)
             {
-                Console.WriteLine(ex.Message);
+                App.Logger.Error(ex.Message);
             }
         }
 
@@ -2589,7 +2647,7 @@ private async void baseGrid_PreviewKeyDown(object sender, KeyEventArgs e)
                 }
             }
 
-            //Console.WriteLine($"key = {e.Key}");
+            App.Logger.Debug($"按下按键：{e.Key}");
 
             // 快捷键检测
             ShortCutBinding shortCutBinding = null;
@@ -2649,17 +2707,20 @@ private async void baseGrid_PreviewKeyDown(object sender, KeyEventArgs e)
                 case 4:
                     {
                         // 固定滚屏
-                        Grid baseGrid = sender as Grid;
-                        (ToggleButton toggleButton, TextEditor textEditor) = FindToggleButtonByBaseGrid(baseGrid);
-                        if (!toggleButton.IsEnabled) return;
-                        toggleButton.IsChecked = !toggleButton.IsChecked;
-                        if ((bool)toggleButton.IsChecked)
-                            textEditor.TextChanged -= TextBox_TextChanged;
-                        else
-                        {
-                            textEditor.TextChanged -= TextBox_TextChanged;
-                            textEditor.TextChanged += TextBox_TextChanged;
-                        }
+                        //Grid baseGrid = sender as Grid;
+                        //(ToggleButton toggleButton, TextEditor textEditor) = FindToggleButtonByBaseGrid(baseGrid);
+                        //if (!toggleButton.IsEnabled) return;
+                        //toggleButton.IsChecked = !toggleButton.IsChecked;
+                        //if ((bool)toggleButton.IsChecked)
+                        //    textEditor.TextChanged -= TextBox_TextChanged;
+                        //else
+                        //{
+                        //    textEditor.TextChanged -= TextBox_TextChanged;
+                        //    textEditor.TextChanged += TextBox_TextChanged;
+                        //}
+                        PortTabItem portTabItem = vieModel.PortTabItems.FirstOrDefault(arg => arg.Name.Equals(portName));
+                        if (portTabItem != null)
+                            portTabItem.FixedText = !portTabItem.FixedText;
                     }
                     break;
                 case 5:
@@ -2825,23 +2886,12 @@ private bool GetMenuItemCheckedStatus(object sender)
             return (sender as MenuItem).IsChecked;
         }
 
-        private void SetTextWrap(object sender, RoutedEventArgs e)
-        {
-            //bool status = GetMenuItemCheckedStatus(sender);
-            //foreach (PortTabItem item in vieModel.PortTabItems)
-            //{
-            //    TextEditor textEditor = FindTextBoxByPortName(item.Name);
-            //    if (textEditor != null)
-            //        textEditor.WordWrap = status;
-            //}
-            //vieModel.AutoTextWrap = status;
-        }
 
         private void SetTextEditOption(string optionName, object status)
         {
             foreach (PortTabItem item in vieModel.PortTabItems)
             {
-                TextEditor textEditor = FindTextBoxByPortName(item.Name);
+                TextEditor textEditor = item.TextEditor;
                 if (textEditor != null)
                 {
                     TextEditorOptions options = textEditor.Options;
@@ -2856,7 +2906,7 @@ private void SetTextPropOption(string propName, object status)
         {
             foreach (PortTabItem item in vieModel.PortTabItems)
             {
-                TextEditor textEditor = FindTextBoxByPortName(item.Name);
+                TextEditor textEditor = item.TextEditor;
                 if (textEditor != null)
                 {
                     System.Reflection.PropertyInfo propertyInfo = textEditor.GetType().GetProperty(propName);
@@ -2900,23 +2950,52 @@ private void SetTextViewLineNumber(object sender, RoutedEventArgs e)
 
         private void SetTextForeground(object sender, RoutedEventArgs e)
         {
-            StackPanel stackPanel = (sender as Button).Parent as StackPanel;
-            ColorPicker colorPicker = stackPanel.Children.OfType<ColorPicker>().FirstOrDefault();
+            //StackPanel stackPanel = (sender as Button).Parent as StackPanel;
+            //ColorPicker colorPicker = stackPanel.Children.OfType<ColorPicker>().FirstOrDefault();
+            //SolidColorBrush brush = new SolidColorBrush(colorPicker.SelectedColor);
+            //SetTextPropOption("Foreground", brush);
+            //ConfigManager.Main.TextForeground = brush.ToString();
+            //if (stackPanel.Tag != null && stackPanel.Tag is ContextMenu contextMenu)
+            //    contextMenu.IsOpen = false;
+        }
+
+        private void colorPicker_SelectedColorChanged(object sender, EventArgs e)
+        {
+            ColorPicker colorPicker = sender as ColorPicker;
             SolidColorBrush brush = new SolidColorBrush(colorPicker.SelectedColor);
             SetTextPropOption("Foreground", brush);
             ConfigManager.Main.TextForeground = brush.ToString();
-            if (stackPanel.Tag != null && stackPanel.Tag is ContextMenu contextMenu)
-                contextMenu.IsOpen = false;
+
         }
 
         private void textBox_GotFocus(object sender, RoutedEventArgs e)
         {
-            ((sender as TextEditor).Parent as Border).BorderBrush = (SolidColorBrush)Application.Current.Resources["Button.Selected.BorderBrush"];
+            TextEditor textEditor = sender as TextEditor;
+            if (textEditor == null || textEditor.Parent == null)
+                return;
+            Border border = textEditor.Parent as Border;
+            if (border == null)
+                return;
+            border.BorderBrush = (SolidColorBrush)Application.Current.Resources["Button.Selected.BorderBrush"];
+            // 设置不滚动
+            Grid rootGrid = border.Parent as Grid;
+            ToggleButton toggleButton = rootGrid.FindName("pinToggleButton") as ToggleButton;
+            // 将文本固定
+            string portName = rootGrid.Tag.ToString();
+            SideComPort sideComPort = vieModel.SideComPorts.FirstOrDefault(arg => arg.Name.Equals(portName));
+            if (sideComPort != null && sideComPort.PortTabItem is PortTabItem portTabItem && !(bool)toggleButton.IsChecked)
+            {
+                //portTabItem.TextEditor.TextChanged -= TextBox_TextChanged;
+                //toggleButton.IsChecked = true;
+                portTabItem.FixedText = true;
+            }
         }
 
         private void textBox_LostFocus(object sender, RoutedEventArgs e)
         {
-            ((sender as TextEditor).Parent as Border).BorderBrush = Brushes.Transparent;
+            TextEditor textEditor = sender as TextEditor;
+            if (textEditor != null && textEditor.Parent is Border border)
+                border.BorderBrush = Brushes.Transparent;
         }
         Window_VirtualPort virtualPort;
         private async void ShowVirtualPort(object sender, RoutedEventArgs e)
@@ -2940,45 +3019,29 @@ private async void ShowVirtualPort(object sender, RoutedEventArgs e)
         }
 
 
+        private void CloseForegroundSelected(object sender, RoutedEventArgs e)
+        {
+            ForegroundPopup.IsOpen = false;
+        }
 
-
-
-        private void MenuItem_SubmenuOpened(object sender, RoutedEventArgs e)
+        private void OpenForegroundSelected(object sender, RoutedEventArgs e)
         {
-            MenuItem menuItem = sender as MenuItem;
-            if (menuItem.Items != null && menuItem.Items.Count > 0 && menuItem.Items[0] is MenuItem item)
+            ForegroundPopup.IsOpen = true;
+            string colorText = ConfigManager.Main.TextForeground;
+            if (!string.IsNullOrEmpty(colorText))
             {
-                Task.Run(async () =>
-                {
-                    await Task.Delay(200);  // 等待一会，因为 template 未渲染出来
-                    App.Current.Dispatcher.Invoke(() =>
-                    {
-                        ControlTemplate template = item.Template;
-                        object v = template.FindName("colorPicker", item);
-                        if (v != null && v is ColorPicker colorPicker)
-                        {
-
-                            string colorText = ConfigManager.Main.TextForeground;
-                            if (!string.IsNullOrEmpty(colorText))
-                            {
-
-                                Brush brush = SuperUtils.WPF.VisualTools.VisualHelper.HexStringToBrush(colorText);
-                                if (brush != null)
-                                {
-                                    SolidColorBrush solidColorBrush = (SolidColorBrush)brush;
-                                    colorPicker.SetCurrentColor(solidColorBrush.Color);
-                                }
-
-                            }
-                        }
-                    });
-
 
-                });
+                Brush brush = SuperUtils.WPF.VisualTools.VisualHelper.HexStringToBrush(colorText);
+                if (brush != null)
+                {
+                    SolidColorBrush solidColorBrush = (SolidColorBrush)brush;
+                    colorPicker.SetCurrentColor(solidColorBrush.Color);
+                }
             }
-
         }
 
+
+
         private void OnShowRightPanel(object sender, RoutedEventArgs e)
         {
             ConfigManager.Main.ShowRightPanel = false;
@@ -3379,6 +3442,14 @@ private async void CloseAllPorts(object sender, RoutedEventArgs e)
             vieModel.DoingLongWork = false;
         }
 
-
+        private void highlightingComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (e.AddedItems == null || e.AddedItems.Count == 0) return;
+            ComboBox comboBox = sender as ComboBox;
+            string portName = comboBox.Tag.ToString();
+            PortTabItem portTabItem = vieModel.PortTabItems.FirstOrDefault(arg => arg.Name.Equals(portName));
+            if (portTabItem != null && portTabItem.TextEditor != null)
+                portTabItem.TextEditor.SyntaxHighlighting = e.AddedItems[0] as IHighlightingDefinition;
+        }
     }
 }
diff --git a/SuperCom/Properties/AssemblyInfo.cs b/SuperCom/Properties/AssemblyInfo.cs
index de2a252..8c8f53c 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.9.0.0")]
-[assembly: AssemblyFileVersion("2.9.0.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.0.0")]
diff --git a/SuperCom/References/SuperControls.Style.dll b/SuperCom/References/SuperControls.Style.dll
index 53ac61d..63af610 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 92c289f..c69706d 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 458fd70..3ce5f60 100644
--- a/SuperCom/SuperCom.csproj
+++ b/SuperCom/SuperCom.csproj
@@ -144,6 +144,9 @@
     <Compile Include="ViewModel\VieModel_Setting.cs" />
     <Compile Include="ViewModel\VieModel_AdvancedSend.cs" />
     <Compile Include="ViewModel\VieModel_Main.cs" />
+    <Compile Include="WatchDog\AbstractDog.cs" />
+    <Compile Include="WatchDog\IDog.cs" />
+    <Compile Include="WatchDog\MemoryDog.cs" />
     <Compile Include="Windows\Window_AdvancedSend.xaml.cs">
       <DependentUpon>Window_AdvancedSend.xaml</DependentUpon>
     </Compile>
diff --git a/SuperCom/ViewModel/VieModel_AdvancedSend.cs b/SuperCom/ViewModel/VieModel_AdvancedSend.cs
index 95eafe6..a42b5e0 100644
--- a/SuperCom/ViewModel/VieModel_AdvancedSend.cs
+++ b/SuperCom/ViewModel/VieModel_AdvancedSend.cs
@@ -181,7 +181,7 @@ private void Init()
             CurrentProjects = new ObservableCollection<AdvancedSend>();
             SendCommands = new ObservableCollection<SendCommand>();
             AllProjects = new List<AdvancedSend>();
-            // �����ݿ��ж�ȡ
+            // 从数据库中读取
             if (mapper != null)
             {
                 AllProjects = mapper.SelectList();
@@ -237,7 +237,7 @@ private void LoadSideComports()
             {
                 SideComPorts.Add(item);
                 bool isChecked = false;
-                // ����ѡ��
+                // 设置选中
                 if (dict != null && dict.ContainsKey(item.Name))
                     isChecked = dict[item.Name];
                 SideComPortSelected.Add(item, isChecked);
@@ -249,7 +249,7 @@ public void UpdateProject(AdvancedSend send)
             int count = mapper.UpdateById(send);
             if (count <= 0)
             {
-                System.Console.WriteLine($"���� {send.ProjectName} ʧ��");
+                Console.WriteLine($"插入 {send.ProjectName} 失败");
             }
         }
 
@@ -258,7 +258,7 @@ public void RenameProject(AdvancedSend send)
             bool result = mapper.UpdateFieldById("ProjectName", send.ProjectName, send.ProjectID);
             if (!result)
             {
-                System.Console.WriteLine($"���� {send.ProjectName} ʧ��");
+                Console.WriteLine($"更新 {send.ProjectName} 失败");
             }
         }
 
@@ -267,7 +267,7 @@ public void DeleteProject(AdvancedSend send)
             int count = mapper.DeleteById(send.ProjectID);
             if (count <= 0)
             {
-                System.Console.WriteLine($"ɾ�� {send.ProjectName} ʧ��");
+                Console.WriteLine($"删除 {send.ProjectName} 失败");
             }
             else
             {
diff --git a/SuperCom/ViewModel/VieModel_Main.cs b/SuperCom/ViewModel/VieModel_Main.cs
index a2e6546..a6d4a8d 100644
--- a/SuperCom/ViewModel/VieModel_Main.cs
+++ b/SuperCom/ViewModel/VieModel_Main.cs
@@ -11,6 +11,7 @@
 using System.Collections.ObjectModel;
 using System.IO.Ports;
 using System.Linq;
+using System;
 
 namespace SuperCom.ViewModel
 {
@@ -184,6 +185,12 @@ public string DoingWorkMsg
             get { return _DoingWorkMsg; }
             set { _DoingWorkMsg = value; RaisePropertyChanged(); }
         }
+        private double _MemoryUsed;
+        public double MemoryUsed
+        {
+            get { return _MemoryUsed; }
+            set { _MemoryUsed = value; RaisePropertyChanged(); }
+        }
 
         public AdvancedSend CurrentAdvancedSend { get; set; }
 
@@ -295,7 +302,7 @@ public void UpdateProject(AdvancedSend send)
             int count = mapper.UpdateById(send);
             if (count <= 0)
             {
-                System.Console.WriteLine($"���� {send.ProjectName} ʧ��");
+                Console.WriteLine($"���� {send.ProjectName} ʧ��");
             }
         }
 
diff --git a/SuperCom/ViewModel/VieModel_Setting.cs b/SuperCom/ViewModel/VieModel_Setting.cs
index 08a3ece..1879efa 100644
--- a/SuperCom/ViewModel/VieModel_Setting.cs
+++ b/SuperCom/ViewModel/VieModel_Setting.cs
@@ -15,6 +15,7 @@
 using System.Windows;
 using System.Windows.Media;
 using static SuperCom.Entity.HighLightRule;
+using System;
 
 namespace SuperCom.ViewModel
 {
@@ -99,7 +100,7 @@ public void SaveValue()
         }
 
 
-        #region "��־����"
+        #region "��־����"
 
 
         private ObservableCollection<HighLightRule> _HighLightRules;
@@ -148,7 +149,7 @@ public long CurrentRuleID
             }
         }
 
-        public void NewRule(string ruleName = "�Զ������")
+        public void NewRule(string ruleName = "�Զ������")
         {
             HighLightRule rule = new HighLightRule();
             rule.RuleName = ruleName;
@@ -241,7 +242,7 @@ public void UpdateRule(HighLightRule rule)
             int count = ruleMapper.UpdateById(rule);
             if (count <= 0)
             {
-                System.Console.WriteLine($"���� {rule.RuleName} ʧ��");
+                Console.WriteLine($"���� {rule.RuleName} ʧ��");
             }
 
         }
@@ -254,7 +255,7 @@ public void SaveAllRule()
                 foreach (var item in HighLightRules)
                 {
                     item.SetFileName();
-                    item.WriteToXshd(); // д�뵽 xshd �ļ���
+                    item.WriteToXshd(); // д�뵽 xshd �ļ���
                     ruleMapper.UpdateById(item);
                 }
                 HighLightRule.AllRules = ruleMapper.SelectList();
@@ -266,7 +267,7 @@ public void RenameRule(HighLightRule rule)
             bool result = ruleMapper.UpdateFieldById("RuleName", rule.RuleName, rule.RuleID);
             if (!result)
             {
-                System.Console.WriteLine($"���� {rule.RuleName} ʧ��");
+                Console.WriteLine($"���� {rule.RuleName} ʧ��");
             }
 
         }
diff --git a/SuperCom/WatchDog/AbstractDog.cs b/SuperCom/WatchDog/AbstractDog.cs
new file mode 100644
index 0000000..df98e0b
--- /dev/null
+++ b/SuperCom/WatchDog/AbstractDog.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SuperCom.WatchDog
+{
+    public abstract class AbstractDog : IDog
+    {
+        private const int DEFAULT_WATCH_INTERVAL = 10 * 1000;
+
+        public Action OnNotFeed { get; set; }
+        public virtual bool Feed()
+        {
+            throw new NotImplementedException();
+        }
+
+        public AbstractDog()
+        {
+            WatchInterval = DEFAULT_WATCH_INTERVAL;
+        }
+
+        public AbstractDog(int watchInterval)
+        {
+            WatchInterval = watchInterval;
+        }
+
+
+        private int WatchInterval { get; set; }
+
+        private bool Init { get; set; }
+
+        public void Watch()
+        {
+            if (Init)
+                return;
+            Init = true;
+            Task.Run(async () =>
+            {
+                while (true)
+                {
+                    Console.WriteLine($"看门狗每 {WatchInterval / 1000} s 看一下门...");
+                    if (!Feed())
+                    {
+                        // 通知程序
+                        OnNotFeed?.Invoke();
+                        Console.WriteLine("看门狗要发飙了！");
+                    }
+                    await Task.Delay(WatchInterval);
+                }
+
+            });
+        }
+
+
+    }
+}
diff --git a/SuperCom/WatchDog/IDog.cs b/SuperCom/WatchDog/IDog.cs
new file mode 100644
index 0000000..57ba295
--- /dev/null
+++ b/SuperCom/WatchDog/IDog.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SuperCom.WatchDog
+{
+    public interface IDog
+    {
+        bool Feed();
+        void Watch();
+    }
+}
diff --git a/SuperCom/WatchDog/MemoryDog.cs b/SuperCom/WatchDog/MemoryDog.cs
new file mode 100644
index 0000000..d6335a1
--- /dev/null
+++ b/SuperCom/WatchDog/MemoryDog.cs
@@ -0,0 +1,45 @@
+using SuperCom.Config;
+using SuperUtils.IO;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SuperCom.WatchDog
+{
+
+
+    /// <summary>
+    /// 内存监控
+    /// </summary>
+    public class MemoryDog : AbstractDog
+    {
+
+        public Action<long> OnMemoryChanged;
+
+#if DEBUG
+        private const int WATCH_INTERVAL = 5 * 1000;
+#else
+        private const int WATCH_INTERVAL = 60 * 1000;
+#endif
+        public MemoryDog() : base(WATCH_INTERVAL)
+        {
+
+        }
+
+        public override bool Feed()
+        {
+            using (Process proc = Process.GetCurrentProcess())
+            {
+                long currentMemory = proc.PrivateMemorySize64;
+                Console.WriteLine($"memory = {currentMemory.ToProperFileSize()}");
+                OnMemoryChanged?.Invoke(currentMemory);
+                if ((double)currentMemory / 1024 / 1024 >= ConfigManager.Settings.MemoryLimit)
+                    return false;
+            }
+            return true;
+        }
+    }
+}
diff --git a/SuperCom/Windows/Window_AdvancedSend.xaml b/SuperCom/Windows/Window_AdvancedSend.xaml
index 2ad1682..53f4207 100644
--- a/SuperCom/Windows/Window_AdvancedSend.xaml
+++ b/SuperCom/Windows/Window_AdvancedSend.xaml
@@ -259,13 +259,20 @@
                 VerticalAlignment="Center"
                 Background="{DynamicResource Window.Title.Background}"
                 CornerRadius="3">
-                <StackPanel Orientation="Horizontal">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto" />
+                        <ColumnDefinition Width="auto" />
+                        <ColumnDefinition Width="auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
                     <Button
+                        Grid.Column="0"
                         Width="25"
                         Height="25"
                         Margin="0"
                         Padding="0"
-                        VerticalAlignment="Stretch"
+                        VerticalAlignment="Top"
                         super:CommonExt.CornerRadius="5"
                         super:CommonExt.HoverBackground="{DynamicResource Window.Title.Hover.Background}"
                         Click="StartCommands"
@@ -297,11 +304,12 @@
                     </Button>
 
                     <Button
+                        Grid.Column="1"
                         Width="25"
                         Height="25"
                         Margin="0"
                         Padding="0"
-                        VerticalAlignment="Stretch"
+                        VerticalAlignment="Top"
                         super:CommonExt.CornerRadius="5"
                         super:CommonExt.HoverBackground="{DynamicResource Window.Title.Hover.Background}"
                         Click="StopCommands"
@@ -336,7 +344,9 @@
                     </Button>
                     <CheckBox
                         Name="showLogCheckBox"
-                        Margin="4,0"
+                        Grid.Column="2"
+                        Margin="4"
+                        VerticalAlignment="Top"
                         super:CheckBoxExt.HookWidth="10"
                         super:CheckBoxExt.MarkHeight="16"
                         super:CheckBoxExt.MarkWidth="16"
@@ -346,7 +356,10 @@
                         Style="{StaticResource NormalCheckBox}" />
 
 
-                    <ItemsControl Margin="5,0" ItemsSource="{Binding SideComPortSelected}">
+                    <ItemsControl
+                        Grid.Column="3"
+                        Margin="5,0"
+                        ItemsSource="{Binding SideComPortSelected}">
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
                                 <WrapPanel Orientation="Horizontal" />
@@ -355,6 +368,7 @@
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
                                 <CheckBox
+                                    Margin="4"
                                     VerticalContentAlignment="Center"
                                     super:CheckBoxExt.HookWidth="10"
                                     super:CheckBoxExt.MarkHeight="16"
@@ -371,7 +385,7 @@
 
 
 
-                </StackPanel>
+                </Grid>
             </Border>
 
             <StackPanel Grid.Row="1" Orientation="Horizontal">
diff --git a/SuperCom/Windows/Window_Setting.xaml b/SuperCom/Windows/Window_Setting.xaml
index 3618b60..7249b1e 100644
--- a/SuperCom/Windows/Window_Setting.xaml
+++ b/SuperCom/Windows/Window_Setting.xaml
@@ -45,18 +45,18 @@
                         Content="{DynamicResource CloseToBar}"
                         IsChecked="{Binding CloseToBar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                         Style="{StaticResource NormalCheckBox}" />
-                    <CheckBox
+                    <!--<CheckBox
                         Margin="10,5"
                         HorizontalAlignment="Left"
                         Content="{DynamicResource FixOnSearching}"
                         IsChecked="{Binding FixedOnSearch, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                        Style="{StaticResource NormalCheckBox}" />
-                    <CheckBox
+                        Style="{StaticResource NormalCheckBox}" />-->
+                    <!--<CheckBox
                         Margin="10,5"
                         HorizontalAlignment="Left"
                         Content="{DynamicResource ScrollOnNotSearching}"
                         IsChecked="{Binding ScrollOnSearchClosed, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                        Style="{StaticResource NormalCheckBox}" />
+                        Style="{StaticResource NormalCheckBox}" />-->
                     <CheckBox
                         Margin="10,5"
                         HorizontalAlignment="Left"
@@ -89,6 +89,36 @@
                             Text="{Binding ElementName=logFragSlider, Path=Value, StringFormat={}{0}\ MB}"
                             Visibility="{Binding ElementName=logFragCheckBox, Path=IsChecked, Converter={StaticResource bool2VisibilityConverter}}" />
 
+                    </StackPanel>
+                    <StackPanel Margin="10,5" Orientation="Horizontal">
+                        <Border
+                            Width="25"
+                            Height="25"
+                            Margin="0"
+                            Padding="0"
+                            VerticalAlignment="Stretch"
+                            Background="Transparent"
+                            ToolTip="超过上限后，文本框中的内容自动清空（硬盘日志保留）">
+                            <Viewbox Width="auto" Height="14">
+                                <Path
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Data="M512 128c212 0 384 172 384 384s-172 384-384 384-384-172-384-384 172-384 384-384m0-64C264.8 64 64 264.8 64 512s200.8 448 448 448 448-200.8 448-448S759.2 64 512 64z m32 192h-64v64h64v-64z m0 448V384h-32.8L384 418.4l16.8 61.6 79.2-21.6V704H384v64h256v-64H544z"
+                                    Fill="{DynamicResource Window.Foreground}" />
+                            </Viewbox>
+                        </Border>
+                        <TextBlock Style="{StaticResource BaseTextBlock}" Text="内存上限" />
+                        <super:Slider
+                            Width="300"
+                            Margin="20,0"
+                            LargeChange="100"
+                            Maximum="2048"
+                            Minimum="256"
+                            SmallChange="10"
+                            Value="{Binding MemoryLimit, Source={x:Static config:ConfigManager.Settings}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                        <TextBlock Style="{StaticResource BaseTextBlock}" Text="{Binding MemoryLimit, Source={x:Static config:ConfigManager.Settings}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, StringFormat={}{0}\ MB}" />
+
                     </StackPanel>
                     <CheckBox
                         Margin="10"
diff --git a/SuperCom/Windows/Window_ShortCut.xaml.cs b/SuperCom/Windows/Window_ShortCut.xaml.cs
index b81474e..abca75e 100644
--- a/SuperCom/Windows/Window_ShortCut.xaml.cs
+++ b/SuperCom/Windows/Window_ShortCut.xaml.cs
@@ -222,8 +222,6 @@ private void TextBox_PreviewKeyDown(object sender, System.Windows.Input.KeyEvent
         {
             Key currentKey = e.Key == Key.System ? e.SystemKey : e.Key;
 
-            //Console.WriteLine(currentKey);
-
             if (currentKey == Key.Escape)
             {
                 inputKeyPopup.IsOpen = false;
@@ -280,10 +278,6 @@ private void TextBox_PreviewKeyDown(object sender, System.Windows.Input.KeyEvent
                 sameTextBlock.Visibility = Visibility.Collapsed;
             }
 
-            Console.WriteLine($"keys = {string.Join(",", keys)}");
-            Console.WriteLine($"normals = {string.Join(",", normals)}");
-
-
             bool containsFunKey =
                 funcKeys.Contains(Key.LeftAlt) ||
                 funcKeys.Contains(Key.LeftCtrl) ||
@@ -293,8 +287,6 @@ private void TextBox_PreviewKeyDown(object sender, System.Windows.Input.KeyEvent
                 funcKeys.Contains(Key.RightShift) ||
                 KeyBoardHelper.IsFKey(currentKey);
 
-            Console.WriteLine("containsFunKey = " + containsFunKey);
-
             if (!containsFunKey || currentKey == Key.None)
             {
                 warningTextBlock.Visibility = Visibility.Visible;
@@ -350,7 +342,6 @@ private void inputKeyPopup_Closed(object sender, EventArgs e)
             funcKeys.Clear();
             normalKeys.Clear();
             fastKeys.Clear();
-            Console.WriteLine("popup closed");
         }
     }
 }