diff --git a/Core/Models/AppModel.cs b/Core/Models/AppModel.cs
index d08a3f6..f01cc67 100644
--- a/Core/Models/AppModel.cs
+++ b/Core/Models/AppModel.cs
@@ -22,6 +22,10 @@ public class AppModel
         /// </summary>
         public string Name { get; set; }
         /// <summary>
+        /// 别名
+        /// </summary>
+        public string Alias { get; set; }
+        /// <summary>
         /// 描述
         /// </summary>
         public string Description { get; set; }
diff --git a/Core/Models/Db/WebSiteModel.cs b/Core/Models/Db/WebSiteModel.cs
index 4e94fb4..3cf3519 100644
--- a/Core/Models/Db/WebSiteModel.cs
+++ b/Core/Models/Db/WebSiteModel.cs
@@ -25,6 +25,10 @@ public class WebSiteModel
         /// </summary>
         public string Domain { get; set; }
         /// <summary>
+        /// 别名
+        /// </summary>
+        public string Alias { get; set; }
+        /// <summary>
         /// 分类ID
         /// </summary>
         public int CategoryID { get; set; }
diff --git a/Core/Properties/AssemblyInfo.cs b/Core/Properties/AssemblyInfo.cs
index 22a9b89..e56a8ab 100644
--- a/Core/Properties/AssemblyInfo.cs
+++ b/Core/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.5")]
-[assembly: AssemblyFileVersion("1.1.0.5")]
+[assembly: AssemblyVersion("1.1.0.7")]
+[assembly: AssemblyFileVersion("1.1.0.7")]
diff --git a/Core/Servicers/Instances/AppData.cs b/Core/Servicers/Instances/AppData.cs
index de50c91..8d7bf8a 100644
--- a/Core/Servicers/Instances/AppData.cs
+++ b/Core/Servicers/Instances/AppData.cs
@@ -48,6 +48,7 @@ select app
                         File = m.File,
                         IconFile = m.IconFile,
                         Name = m.Name,
+                        Alias = m.Alias,
                         TotalTime = m.TotalTime
                     })
                     .ToList();
@@ -73,12 +74,13 @@ public void UpdateApp(AppModel app_)
                         app.Description = app_.Description;
                         app.File = app_.File;
                         app.CategoryID = app_.CategoryID;
+                        app.Alias = app_.Alias;
                         db.SaveChanges();
                     }
                     _databse.CloseWriter();
                 }
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 Logger.Error(e.ToString());
             }
@@ -119,7 +121,8 @@ public void AddApp(AppModel app)
                         }
                         _databse.CloseWriter();
                     }
-                }catch(Exception e)
+                }
+                catch (Exception e)
                 {
                     Logger.Error(e.ToString());
                 }
diff --git a/Core/Servicers/Instances/WebData.cs b/Core/Servicers/Instances/WebData.cs
index 518457d..5f7a23e 100644
--- a/Core/Servicers/Instances/WebData.cs
+++ b/Core/Servicers/Instances/WebData.cs
@@ -278,11 +278,12 @@ public List<WebSiteModel> GetDateRangeWebSiteList(DateTime start, DateTime end,
               .GroupBy(m => m.SiteId)
               .Select(s => new
               {
-                  Title = s.FirstOrDefault().Site.Title,
-                  Domain = s.FirstOrDefault().Site.Domain,
-                  CategoryID = s.FirstOrDefault().Site.CategoryID,
-                  IconFile = s.FirstOrDefault().Site.IconFile,
-                  ID = s.FirstOrDefault().Site.ID,
+                  //Title = s.FirstOrDefault().Site.Title,
+                  //Domain = s.FirstOrDefault().Site.Domain,
+                  //CategoryID = s.FirstOrDefault().Site.CategoryID,
+                  //IconFile = s.FirstOrDefault().Site.IconFile,
+                  //ID = s.FirstOrDefault().Site.ID,
+                  Site = s.FirstOrDefault().Site,
                   Duration = s.Sum(m => m.Duration),
               });
 
@@ -302,7 +303,18 @@ public List<WebSiteModel> GetDateRangeWebSiteList(DateTime start, DateTime end,
                 {
                     data = data.OrderByDescending(m => m.Duration);
                 }
-                var result = JsonConvert.DeserializeObject<List<WebSiteModel>>(JsonConvert.SerializeObject(data.ToList()));
+                var list = data.Select(s => new
+                {
+                    Alias = s.Site.Alias,
+                    Title = s.Site.Title,
+                    Domain = s.Site.Domain,
+                    CategoryID = s.Site.CategoryID,
+                    IconFile = s.Site.IconFile,
+                    ID = s.Site.ID,
+                    Duration = s.Duration,
+                }).ToList();
+
+                var result = JsonConvert.DeserializeObject<List<WebSiteModel>>(JsonConvert.SerializeObject(list));
                 return result;
             }
         }
@@ -777,6 +789,7 @@ from nc in newCategory.DefaultIfEmpty()
                     IconFile = s.FirstOrDefault().Site.IconFile,
                     CategoryID = s.FirstOrDefault().Site.CategoryID,
                     Category = s.FirstOrDefault().Category,
+                    Alias = s.FirstOrDefault().Site.Alias,
                 }).ToList();
 
                 //var result = query.Select(s => new WebSiteModel
@@ -840,5 +853,25 @@ public void Export(string dir_, DateTime start_, DateTime end_)
                 }
             }
         }
+
+        public WebSiteModel Update(WebSiteModel website_)
+        {
+            using (var db = _database.GetWriterContext())
+            {
+                var website = db.WebSites.FirstOrDefault(m => m.ID == website_.ID);
+                if (website != null)
+                {
+                    website.Alias = website_.Alias;
+                    website.Domain = website_.Domain;
+                    website.Title = website_.Title;
+                    db.SaveChanges();
+                    _database.CloseWriter();
+                }
+                return website;
+                //string sql = $"update WebSiteModels set CategoryID={categoryId_} where ID in ({string.Join(",", siteIds_)})";
+                //db.Database.ExecuteSqlCommand(sql);
+                //db.SaveChanges();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Core/Servicers/Interfaces/IWebData.cs b/Core/Servicers/Interfaces/IWebData.cs
index 08277bd..37d6f15 100644
--- a/Core/Servicers/Interfaces/IWebData.cs
+++ b/Core/Servicers/Interfaces/IWebData.cs
@@ -168,5 +168,10 @@ public interface IWebData
         /// <param name="start_">开始时间</param>
         /// <param name="end_">结束时间</param>
         void Export(string dir_, DateTime start_, DateTime end_);
+        /// <summary>
+        /// 更新站点数据
+        /// </summary>
+        /// <param name="website_"></param>
+        WebSiteModel Update(WebSiteModel website_);
     }
 }
diff --git a/UI/Controls/Charts/ChartsItemTypeCard.cs b/UI/Controls/Charts/ChartsItemTypeCard.cs
index 61fb866..7bc9803 100644
--- a/UI/Controls/Charts/ChartsItemTypeCard.cs
+++ b/UI/Controls/Charts/ChartsItemTypeCard.cs
@@ -120,7 +120,7 @@ private void Render()
             isRendering = true;
 
             //对部分程序未获取程序名的程序使用路径中名字作为程序名
-            NameTextObj.Text = Data.Name;
+            //NameTextObj.Text = Data.Name;
             //if (Data.Name.Trim() == "" && Data.PopupText.Trim() != "")
             //{
             //    FileInfo fi = new FileInfo(Data.PopupText);
diff --git a/UI/Controls/Charts/ChartsItemTypeList.cs b/UI/Controls/Charts/ChartsItemTypeList.cs
index 4548a23..180a8c8 100644
--- a/UI/Controls/Charts/ChartsItemTypeList.cs
+++ b/UI/Controls/Charts/ChartsItemTypeList.cs
@@ -162,7 +162,7 @@ private void Render()
                 return;
             }
             isRendering = true;
-            NameTextObj.Text = Data.Name;
+            //NameTextObj.Text = Data.Name;
             //对部分程序未获取程序名的程序使用路径中名字作为程序名
             //if (Data.Name.Trim() == "" && Data.PopupText.Trim() != "")
             //{
diff --git a/UI/Controls/Charts/Model/ChartsDataModel.cs b/UI/Controls/Charts/Model/ChartsDataModel.cs
index 8a0c00a..3f8b924 100644
--- a/UI/Controls/Charts/Model/ChartsDataModel.cs
+++ b/UI/Controls/Charts/Model/ChartsDataModel.cs
@@ -9,10 +9,11 @@ namespace UI.Controls.Charts.Model
 {
     public class ChartsDataModel : UINotifyPropertyChanged
     {
+        private string Name_;
         /// <summary>
         /// 名称
         /// </summary>
-        public string Name { get; set; }
+        public string Name { get { return Name_; } set { Name_ = value; OnPropertyChanged(); } }
 
         /// <summary>
         /// 值
diff --git a/UI/Controls/Window/DefaultWindow.cs b/UI/Controls/Window/DefaultWindow.cs
index 71813cb..d4280a0 100644
--- a/UI/Controls/Window/DefaultWindow.cs
+++ b/UI/Controls/Window/DefaultWindow.cs
@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
@@ -16,6 +17,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 using UI.Controls.Button;
+using UI.Controls.Input;
 
 namespace UI.Controls.Window
 {
@@ -43,6 +45,17 @@ public string DialogMessage
             set { SetValue(DialogMessageProperty, value); }
         }
         #endregion
+        #region InputModal
+        public static readonly DependencyProperty InputModalValueProperty = DependencyProperty.Register("InputModalValue", typeof(string), typeof(DefaultWindow));
+        /// <summary>
+        /// Dialog title
+        /// </summary>
+        public string InputModalValue
+        {
+            get { return (string)GetValue(InputModalValueProperty); }
+            set { SetValue(InputModalValueProperty, value); }
+        }
+        #endregion
         public static readonly DependencyProperty IsShowToastDeproperty = DependencyProperty.Register("IsShowToast", typeof(bool), typeof(DefaultWindow), new PropertyMetadata(false, new PropertyChangedCallback(OnIsShowToastChanged)));
         public bool IsShowToast { get { return (bool)GetValue(IsShowToastDeproperty); } set { SetValue(IsShowToastDeproperty, value); } }
         private static void OnIsShowToastChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -209,12 +222,15 @@ private static void OnIsCanBackChanged(DependencyObject d, DependencyPropertyCha
         /// </summary>
         public bool IsWindowClosed { get { return IsWindowClosed_; } }
 
-        private Border ToastBorder, Masklayer, DialogBorder;
+        private Border ToastBorder, Masklayer, DialogBorder, InputModalBorder;
         private Grid ToastGrid;
         private DispatcherTimer toastTimer;
         private bool IsDialogConfirm;
-        private bool IsShowConfirmDialog;
-        private Button.Button CancelBtn, ConfirmBtn;
+        private bool IsShowConfirmDialog, IsShowInputModal;
+        private Button.Button CancelBtn, ConfirmBtn, InputModalCancelBtn, InputModalConfirmBtn;
+        private InputBox InputModalInputBox;
+        private string InputValue;
+        private Func<string, bool> InputModalValidFnc;
         #region 3.初始化
         public DefaultWindow()
         {
@@ -306,6 +322,10 @@ public override void OnApplyTemplate()
             DialogBorder = GetTemplateChild("DialogBorder") as Border;
             CancelBtn = GetTemplateChild("CancelBtn") as Button.Button;
             ConfirmBtn = GetTemplateChild("ConfirmBtn") as Button.Button;
+            InputModalBorder = GetTemplateChild("InputModalBorder") as Border;
+            InputModalCancelBtn = GetTemplateChild("InputModalCancelBtn") as Button.Button;
+            InputModalConfirmBtn = GetTemplateChild("InputModalConfirmBtn") as Button.Button;
+            InputModalInputBox = GetTemplateChild("InputModalInputBox") as InputBox;
 
             if (PageContainer != null)
             {
@@ -337,6 +357,36 @@ public override void OnApplyTemplate()
                     HideDialog();
                 };
             }
+
+            if (InputModalCancelBtn != null)
+            {
+                InputModalCancelBtn.Click += (e, c) =>
+                {
+                    IsDialogConfirm = false;
+                    HideInputModal();
+                };
+            }
+
+            if (InputModalConfirmBtn != null)
+            {
+                InputModalConfirmBtn.Click += (e, c) =>
+                {
+                    if (InputModalValidFnc != null && !InputModalValidFnc(InputValue))
+                    {
+                        return;
+                    }
+                    IsDialogConfirm = true;
+                    HideInputModal();
+                };
+            }
+
+            if (InputModalInputBox != null)
+            {
+                InputModalInputBox.TextChanged += (e, c) =>
+                {
+                    InputValue = InputModalInputBox.Text;
+                };
+            }
         }
 
 
@@ -400,6 +450,10 @@ private void ShowToast()
         {
             ToastGrid.Visibility = Visibility.Visible;
             DialogBorder.Visibility = Visibility.Collapsed;
+            if (!IsShowInputModal)
+            {
+                InputModalBorder.Visibility = Visibility.Collapsed;
+            }
             ToastBorder.Visibility = Visibility.Visible;
             Storyboard storyboard = new Storyboard();
 
@@ -424,7 +478,10 @@ private void ShowToast()
                 ToastGrid.MouseLeftButtonDown += ToastGrid_MouseLeftButtonDown;
             };
             storyboard.Children.Add(scrollAnimation);
-            storyboard.Children.Add(opacityAnimation);
+            if (!IsShowInputModal)
+            {
+                storyboard.Children.Add(opacityAnimation);
+            }
             storyboard.Begin();
         }
 
@@ -455,14 +512,19 @@ private void HideToast()
             opacityAnimation.Duration = new Duration(TimeSpan.FromSeconds(0.25));
 
             storyboard.Children.Add(scrollAnimation);
-            storyboard.Children.Add(opacityAnimation);
-            storyboard.Completed += (e, c) =>
+            if (!IsShowInputModal)
             {
-                ToastGrid.Visibility = Visibility.Collapsed;
-            };
+                storyboard.Children.Add(opacityAnimation);
+                storyboard.Completed += (e, c) =>
+                {
+                    ToastGrid.Visibility = Visibility.Collapsed;
+                };
+            }
+
             storyboard.Begin();
         }
 
+
         #region Dialog
         public Task<bool> ShowConfirmDialogAsync(string title_, string message_)
         {
@@ -470,6 +532,7 @@ public Task<bool> ShowConfirmDialogAsync(string title_, string message_)
             ToastGrid.Visibility = Visibility.Visible;
             ToastBorder.Visibility = Visibility.Collapsed;
             DialogBorder.Visibility = Visibility.Visible;
+            InputModalBorder.Visibility = Visibility.Collapsed;
 
             DialogMessage = message_;
             DialogTitle = title_;
@@ -536,6 +599,91 @@ private void HideDialog()
         }
         #endregion
 
+        #region InputModal
+        public Task<string> ShowInputModalAsync(string title_, string message_, string value_, Func<string, bool> validFnc_)
+        {
+            IsShowInputModal = true;
+            ToastGrid.Visibility = Visibility.Visible;
+            ToastBorder.Visibility = Visibility.Collapsed;
+            DialogBorder.Visibility = Visibility.Collapsed;
+            InputModalBorder.Visibility = Visibility.Visible;
+
+            DialogMessage = message_;
+            DialogTitle = title_;
+            InputModalValue = value_;
+            InputModalValidFnc = validFnc_;
+
+            InputModalInputBox.Text = InputModalValue;
+
+            Storyboard storyboard = new Storyboard();
+
+            DoubleAnimation scrollAnimation = new DoubleAnimation();
+            scrollAnimation.From = -150;
+            scrollAnimation.To = 10;
+
+            scrollAnimation.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseIn };
+            Storyboard.SetTarget(scrollAnimation, InputModalBorder);
+            Storyboard.SetTargetProperty(scrollAnimation, new PropertyPath("RenderTransform.Children[0].Y"));
+            scrollAnimation.Duration = new Duration(TimeSpan.FromSeconds(0.15));
+
+            DoubleAnimation opacityAnimation = new DoubleAnimation();
+            opacityAnimation.To = 0.6;
+            opacityAnimation.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseIn };
+            Storyboard.SetTarget(opacityAnimation, Masklayer);
+            Storyboard.SetTargetProperty(opacityAnimation, new PropertyPath("Opacity"));
+            opacityAnimation.Duration = new Duration(TimeSpan.FromSeconds(0.15));
+            storyboard.Children.Add(scrollAnimation);
+            storyboard.Children.Add(opacityAnimation);
+            storyboard.Begin();
+
+            return Task.Run(() =>
+            {
+
+                while (IsShowInputModal)
+                {
+                    Thread.Sleep(10);
+                }
+
+                if (IsDialogConfirm)
+                {
+                    return InputValue;
+                }
+                else
+                {
+                    throw new Exception("Input cancel");
+                }
+            });
+        }
+        private void HideInputModal()
+        {
+            Storyboard storyboard = new Storyboard();
+
+            DoubleAnimation scrollAnimation = new DoubleAnimation();
+            scrollAnimation.To = -150;
+
+            scrollAnimation.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseIn };
+            Storyboard.SetTarget(scrollAnimation, InputModalBorder);
+            Storyboard.SetTargetProperty(scrollAnimation, new PropertyPath("RenderTransform.Children[0].Y"));
+            scrollAnimation.Duration = new Duration(TimeSpan.FromSeconds(0.12));
+
+            DoubleAnimation opacityAnimation = new DoubleAnimation();
+            opacityAnimation.To = 0;
+            opacityAnimation.EasingFunction = new SineEase() { EasingMode = EasingMode.EaseIn };
+            Storyboard.SetTarget(opacityAnimation, Masklayer);
+            Storyboard.SetTargetProperty(opacityAnimation, new PropertyPath("Opacity"));
+            opacityAnimation.Duration = new Duration(TimeSpan.FromSeconds(0.15));
+
+            storyboard.Children.Add(scrollAnimation);
+            storyboard.Children.Add(opacityAnimation);
+            storyboard.Completed += (e, c) =>
+            {
+                ToastGrid.Visibility = Visibility.Collapsed;
+                IsShowInputModal = false;
+            };
+            storyboard.Begin();
+        }
+        #endregion
+
         #region 6.事件
 
         protected override void OnSourceInitialized(EventArgs e)
diff --git a/UI/Properties/AssemblyInfo.cs b/UI/Properties/AssemblyInfo.cs
index b81c92e..50b49ce 100644
--- a/UI/Properties/AssemblyInfo.cs
+++ b/UI/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.5")]
-[assembly: AssemblyFileVersion("1.5.0.5")]
+[assembly: AssemblyVersion("1.5.0.6")]
+[assembly: AssemblyFileVersion("1.5.0.6")]
diff --git a/UI/Servicers/AppContextMenuServicer.cs b/UI/Servicers/AppContextMenuServicer.cs
index a9c954b..63aab66 100644
--- a/UI/Servicers/AppContextMenuServicer.cs
+++ b/UI/Servicers/AppContextMenuServicer.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using UI.Controls.Charts.Model;
@@ -22,6 +23,7 @@ public class AppContextMenuServicer : IAppContextMenuServicer
         private readonly IAppData appData;
         private readonly IAppConfig appConfig;
         private readonly IThemeServicer theme;
+        private readonly IUIServicer _uIServicer;
         private ContextMenu menu;
         private MenuItem setCategory;
         private MenuItem setLink;
@@ -29,13 +31,20 @@ public class AppContextMenuServicer : IAppContextMenuServicer
         MenuItem _whiteList = new MenuItem();
 
 
-        public AppContextMenuServicer(MainViewModel main, ICategorys categorys, IAppData appData, IAppConfig appConfig, IThemeServicer theme)
+        public AppContextMenuServicer(
+            MainViewModel main,
+            ICategorys categorys,
+            IAppData appData,
+            IAppConfig appConfig,
+            IThemeServicer theme,
+            IUIServicer uIServicer_)
         {
             this.main = main;
             this.categorys = categorys;
             this.appData = appData;
             this.appConfig = appConfig;
             this.theme = theme;
+            this._uIServicer = uIServicer_;
 
         }
 
@@ -65,6 +74,10 @@ private void CreateMenu()
             setCategory = new MenuItem();
             setCategory.Header = "设置分类";
 
+            MenuItem editAlias = new MenuItem();
+            editAlias.Header = "编辑别名";
+            editAlias.Click += EditAlias_ClickAsync;
+
             setLink = new MenuItem();
             setLink.Header = "添加关联";
 
@@ -78,6 +91,7 @@ private void CreateMenu()
             menu.Items.Add(new Separator());
             menu.Items.Add(setCategory);
             menu.Items.Add(setLink);
+            menu.Items.Add(editAlias);
             menu.Items.Add(new Separator());
 
             menu.Items.Add(openDir);
@@ -87,6 +101,49 @@ private void CreateMenu()
             menu.ContextMenuOpening += SetCategory_ContextMenuOpening;
         }
 
+        private async void EditAlias_ClickAsync(object sender, RoutedEventArgs e)
+        {
+            var data = menu.Tag as ChartsDataModel;
+            var log = data.Data as DailyLogModel;
+            var app = log != null ? log.AppModel : null;
+
+            if (log == null)
+            {
+                app = (data.Data as HoursLogModel).AppModel;
+            }
+
+            try
+            {
+                string input = await _uIServicer.ShowInputModalAsync("修改别名", "请输入别名", app.Alias, (val) =>
+                 {
+                     if (string.IsNullOrEmpty(val))
+                     {
+                         main.Error("请输入别名");
+                         return false;
+                     }
+                     else if (val.Length > 10)
+                     {
+                         main.Error("别名最大长度为10位字符");
+                         return false;
+                     }
+                     return true;
+                 });
+
+                //  开始更新别名
+                var editApp = appData.GetApp(app.ID);
+                editApp.Alias = input;
+                appData.UpdateApp(editApp);
+                data.Name = input;
+
+                main.Success("别名已更新");
+                Debug.WriteLine("输入内容：" + input);
+            }
+            catch
+            {
+                //  输入取消，无需处理异常
+            }
+        }
+
         private void _whiteList_Click(object sender, System.Windows.RoutedEventArgs e)
         {
             var data = menu.Tag as ChartsDataModel;
@@ -215,6 +272,8 @@ private void UpdateCategory()
                 setCategory.Items.Add(categoryMenu);
             }
 
+            setCategory.IsEnabled = setCategory.Items.Count > 0;
+
         }
 
         private void UpdateLinks()
diff --git a/UI/Servicers/IUIServicer.cs b/UI/Servicers/IUIServicer.cs
index 91b1dfc..8fe8bf7 100644
--- a/UI/Servicers/IUIServicer.cs
+++ b/UI/Servicers/IUIServicer.cs
@@ -11,5 +11,7 @@ public interface IUIServicer
     {
         Task<bool> ShowConfirmDialogAsync(string title_, string message_);
         void InitWindow(DefaultWindow window_);
+        Task<string> ShowInputModalAsync(string title_, string placeholder_, string value_ = null, Func<string, bool> validFnc_ = null);
+
     }
 }
diff --git a/UI/Servicers/UIServicer.cs b/UI/Servicers/UIServicer.cs
index 34faf99..879be3e 100644
--- a/UI/Servicers/UIServicer.cs
+++ b/UI/Servicers/UIServicer.cs
@@ -24,5 +24,11 @@ public Task<bool> ShowConfirmDialogAsync(string title_, string message_)
         {
             return _window.ShowConfirmDialogAsync(title_, message_);
         }
+
+        public Task<string> ShowInputModalAsync(string title_, string placeholder_, string value_ = null, Func<string, bool> validFnc_ = null)
+        {
+            return _window.ShowInputModalAsync(title_, placeholder_, value_, validFnc_);
+
+        }
     }
 }
diff --git a/UI/Servicers/WebSiteContextMenuServicer.cs b/UI/Servicers/WebSiteContextMenuServicer.cs
index 048479f..ea1628e 100644
--- a/UI/Servicers/WebSiteContextMenuServicer.cs
+++ b/UI/Servicers/WebSiteContextMenuServicer.cs
@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Media;
@@ -24,6 +25,8 @@ public class WebSiteContextMenuServicer : IWebSiteContextMenuServicer
         private readonly IAppConfig _appConfig;
         private readonly IThemeServicer _theme;
         private readonly IWebData _webData;
+        private readonly IUIServicer _uIServicer;
+
         private ContextMenu _menu;
         private MenuItem _setCategory;
         private MenuItem _block;
@@ -34,12 +37,14 @@ public WebSiteContextMenuServicer(
             MainViewModel main_,
             IAppConfig appConfig_,
             IThemeServicer theme_,
-            IWebData webData_)
+            IWebData webData_,
+             IUIServicer uIServicer_)
         {
             _main = main_;
             _appConfig = appConfig_;
             _theme = theme_;
             _webData = webData_;
+            _uIServicer = uIServicer_;
         }
 
         public void Init()
@@ -65,6 +70,10 @@ private void CreateMenu()
             _setCategory = new MenuItem();
             _setCategory.Header = "设置分类";
 
+            MenuItem editAlias = new MenuItem();
+            editAlias.Header = "编辑别名";
+            editAlias.Click += EditAlias_ClickAsync;
+
             _block = new MenuItem();
             _block.Header = "忽略此网站";
             _block.Click += Block_Click;
@@ -76,11 +85,50 @@ private void CreateMenu()
             _menu.Items.Add(open);
             _menu.Items.Add(new Separator());
             _menu.Items.Add(_setCategory);
+            _menu.Items.Add(editAlias);
             _menu.Items.Add(new Separator());
             _menu.Items.Add(_block);
             _menu.ContextMenuOpening += _menu_ContextMenuOpening;
         }
 
+        private async void EditAlias_ClickAsync(object sender, RoutedEventArgs e)
+        {
+            var data = _menu.Tag as ChartsDataModel;
+            var site = data.Data as WebSiteModel;
+
+            try
+            {
+                string input = await _uIServicer.ShowInputModalAsync("修改别名", "请输入别名", site.Alias, (val) =>
+                {
+                    if (string.IsNullOrEmpty(val))
+                    {
+                        _main.Error("请输入别名");
+                        return false;
+                    }
+                    else if (val.Length > 10)
+                    {
+                        _main.Error("别名最大长度为10位字符");
+                        return false;
+                    }
+                    return true;
+                });
+
+                //  开始更新别名
+
+                data.Name = input;
+                site.Alias = input;
+
+                _webData.Update(site);
+
+                _main.Success("别名已更新");
+                Debug.WriteLine("输入内容：" + input);
+            }
+            catch
+            {
+                //  输入取消，无需处理异常
+            }
+        }
+
         private void _menu_ContextMenuOpening(object sender, ContextMenuEventArgs e)
         {
             if (_menu.Tag == null)
diff --git a/UI/Themes/Charts/ChartsItemTypeCard.xaml b/UI/Themes/Charts/ChartsItemTypeCard.xaml
index 93c8f86..c2d0252 100644
--- a/UI/Themes/Charts/ChartsItemTypeCard.xaml
+++ b/UI/Themes/Charts/ChartsItemTypeCard.xaml
@@ -54,7 +54,7 @@
                                     <Image x:Name="IconObj" Width="25" HorizontalAlignment="Center" VerticalAlignment="Center" RenderOptions.BitmapScalingMode="LowQuality"/>
                                     <!--</Border>-->
 
-                                    <TextBlock x:Name="NameTextObj" Foreground="{DynamicResource WhiteBgTextBrush}" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="10"/>
+                                    <TextBlock x:Name="NameTextObj" Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:ChartsItemTypeCard}}, Path=Data.Name}" Foreground="{DynamicResource WhiteBgTextBrush}" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="10"/>
 
                                     <Border VerticalAlignment="Top" CornerRadius="5" Padding="5" HorizontalAlignment="Left" Margin="10" >
                                         <Border.Background>
diff --git a/UI/Themes/Charts/ChartsItemTypeList.xaml b/UI/Themes/Charts/ChartsItemTypeList.xaml
index 16ac831..0f2d462 100644
--- a/UI/Themes/Charts/ChartsItemTypeList.xaml
+++ b/UI/Themes/Charts/ChartsItemTypeList.xaml
@@ -31,7 +31,7 @@
                                         <ColumnDefinition Width="auto"/>
                                         <ColumnDefinition Width="auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock  x:Name="NameTextObj" Foreground="{DynamicResource DefaultTextBrush}" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                                    <TextBlock  x:Name="NameTextObj" Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:ChartsItemTypeList}}, Path=Data.Name}" Foreground="{DynamicResource DefaultTextBrush}" HorizontalAlignment="Left" VerticalAlignment="Center" />
 
                                     <ListView x:Name="BadgeListView" Visibility="Collapsed" Grid.Column="1" ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:ChartsItemTypeList}}, Path=Data.BadgeList}" Margin="0,0,0,0" ScrollViewer.HorizontalScrollBarVisibility="Disabled" >
 
diff --git a/UI/Themes/Window/DefaultWindow.xaml b/UI/Themes/Window/DefaultWindow.xaml
index 3c41e82..503f55b 100644
--- a/UI/Themes/Window/DefaultWindow.xaml
+++ b/UI/Themes/Window/DefaultWindow.xaml
@@ -1,7 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:w="clr-namespace:UI.Controls.Window" xmlns:button="clr-namespace:UI.Controls.Button"
-                    xmlns:base="clr-namespace:UI.Controls.Base">
+                    xmlns:base="clr-namespace:UI.Controls.Base"
+                    xmlns:input="clr-namespace:UI.Controls.Input">
     <Style x:Key="WindowSystemButton" TargetType="{x:Type Button}">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="OverridesDefaultStyle" Value="True"/>
@@ -178,7 +179,7 @@
                                             Padding="15,15"
                                             CornerRadius="12"
                                             MaxWidth="320"
-                                            x:Name="ToastBorder" Background="White" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="1000">
+                                            x:Name="ToastBorder" Background="White" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="99999">
                                             <Border.RenderTransform>
                                                 <TransformGroup>
                                                     <TranslateTransform Y="-150"/>
@@ -225,6 +226,36 @@
                                                 </StackPanel>
                                             </Grid>
                                         </Border>
+                                        <!--Dialog-->
+                                        <Border 
+     Padding="15,15"
+     CornerRadius="10"
+     Width="350"
+     x:Name="InputModalBorder" Background="White" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="1000">
+                                            <Border.RenderTransform>
+                                                <TransformGroup>
+                                                    <TranslateTransform Y="-150"/>
+                                                </TransformGroup>
+                                            </Border.RenderTransform>
+                                            <Border.Effect>
+                                                <DropShadowEffect BlurRadius="10" Color="Black" Opacity=".1"/>
+                                            </Border.Effect>
+                                            <Grid >
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="40"/>
+                                                    <RowDefinition Height="auto"/>
+                                                    <RowDefinition Height="auto"/>
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Text="{TemplateBinding DialogTitle}" FontSize="16" FontWeight="Bold"/>
+                                                <Border Grid.Row="1">
+                                                    <input:InputBox x:Name="InputModalInputBox" Placeholder="{TemplateBinding DialogMessage}"></input:InputBox>
+                                                </Border>
+                                                <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,0,0">
+                                                    <button:Button x:Name="InputModalCancelBtn" Width="100">取消</button:Button>
+                                                    <button:Button x:Name="InputModalConfirmBtn" Background="{DynamicResource ThemeBrush}" Foreground="White" Width="100" Margin="10,0,0,0">确定</button:Button>
+                                                </StackPanel>
+                                            </Grid>
+                                        </Border>
                                         <!--遮罩层-->
                                         <Border x:Name="Masklayer" Background="Black" Opacity="0"></Border>
                                     </Grid>
diff --git a/UI/ViewModels/ChartPageVM.cs b/UI/ViewModels/ChartPageVM.cs
index 6c0571f..45f2a25 100644
--- a/UI/ViewModels/ChartPageVM.cs
+++ b/UI/ViewModels/ChartPageVM.cs
@@ -62,7 +62,7 @@ public ChartPageVM(IData data, ICategorys categorys, MainViewModel mainVM, IAppC
             {
                 Name = "上周"
             });
-        
+
             var chartDataModeOptions = new List<SelectItemModel>
             {
                 new SelectItemModel()
@@ -682,7 +682,7 @@ private List<ChartsDataModel> MapToChartsData(IEnumerable<Core.Models.DailyLogMo
 
                 var bindModel = new ChartsDataModel();
                 bindModel.Data = item;
-                bindModel.Name = string.IsNullOrEmpty(item.AppModel?.Description) ? item.AppModel.Name : item.AppModel.Description;
+                bindModel.Name = !string.IsNullOrEmpty(item.AppModel?.Alias) ? item.AppModel.Alias : string.IsNullOrEmpty(item.AppModel?.Description) ? item.AppModel.Name : item.AppModel.Description;
                 bindModel.Value = item.Time;
                 bindModel.Tag = Time.ToString(item.Time);
                 bindModel.PopupText = item.AppModel?.File;
@@ -746,7 +746,7 @@ private void LoadSelectedColData()
                     {
                         var bindModel = new ChartsDataModel();
                         bindModel.Data = item;
-                        bindModel.Name = string.IsNullOrEmpty(item.AppModel?.Description) ? item.AppModel.Name : item.AppModel.Description;
+                        bindModel.Name = !string.IsNullOrEmpty(item.AppModel?.Alias) ? item.AppModel.Alias : string.IsNullOrEmpty(item.AppModel?.Description) ? item.AppModel.Name : item.AppModel.Description;
                         bindModel.Value = item.Time;
                         bindModel.Tag = Time.ToString(item.Time);
                         bindModel.PopupText = item.AppModel?.File;
@@ -760,7 +760,7 @@ private void LoadSelectedColData()
                     {
                         var bindModel = new ChartsDataModel();
                         bindModel.Data = item;
-                        bindModel.Name = string.IsNullOrEmpty(item.AppModel?.Description) ? item.AppModel.Name : item.AppModel.Description;
+                        bindModel.Name = !string.IsNullOrEmpty(item.AppModel?.Alias) ? item.AppModel.Alias : string.IsNullOrEmpty(item.AppModel?.Description) ? item.AppModel.Name : item.AppModel.Description;
                         bindModel.Value = item.Time;
                         bindModel.Tag = Time.ToString(item.Time);
                         bindModel.PopupText = item.AppModel?.File;
@@ -951,7 +951,7 @@ private List<ChartsDataModel> MapToChartData(IEnumerable<Core.Models.Db.WebSiteM
             {
                 var bindModel = new ChartsDataModel();
                 bindModel.Data = item;
-                bindModel.Name = item.Title;
+                bindModel.Name = !string.IsNullOrEmpty(item.Alias) ? item.Alias : item.Title;
                 bindModel.Value = item.Duration;
                 bindModel.Tag = Time.ToString(item.Duration);
                 bindModel.PopupText = item.Domain;
diff --git a/UI/ViewModels/DataPageVM.cs b/UI/ViewModels/DataPageVM.cs
index a4fc4c9..eb94615 100644
--- a/UI/ViewModels/DataPageVM.cs
+++ b/UI/ViewModels/DataPageVM.cs
@@ -212,7 +212,7 @@ private List<ChartsDataModel> MapToChartsData(IEnumerable<Core.Models.DailyLogMo
                 {
                     var bindModel = new ChartsDataModel();
                     bindModel.Data = item;
-                    bindModel.Name = string.IsNullOrEmpty(item.AppModel?.Description) ? item.AppModel.Name : item.AppModel.Description;
+                    bindModel.Name = !string.IsNullOrEmpty(item.AppModel?.Alias) ? item.AppModel.Alias : string.IsNullOrEmpty(item.AppModel?.Description) ? item.AppModel.Name : item.AppModel.Description;
                     bindModel.Value = item.Time;
                     bindModel.Tag = Time.ToString(item.Time);
                     bindModel.PopupText = item.AppModel?.File;
@@ -253,7 +253,7 @@ private List<ChartsDataModel> MapToChartsWebData(IEnumerable<Core.Models.Db.WebS
                 {
                     var bindModel = new ChartsDataModel();
                     bindModel.Data = item;
-                    bindModel.Name = item.Title;
+                    bindModel.Name = !string.IsNullOrEmpty(item.Alias) ? item.Alias : item.Title;
                     bindModel.Value = item.Duration;
                     bindModel.Tag = Time.ToString(item.Duration);
                     bindModel.PopupText = item.Domain;
diff --git a/UI/ViewModels/DetailPageVM.cs b/UI/ViewModels/DetailPageVM.cs
index 38bf0d7..e91f85c 100644
--- a/UI/ViewModels/DetailPageVM.cs
+++ b/UI/ViewModels/DetailPageVM.cs
@@ -169,6 +169,9 @@ private void CreateContextMenu()
 
             _setCategoryMenuItem = new MenuItem();
             _setCategoryMenuItem.Header = "设置分类";
+            MenuItem editAlias = new MenuItem();
+            editAlias.Header = "编辑别名";
+            editAlias.Click += EditAlias_ClickAsync;
 
             _whiteListMenuItem = new MenuItem();
             _whiteListMenuItem.Click += (e, c) =>
@@ -190,6 +193,7 @@ private void CreateContextMenu()
             AppContextMenu.Items.Add(reLoadData);
             AppContextMenu.Items.Add(new Separator());
             AppContextMenu.Items.Add(_setCategoryMenuItem);
+            AppContextMenu.Items.Add(editAlias);
             AppContextMenu.Items.Add(new Separator());
             AppContextMenu.Items.Add(copyProcessName);
             AppContextMenu.Items.Add(copyProcessFile);
@@ -199,6 +203,40 @@ private void CreateContextMenu()
             AppContextMenu.Items.Add(_whiteListMenuItem);
         }
 
+        private async void EditAlias_ClickAsync(object sender, RoutedEventArgs e)
+        {
+            var app = appData.GetApp(App.ID);
+            try
+            {
+                string input = await _uIServicer.ShowInputModalAsync("修改别名", "请输入别名", app.Alias, (val) =>
+                {
+                    if (string.IsNullOrEmpty(val))
+                    {
+                        main.Error("请输入别名");
+                        return false;
+                    }
+                    else if (val.Length > 10)
+                    {
+                        main.Error("别名最大长度为10位字符");
+                        return false;
+                    }
+                    return true;
+                });
+
+                //  开始更新别名
+                app.Alias = input;
+                appData.UpdateApp(app);
+                App = app;
+
+                main.Success("别名已更新");
+            }
+            catch
+            {
+                //  输入取消，无需处理异常
+            }
+        }
+
+
         private async void ClearAppData_Click(object sender, RoutedEventArgs e)
         {
             bool isConfirm = await _uIServicer.ShowConfirmDialogAsync("清空确认", "是否确定清空此应用的所有统计数据？");
@@ -227,6 +265,8 @@ private void AppContextMenu_Opened(object sender, RoutedEventArgs e)
                 _setCategoryMenuItem.Items.Add(categoryMenu);
             }
 
+            _setCategoryMenuItem.IsEnabled = _setCategoryMenuItem.Items.Count > 0;
+
             if (config.Behavior.ProcessWhiteList.Contains(App.Name))
             {
                 _whiteListMenuItem.Header = "从白名单移除";
@@ -541,7 +581,7 @@ private List<ChartsDataModel> MapToChartsData(List<Core.Models.DailyLogModel> li
             {
                 var bindModel = new ChartsDataModel();
                 bindModel.Data = item;
-                bindModel.Name = string.IsNullOrEmpty(item.AppModel?.Description) ? item.AppModel.Name : item.AppModel.Description;
+                bindModel.Name = !string.IsNullOrEmpty(item.AppModel?.Alias) ? item.AppModel.Alias : string.IsNullOrEmpty(item.AppModel?.Description) ? item.AppModel.Name : item.AppModel.Description;
                 bindModel.Value = item.Time;
                 bindModel.Tag = Time.ToString(item.Time);
                 bindModel.PopupText = item.AppModel.File;
diff --git a/UI/ViewModels/IndexPageVM.cs b/UI/ViewModels/IndexPageVM.cs
index 86427ce..7f3de7a 100644
--- a/UI/ViewModels/IndexPageVM.cs
+++ b/UI/ViewModels/IndexPageVM.cs
@@ -272,7 +272,7 @@ private List<ChartsDataModel> MapToChartsData(IEnumerable<Core.Models.DailyLogMo
             {
                 var bindModel = new ChartsDataModel();
                 bindModel.Data = item;
-                bindModel.Name = string.IsNullOrEmpty(item.AppModel?.Description) ? item.AppModel.Name : item.AppModel.Description;
+                bindModel.Name = !string.IsNullOrEmpty(item.AppModel?.Alias) ? item.AppModel.Alias : string.IsNullOrEmpty(item.AppModel?.Description) ? item.AppModel.Name : item.AppModel.Description;
                 bindModel.Value = item.Time;
                 bindModel.Tag = Time.ToString(item.Time);
                 bindModel.PopupText = item.AppModel?.File;
@@ -291,7 +291,7 @@ private List<ChartsDataModel> MapToChartsData(IEnumerable<Core.Models.Db.WebSite
             {
                 var bindModel = new ChartsDataModel();
                 bindModel.Data = item;
-                bindModel.Name = item.Title;
+                bindModel.Name = !string.IsNullOrEmpty(item.Alias) ? item.Alias : item.Title;
                 bindModel.Value = item.Duration;
                 bindModel.Tag = Time.ToString(item.Duration);
                 bindModel.PopupText = item.Domain;
diff --git a/UI/ViewModels/WebSiteDetailPageVM.cs b/UI/ViewModels/WebSiteDetailPageVM.cs
index 7dcb9b8..c2c384e 100644
--- a/UI/ViewModels/WebSiteDetailPageVM.cs
+++ b/UI/ViewModels/WebSiteDetailPageVM.cs
@@ -150,6 +150,10 @@ private void CreateContextMenu()
             _setCategoryMenuItem = new MenuItem();
             _setCategoryMenuItem.Header = "设置分类";
 
+            MenuItem editAlias = new MenuItem();
+            editAlias.Header = "编辑别名";
+            editAlias.Click += EditAlias_ClickAsync;
+
             _blockMenuItem = new MenuItem();
             _blockMenuItem.Header = "忽略此网站";
             _blockMenuItem.Click += _blockMenuItem_Click;
@@ -157,11 +161,48 @@ private void CreateContextMenu()
             WebSiteContextMenu.Items.Add(reLoadData);
             WebSiteContextMenu.Items.Add(new Separator());
             WebSiteContextMenu.Items.Add(_setCategoryMenuItem);
+            WebSiteContextMenu.Items.Add(editAlias);
             WebSiteContextMenu.Items.Add(new Separator());
             WebSiteContextMenu.Items.Add(_blockMenuItem);
             WebSiteContextMenu.Items.Add(clear);
 
         }
+
+        private async void EditAlias_ClickAsync(object sender, RoutedEventArgs e)
+        {
+
+
+            try
+            {
+                string input = await _uIServicer.ShowInputModalAsync("修改别名", "请输入别名", WebSite.Alias, (val) =>
+                {
+                    if (string.IsNullOrEmpty(val))
+                    {
+                        _mainVM.Error("请输入别名");
+                        return false;
+                    }
+                    else if (val.Length > 10)
+                    {
+                        _mainVM.Error("别名最大长度为10位字符");
+                        return false;
+                    }
+                    return true;
+                });
+
+                //  开始更新别名
+
+                WebSite.Alias = input;
+                WebSite = _webData.Update(WebSite);
+
+                _mainVM.Success("别名已更新");
+                Debug.WriteLine("输入内容：" + input);
+            }
+            catch
+            {
+                //  输入取消，无需处理异常
+            }
+        }
+
         private async void ClearData_Click(object sender, RoutedEventArgs e)
         {
             bool isConfirm = await _uIServicer.ShowConfirmDialogAsync("清空确认", "是否确定清空此站点的所有统计数据？");
@@ -293,7 +334,7 @@ private void LoadData()
                 {
                     new ChartsDataModel()
                     {
-                        Name =WebSite.Title,
+                        Name =!string.IsNullOrEmpty(WebSite.Alias) ? WebSite.Alias :WebSite.Title,
                         Values = list.Select(m=>m.Value).ToArray(),
                         ColumnNames= colNames,
                         Color=StateData.ThemeColor
diff --git a/UI/Views/DetailPage.xaml b/UI/Views/DetailPage.xaml
index 730a52a..8bf9247 100644
--- a/UI/Views/DetailPage.xaml
+++ b/UI/Views/DetailPage.xaml
@@ -61,9 +61,26 @@
                             </StackPanel>
                         </Border>
                     </base:View>
-                    <TextBlock ToolTip="应用描述" Grid.Column="1" Text="{Binding App.Description}" FontSize="18" VerticalAlignment="Center" TextWrapping="WrapWithOverflow"/>
+                    <base:View Value="{Binding App.Alias}" Condition="not empty">
+                        <StackPanel>
+                            <TextBlock ToolTip="别名" Grid.Column="1" Text="{Binding App.Alias}" FontSize="18" VerticalAlignment="Center" TextWrapping="WrapWithOverflow"/>
+                            <TextBlock FontSize="12" Foreground="Gray" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,5,0,0">
+                               <Run ToolTip="应用进程名称" Text="{Binding App.Name}"></Run>
+                                <Run>(</Run>
+                               <Run ToolTip="应用描述" Text="{Binding App.Description}"></Run>
+                                <Run>)</Run>
+
+                            </TextBlock>
+                        </StackPanel>
+                    </base:View>
+                    <base:View Value="{Binding App.Alias}" Condition="empty">
+                        <StackPanel>
+                            <TextBlock ToolTip="应用描述" Grid.Column="1" Text="{Binding App.Description}" FontSize="18" VerticalAlignment="Center" TextWrapping="WrapWithOverflow"/>
+
+                            <TextBlock ToolTip="应用进程名称" Text="{Binding App.Name}" FontSize="12" Foreground="Gray" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,5,0,0"/>
+                        </StackPanel>
+                    </base:View>
 
-                    <TextBlock ToolTip="应用进程名称" Text="{Binding App.Name}" FontSize="12" Foreground="Gray" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,5,0,0"/>
                     <TextBlock ToolTip="应用文件路径"  Foreground="Gray" Text="{Binding App.File}"  Margin="0,5,0,0" TextWrapping="WrapWithOverflow"/>
                     <!--分类-->
 
diff --git a/UI/Views/WebSiteDetailPage.xaml b/UI/Views/WebSiteDetailPage.xaml
index 809dec2..6e3b2b4 100644
--- a/UI/Views/WebSiteDetailPage.xaml
+++ b/UI/Views/WebSiteDetailPage.xaml
@@ -37,9 +37,25 @@
                                 </StackPanel>
                             </Border>
                         </base:View>
-                        
-                        <TextBlock ToolTip="网站名称" Text="{Binding WebSite.Title}" FontSize="18" VerticalAlignment="Center" TextWrapping="WrapWithOverflow"/>
-                        <TextBlock ToolTip="域名" Text="{Binding WebSite.Domain}" FontSize="12" Foreground="Gray" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,0,0"/>
+                        <base:View Value="{Binding WebSite.Alias}" Condition="not empty">
+                            <StackPanel>
+                                <TextBlock ToolTip="别名" Grid.Column="1" Text="{Binding WebSite.Alias}" FontSize="18" VerticalAlignment="Center" TextWrapping="WrapWithOverflow"/>
+                                <TextBlock FontSize="12" Foreground="Gray" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,5,0,0">
+                               <Run ToolTip="域名" Text="{Binding WebSite.Domain}"></Run>
+                                <Run>(</Run>
+                               <Run ToolTip="网站名称" Text="{Binding WebSite.Title}"></Run>
+                                <Run>)</Run>
+
+                                </TextBlock>
+                            </StackPanel>
+                        </base:View>
+                        <base:View Value="{Binding WebSite.Alias}" Condition="empty">
+                            <StackPanel>
+                                <TextBlock ToolTip="网站名称" Text="{Binding WebSite.Title}" FontSize="18" VerticalAlignment="Center" TextWrapping="WrapWithOverflow"/>
+                                <TextBlock ToolTip="域名" Text="{Binding WebSite.Domain}" FontSize="12" Foreground="Gray" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,0,0"/>
+                            </StackPanel>
+                        </base:View>
+                       
                         <base:View Condition="not null" Value="{Binding Category}" HorizontalAlignment="Left">
                             <select:Select Margin="0,10,0,0" ToolTip="网站分类" SelectedItem="{Binding Category,Mode=TwoWay}" Options="{Binding Categories}"  Padding="10,0" Height="30"/>