From 6462a029419c42439f0d4903f0a5876f3492dd42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Wed, 20 Apr 2022 00:24:03 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=8C=BA=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/AreaEditWindow.xaml        |  40 +++
 TextLocator/AreaEditWindow.xaml.cs     | 189 ++++++++++++++
 TextLocator/AreaInfoItem.xaml          |  27 ++
 TextLocator/AreaInfoItem.xaml.cs       |  61 +++++
 TextLocator/AreaWindow.xaml            |  88 ++++---
 TextLocator/AreaWindow.xaml.cs         | 270 +++++++++----------
 TextLocator/Core/AppConst.cs           |   4 +
 TextLocator/Entity/AreaInfo.cs         |  32 +++
 TextLocator/FileInfoItem.xaml.cs       |  12 +
 TextLocator/FolderInfoItem.xaml        |  10 +-
 TextLocator/HotkeyWindow.xaml          |   2 +-
 TextLocator/Index/IndexCore.cs         | 140 ++++++----
 TextLocator/MainWindow.xaml            |  14 +-
 TextLocator/MainWindow.xaml.cs         | 346 +++++++++++++++----------
 TextLocator/Properties/AssemblyInfo.cs |   4 +-
 TextLocator/Service/PdfFileService.cs  |   4 +-
 TextLocator/SettingWindow.xaml         |  14 +-
 TextLocator/SettingWindow.xaml.cs      |   7 +
 TextLocator/TextLocator.csproj         |  16 ++
 TextLocator/Util/AppUtil.cs            |  38 ++-
 TextLocator/Util/AreaUtil.cs           | 199 ++++++++++++++
 21 files changed, 1143 insertions(+), 374 deletions(-)
 create mode 100644 TextLocator/AreaEditWindow.xaml
 create mode 100644 TextLocator/AreaEditWindow.xaml.cs
 create mode 100644 TextLocator/AreaInfoItem.xaml
 create mode 100644 TextLocator/AreaInfoItem.xaml.cs
 create mode 100644 TextLocator/Entity/AreaInfo.cs
 create mode 100644 TextLocator/Util/AreaUtil.cs

diff --git a/TextLocator/AreaEditWindow.xaml b/TextLocator/AreaEditWindow.xaml
new file mode 100644
index 0000000..97c3a2b
--- /dev/null
+++ b/TextLocator/AreaEditWindow.xaml
@@ -0,0 +1,40 @@
+<Window x:Class="TextLocator.AreaEditWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:TextLocator"
+        mc:Ignorable="d"
+        Title="区域编辑" Height="350" Width="600" WindowStartupLocation="CenterOwner" WindowStyle="ToolWindow" ResizeMode="CanMinimize" Icon="/Resource/App.ico" Loaded="Window_Loaded" >
+    <Grid Margin="10">
+        <StackPanel>
+            <!-- 文字提示 -->
+            <TextBlock Text="请为区域设置名字，并选择文件夹保存。" FontWeight="Bold" Foreground="OrangeRed"/>
+            <!-- 区域名称 -->
+            <Grid Margin="0,10,0,0" VerticalAlignment="Center">
+                <TextBlock Text="区域名称：" Margin="0,0,480,0" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                <TextBox x:Name="AreaName" Margin="100,0,0,0" Width="440" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+            </Grid>
+            <!-- 区域名称 -->
+            <Grid Margin="0,10,0,0" VerticalAlignment="Center">
+                <TextBlock Text="区域文件夹：" Margin="0,10,480,0" VerticalAlignment="Top" HorizontalAlignment="Right"/>
+                <ListBox x:Name="AreaFolders" Margin="100,0,0,0" Height="165">
+                    <ListBoxItem>
+                        <Grid Width="440" Height="30">
+                            <TextBlock Text="C:\Users\{User}\Document" Margin="0,0,0,0" FontSize="14" HorizontalAlignment="Left"/>
+                            <Button Content="删除" Margin="0,0,10,0" Height="20" Background="Red" HorizontalAlignment="Right"/>
+                            <!-- 分割线 -->
+                            <Line X1="0" Y1="0" X2="430" Y2="0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="1"></Line>
+                        </Grid>
+                    </ListBoxItem>
+                </ListBox>
+            </Grid>
+        </StackPanel>
+
+        <Grid Margin="0,10,0,0" VerticalAlignment="Bottom">
+            <Button x:Name="AddButton" Content="添加" Margin="0,0,150,0" Width="60" Click="AddButton_Click"/>
+            <Button x:Name="SaveButton" Content="保存" Margin="0,0,0,0" Width="60" Background="Green" Click="SaveButton_Click"/>
+            <Button x:Name="ExitButton" Content="退出" Margin="150,0,0,0" Width="60" Background="Red" Click="ExitButton_Click"/>
+        </Grid>
+    </Grid>
+</Window>
diff --git a/TextLocator/AreaEditWindow.xaml.cs b/TextLocator/AreaEditWindow.xaml.cs
new file mode 100644
index 0000000..5c7c122
--- /dev/null
+++ b/TextLocator/AreaEditWindow.xaml.cs
@@ -0,0 +1,189 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using TextLocator.Entity;
+using TextLocator.Message;
+using TextLocator.Util;
+
+namespace TextLocator
+{
+    /// <summary>
+    /// AreaEditWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class AreaEditWindow : Window
+    {
+        /// <summary>
+        /// 索引区文件夹
+        /// </summary>
+        private List<string> _areaFolders = new List<string>();
+        /// <summary>
+        /// 区域信息
+        /// </summary>
+        private AreaInfo _areaInfo;
+
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        /// <param name="areaInfo">区域信息对象</param>
+        public AreaEditWindow(AreaInfo areaInfo = null)
+        {
+            InitializeComponent();
+            _areaInfo = areaInfo;
+
+            if (_areaInfo == null)
+            {
+                _areaInfo = new AreaInfo()
+                {
+                    AreaId = "Area" + DateTime.Now.ToString("yyyyMMddHHmmssffff")
+                };
+            }
+        }
+
+        /// <summary>
+        /// 加载完毕
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.AreaName.Text = _areaInfo.AreaName;
+            this.AreaFolders.Items.Clear();
+            if (_areaInfo.AreaFolders != null)
+            {
+                FolderInfoItem folder;
+                foreach (string folderPath in _areaInfo.AreaFolders)
+                {
+                    _areaFolders.Add(folderPath);
+
+                    folder = new FolderInfoItem(folderPath);
+                    folder.DelButton.Click += DelButton_Click; ;
+                    folder.DelButton.Tag = folderPath;
+                    this.AreaFolders.Items.Add(folder);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 删除文件夹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void DelButton_Click(object sender, RoutedEventArgs e)
+        {
+            for (int i = 0; i < this.AreaFolders.Items.Count; i++)
+            {
+                if ((this.AreaFolders.Items[i] as FolderInfoItem).FolderPath.Text.Equals((sender as Button).Tag))
+                {
+                    this.AreaFolders.Items.RemoveAt(i);
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 添加文件夹
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void AddButton_Click(object sender, RoutedEventArgs e)
+        {
+            System.Windows.Forms.FolderBrowserDialog browserDialog = new System.Windows.Forms.FolderBrowserDialog();
+            if (browserDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            {
+                string folderPath = browserDialog.SelectedPath;
+
+                // 判断是否已选过
+                if (_areaFolders.Contains(folderPath))
+                {
+                    MessageCore.ShowWarning("选定目录已存在");
+                    return;
+                }
+
+                // 判断文件夹是否存在于其他区域中
+                if (AreaUtil.GetAreaFolderList().Contains(folderPath))
+                {
+                    MessageCore.ShowWarning("该文件夹已存在于其他区域");
+                    return;
+                }
+
+                // 加入列表
+                FolderInfoItem folder = new FolderInfoItem(folderPath);
+                folder.DelButton.Click += DelButton_Click;
+                folder.DelButton.Tag = folderPath;
+
+                this.AreaFolders.Items.Add(folder);
+
+                _areaFolders.Add(folderPath);
+            }
+        }
+
+        /// <summary>
+        /// 保存
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SaveButton_Click(object sender, RoutedEventArgs e)
+        {
+            string areaName = this.AreaName.Text.Trim();
+
+            if (string.IsNullOrEmpty(areaName))
+            {
+                MessageCore.ShowWarning("区域名称为空");
+                return;
+            }
+            if (this.AreaFolders.Items.Count <= 0)
+            {
+                MessageCore.ShowWarning("至少需要一个文件夹");
+                return;
+            }
+            if (AreaUtil.GetAreaNameListRuleOut(_areaInfo).Contains(areaName))
+            {
+                MessageCore.ShowWarning("区域名称不能重复");
+                return;
+            }
+
+            // 搜索区名称
+            _areaInfo.AreaName = areaName;
+            // 搜索区文件夹
+            _areaInfo.AreaFolders = _areaFolders;
+
+            // 保存区域信息
+            // AreaUtil.SaveAreaInfo(_areaInfo);
+            List<AreaInfo> areaInfos = CacheUtil.Get<List<AreaInfo>>("AreaInfos");
+            if (areaInfos.Contains(_areaInfo))
+            {
+                for (int i = 0; i < areaInfos.Count; i++)
+                {
+                    AreaInfo areaInfo = areaInfos[i];
+                    if (_areaInfo.AreaId == areaInfo.AreaId)
+                    {
+                        areaInfos[i] = _areaInfo;
+                    }
+                    break;
+                }
+            }
+            else
+            {
+                areaInfos.Add(_areaInfo);
+            }
+            
+            CacheUtil.Put("AreaInfos", areaInfos);
+
+            // 返回
+            this.DialogResult = true;
+            this.Close();
+        }
+
+        /// <summary>
+        /// 退出
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ExitButton_Click(object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = false;
+            this.Close();
+        }
+    }
+}
diff --git a/TextLocator/AreaInfoItem.xaml b/TextLocator/AreaInfoItem.xaml
new file mode 100644
index 0000000..a35547f
--- /dev/null
+++ b/TextLocator/AreaInfoItem.xaml
@@ -0,0 +1,27 @@
+<UserControl x:Class="TextLocator.AreaInfoItem"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:TextLocator"
+             mc:Ignorable="d" 
+             d:DesignHeight="50" d:DesignWidth="800">
+    <Grid>
+        <Grid Margin="0,10,0,10">
+            <CheckBox x:Name="AreaIsEnable" Margin="10,0,0,0" Width="20" Height="20" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+            <Grid Margin="50,0,0,0" Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
+                <TextBlock x:Name="AreaName" Text="默认区域"/>
+            </Grid>
+            <StackPanel x:Name="AreaFolders" Margin="230,0,0,0" Width="380" VerticalAlignment="Center" HorizontalAlignment="Left">
+                <TextBlock Text="C:\Users\liulei\Desktop\"/>
+                <TextBlock Text="C:\Users\liulei\Documents\"/>
+            </StackPanel>
+            <Grid Margin="630,0,10,0" Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
+                <Button x:Name="EditButton" Content="编辑" Margin="0,0,70,0" Width="60" />
+                <Button x:Name="DeleteButton" Content="删除" Margin="70,0,0,0" Width="60" Background="Red"/>
+            </Grid>
+        </Grid>
+        <!-- 分割线 -->
+        <Line X1="0" Y1="0" X2="800" Y2="0" Margin="0,0,0,0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="0.5"></Line>
+    </Grid>
+</UserControl>
diff --git a/TextLocator/AreaInfoItem.xaml.cs b/TextLocator/AreaInfoItem.xaml.cs
new file mode 100644
index 0000000..2f430d6
--- /dev/null
+++ b/TextLocator/AreaInfoItem.xaml.cs
@@ -0,0 +1,61 @@
+using log4net;
+using System;
+using System.Windows.Controls;
+using TextLocator.Entity;
+
+namespace TextLocator
+{
+    /// <summary>
+    /// AreaInfoItem.xaml 的交互逻辑
+    /// </summary>
+    public partial class AreaInfoItem : UserControl
+    {
+        private static readonly ILog log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
+        public AreaInfoItem(AreaInfo areaInfo)
+        {
+            InitializeComponent();
+
+            try
+            {
+                Refresh(areaInfo);
+            }
+            catch
+            {
+                this.Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    try
+                    {
+                        Refresh(areaInfo);
+                    }
+                    catch (Exception ex)
+                    {
+                        log.Error(ex.Message, ex);
+                    }
+                }));
+            }
+        }
+
+        /// <summary>
+        /// 刷新数据
+        /// </summary>
+        /// <param name="areaInfo">区域信息</param>
+        public void Refresh(AreaInfo areaInfo)
+        {
+            // 是否启用
+            this.AreaIsEnable.IsChecked = areaInfo.IsEnable;
+            // 区域名称
+            this.AreaName.Text = areaInfo.AreaName;
+            // 区域文件夹
+            this.AreaFolders.Children.Clear();
+            if (areaInfo.AreaFolders != null)
+            {
+                foreach (string path in areaInfo.AreaFolders)
+                {
+                    TextBlock text = new TextBlock() { Text = path };
+                    this.AreaFolders.Children.Add(text);
+                }
+            }
+        }
+    }
+}
diff --git a/TextLocator/AreaWindow.xaml b/TextLocator/AreaWindow.xaml
index e586c24..abced05 100644
--- a/TextLocator/AreaWindow.xaml
+++ b/TextLocator/AreaWindow.xaml
@@ -5,45 +5,59 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:TextLocator"
         mc:Ignorable="d"
-        Title="区域设置" Height="540" Width="960" WindowStartupLocation="CenterOwner" WindowStyle="ToolWindow" ResizeMode="CanMinimize" Icon="/Resource/App.ico" Loaded="Window_Loaded" >
-    <Grid>
-        <StackPanel Margin="0,10,0,50" Orientation="Horizontal">
-            <!-- 搜索区域 -->
-            <GroupBox Header="搜索区域" Width="480" HorizontalAlignment="Left">
-                <Grid>
-                    <ListBox x:Name="FolderList" Margin="0,0,10,50">
-                        <ListBoxItem>
-                            <Grid Width="430" Height="40">
-                                <TextBlock Text="C:\Users\{User}\Document" Margin="10,0,0,0" FontSize="16" HorizontalAlignment="Left"/>
-                                <Button Content="删除" Margin="0,0,10,0" Background="Red" HorizontalAlignment="Right"/>
-                                <!-- 分割线 -->
-                                <Line X1="0" Y1="0" X2="455" Y2="0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="1"></Line>
-                            </Grid>
-                        </ListBoxItem>
-                    </ListBox>
-                    <!-- 功能按钮 -->
-                    <Button x:Name="AddFolder" Content="增加区域" Width="100" VerticalAlignment="Bottom" Margin="10,0,10,10" Click="AddFolder_Click" Tag="SearchArea" />
+        Title="区域设置" Height="465" Width="830" WindowStartupLocation="CenterOwner" WindowStyle="ToolWindow" ResizeMode="CanMinimize" Icon="/Resource/App.ico" Loaded="Window_Loaded" >
+    <Grid Margin="10">
+        <StackPanel>
+            <!-- 文字提示 -->
+            <TextBlock Text="“区域”代表搜索范围，即已选定的目录（需要启用才能用于搜索）。" FontWeight="Bold" Foreground="OrangeRed"/>
+            <!-- 表头 -->
+            <Grid>
+                <Grid Margin="0,10,0,10">
+                    <Grid Margin="10,0,0,0" Width="50" VerticalAlignment="Center" HorizontalAlignment="Left">
+                        <TextBlock Text="启用" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                    </Grid>
+                    <Grid Margin="50,0,0,0" Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
+                        <TextBlock Text="区域名称" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                    </Grid>
+                    <Grid Margin="230,0,0,0" Width="380" VerticalAlignment="Center" HorizontalAlignment="Left">
+                        <TextBlock Text="文件夹" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                    </Grid>
+                    <Grid Margin="640,0,10,0" Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
+                        <TextBlock Text="操作" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                    </Grid>
                 </Grid>
-            </GroupBox>
-            <!-- 排除区域 -->
-            <GroupBox Header="排除区域" Width="480" HorizontalAlignment="Left">
-                <Grid>
-                    <ListBox x:Name="ExclusionList" Margin="0,0,10,50">
-                        <ListBoxItem>
-                            <Grid Width="430" Height="40">
-                                <TextBlock Text="C:\Users\{User}\Document" Margin="10,0,0,0" Foreground="Gray" FontSize="16" HorizontalAlignment="Left"/>
-                                <Button Content="删除" Margin="0,0,10,0" Background="Red" HorizontalAlignment="Right"/>
-                                <!-- 分割线 -->
-                                <Line X1="0" Y1="0" X2="455" Y2="0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="1"></Line>
+                <!-- 分割线 -->
+                <Line X1="0" Y1="0" X2="800" Y2="0" Margin="0,0,0,0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="0.5"></Line>
+            </Grid>
+            <!-- 列表区 -->
+            <ScrollViewer Height="310" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden">
+                <StackPanel x:Name="AreaInfoList">
+                    <Grid>
+                        <Grid Margin="0,10,0,10">
+                            <CheckBox Margin="10,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                            <Grid Margin="50,0,0,0" Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
+                                <TextBlock Text="默认区域"/>
                             </Grid>
-                        </ListBoxItem>
-                    </ListBox>
-                    <!-- 功能按钮 -->
-                    <Button x:Name="AddExclusionFolder" Content="增加排除" Background="DarkGray" Width="100" VerticalAlignment="Bottom" Margin="10,0,10,10" Click="AddExclusionFolder_Click" Tag=""/>
-                </Grid>
-            </GroupBox>
+                            <StackPanel Margin="230,0,0,0" Width="380" VerticalAlignment="Center" HorizontalAlignment="Left">
+                                <TextBlock Text="C:\Users\liulei\Desktop\"/>
+                                <TextBlock Text="C:\Users\liulei\Documents\"/>
+                            </StackPanel>
+                            <Grid Margin="630,0,10,0" Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
+                                <Button Content="编辑" Margin="0,0,70,0" Width="60" />
+                                <Button Content="删除" Margin="70,0,0,0" Width="60" Background="Red"/>
+                            </Grid>
+                        </Grid>
+                        <!-- 分割线 -->
+                        <Line X1="0" Y1="0" X2="800" Y2="0" Margin="0,0,0,0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="0.5"></Line>
+                    </Grid>
+                </StackPanel>
+            </ScrollViewer>
         </StackPanel>
-        <!-- 功能按钮 -->
-        <Button x:Name="SaveClose" Content="保存并关闭" Background="Green" VerticalAlignment="Bottom" Margin="10,0,10,10" Width="100" Click="SaveClose_Click"/>
+
+        <Grid Margin="0,10,0,0" VerticalAlignment="Bottom">
+            <Button x:Name="AddButton" Content="新增" Margin="0,0,150,0" Width="60" Click="AddButton_Click"/>
+            <Button x:Name="SaveButton" Content="保存" Margin="0,0,0,0" Width="60" Background="Green" Click="SaveButton_Click"/>
+            <Button x:Name="ExitButton" Content="退出" Margin="150,0,0,0" Width="60" Background="Red" Click="ExitButton_Click"/>
+        </Grid>
     </Grid>
 </Window>
diff --git a/TextLocator/AreaWindow.xaml.cs b/TextLocator/AreaWindow.xaml.cs
index a3daee0..1e88ad5 100644
--- a/TextLocator/AreaWindow.xaml.cs
+++ b/TextLocator/AreaWindow.xaml.cs
@@ -1,9 +1,8 @@
-using Rubyer;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Media;
+using TextLocator.Entity;
 using TextLocator.Message;
 using TextLocator.Util;
 
@@ -15,207 +14,218 @@ namespace TextLocator
     public partial class AreaWindow : Window
     {
         /// <summary>
-        /// 索引区文件夹
+        /// 区域信息列表
         /// </summary>
-        private List<string> _indexFolder = new List<string>();
-        /// <summary>
-        /// 排除区文件夹
-        /// </summary>
-        private List<string> _exclusionFolder = new List<string>();
+        private List<AreaInfo> _areaInfos;
 
         public AreaWindow()
         {
             InitializeComponent();
         }
 
+        /// <summary>
+        /// 加载完毕
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            // 获取搜索文件夹
-            string folderPaths = AppUtil.ReadValue("AppConfig", "FolderPaths", Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "," + Environment.GetFolderPath(Environment.SpecialFolder.Desktop));
-            // 清空
-            this.FolderList.Items.Clear();
-            if (!string.IsNullOrEmpty(folderPaths))
-            {                
-                FolderInfoItem folder;
-                foreach (string folderPath in folderPaths.Split(','))
-                {
-                    folder = new FolderInfoItem(folderPath);
-                    folder.DeleteButton.Click += DeleteButton_Click;
-                    folder.DeleteButton.Tag = folderPath;
-
-                    this.FolderList.Items.Add(folder);
+            // 加载区域信息列表
+            LoadAreaInfoList();
+        }
 
-                    _indexFolder.Add(folderPath);
-                }
+        /// <summary>
+        /// 加载区域信息列表
+        /// <param name="areaInfos">区域信息列表</param>
+        /// </summary>
+        private void LoadAreaInfoList(List<AreaInfo> areaInfos = null)
+        {
+            // 外部传入区域信息列表为空
+            if (areaInfos == null)
+            {
+                // 重新获取新的列表
+                areaInfos = AreaUtil.GetAreaInfoList();
             }
 
-            // 获取排除文件夹
-            string exclusionPaths = AppUtil.ReadValue("AppConfig", "ExclusionPaths", "");
-            // 清空
-            this.ExclusionList.Items.Clear();
-            if(!string.IsNullOrEmpty(exclusionPaths))
+            if (areaInfos != null)
             {
-                FolderInfoItem exclusion;
-                foreach (string folderPath in exclusionPaths.Split(','))
+                this.AreaInfoList.Children.Clear();
+                foreach (AreaInfo areaInfo in areaInfos)
                 {
-                    exclusion = new FolderInfoItem(folderPath);
-                    exclusion.FolderPath.Foreground = new SolidColorBrush(Colors.Gray);
-                    exclusion.DeleteButton.Click += DeleteExclusionButton_Click;
-                    exclusion.DeleteButton.Tag = folderPath;
-
-                    this.ExclusionList.Items.Add(exclusion);
-
-                    _exclusionFolder.Add(folderPath);
+                    AreaInfoItem item = new AreaInfoItem(areaInfo);
+                    // 编辑按钮
+                    item.EditButton.Tag = areaInfo;
+                    item.EditButton.Click += EditButton_Click;
+                    // 删除按钮
+                    item.DeleteButton.Tag = areaInfo;
+                    item.DeleteButton.Click += DelButton_Click;
+                    // 选中或取消选中事件
+                    item.AreaIsEnable.Tag = areaInfo;
+                    item.AreaIsEnable.Checked += AreaIsEnable_Checked;
+                    item.AreaIsEnable.Unchecked += AreaIsEnable_Unchecked;
+                    this.AreaInfoList.Children.Add(item);
                 }
             }
+            _areaInfos = areaInfos;
         }
 
-        #region 搜索区文件夹
         /// <summary>
-        /// 条目删除按钮
+        /// 区域是否取用未选中
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void DeleteButton_Click(object sender, RoutedEventArgs e)
+        private void AreaIsEnable_Unchecked(object sender, RoutedEventArgs e)
         {
-            for(int i = 0; i < this.FolderList.Items.Count; i++)
+            AreaInfo areaInfo = (AreaInfo)(sender as CheckBox).Tag;
+            areaInfo.IsEnable = false;
+
+            // 修改本地列表缓存
+            if (_areaInfos!= null)
             {
-                if ((this.FolderList.Items[i] as FolderInfoItem).FolderPath.Text.Equals((sender as Button).Tag))
+                for(int i = 0; i < _areaInfos.Count; i++)
                 {
-                    this.FolderList.Items.RemoveAt(i);
-                    break;
+                    AreaInfo info = _areaInfos[i];
+                    if (info.AreaId.Equals(areaInfo.AreaId))
+                    {
+                        info = areaInfo;
+                        _areaInfos[i] = info;
+                    }
                 }
             }
         }
 
         /// <summary>
-        /// 添加文件夹
+        /// 区域是否启用选中
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void AddFolder_Click(object sender, RoutedEventArgs e)
+        private void AreaIsEnable_Checked(object sender, RoutedEventArgs e)
         {
-            System.Windows.Forms.FolderBrowserDialog browserDialog = new System.Windows.Forms.FolderBrowserDialog();
-            if (browserDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
-            {
-                string folderPath = browserDialog.SelectedPath;
+            AreaInfo areaInfo = (AreaInfo)(sender as CheckBox).Tag;
+            areaInfo.IsEnable = true;
 
-                // 判断是否已选过
-                if (_indexFolder.Contains(folderPath))
+            // 修改本地列表缓存
+            if (_areaInfos != null)
+            {
+                for (int i = 0; i < _areaInfos.Count; i++)
                 {
-                    MessageCore.ShowWarning("选定目录已存在");
-                    return;
+                    AreaInfo info = _areaInfos[i];
+                    if (info.AreaId.Equals(areaInfo.AreaId))
+                    {
+                        info = areaInfo;
+                        _areaInfos[i] = info;
+                    }
                 }
-
-                // 加入列表
-                FolderInfoItem folder = new FolderInfoItem(folderPath);
-                folder.DeleteButton.Click += DeleteButton_Click;
-                folder.DeleteButton.Tag = folderPath;
-
-                this.FolderList.Items.Add(folder);
-
-                _indexFolder.Add(folderPath);
             }
         }
-        #endregion
 
-        #region 排除文件夹
         /// <summary>
-        /// 排除文件夹条目删除按钮
+        /// 删除
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void DeleteExclusionButton_Click(object sender, RoutedEventArgs e)
+        private void DelButton_Click(object sender, RoutedEventArgs e)
         {
-            for (int i = 0; i < this.ExclusionList.Items.Count; i++)
+            AreaInfo areaInfo = (AreaInfo)(sender as Button).Tag;
+            if (areaInfo != null)
             {
-                if ((this.ExclusionList.Items[i] as FolderInfoItem).FolderPath.Text.Equals((sender as Button).Tag))
+                // AreaUtil.DeleteAreaInfo(areaInfo);
+                for( int i = 0; i < _areaInfos.Count; i++)
                 {
-                    this.ExclusionList.Items.RemoveAt(i);
-                    break;
+                    if (_areaInfos[i].AreaId == areaInfo.AreaId)
+                    {
+                        _areaInfos.RemoveAt(i);
+                        break;
+                    }
                 }
+
+                // 重新加载区域信息列表（刷新）
+                LoadAreaInfoList(_areaInfos);
             }
         }
+
         /// <summary>
-        /// 添加排除文件夹
+        /// 编辑
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void AddExclusionFolder_Click(object sender, RoutedEventArgs e)
+        private void EditButton_Click(object sender, RoutedEventArgs e)
         {
-            System.Windows.Forms.FolderBrowserDialog browserDialog = new System.Windows.Forms.FolderBrowserDialog();
-            if (browserDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
-            {
-                // 获得选定文件夹
-                string folderPath = browserDialog.SelectedPath;
+            AreaInfo areaInfo = (AreaInfo)(sender as Button).Tag;
+            CacheUtil.Put("AreaInfos", _areaInfos);
+            ShowAreaEditDialog(areaInfo);
+        }
+
+        /// <summary>
+        /// 新增
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void AddButton_Click(object sender, RoutedEventArgs e)
+        {
+            CacheUtil.Put("AreaInfos", _areaInfos);
+            ShowAreaEditDialog();
+        }
 
-                // 判断是否已选过
-                if (_exclusionFolder.Contains(folderPath))
+        /// <summary>
+        /// 保存
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SaveButton_Click(object sender, RoutedEventArgs e)
+        {
+            // 修改本地列表缓存
+            if (_areaInfos != null)
+            {
+                int enableCount = 0;
+                foreach (AreaInfo info in _areaInfos)
                 {
-                    MessageCore.ShowWarning("选定目录已存在");
-                    return;
+                    if (info.IsEnable) enableCount++;
                 }
 
-                // 判断是否存在于搜索区
-                if (_indexFolder.Contains(folderPath))
+                if (enableCount < 1)
                 {
-                    MessageCore.ShowWarning("不能排除搜索区目录");
+                    MessageCore.ShowWarning("至少保留一个启用的搜索区");
                     return;
                 }
 
-                // 加入列表
-                FolderInfoItem folder = new FolderInfoItem(folderPath);
-                folder.FolderPath.Foreground = new SolidColorBrush(Colors.Gray);
-                folder.DeleteButton.Click += DeleteExclusionButton_Click;
-                folder.DeleteButton.Tag = folderPath;
-
-                this.ExclusionList.Items.Add(folder);
-
-                _exclusionFolder.Add(folderPath);
+                foreach (AreaInfo areaInfo in _areaInfos)
+                {
+                    AreaUtil.SaveAreaInfo(areaInfo);
+                }
             }
+            this.DialogResult = true;
         }
-        #endregion
 
-        #region 保存并关闭
         /// <summary>
-        /// 保存并关闭
+        /// 退出
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void SaveClose_Click(object sender, RoutedEventArgs e)
+        private void ExitButton_Click(object sender, RoutedEventArgs e)
         {
-            if (this.FolderList.Items.Count <= 0)
-            {
-                MessageCore.ShowWarning("至少保留一个被搜索文件夹哦");
-                return;
-            }
-            // 搜索区文件夹
-            string folderPaths = "";
-            foreach(FolderInfoItem item in this.FolderList.Items)
-            {
-                folderPaths += item.FolderPath.Text + ",";
-            }
-            folderPaths = folderPaths.Substring(0, folderPaths.Length - 1);
-            // 保存到配置文件
-            AppUtil.WriteValue("AppConfig", "FolderPaths", folderPaths);
+            this.DialogResult = false;
+        }
 
-            // 排除文件夹
-            string exclusionPaths = "";
-            foreach (FolderInfoItem item in this.ExclusionList.Items)
-            {
-                exclusionPaths += item.FolderPath.Text + ",";
-            }
-            if (!string.IsNullOrEmpty(exclusionPaths))
-            {
-                exclusionPaths = exclusionPaths.Substring(0, exclusionPaths.Length - 1);
-            }
-            // 保存到配置文件
-            AppUtil.WriteValue("AppConfig", "ExclusionPaths", exclusionPaths);
 
-            this.DialogResult = true;
 
-            this.Close();
+        /// <summary>
+        /// 显示区域编辑
+        /// </summary>
+        /// <param name="areaInfo"></param>
+        private void ShowAreaEditDialog(AreaInfo areaInfo = null)
+        {
+            AreaEditWindow editDialog = new AreaEditWindow(areaInfo);
+            editDialog.Topmost = true;
+            editDialog.Owner = this;
+            editDialog.ShowDialog();
+
+            if (editDialog.DialogResult == true)
+            {
+                _areaInfos = CacheUtil.Get<List<AreaInfo>>("AreaInfos");
+                // 重新加载区域信息列表（刷新）
+                LoadAreaInfoList(_areaInfos);
+            }
         }
-        #endregion
     }
 }
diff --git a/TextLocator/Core/AppConst.cs b/TextLocator/Core/AppConst.cs
index 87e9fd1..d3614d4 100644
--- a/TextLocator/Core/AppConst.cs
+++ b/TextLocator/Core/AppConst.cs
@@ -128,6 +128,10 @@ namespace TextLocator.Core
         /// 加密解密秘钥（不能随意修改，随意修改将导致注册码失效）
         /// </summary>
         public const string AES_KEY = "TextLocator_Activation_2022";
+        /// <summary>
+        /// 区域配置
+        /// </summary>
+        public const string AREA_CONFIG_KEY = "AreaConfig";
 
     }
 }
diff --git a/TextLocator/Entity/AreaInfo.cs b/TextLocator/Entity/AreaInfo.cs
new file mode 100644
index 0000000..f11b7dd
--- /dev/null
+++ b/TextLocator/Entity/AreaInfo.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TextLocator.Entity
+{
+    /// <summary>
+    /// 区域信息
+    /// </summary>
+    public class AreaInfo
+    {
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool IsEnable { get; set; }
+
+        /// <summary>
+        /// 区域索引
+        /// </summary>
+        public string AreaId { get; set; }
+        /// <summary>
+        /// 区域名称
+        /// </summary>
+        public string AreaName { get; set; }
+        /// <summary>
+        /// 区域文件夹路径
+        /// </summary>
+        public List<string> AreaFolders { get; set; }
+    }
+}
diff --git a/TextLocator/FileInfoItem.xaml.cs b/TextLocator/FileInfoItem.xaml.cs
index 0c734e5..050abae 100644
--- a/TextLocator/FileInfoItem.xaml.cs
+++ b/TextLocator/FileInfoItem.xaml.cs
@@ -71,6 +71,18 @@ namespace TextLocator
                     RichTextBoxUtil.Highlighted(this.ContentBreviary, Colors.Red, fileInfo.Keywords);
                 }));
             });
+
+            // 词频统计
+            Task.Factory.StartNew(() => {
+                string keywordFrequency = IndexCore.GetKeywordFrequency(fileInfo);
+                this.Dispatcher.BeginInvoke(new Action(() => {
+                    if (!string.IsNullOrWhiteSpace(keywordFrequency))
+                    {
+                        // 关键词匹配次数
+                        this.FileTypeIcon.ToolTip = keywordFrequency;
+                    }
+                }));
+            });
         }
     }
 }
diff --git a/TextLocator/FolderInfoItem.xaml b/TextLocator/FolderInfoItem.xaml
index bdf5606..d4bd35d 100644
--- a/TextLocator/FolderInfoItem.xaml
+++ b/TextLocator/FolderInfoItem.xaml
@@ -5,11 +5,11 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:TextLocator"
              mc:Ignorable="d" 
-             d:DesignWidth="430" d:DesignHeight="40">
-    <Grid Width="430" Height="40">
-        <TextBlock x:Name="FolderPath" Text="D:\桌面文档" Margin="10,0,0,0" FontSize="16" HorizontalAlignment="Left"/>
-        <Button x:Name="DeleteButton" Content="删除" Margin="0,0,10,0" Background="OrangeRed" HorizontalAlignment="Right"/>
+             d:DesignWidth="430" d:DesignHeight="30">
+    <Grid Width="430" Height="30">
+        <TextBlock x:Name="FolderPath" Text="D:\桌面文档" Margin="0,0,0,0" FontSize="14" HorizontalAlignment="Left"/>
+        <Button x:Name="DelButton" Content="删除" Margin="0,0,10,0" Height="20" Background="OrangeRed" HorizontalAlignment="Right"/>
         <!-- 分割线 -->
-        <Line X1="0" Y1="0" X2="455" Y2="0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="1"></Line>
+        <Line X1="0" Y1="0" X2="430" Y2="0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="1"></Line>
     </Grid>
 </UserControl>
diff --git a/TextLocator/HotkeyWindow.xaml b/TextLocator/HotkeyWindow.xaml
index 9e462da..ff58c20 100644
--- a/TextLocator/HotkeyWindow.xaml
+++ b/TextLocator/HotkeyWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:TextLocator"
         mc:Ignorable="d"
         x:Name="hotkey"
-        Title="热键设置" Height="380" Width="520" WindowStartupLocation="CenterOwner" WindowStyle="ToolWindow" ResizeMode="CanMinimize" Icon="/Resource/App.ico" Loaded="Window_Loaded" Closed="Window_Closed" >
+        Title="热键设置" Height="380" Width="520" WindowStartupLocation="CenterScreen" WindowStyle="ToolWindow" ResizeMode="CanMinimize" Icon="/Resource/App.ico" Loaded="Window_Loaded" Closed="Window_Closed" >
     <Grid>
         <Grid Margin="0,0,0,50">
             <GroupBox Header="热键">
diff --git a/TextLocator/Index/IndexCore.cs b/TextLocator/Index/IndexCore.cs
index 490a2c0..789b784 100644
--- a/TextLocator/Index/IndexCore.cs
+++ b/TextLocator/Index/IndexCore.cs
@@ -57,7 +57,7 @@ namespace TextLocator.Index
         /// 删除索引
         /// </summary>
         private static volatile Queue<int> _indexDeleted = new Queue<int>();
-        
+
         #region 索引写入器
         /// <summary>
         /// 索引写入初始化（FSDirectory表示索引存放在硬盘上，RAMDirectory表示放在内存上）
@@ -75,15 +75,16 @@ namespace TextLocator.Index
         /// <summary>
         /// 创建索引写入器
         /// </summary>
+        /// <param name="areaId">区域ID（区域索引标识符）</param>
         /// <param name="create">是否是创建</param>
         /// <param name="index">索引写入器下标</param>
-        private static void CreateIndexWriter(bool create, int index = -1)
+        private static void CreateIndexWriter(string areaId, bool create, int index = -1)
         {
             // 内部函数
             void BuiltIn(int subIndex, bool isNew = false)
             {
                 // 索引子目录
-                string appIndexDirSub = Path.Combine(AppConst.APP_INDEX_DIR, subIndex + "");
+                string appIndexDirSub = Path.Combine(AppConst.APP_INDEX_DIR, areaId, subIndex + "");
                 if (!Directory.Exists(appIndexDirSub)) Directory.CreateDirectory(appIndexDirSub);
 
                 // 如果目录下的文件为空，说明是新建
@@ -95,9 +96,13 @@ namespace TextLocator.Index
                 // ---- 索引目录
                 Lucene.Net.Store.FSDirectory indexWriterDir = Lucene.Net.Store.FSDirectory.Open(new DirectoryInfo(appIndexDirSub), new Lucene.Net.Store.NativeFSLockFactory());
                 if (isNew)
+                {
                     indexWriterDirs.Add(indexWriterDir);
+                }
                 else
+                {
                     indexWriterDirs[subIndex] = indexWriterDir;
+                }               
 
                 //  如果索引目录被锁定（比如索引过程中程序异常退出），则首先解锁
                 //  Lucene.Net在写索引库之前会自动加锁，在Close的时候会自动解锁
@@ -142,7 +147,7 @@ namespace TextLocator.Index
                 for (int i = 0; i < 10; i++)
                 {
                     BuiltIn(i, true);
-                }
+                }                
             }
             else
             {
@@ -173,7 +178,7 @@ namespace TextLocator.Index
             }
             if (index <= -1)
             {
-                for (int i = 0; i < indexWriters.Count; i++)
+                for(int i = 0; i < indexWriters.Count; i++)
                 {
                     BuiltIn(i);
                 }
@@ -184,6 +189,18 @@ namespace TextLocator.Index
             {
                 BuiltIn(index);
             }
+            
+        }
+
+        /// <summary>
+        /// 区域索引标记
+        /// </summary>
+        /// <param name="areaId">区域ID，不允许为空</param>
+        /// <returns></returns>
+        private static string AreaIndexTag(string areaId)
+        {
+            // 不同区域，索引分开记录
+            return areaId + "Index";
         }
         #endregion
 
@@ -191,12 +208,16 @@ namespace TextLocator.Index
         /// <summary>
         /// 创建或更新索引
         /// </summary>
+        /// <param name="areaId">区域ID（区域索引标识符）</param>
         /// <param name="updateFilePaths">文件列表</param>
         /// <param name="deleteFilePaths">删除文件列表</param>
         /// <param name="isRebuild">是否重建，true表示重建，false表示更新</param>
         /// <param name="callback">消息回调</param>
-        public static int CreateIndex(List<string> updateFilePaths, List<string> deleteFilePaths, bool isRebuild, CallbackStatus callback)
+        public static int CreateIndex(string areaId, List<string> updateFilePaths, List<string> deleteFilePaths, bool isRebuild, CallbackStatus callback)
         {
+            // 不同区域，索引分开记录
+            string areaIdIndex = AreaIndexTag(areaId);
+
             // 排重 => 排序
             updateFilePaths = ListUtil.Shuffle(updateFilePaths.Distinct().ToList());
 
@@ -213,7 +234,7 @@ namespace TextLocator.Index
             _errorCount = 0;
 
             // 判断是创建索引还是增量索引（如果索引目录不存在，重建）
-            bool create = !Directory.Exists(AppConst.APP_INDEX_DIR);
+            bool create = !Directory.Exists(Path.Combine(AppConst.APP_INDEX_DIR, areaId));
             // 入参为true，表示重建
             if (isRebuild)
             {
@@ -224,19 +245,19 @@ namespace TextLocator.Index
             if (create)
             {
                 // 重建时，删除全部标记
-                AppUtil.DeleteSection("FileIndex");
+                AppUtil.DeleteSection(areaIdIndex);
             }
 
             // -------- 以下4个函数调用顺序不能更改 --------
 
             // 1、-------- 创建索引写入器（创建索引任务执行前，创建写入器很关键）
-            CreateIndexWriter(create);
+            CreateIndexWriter(areaId, create);
 
-            // 2、-------- 删除文件索引（更新ini文件的FileIndex标记，便于更新方法检测时使用）
-            DeleteFileIndex(deleteFilePaths);
+            // 2、-------- 删除文件索引（更新ini文件的AreaIdIndex标记，便于更新方法检测时使用）
+            DeleteFileIndex(areaId, deleteFilePaths);
 
             // 3、-------- 更新文件索引
-            UpdateFileIndex(updateFilePaths, create);
+            UpdateFileIndex(areaId, updateFilePaths, create);
 
             // 4、-------- 删除搜索时标记的索引
             DeleteFileIndexForSearch();
@@ -270,10 +291,11 @@ namespace TextLocator.Index
         /// <summary>
         /// 更新文件索引
         /// </summary>
+        /// <param name="areaId">区域ID（区域索引标识符）</param>
         /// <param name="updateFilePaths">更新文件列表</param>
         /// <param name="create">是否是创建</param>
         /// <returns></returns>
-        private static void UpdateFileIndex(List<string> updateFilePaths, bool create)
+        private static void UpdateFileIndex(string areaId, List<string> updateFilePaths, bool create)
         {
             if (updateFilePaths.Count > 0)
             {
@@ -284,13 +306,14 @@ namespace TextLocator.Index
                     {
                         string filePath = updateFilePaths[i];
                         // 忽略已存在索引的文件
-                        if (SkipFile(create, filePath, resetEvent))
+                        if (SkipFile(areaId, create, filePath, resetEvent))
                         {
                             continue;
                         }
                         // 加入线程池
                         ThreadPool.QueueUserWorkItem(new WaitCallback(CreateIndexTask), new TaskInfo()
                         {
+                            AreaId = areaId,
                             FilePath = filePath,
                             ResetEvent = resetEvent
                         });
@@ -309,12 +332,16 @@ namespace TextLocator.Index
         /// <summary>
         /// 删除文件索引
         /// </summary>
+        /// <param name="areaId">区域ID（区域索引标识符）</param>
         /// <param name="deleteFilePaths">删除文件列表</param>
         /// <returns></returns>
-        private static void DeleteFileIndex(List<string> deleteFilePaths)
+        private static void DeleteFileIndex(string areaId, List<string> deleteFilePaths)
         {
             if (deleteFilePaths.Count > 0)
             {
+                // 不同区域，索引分开记录
+                string areaIdIndex = AreaIndexTag(areaId);
+
                 foreach (string filePath in deleteFilePaths)
                 {
                     // 文件标记
@@ -332,7 +359,7 @@ namespace TextLocator.Index
                     }
 
                     // 删除标记和缓存
-                    AppUtil.WriteValue("FileIndex", filePath, null);
+                    AppUtil.WriteValue(areaIdIndex, filePath, null);
                 }
             }
             else
@@ -376,18 +403,22 @@ namespace TextLocator.Index
         /// <summary>
         /// 忽略文件
         /// </summary>
+        /// <param name="areaId">区域ID（区域索引标识符），不允许为空</param>
         /// <param name="create">是否是创建，true为创建、false为更新</param>
         /// <param name="filePath">文件路径</param>
         /// <param name="resetEvent">多线程任务标记</param>
-        private static bool SkipFile(bool create, string filePath, MutipleThreadResetEvent resetEvent)
+        private static bool SkipFile(string areaId, bool create, string filePath, MutipleThreadResetEvent resetEvent)
         {
             try
             {
+                // 不同区域，索引分开记录
+                string areaIdIndex = AreaIndexTag(areaId);
+
                 FileInfo fileInfo = new FileInfo(filePath);
                 // 当前文件修改时间
                 string lastWriteTime = fileInfo.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss.ffff");
                 // 上次索引时文件修改时间标记
-                string lastWriteTimeTag = AppUtil.ReadValue("FileIndex", filePath);
+                string lastWriteTimeTag = AppUtil.ReadValue(areaIdIndex, filePath);
 
                 // 非重建 && 文件已经被索引过
                 bool isUpdate = !create;
@@ -409,9 +440,7 @@ namespace TextLocator.Index
                     // 当前任务执行完成，唤醒等待线程继续执行
                     resetEvent.SetOne();
 
-#if !DEBUG
                     log.Debug(skip);
-#endif
                     return true;
                 }
             }
@@ -423,12 +452,15 @@ namespace TextLocator.Index
         /// <summary>
         /// 创建索引任务方法
         /// </summary>
-        /// <param name="obj"></param>
+        /// <param name="obj">实际传入TaskInfo</param>
         private static void CreateIndexTask(object obj)
         {
             TaskInfo taskInfo = obj as TaskInfo;
             try
             {
+                // 不同区域，索引分开记录
+                string areaIdIndex = AreaIndexTag(taskInfo.AreaId);
+
                 // 解析时间
                 var taskMark = TaskTime.StartNew();
 
@@ -447,7 +479,7 @@ namespace TextLocator.Index
                 string updateTime = fileInfo.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss");
 
                 // ---- 写入已索引标记 ----
-                AppUtil.WriteValue("FileIndex", filePath, fileInfo.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+                AppUtil.WriteValue(areaIdIndex, filePath, fileInfo.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
                 // 根据文件路径获取文件类型（自定义文件类型分类）
                 FileType fileType = FileTypeUtil.GetFileType(filePath);
@@ -496,7 +528,7 @@ namespace TextLocator.Index
                         doc.Add(new Lucene.Net.Documents.Field("Preview", content, Lucene.Net.Documents.Field.Store.YES, Lucene.Net.Documents.Field.Index.NOT_ANALYZED));
 
                         // 执行删除、添加逻辑
-                        AddDocument(filePath, doc);
+                        AddDocument(taskInfo.AreaId, filePath, doc);
                     }
                     msg.Append("，索引：" + taskMark.ConsumeTime);
                 }
@@ -532,9 +564,10 @@ namespace TextLocator.Index
         /// <summary>
         /// 添加文件索引Doc
         /// </summary>
+        /// <param name="areaId">区域ID（区域索引标识符），不允许为null</param>
         /// <param name="filePath">文件路径</param>
-        /// <param name="doc">文件索引Doc</param>
-        private static void AddDocument(string filePath, Lucene.Net.Documents.Document doc)
+        /// <param name="doc">文件索引Doc对象</param>
+        private static void AddDocument(string areaId, string filePath, Lucene.Net.Documents.Document doc)
         {
             // -------- 获取索引写入器
             // 随机索引写入器
@@ -552,15 +585,15 @@ namespace TextLocator.Index
                 log.Error(filePath + " -> " + ex.Message + " => 重启索引写入器！", ex);
 
 
-                // 关闭索引写入器
-                CloseIndexWriter();
+                // 关闭索引写入器（区域ID + 写入器索引）
+                CloseIndexWriter(index);
 
-                // 创建索引写入器
-                CreateIndexWriter(false, index);
+                // 创建索引写入器（区域ID + 更新 + 写入器索引）
+                CreateIndexWriter(areaId, false, index);
 
                 log.Debug(filePath + " -> 重新执行添加操作");
 
-                AddDocument(filePath, doc);
+                AddDocument(areaId, filePath, doc);
             }
         }
         #endregion
@@ -590,22 +623,24 @@ namespace TextLocator.Index
             List<Lucene.Net.Search.IndexSearcher> searchers = new List<Lucene.Net.Search.IndexSearcher>();
 
             // 构造全部搜索区索引路径
-            for (int i = 0; i < 10; i++)
+            foreach(Entity.AreaInfo areaInfo in AreaUtil.GetEnableAreaInfoList())
             {
-                try
-                {
-                    string subDir = Path.Combine(AppConst.APP_INDEX_DIR, i + "");
-                    log.Debug("搜索缩影路径：" + subDir);
-                    Lucene.Net.Store.FSDirectory directory = Lucene.Net.Store.FSDirectory.Open(new DirectoryInfo(subDir), new Lucene.Net.Store.NoLockFactory());
-                    directorys.Add(directory);
-                    searchers.Add(new Lucene.Net.Search.IndexSearcher(directory, true));
-                }
-                catch (Exception ex)
+                for(int i = 0; i < 10; i++)
                 {
-                    log.Error("搜索器初始化失败：" + ex.Message, ex);
+                    try
+                    {
+                        string subDir = Path.Combine(AppConst.APP_INDEX_DIR, areaInfo.AreaId, i + "");
+                        log.Debug("搜索缩影路径：" + subDir);
+                        Lucene.Net.Store.FSDirectory directory = Lucene.Net.Store.FSDirectory.Open(new DirectoryInfo(subDir), new Lucene.Net.Store.NoLockFactory());
+                        directorys.Add(directory);
+                        searchers.Add(new Lucene.Net.Search.IndexSearcher(directory, true));
+                    }
+                    catch (Exception ex)
+                    {
+                        log.Error("搜索器初始化失败：" + ex.Message, ex);
+                    }
                 }
             }
-
             // 并行多搜索器（搜索结果去重合并）
             Lucene.Net.Search.ParallelMultiSearcher parallelMultiSearcher = new Lucene.Net.Search.ParallelMultiSearcher(searchers.ToArray());
             try
@@ -778,9 +813,7 @@ namespace TextLocator.Index
                 string msg = string.Format("检索完成。{0}：( {1} )，结果：{2}个符合条件的结果 (第 {3} 页)，耗时：{4}。", tag, (text.Length > 50 ? text.Substring(0, 50) + "..." : text), totalHits - deleteCount, param.PageIndex, taskMark.ConsumeTime);
                 log.Debug(msg);
                 if (_searchCallback != null)
-                {
                     _searchCallback(msg);
-                }
 
                 // 返回查询结果
                 return new Entity.SearchResult()
@@ -796,7 +829,7 @@ namespace TextLocator.Index
             }
             finally
             {
-                foreach (var searcher in searchers)
+                foreach(var searcher in searchers)
                 {
                     try
                     {
@@ -807,7 +840,7 @@ namespace TextLocator.Index
                     }
                     catch { }
                 }
-                foreach (var dir in directorys)
+                foreach(var dir in directorys)
                 {
                     try
                     {
@@ -821,6 +854,17 @@ namespace TextLocator.Index
             }
         }
 
+        /// <summary>
+        /// 获取关键词词频
+        /// </summary>
+        /// <param name="fileInfo">文件信息</param>
+        /// <param name="autoNewLine">自动换行</param>
+        /// <returns></returns>
+        public static string GetKeywordFrequency(Entity.FileInfo fileInfo, bool autoNewLine = true)
+        {
+            return GetKeywordFrequency(fileInfo.Keywords, fileInfo.FileName, fileInfo.Preview, autoNewLine);
+        }
+
         /// <summary>
         /// 获取关键词词频
         /// </summary>
@@ -979,6 +1023,10 @@ namespace TextLocator.Index
         /// </summary>
         class TaskInfo
         {
+            /// <summary>
+            /// 区域ID（区域唯一标识符）
+            /// </summary>
+            public string AreaId { get; set; }
             /// <summary>
             /// 文件路径
             /// </summary>
diff --git a/TextLocator/MainWindow.xaml b/TextLocator/MainWindow.xaml
index 88115a0..7bcc3ac 100644
--- a/TextLocator/MainWindow.xaml
+++ b/TextLocator/MainWindow.xaml
@@ -27,7 +27,8 @@
                                 <!-- 搜索框 -->
                                 <TextBox x:Name="SearchText" Width="900" Height="36" FontSize="20" HorizontalAlignment="Left" VerticalContentAlignment="Center" BorderThickness="1" BorderBrush="Green" 
                                          PreviewKeyUp="SearchText_PreviewKeyUp" 
-                                         TextChanged="SearchText_TextChanged">
+                                         TextChanged="SearchText_TextChanged" 
+                                         MouseDoubleClick="SearchText_MouseDoubleClick">
                                     <TextBox.Resources>
                                         <VisualBrush x:Key="HintText" TileMode="None" Opacity="0.5" Stretch="None" AlignmentX="Left">
                                             <VisualBrush.Visual>
@@ -97,13 +98,13 @@
                                     </Grid>
                                     <!-- 搜索区域 -->
                                     <Grid>
-                                        <TextBlock Text="搜索区域：" Margin="0,5,0,0" HorizontalAlignment="Left"/>
-                                        <TextBox x:Name="FolderPaths" Text="C:\Users\{User}\Document" IsReadOnly="true" Width="485" Height="25" Margin="65,5,0,0" HorizontalAlignment="Left" MouseDoubleClick="FolderPaths_MouseDoubleClick"/>
+                                        <TextBlock Text="启用搜索区：" Margin="0,5,0,0" HorizontalAlignment="Left"/>
+                                        <TextBox x:Name="EnableAreaInfos" Text="默认区域" IsReadOnly="true" Width="470" Height="25" Margin="80,5,0,0" HorizontalAlignment="Left" MouseDoubleClick="FolderPaths_MouseDoubleClick"/>
                                     </Grid>
                                     <!-- 排除区域 -->
                                     <Grid>
-                                        <TextBlock Text="排除区域：" Margin="0,9,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                                        <TextBox x:Name="ExclusionPaths" Text="" Foreground="Gray" IsReadOnly="true" Width="485" Height="25" Margin="65,5,0,0" HorizontalAlignment="Left" MouseDoubleClick="FolderPaths_MouseDoubleClick" Grid.ColumnSpan="2" Cursor="IBeam"/>
+                                        <TextBlock Text="禁用搜索区：" Margin="0,9,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                                        <TextBox x:Name="DisableAreaInfos" Text="" Foreground="Gray" IsReadOnly="true" Width="470" Height="25" Margin="80,5,0,0" HorizontalAlignment="Left" MouseDoubleClick="FolderPaths_MouseDoubleClick" Grid.ColumnSpan="2" Cursor="IBeam"/>
                                     </Grid>
                                 </StackPanel>
                             </StackPanel>
@@ -206,6 +207,9 @@
                                 </ListBoxItem>
                             </ListBox>
 
+                            <!-- 搜索加载中 -->
+                            <TextBlock x:Name="_searchLoading" Text="搜索处理中..." FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Top" Foreground="#2196f3" Margin="0,130,0,0" Visibility="Collapsed"/>
+
                             <!-- 分页 -->
                             <rubyer:PageBar x:Name="PageBar" VerticalAlignment="Bottom" HorizontalAlignment="Center"
                                     PageSize="{Binding PageSize}"
diff --git a/TextLocator/MainWindow.xaml.cs b/TextLocator/MainWindow.xaml.cs
index 1126a91..66e111f 100644
--- a/TextLocator/MainWindow.xaml.cs
+++ b/TextLocator/MainWindow.xaml.cs
@@ -1,11 +1,12 @@
 using log4net;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
-using System.Text.RegularExpressions;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -38,25 +39,18 @@ namespace TextLocator
         /// </summary>
         private RadioButton _radioButtonAll;
         /// <summary>
-        /// 索引文件夹列表
-        /// </summary>
-        private List<string> _indexFolders = new List<string>();
-        /// <summary>
-        /// 排除文件夹列表
-        /// </summary>
-        private List<string> _exclusionFolders = new List<string>();
-        /// <summary>
-        /// 正则匹配排除文件夹
-        /// </summary>
-        private Regex _exclusionFolderRegex;
-        /// <summary>
         /// 时间戳
         /// </summary>
         private long _timestamp;
         /// <summary>
+        /// 总条数
+        /// </summary>
+        private int _totalCount = 0;
+        /// <summary>
         /// 搜索参数
         /// </summary>
         private Entity.SearchParam _searchParam;
+
         /// <summary>
         /// 上次预览区搜索文本
         /// </summary>
@@ -66,6 +60,10 @@ namespace TextLocator
         /// 索引构建中
         /// </summary>
         private static volatile bool build = false;
+        /// <summary>
+        /// 数据导出中
+        /// </summary>
+        private static volatile bool export = false;
 
         #region 热键
         /// <summary>
@@ -175,7 +173,7 @@ namespace TextLocator
             Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
 
             // 设置标题
-            this.Title = string.Format("{0} v{1} ({2})", this.Title, version, "开放版");
+            this.Title = string.Format("{0} v{1} (开放版)", this.Title, version);
         }
 
         /// <summary>
@@ -254,40 +252,33 @@ namespace TextLocator
         private void InitializeAppConfig()
         {
             TaskTime taskTime = TaskTime.StartNew();
-            // 初始化显示被索引的文件夹列表
-            _indexFolders.Clear();
 
-            // 读取被索引文件夹配置信息，如果配置信息为空：默认为我的文档和我的桌面
-            string folderPaths = AppUtil.ReadValue("AppConfig", "FolderPaths", Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "," + Environment.GetFolderPath(Environment.SpecialFolder.Desktop));
-            // 配置信息不为空
-            if (!string.IsNullOrEmpty(folderPaths))
+            // 启用的搜索区域信息显示
+            List<Entity.AreaInfo> enableAreaInfos = AreaUtil.GetEnableAreaInfoList();
+            string enableAreaNames = "";
+            string enableAreaNameDescs = "";
+            foreach (Entity.AreaInfo areaInfo in enableAreaInfos)
             {
-                string[] folderPathArray = folderPaths.Split(',');
-                foreach (string folderPath in folderPathArray)
-                {
-                    _indexFolders.Add(folderPath);
-                }
+                enableAreaNames += areaInfo.AreaName + "，";
+                enableAreaNameDescs += areaInfo.AreaName + "：" + string.Join(",", areaInfo.AreaFolders.ToArray()) + "\r\n";
             }
-            FolderPaths.Text = folderPaths;
-            FolderPaths.ToolTip = FolderPaths.Text;
-
-            // 读取排除文件夹，
-            string exclusionPaths = AppUtil.ReadValue("AppConfig", "ExclusionPaths", "");
-            if (!string.IsNullOrEmpty(exclusionPaths))
+            this.EnableAreaInfos.Text = enableAreaNames.Substring(0, enableAreaNames.Length - 1);
+            this.EnableAreaInfos.ToolTip = enableAreaNameDescs.Substring(0, enableAreaNameDescs.Length - 2);
+
+            // 未启用的搜索区域信息显示
+            List<Entity.AreaInfo> disableAreaInfos = AreaUtil.GetDisableAreaInfoList();
+            string disableAreaNames = "";
+            string disableAreaNameDescs = "";
+            foreach (Entity.AreaInfo areaInfo in disableAreaInfos)
             {
-                string[] exclusionPathArray = exclusionPaths.Split(',');
-                foreach (string exclusionPath in exclusionPathArray)
-                {
-                    _exclusionFolders.Add(exclusionPath);
-                }
-                _exclusionFolderRegex = new Regex(@"(" + exclusionPaths.Replace("\\", "\\\\").Replace(',', '|') + ")");
+                disableAreaNames += areaInfo.AreaName + "，";
+                disableAreaNameDescs += areaInfo.AreaName + "：" + string.Join(",", areaInfo.AreaFolders.ToArray()) + "\r\n";
             }
-            else
+            this.DisableAreaInfos.Text = string.IsNullOrEmpty(disableAreaNames) ? disableAreaNames : disableAreaNames.Substring(0, disableAreaNames.Length - 1);
+            if (!string.IsNullOrEmpty(disableAreaNameDescs))
             {
-                _exclusionFolderRegex = null;
-            }
-            ExclusionPaths.Text = exclusionPaths;
-            ExclusionPaths.ToolTip = ExclusionPaths.Text;
+                this.DisableAreaInfos.ToolTip = disableAreaNameDescs.Substring(0, disableAreaNameDescs.Length - 2);
+            }            
 
             // 读取分页每页显示条数
             if (string.IsNullOrEmpty(AppUtil.ReadValue("AppConfig", "ResultListPageSize", "")))
@@ -334,7 +325,6 @@ namespace TextLocator
                 if (!win.IsVisible)
                 {
                     win.Topmost = true;
-                    win.Owner = this;
                     win.ShowDialog();
                 }
                 else
@@ -410,6 +400,56 @@ namespace TextLocator
 
         #region 搜索
         /// <summary>
+        /// 搜索文本框双击
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SearchText_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            var openFileDialog = new OpenFileDialog()
+            {
+                Filter = "关键词 (*.txt)|*.txt"
+            };
+            var result = openFileDialog.ShowDialog();
+            if (result == true)
+            {
+                Task.Factory.StartNew(() =>
+                {
+                    try
+                    {
+                        // 打开文本，解析内容调用搜索
+                        if (File.Exists(openFileDialog.FileName))
+                        {
+                            StringBuilder builder = new StringBuilder();
+                            using (FileStream fs = File.OpenRead(openFileDialog.FileName))
+                            {
+                                using (StreamReader reader = new StreamReader(fs, FileUtil.GetEncoding(openFileDialog.FileName)))
+                                {
+                                    string line;
+                                    while ((line = reader.ReadLine()) != null)
+                                    {
+                                        // 按行分词
+                                        builder.Append(line + " ");
+                                    }
+                                }
+                            }
+                            this.Dispatcher.BeginInvoke(new Action(() =>
+                            {
+                                this.SearchText.Text = builder.ToString().Trim();
+
+                                // 搜索前
+                                BeforeSearch();
+                            }));
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        log.Error("读取关键词文档错误：" + ex.Message, ex);
+                    }
+                });
+            }
+        }
+        /// <summary>
         /// 搜索
         /// </summary>
         /// <param name="sender"></param>
@@ -509,6 +549,8 @@ namespace TextLocator
             {
                 try
                 {
+                    // 重置总数未0
+                    _totalCount = 0;
                     // 清空搜索结果列表
                     Dispatcher.Invoke(new Action(() =>
                     {
@@ -540,6 +582,9 @@ namespace TextLocator
                         return;
                     }
 
+                    // 标记总数
+                    _totalCount = searchResult.Total;
+
                     // 遍历结果
                     foreach (Entity.FileInfo fileInfo in searchResult.Results)
                     {
@@ -964,13 +1009,12 @@ namespace TextLocator
         private void FolderPaths_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
         {
             AreaWindow areaDialog = new AreaWindow();
-            areaDialog.Topmost = true;
             areaDialog.Owner = this;
+            areaDialog.Topmost = true;
             areaDialog.ShowDialog();
-            if (areaDialog.DialogResult == true)
-            {
-                InitializeAppConfig();
-            }
+
+            // 不管是否修改都刷新
+            InitializeAppConfig();
         }
 
         /// <summary>
@@ -1082,120 +1126,153 @@ namespace TextLocator
                 // 提示语
                 string tag = isRebuild ? "重建" : "更新";
 
-                var taskMark = TaskTime.StartNew();
-
-                // 1、-------- 开始获取文件列表
-                string msg = string.Format("开始{0}索引，正在扫描文件...", tag);
-                log.Info(msg);
-                ShowStatus(msg);
-                var fileScanMark = TaskTime.StartNew();
-                // 定义全部文件列表
-                List<string> allFilePaths = new List<string>();
-                // 定义更新文件列表
-                List<string> updateFilePaths = new List<string>();
-                // 定义删除文件列表
-                List<string> deleteFilePaths = new List<string>();
-
-                // 扫描需要建立索引的文件列表
-                foreach (string s in _indexFolders)
+                // --------定义总数
+                // 文件总数
+                int fileTotalCount = 0;
+                // 更新总数
+                int updateTotalCount = 0;
+                // 删除总数
+                int deleteTotalCount = 0;
+                // 错误总数
+                int errorTotalCount = 0;
+
+                // 总任务消耗时间
+                var totalTaskMark = TaskTime.StartNew();
+
+                // ---------------- 遍历搜索区
+                List<Entity.AreaInfo> areaInfos = AreaUtil.GetEnableAreaInfoList();
+                foreach(Entity.AreaInfo areaInfo in areaInfos)
                 {
-                    log.Info("目录：" + s);
-                    // 获取文件信息列表
-                    FileUtil.GetAllFiles(allFilePaths, s, _exclusionFolderRegex);
-                }
+                    var singleTaskMark = TaskTime.StartNew();
+
+                    // 不同区域，索引分开记录
+                    string areaIdIndex = areaInfo.AreaId + "Index";
+
+                    // -------- 开始获取文件列表
+                    string msg = string.Format("搜索区【{0}】，开始扫描文件...", areaInfo.AreaName);
+                    log.Info(msg);
+                    ShowStatus(msg);
+
+                    var scanTaskMark = TaskTime.StartNew();
+                    // 定义全部文件列表
+                    List<string> allFilePaths = new List<string>();
+                    // 定义更新文件列表
+                    List<string> updateFilePaths = new List<string>();
+                    // 定义删除文件列表
+                    List<string> deleteFilePaths = new List<string>();
+
+                    // 扫描需要建立索引的文件列表
+                    foreach (string s in areaInfo.AreaFolders)
+                    {
+                        log.Info("目录：" + s);
+                        // 获取文件信息列表
+                        FileUtil.GetAllFiles(allFilePaths, s, null);
+                    }
 
-                msg = string.Format("文件扫描完成，文件总数：{0}，耗时：{1}。开始分析需要更新的文件列表...", allFilePaths.Count, fileScanMark.ConsumeTime);
-                log.Info(msg);
-                ShowStatus(msg);
+                    msg = string.Format("搜索区【{0}】，文件扫描完成；文件数：{1}，耗时：{2}；开始分析需要更新的文件列表...", areaInfo.AreaName, allFilePaths.Count, scanTaskMark.ConsumeTime);
+                    log.Info(msg);
+                    ShowStatus(msg);
 
-                var fileAnalysisMark = TaskTime.StartNew();
-                // 如果是更新操作，判断文件格式是否变化 -> 判断文件更新时间变化找到最终需要更新的文件列表
-                // 2、-------- 获取需要删除的文件列表
-                if (AppUtil.ReadSectionList("FileIndex") != null)
-                {
-                    foreach (string filePath in AppUtil.ReadSectionList("FileIndex"))
+                    // -------- 获取需要删除的文件列表
+                    if (AppUtil.ReadSectionList(areaIdIndex) != null)
                     {
-                        // 不存在，则表示文件已删除
-                        if (!allFilePaths.Contains(filePath))
+                        foreach (string filePath in AppUtil.ReadSectionList(areaIdIndex))
                         {
-                            deleteFilePaths.Add(filePath);
-                            AppUtil.WriteValue("FileIndex", filePath, null);
+                            // 不存在，则表示文件已删除
+                            if (!allFilePaths.Contains(filePath))
+                            {
+                                deleteFilePaths.Add(filePath);
+                                AppUtil.WriteValue(areaIdIndex, filePath, null);
+                            }
                         }
                     }
-                }
-                
-                // 3、-------- 更新是才需要校验，重建是直接跳过
-                if (isRebuild)
-                {
-                    // 3.1、重建时为全部文件
-                    updateFilePaths.AddRange(allFilePaths);
-                }
-                else
-                {
-                    // 3.2、获取需要更新的文件列表
-                    foreach (string filePath in allFilePaths)
+
+                    // -------- 如果是更新操作，判断文件格式是否变化 -> 判断文件更新时间变化找到最终需要更新的文件列表
+                    var analysisTaskMark = TaskTime.StartNew();
+                    // 更新是才需要校验，重建是直接跳过
+                    if (!isRebuild)
                     {
-                        try
+                        // 更新：需要更新的文件列表
+                        foreach (string filePath in allFilePaths)
                         {
-                            FileInfo fileInfo = new FileInfo(filePath);
-                            // 当前文件修改时间
-                            string lastWriteTime = fileInfo.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss.ffff");
-                            // 上次索引时文件修改时间标记
-                            string lastWriteTimeTag = AppUtil.ReadValue("FileIndex", filePath);
-
-                            // 文件修改时间不一致，说明文件已修改
-                            if (!lastWriteTime.Equals(lastWriteTimeTag))
+                            try
                             {
-                                updateFilePaths.Add(filePath);
+                                FileInfo fileInfo = new FileInfo(filePath);
+                                // 当前文件修改时间
+                                string lastWriteTime = fileInfo.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss.ffff");
+                                // 上次索引时文件修改时间标记
+                                string lastWriteTimeTag = AppUtil.ReadValue(areaIdIndex, filePath);
+
+                                // 文件修改时间不一致，说明文件已修改
+                                if (!lastWriteTime.Equals(lastWriteTimeTag))
+                                {
+                                    updateFilePaths.Add(filePath);
+                                }
                             }
+                            catch { }
                         }
-                        catch { }
                     }
-                }
+                    else
+                    {
+                        // 重建：全部文件列表
+                        updateFilePaths.AddRange(allFilePaths);
+                    }
 
-                msg = string.Format("文件分析完成，{0}总数：{1}，删除总数：{2}，耗时：{3}。开始{4}索引...", tag, updateFilePaths.Count, deleteFilePaths.Count, fileAnalysisMark.ConsumeTime, tag);
-                log.Info(msg);
-                ShowStatus(msg);
+                    msg = string.Format("搜索区【{0}】，文件分析完成；{1}数：{2}，删除数：{3}，耗时：{4}；开始{5}索引...", areaInfo.AreaName, tag, updateFilePaths.Count, deleteFilePaths.Count, analysisTaskMark.ConsumeTime, tag);
+                    log.Info(msg);
+                    ShowStatus(msg);
 
-                // 4、-------- 如果是更新操作，判断文件格式是否变化 -> 判断文件更新时间变化找到最终需要更新的文件列表
-                // 验证扫描文件列表是否为空
-                if (updateFilePaths.Count <= 0 && deleteFilePaths.Count <= 0)
-                {
-                    build = false;
+                    // -------- 验证扫描文件列表是否为空（如果是更新操作，判断文件格式是否变化 -> 判断文件更新时间变化找到最终需要更新的文件列表）
+                    if (updateFilePaths.Count <= 0 && deleteFilePaths.Count <= 0)
+                    {
+                        build = false;
+                        msg = string.Format("搜索区【{0}】，无更新文件和删除文件，不{1}索引...", areaInfo.AreaName, tag);
+                        log.Info(msg);
+                        ShowStatus(msg);
+                        continue;
+                    }
 
-                    ShowStatus("就绪");
+                    // 后台执行时修改为最小线程单位，反之恢复为系统配置线程数
+                    AppCore.SetThreadPoolSize(!isBackground);
 
-                    // 标记索引文件数量 和 最后更新时间
-                    AppUtil.WriteValue("AppConfig", "IndexFileCount", allFilePaths.Count + "");
-                    AppUtil.WriteValue("AppConfig", "LastIndexTime", DateTime.Now.ToString());
-                    return;
-                }
+                    // -------- 创建索引方法
+                    int errorCount = IndexCore.CreateIndex(areaInfo.AreaId, updateFilePaths, deleteFilePaths, isRebuild, ShowStatus);
 
-                // 后台执行时修改为最小线程单位，反之恢复为系统配置线程数
-                AppCore.SetThreadPoolSize(!isBackground);
+                    // 索引完成日志
+                    msg = string.Format("搜索区【{0}】，索引{1}完成；{2}数：{3}，删除数：{4}，错误数：{5}，共用时：{6}。", areaInfo.AreaName, tag, tag, updateFilePaths.Count, deleteFilePaths.Count, errorCount, singleTaskMark.ConsumeTime);
+                    log.Info(msg);
+                    ShowStatus(msg);
 
-                // 5、-------- 创建索引方法
-                int errorCount = IndexCore.CreateIndex(updateFilePaths, deleteFilePaths, isRebuild, ShowStatus);
-                msg = string.Format("索引{0}完成，{1}总数：{2}，删除数：{3}，错误数：{4}，共用时：{5}。", tag, tag, updateFilePaths.Count, deleteFilePaths.Count, errorCount, taskMark.ConsumeTime);
-                log.Info(msg);
-                // 显示状态
-                ShowStatus(msg);
+                    Dispatcher.BeginInvoke(new Action(() =>
+                    {
+                        MessageCore.ShowSuccess(msg);
+                    }));
 
-                Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    MessageCore.ShowSuccess(msg);
-                }));
+
+                    // 记录文件总数、更新总数、删除总数、错误总数
+                    fileTotalCount = fileTotalCount + allFilePaths.Count;
+                    updateTotalCount = updateTotalCount + updateFilePaths.Count;
+                    deleteTotalCount = deleteTotalCount + deleteFilePaths.Count;
+                    errorTotalCount = errorTotalCount + errorCount;
+                }
+
+                // 索引完成日志
+                string message = string.Format("索引{0}完成。区域数：{1}，{2}数：{3}，删除数：{4}，错误数：{5}，共用时：{6}。", tag, areaInfos.Count, tag, updateTotalCount, deleteTotalCount, errorTotalCount, totalTaskMark.ConsumeTime);
+                log.Info(message);
+                ShowStatus(message);
 
                 // 标记索引文件数量 和 最后更新时间
-                AppUtil.WriteValue("AppConfig", "IndexFileCount", allFilePaths.Count + "");
+                AppUtil.WriteValue("AppConfig", "FileTotalCount", fileTotalCount + "");
                 AppUtil.WriteValue("AppConfig", "LastIndexTime", DateTime.Now.ToString());
 
-                // 6、-------- 构建结束
+                // 构建结束
                 build = false;
             }
             catch (Exception ex)
             {
                 log.Error("构建索引错误：" + ex.Message, ex);
+
+                build = false;
             }
         }
 
@@ -1230,7 +1307,7 @@ namespace TextLocator
         {
             if (OpenFile.Tag != null)
             {
-                string filePath = OpenFile.Tag + "";
+                string filePath = OpenFile.Tag + "";                
                 try
                 {
                     System.Diagnostics.Process.Start(filePath);
@@ -1274,6 +1351,7 @@ namespace TextLocator
             // 预览搜索关键词高亮
             PreviewSearchTextHighlighted();
         }
+
         /// <summary>
         /// 预览搜索关键词高亮
         /// </summary>
diff --git a/TextLocator/Properties/AssemblyInfo.cs b/TextLocator/Properties/AssemblyInfo.cs
index 46b0b09..f0befdf 100644
--- a/TextLocator/Properties/AssemblyInfo.cs
+++ b/TextLocator/Properties/AssemblyInfo.cs
@@ -49,8 +49,8 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.16")]
-[assembly: AssemblyFileVersion("1.2.16.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
 
 // log4net
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
\ No newline at end of file
diff --git a/TextLocator/Service/PdfFileService.cs b/TextLocator/Service/PdfFileService.cs
index 2f3a105..62dd243 100644
--- a/TextLocator/Service/PdfFileService.cs
+++ b/TextLocator/Service/PdfFileService.cs
@@ -1,9 +1,11 @@
-using log4net;
+using java.io;
+using log4net;
 using org.apache.pdfbox.pdmodel;
 using org.apache.pdfbox.util;
 using System;
 using System.IO;
 using System.Text;
+using TextLocator.Factory;
 
 namespace TextLocator.Service
 {
diff --git a/TextLocator/SettingWindow.xaml b/TextLocator/SettingWindow.xaml
index 17adfa3..4b8c038 100644
--- a/TextLocator/SettingWindow.xaml
+++ b/TextLocator/SettingWindow.xaml
@@ -7,7 +7,7 @@
         xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore"
         mc:Ignorable="d"
         x:Name="hotkey"
-        Title="设置" Height="380" Width="520" WindowStartupLocation="CenterOwner" WindowStyle="ToolWindow" ResizeMode="CanMinimize" Icon="/Resource/App.ico" Loaded="Window_Loaded" Closed="Window_Closed" >
+        Title="设置" Height="380" Width="520" WindowStartupLocation="CenterScreen" WindowStyle="ToolWindow" ResizeMode="CanMinimize" Icon="/Resource/App.ico" Loaded="Window_Loaded" Closed="Window_Closed" >
     <Grid>
         <Grid Margin="0,0,0,50">
             <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
@@ -80,6 +80,18 @@
                             </Grid>
                         </Grid>
                     </Grid>
+                    <!-- 分割线 -->
+                    <Line X1="0" Y1="0" X2="500" Y2="0" Margin="0,10,0,10" Stroke="Gray" StrokeThickness="1"></Line>
+                    <!-- 索引更新任务间隔时间 -->
+                    <Grid>
+                        <TextBlock Text="启用内置预览界面：" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                        <Grid Margin="20,30,20,0">
+                            <Grid HorizontalAlignment="Left">
+                                <CheckBox x:Name="EnableXpsDocument" Content="启用内置Office预览窗口" HorizontalAlignment="Left" VerticalAlignment="Top" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
+                            </Grid>
+                        </Grid>
+                        
+                    </Grid>
                 </StackPanel>
             </ScrollViewer>
         </Grid>
diff --git a/TextLocator/SettingWindow.xaml.cs b/TextLocator/SettingWindow.xaml.cs
index 483be7a..a99786c 100644
--- a/TextLocator/SettingWindow.xaml.cs
+++ b/TextLocator/SettingWindow.xaml.cs
@@ -74,6 +74,9 @@ namespace TextLocator
             this.EnableIndexUpdateTask.IsChecked = AppConst.ENABLE_INDEX_UPDATE_TASK;
             // 索引更新时间间隔
             this.IndexUpdateTaskInterval.Text = AppConst.INDEX_UPDATE_TASK_INTERVAL + "";
+
+            // 启用XpsDocument预览
+            this.EnableXpsDocument.IsChecked = AppConst.ENABLE_XPSDOCUMENT_VIEW;
         }
 
         #region 保存并关闭
@@ -227,6 +230,10 @@ namespace TextLocator
                 log.Debug("修改索引更新任务间隔时间：" + AppConst.INDEX_UPDATE_TASK_INTERVAL);
             }
 
+            AppConst.ENABLE_XPSDOCUMENT_VIEW = (bool)this.EnableXpsDocument.IsChecked;
+            AppUtil.WriteValue("AppConfig", "EnableXpsDocumentView", AppConst.ENABLE_XPSDOCUMENT_VIEW + "");
+            log.Debug("修改使用XpsDocument预览：" + AppConst.ENABLE_XPSDOCUMENT_VIEW);
+
             this.Close();
         }
         #endregion
diff --git a/TextLocator/TextLocator.csproj b/TextLocator/TextLocator.csproj
index c126728..05a2417 100644
--- a/TextLocator/TextLocator.csproj
+++ b/TextLocator/TextLocator.csproj
@@ -264,8 +264,15 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="AreaEditWindow.xaml.cs">
+      <DependentUpon>AreaEditWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="AreaInfoItem.xaml.cs">
+      <DependentUpon>AreaInfoItem.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Cache\LFUCache.cs" />
     <Compile Include="Cache\LFUCacheEntity.cs" />
+    <Compile Include="Entity\AreaInfo.cs" />
     <Compile Include="Entity\SearchParam.cs" />
     <Compile Include="Entity\SearchResult.cs" />
     <Compile Include="Exceptions\FileSizeTooBigException.cs" />
@@ -323,12 +330,21 @@
     <Compile Include="Service\WordFileService.cs" />
     <Compile Include="Service\DomFileService.cs" />
     <Compile Include="Util\AppUtil.cs" />
+    <Compile Include="Util\AreaUtil.cs" />
     <Compile Include="Util\CacheUtil.cs" />
     <Compile Include="Util\FileTypeUtil.cs" />
     <Compile Include="Util\FileUtil.cs" />
     <Compile Include="Util\ListUtil.cs" />
     <Compile Include="Util\MD5Util.cs" />
     <Compile Include="Util\RichTextBoxUtil.cs" />
+    <Page Include="AreaEditWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="AreaInfoItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="SettingWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/TextLocator/Util/AppUtil.cs b/TextLocator/Util/AppUtil.cs
index d257e78..f025c0f 100644
--- a/TextLocator/Util/AppUtil.cs
+++ b/TextLocator/Util/AppUtil.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
+using TextLocator.Core;
 
 namespace TextLocator.Util
 {
@@ -34,7 +35,7 @@ namespace TextLocator.Util
         /// <summary>
         /// App.ini路径：_AppDir\\_AppName.ini
         /// </summary>
-        private static readonly string _AppIniFile = _AppDir + "\\" + _AppName + ".ini";
+        private static readonly string _AppIniFile =  _AppDir + "\\" + _AppName + ".ini";
         
         /// <summary>
         /// Ini文件内容缓存
@@ -48,8 +49,8 @@ namespace TextLocator.Util
             // ini文件初始化
             Initialize();
 
-            // 加载节点下全部Key-Value
-            LoadAllKeyValue("FileIndex");
+            // 加载区域配置
+            LoadAllKeyValue(AppConst.AREA_CONFIG_KEY);
         }
 
         /// <summary>
@@ -103,15 +104,18 @@ namespace TextLocator.Util
                     if (sectionDic.ContainsKey(key))
                     {
                         if (string.IsNullOrEmpty(value))
-                        {
                             sectionDic.Remove(key);
-                        }
                         else
-                        {
                             sectionDic[key] = value;
-                        }
                     }
-                    _AppIniCache[section] = sectionDic;
+                    else
+                    {
+                        sectionDic.Add(key, value);
+                    }
+                    if (_AppIniCache.ContainsKey(section))
+                        _AppIniCache[section] = sectionDic;
+                    else
+                        _AppIniCache.Add(section, sectionDic);
 
                     WritePrivateProfileString(section, key, value, _AppIniFile);
                 }
@@ -160,7 +164,10 @@ namespace TextLocator.Util
                     {
                         Dictionary<string, string> sectionDic = _AppIniCache.ContainsKey(section) ? _AppIniCache[section] : new Dictionary<string, string>();
                         sectionDic[key] = def;
-                        _AppIniCache[section] = sectionDic;
+                        if (_AppIniCache.ContainsKey(section))
+                            _AppIniCache[section] = sectionDic;
+                        else
+                            _AppIniCache.Add(section, sectionDic);
                     }                    
                 }
                 return def;
@@ -237,7 +244,7 @@ namespace TextLocator.Util
                     // 默认为32767（32.767KB），设置为128000000（128MB）
                     uint MAX_BUFFER = 256000000;
                     // 返回值[返回值形式为 key=value,例如 Color=Red]
-                    string[] items = new string[0];      
+                    string[] items = new string[0];
 
                     //分配内存
                     IntPtr pReturnedString = Marshal.AllocCoTaskMem((int)MAX_BUFFER * sizeof(char));
@@ -260,9 +267,16 @@ namespace TextLocator.Util
                         // 获取 section 节点
                         Dictionary<string, string> sectionDic = _AppIniCache.ContainsKey(section) ? _AppIniCache[section] : new Dictionary<string, string>();
                         // 设置 section 节点子项
-                        sectionDic[v[0]] = v[1];
+                        if (sectionDic.ContainsKey(v[0]))
+                            sectionDic[v[0]] = v[1];
+                        else
+                            sectionDic.Add(v[0], v[1]);
                         // 回写 section 节点
-                        _AppIniCache[section] = sectionDic;
+                        if (_AppIniCache.ContainsKey(section))
+                            _AppIniCache[section] = sectionDic;
+                        else
+                            _AppIniCache.Add(section, sectionDic);
+
                     }
                     log.Debug("加载" + section + "节点下全部键值，总数：" + _AppIniCache.Count);
                 }
diff --git a/TextLocator/Util/AreaUtil.cs b/TextLocator/Util/AreaUtil.cs
new file mode 100644
index 0000000..1440a76
--- /dev/null
+++ b/TextLocator/Util/AreaUtil.cs
@@ -0,0 +1,199 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TextLocator.Core;
+using TextLocator.Entity;
+
+namespace TextLocator.Util
+{
+    /// <summary>
+    /// 区域工具类
+    /// </summary>
+    public class AreaUtil
+    {
+        /// <summary>
+        /// 区域配置
+        /// </summary>
+        private static string AreaConfig = AppConst.AREA_CONFIG_KEY;
+        /// <summary>
+        /// 区域名称
+        /// </summary>
+        private static string AreaName = "AreaName";
+        /// <summary>
+        /// 区域文件夹
+        /// </summary>
+        private static string AreaFolders = "AreaFolders";
+
+        /// <summary>
+        /// 私有构造方法
+        /// </summary>
+        private AreaUtil() { }
+
+        /// <summary>
+        /// 获取区域信息列表
+        /// </summary>
+        /// <returns></returns>
+        public static List<AreaInfo> GetAreaInfoList()
+        {
+            List<AreaInfo> areaInfoList = new List<AreaInfo>();
+
+            List<string> areaList = AppUtil.ReadSectionList(AreaConfig);
+            if (areaList != null)
+            {
+                foreach (string areaId in areaList)
+                {
+                    // 根据区域获取明细配置
+                    bool isEnable = bool.Parse(AppUtil.ReadValue(AreaConfig, areaId, "False"));
+                    // 区域显示名称
+                    string areaName = AppUtil.ReadValue(areaId, AreaName, "区域名称");
+                    // 区域文件夹
+                    string folders = AppUtil.ReadValue(areaId, AreaFolders, "");
+                    List<string> areaFolders = new List<string>();
+                    if (!string.IsNullOrEmpty(folders))
+                    {
+                        areaFolders = folders.Split(',').ToList();
+                    }
+                    AreaInfo areaInfo = new AreaInfo()
+                    {
+                        IsEnable = isEnable,
+                        AreaId = areaId,
+                        AreaName = areaName,
+                        AreaFolders = areaFolders
+                    };
+                    // 全部搜索区
+                    areaInfoList.Add(areaInfo);
+                }
+            }
+            // 区域信息列表为空（填充默认区域信息列表）
+            if (areaInfoList.Count <= 0)
+            {
+                AreaInfo areaInfo = new AreaInfo()
+                {
+                    IsEnable = true,
+                    AreaId = "AreaDefault",
+                    AreaName = "默认区域",
+                    AreaFolders = new string[] { Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), Environment.GetFolderPath(Environment.SpecialFolder.Desktop) }.ToList()
+                };
+                areaInfoList.Add(areaInfo);
+            }
+            // 保存信息
+            foreach (AreaInfo areaInfo in areaInfoList)
+            {
+                // 区域根信息
+                AppUtil.WriteValue(AreaConfig, areaInfo.AreaId, areaInfo.IsEnable + "");
+
+                // 区域配置
+                AppUtil.WriteValue(areaInfo.AreaId, AreaName, areaInfo.AreaName);
+                AppUtil.WriteValue(areaInfo.AreaId, AreaFolders, string.Join(",", areaInfo.AreaFolders.ToArray()));
+            }
+            return areaInfoList;
+        }
+
+        /// <summary>
+        /// 获取启用的区域信息列表
+        /// </summary>
+        /// <returns></returns>
+        public static List<AreaInfo> GetEnableAreaInfoList()
+        {
+            // 获取全部区域信息列表
+            List<AreaInfo> allAreaInfoList = GetAreaInfoList();
+            return allAreaInfoList.Where(areaInfo => areaInfo.IsEnable).ToList();
+        }
+
+        /// <summary>
+        /// 获取禁用的区域信息列表
+        /// </summary>
+        /// <returns></returns>
+        public static List<AreaInfo> GetDisableAreaInfoList()
+        {
+            // 获取全部区域信息列表
+            List<AreaInfo> allAreaInfoList = GetAreaInfoList();
+            return allAreaInfoList.Where(areaInfo => !areaInfo.IsEnable).ToList();
+        }
+
+        /// <summary>
+        /// 保存区域信息
+        /// </summary>
+        /// <param name="areaInfo"></param>
+        public static void SaveAreaInfo(AreaInfo areaInfo)
+        {
+            // 区域名称
+            AppUtil.WriteValue(areaInfo.AreaId, AreaName, areaInfo.AreaName);
+            // 区域文件夹
+            AppUtil.WriteValue(areaInfo.AreaId, AreaFolders, areaInfo.AreaFolders != null ? string.Join(",", areaInfo.AreaFolders.ToArray()) : null);
+
+            // 区域列表
+            AppUtil.WriteValue(AreaConfig, areaInfo.AreaId, areaInfo.IsEnable + "");
+        }
+
+        /// <summary>
+        /// 删除区域信息
+        /// </summary>
+        /// <param name="areaInfo"></param>
+        public static void DeleteAreaInfo(AreaInfo areaInfo)
+        {
+            // 区域名称
+            AppUtil.WriteValue(areaInfo.AreaId, AreaName, null);
+            // 区域文件夹
+            AppUtil.WriteValue(areaInfo.AreaId, AreaFolders, null);
+
+            // 区域列表
+            AppUtil.WriteValue(AreaConfig, areaInfo.AreaId, null);
+        }
+
+        /// <summary>
+        /// 获取全部区域文件夹列表
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> GetAreaFolderList()
+        {
+            List<string> areaFolderList = new List<string>();
+
+            List<string> areaList = AppUtil.ReadSectionList(AreaConfig);
+            if (areaList != null)
+            {
+                foreach (string areaId in areaList)
+                {
+                    // 区域文件夹
+                    string folders = AppUtil.ReadValue(areaId, AreaFolders, "");
+                    List<string> areaFolders = new List<string>();
+                    if (!string.IsNullOrEmpty(folders))
+                    {
+                        areaFolders = folders.Split(',').ToList();
+                    }
+                    areaFolderList.AddRange(areaFolders);
+                }
+            }
+            return areaFolderList;
+        }
+
+        /// <summary>
+        /// 获取不包含自己的区域名称列表
+        /// </summary>
+        /// <param name="areaInfo">区域信息</param>
+        /// <returns></returns>
+        public static List<string> GetAreaNameListRuleOut(AreaInfo areaInfo)
+        {
+            List<string> areaNameList = new List<string>();
+            List<string> areaList = AppUtil.ReadSectionList(AreaConfig);
+            if (areaList != null)
+            {
+                foreach (string areaId in areaList)
+                {
+                    // 跳过区域ID相同的
+                    if (areaId.Equals(areaInfo.AreaId))
+                    {
+                        continue;
+                    }
+                    // 区域显示名称
+                    string areaName = AppUtil.ReadValue(areaId, AreaName, "区域名称");
+                    // 加入区域名称列表
+                    areaNameList.Add(areaName);
+                }
+            }
+            return areaNameList;
+        }
+    }
+}
-- 
Gitee


From f2a92dce42d8f55405a951802bbd6c2ebe762ed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Wed, 20 Apr 2022 01:09:18 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/MainWindow.xaml.cs | 2 +-
 TextLocator/Util/FileUtil.cs   | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/TextLocator/MainWindow.xaml.cs b/TextLocator/MainWindow.xaml.cs
index 66e111f..a31567d 100644
--- a/TextLocator/MainWindow.xaml.cs
+++ b/TextLocator/MainWindow.xaml.cs
@@ -1166,7 +1166,7 @@ namespace TextLocator
                     {
                         log.Info("目录：" + s);
                         // 获取文件信息列表
-                        FileUtil.GetAllFiles(allFilePaths, s, null);
+                        FileUtil.GetAllFiles(allFilePaths, s);
                     }
 
                     msg = string.Format("搜索区【{0}】，文件扫描完成；文件数：{1}，耗时：{2}；开始分析需要更新的文件列表...", areaInfo.AreaName, allFilePaths.Count, scanTaskMark.ConsumeTime);
diff --git a/TextLocator/Util/FileUtil.cs b/TextLocator/Util/FileUtil.cs
index 323e7ad..30a3087 100644
--- a/TextLocator/Util/FileUtil.cs
+++ b/TextLocator/Util/FileUtil.cs
@@ -125,8 +125,7 @@ namespace TextLocator.Util
         /// </summary>
         /// <param name="filePaths">文档列表</param>
         /// <param name="rootPath">根目录路径</param>
-        /// <param name="regexExclude">过滤列表</param>
-        public static void GetAllFiles(List<string> filePaths, string rootPath, Regex regexExclude = null)
+        public static void GetAllFiles(List<string> filePaths, string rootPath)
         {
             // 根目录
             DirectoryInfo rootDir = new DirectoryInfo(rootPath);
@@ -144,12 +143,12 @@ namespace TextLocator.Util
                     string dirPath = dir.FullName;
                     // 系统过滤：$RECYCLE|360REC|SYSTEM|TEMP|SYSTEM VOLUME INFOMATION
                     // 自定义过滤：
-                    if (AppConst.REGEX_EXCLUDE_KEYWORD.IsMatch(dirPath.ToUpper()) || (regexExclude != null && regexExclude.IsMatch(dirPath)))
+                    if (AppConst.REGEX_EXCLUDE_KEYWORD.IsMatch(dirPath.ToUpper()))
                     {
                         continue;
                     }
                     // 递归调用
-                    GetAllFiles(filePaths, dirPath, regexExclude);
+                    GetAllFiles(filePaths, dirPath);
                 }
             }
             catch (UnauthorizedAccessException ex) {
-- 
Gitee


From 0b8bb311f34d74d24031528e17cf8daa4edc23a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Wed, 20 Apr 2022 01:42:11 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E7=B4=A2=E5=BC=95=E5=86=99=E5=85=A5?=
 =?UTF-8?q?=E5=99=A8=E6=A0=B9=E6=8D=AE=E6=96=87=E4=BB=B6=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6=E5=8F=96=E6=A8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/Index/IndexCore.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/TextLocator/Index/IndexCore.cs b/TextLocator/Index/IndexCore.cs
index 789b784..b09e1dd 100644
--- a/TextLocator/Index/IndexCore.cs
+++ b/TextLocator/Index/IndexCore.cs
@@ -571,7 +571,7 @@ namespace TextLocator.Index
         {
             // -------- 获取索引写入器
             // 随机索引写入器
-            int index = new Random().Next(10);
+            int index = filePath.Length % 10;
 
             try
             {
@@ -580,12 +580,12 @@ namespace TextLocator.Index
 
                 indexWriters[index].UpdateDocument(new Lucene.Net.Index.Term("FileMark", fileMark), doc);
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 log.Error(filePath + " -> " + ex.Message + " => 重启索引写入器！", ex);
 
 
-                // 关闭索引写入器（区域ID + 写入器索引）
+                // 关闭索引写入器（写入器索引）
                 CloseIndexWriter(index);
 
                 // 创建索引写入器（区域ID + 更新 + 写入器索引）
-- 
Gitee


From 46f5fabc2efe96e3cf172dd358f70a25b457f631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Wed, 20 Apr 2022 01:48:55 +0800
Subject: [PATCH 04/18] filePath.Length % 10; // new Random().Next(10);

---
 TextLocator/Index/IndexCore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TextLocator/Index/IndexCore.cs b/TextLocator/Index/IndexCore.cs
index b09e1dd..9aed7a6 100644
--- a/TextLocator/Index/IndexCore.cs
+++ b/TextLocator/Index/IndexCore.cs
@@ -571,7 +571,7 @@ namespace TextLocator.Index
         {
             // -------- 获取索引写入器
             // 随机索引写入器
-            int index = filePath.Length % 10;
+            int index = filePath.Length % 10; // new Random().Next(10);
 
             try
             {
-- 
Gitee


From 3b64e6ec3038e79367341c117c831070fb639068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Wed, 20 Apr 2022 02:16:16 +0800
Subject: [PATCH 05/18] =?UTF-8?q?LoadAllKeyValue(AppConst.AREA=5FCONFIG=5F?=
 =?UTF-8?q?KEY);=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/Util/AppUtil.cs | 91 ++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 41 deletions(-)

diff --git a/TextLocator/Util/AppUtil.cs b/TextLocator/Util/AppUtil.cs
index f025c0f..adb5ae7 100644
--- a/TextLocator/Util/AppUtil.cs
+++ b/TextLocator/Util/AppUtil.cs
@@ -49,8 +49,23 @@ namespace TextLocator.Util
             // ini文件初始化
             Initialize();
 
-            // 加载区域配置
-            LoadAllKeyValue(AppConst.AREA_CONFIG_KEY);
+            Thread t = new Thread(() =>
+            {
+                // 加载区域配置
+                LoadAllKeyValue(AppConst.AREA_CONFIG_KEY);
+
+                List<string> areaList = ReadSectionList(AppConst.AREA_CONFIG_KEY);
+                foreach (string areaId in areaList)
+                {
+                    LoadAllKeyValue(areaId);
+                }
+            });
+            t.Priority = ThreadPriority.AboveNormal;
+            t.Start();
+            
+
+
+            
         }
 
         /// <summary>
@@ -237,53 +252,47 @@ namespace TextLocator.Util
         /// <returns></returns>
         private static void LoadAllKeyValue(string section)
         {
-            Thread t = new Thread(() =>
+            try
             {
-                try
-                {
-                    // 默认为32767（32.767KB），设置为128000000（128MB）
-                    uint MAX_BUFFER = 256000000;
-                    // 返回值[返回值形式为 key=value,例如 Color=Red]
-                    string[] items = new string[0];
+                // 默认为32767（32.767KB），设置为128000000（128MB）
+                uint MAX_BUFFER = 256000000;
+                // 返回值[返回值形式为 key=value,例如 Color=Red]
+                string[] items = new string[0];
 
-                    //分配内存
-                    IntPtr pReturnedString = Marshal.AllocCoTaskMem((int)MAX_BUFFER * sizeof(char));
+                //分配内存
+                IntPtr pReturnedString = Marshal.AllocCoTaskMem((int)MAX_BUFFER * sizeof(char));
 
-                    uint bytesReturned = GetPrivateProfileSection(section, pReturnedString, MAX_BUFFER, _AppIniFile);
+                uint bytesReturned = GetPrivateProfileSection(section, pReturnedString, MAX_BUFFER, _AppIniFile);
 
-                    if (!(bytesReturned == MAX_BUFFER - 2) || (bytesReturned == 0))
-                    {
-                        string returnedString = Marshal.PtrToStringAuto(pReturnedString, (int)bytesReturned);
-                        items = returnedString.Split(new char[] { '\0' }, StringSplitOptions.RemoveEmptyEntries);
-                    }
-
-                    // 释放内存
-                    Marshal.FreeCoTaskMem(pReturnedString);
+                if (!(bytesReturned == MAX_BUFFER - 2) || (bytesReturned == 0))
+                {
+                    string returnedString = Marshal.PtrToStringAuto(pReturnedString, (int)bytesReturned);
+                    items = returnedString.Split(new char[] { '\0' }, StringSplitOptions.RemoveEmptyEntries);
+                }
 
-                    foreach (string entry in items)
-                    {
-                        string[] v = entry.Split('=');
+                // 释放内存
+                Marshal.FreeCoTaskMem(pReturnedString);
 
-                        // 获取 section 节点
-                        Dictionary<string, string> sectionDic = _AppIniCache.ContainsKey(section) ? _AppIniCache[section] : new Dictionary<string, string>();
-                        // 设置 section 节点子项
-                        if (sectionDic.ContainsKey(v[0]))
-                            sectionDic[v[0]] = v[1];
-                        else
-                            sectionDic.Add(v[0], v[1]);
-                        // 回写 section 节点
-                        if (_AppIniCache.ContainsKey(section))
-                            _AppIniCache[section] = sectionDic;
-                        else
-                            _AppIniCache.Add(section, sectionDic);
+                foreach (string entry in items)
+                {
+                    string[] v = entry.Split('=');
 
-                    }
-                    log.Debug("加载" + section + "节点下全部键值，总数：" + _AppIniCache.Count);
+                    // 获取 section 节点
+                    Dictionary<string, string> sectionDic = _AppIniCache.ContainsKey(section) ? _AppIniCache[section] : new Dictionary<string, string>();
+                    // 设置 section 节点子项
+                    if (sectionDic.ContainsKey(v[0]))
+                        sectionDic[v[0]] = v[1];
+                    else
+                        sectionDic.Add(v[0], v[1]);
+                    // 回写 section 节点
+                    if (_AppIniCache.ContainsKey(section))
+                        _AppIniCache[section] = sectionDic;
+                    else
+                        _AppIniCache.Add(section, sectionDic);
                 }
-                catch { }
-            });
-            t.Priority = ThreadPriority.AboveNormal;
-            t.Start();
+                log.Debug("加载" + section + "节点下全部键值，总数：" + _AppIniCache.Count);
+            }
+            catch { }
         }
         #endregion
 
-- 
Gitee


From 87b4427fe404ceefbd9e6c84039b9f8df6db700d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Wed, 20 Apr 2022 16:47:52 +0800
Subject: [PATCH 06/18] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/AreaWindow.xaml.cs         | 71 +++++++++++++++-----------
 TextLocator/Entity/AreaInfo.cs         |  6 +--
 TextLocator/Properties/AssemblyInfo.cs |  4 +-
 3 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/TextLocator/AreaWindow.xaml.cs b/TextLocator/AreaWindow.xaml.cs
index 1e88ad5..ae3d393 100644
--- a/TextLocator/AreaWindow.xaml.cs
+++ b/TextLocator/AreaWindow.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using TextLocator.Entity;
@@ -14,9 +15,13 @@ namespace TextLocator
     public partial class AreaWindow : Window
     {
         /// <summary>
-        /// 区域信息列表
+        /// 正常区域列表区域信息列表
         /// </summary>
-        private List<AreaInfo> _areaInfos;
+        private List<AreaInfo> _normalAreaInfos = new List<AreaInfo>();
+        /// <summary>
+        /// 删除区域信息列表
+        /// </summary>
+        private List<AreaInfo> _deleteAreaInfos = new List<AreaInfo>();
 
         public AreaWindow()
         {
@@ -66,7 +71,7 @@ namespace TextLocator
                     this.AreaInfoList.Children.Add(item);
                 }
             }
-            _areaInfos = areaInfos;
+            _normalAreaInfos.AddRange(areaInfos);
         }
 
         /// <summary>
@@ -77,18 +82,14 @@ namespace TextLocator
         private void AreaIsEnable_Unchecked(object sender, RoutedEventArgs e)
         {
             AreaInfo areaInfo = (AreaInfo)(sender as CheckBox).Tag;
-            areaInfo.IsEnable = false;
-
             // 修改本地列表缓存
-            if (_areaInfos!= null)
+            if (_normalAreaInfos!= null)
             {
-                for(int i = 0; i < _areaInfos.Count; i++)
+                for(int i = 0; i < _normalAreaInfos.Count; i++)
                 {
-                    AreaInfo info = _areaInfos[i];
-                    if (info.AreaId.Equals(areaInfo.AreaId))
+                    if (_normalAreaInfos[i].AreaId.Equals(areaInfo.AreaId))
                     {
-                        info = areaInfo;
-                        _areaInfos[i] = info;
+                        _normalAreaInfos[i].IsEnable = false;
                     }
                 }
             }
@@ -102,18 +103,15 @@ namespace TextLocator
         private void AreaIsEnable_Checked(object sender, RoutedEventArgs e)
         {
             AreaInfo areaInfo = (AreaInfo)(sender as CheckBox).Tag;
-            areaInfo.IsEnable = true;
 
             // 修改本地列表缓存
-            if (_areaInfos != null)
+            if (_normalAreaInfos != null)
             {
-                for (int i = 0; i < _areaInfos.Count; i++)
+                for (int i = 0; i < _normalAreaInfos.Count; i++)
                 {
-                    AreaInfo info = _areaInfos[i];
-                    if (info.AreaId.Equals(areaInfo.AreaId))
+                    if (_normalAreaInfos[i].AreaId.Equals(areaInfo.AreaId))
                     {
-                        info = areaInfo;
-                        _areaInfos[i] = info;
+                        _normalAreaInfos[i].IsEnable = true;
                     }
                 }
             }
@@ -129,18 +127,19 @@ namespace TextLocator
             AreaInfo areaInfo = (AreaInfo)(sender as Button).Tag;
             if (areaInfo != null)
             {
-                // AreaUtil.DeleteAreaInfo(areaInfo);
-                for( int i = 0; i < _areaInfos.Count; i++)
+                for( int i = 0; i < _normalAreaInfos.Count; i++)
                 {
-                    if (_areaInfos[i].AreaId == areaInfo.AreaId)
+                    AreaInfo normalAreaInfo = _normalAreaInfos[i];
+                    if (normalAreaInfo.AreaId == areaInfo.AreaId)
                     {
-                        _areaInfos.RemoveAt(i);
+                        _normalAreaInfos.RemoveAt(i);
+                        _deleteAreaInfos.Add(normalAreaInfo);
                         break;
                     }
                 }
 
                 // 重新加载区域信息列表（刷新）
-                LoadAreaInfoList(_areaInfos);
+                LoadAreaInfoList(_normalAreaInfos);
             }
         }
 
@@ -152,7 +151,7 @@ namespace TextLocator
         private void EditButton_Click(object sender, RoutedEventArgs e)
         {
             AreaInfo areaInfo = (AreaInfo)(sender as Button).Tag;
-            CacheUtil.Put("AreaInfos", _areaInfos);
+            CacheUtil.Put("AreaInfos", _normalAreaInfos);
             ShowAreaEditDialog(areaInfo);
         }
 
@@ -163,7 +162,7 @@ namespace TextLocator
         /// <param name="e"></param>
         private void AddButton_Click(object sender, RoutedEventArgs e)
         {
-            CacheUtil.Put("AreaInfos", _areaInfos);
+            CacheUtil.Put("AreaInfos", _normalAreaInfos);
             ShowAreaEditDialog();
         }
 
@@ -174,11 +173,11 @@ namespace TextLocator
         /// <param name="e"></param>
         private void SaveButton_Click(object sender, RoutedEventArgs e)
         {
-            // 修改本地列表缓存
-            if (_areaInfos != null)
+            // 保存正常的区域信息列表
+            if (_normalAreaInfos != null)
             {
                 int enableCount = 0;
-                foreach (AreaInfo info in _areaInfos)
+                foreach (AreaInfo info in _normalAreaInfos)
                 {
                     if (info.IsEnable) enableCount++;
                 }
@@ -189,11 +188,21 @@ namespace TextLocator
                     return;
                 }
 
-                foreach (AreaInfo areaInfo in _areaInfos)
+                foreach (AreaInfo areaInfo in _normalAreaInfos)
                 {
                     AreaUtil.SaveAreaInfo(areaInfo);
                 }
             }
+            // 保存删除的区域信息列表
+            if (_deleteAreaInfos.Count > 0)
+            {
+                foreach (AreaInfo areaInfo in _deleteAreaInfos)
+                {
+                    areaInfo.AreaName = null;
+                    areaInfo.AreaFolders = null;
+                    AreaUtil.DeleteAreaInfo(areaInfo);
+                }
+            }
             this.DialogResult = true;
         }
 
@@ -222,9 +231,9 @@ namespace TextLocator
 
             if (editDialog.DialogResult == true)
             {
-                _areaInfos = CacheUtil.Get<List<AreaInfo>>("AreaInfos");
+                _normalAreaInfos = CacheUtil.Get<List<AreaInfo>>("AreaInfos");
                 // 重新加载区域信息列表（刷新）
-                LoadAreaInfoList(_areaInfos);
+                LoadAreaInfoList(_normalAreaInfos);
             }
         }
     }
diff --git a/TextLocator/Entity/AreaInfo.cs b/TextLocator/Entity/AreaInfo.cs
index f11b7dd..9b73147 100644
--- a/TextLocator/Entity/AreaInfo.cs
+++ b/TextLocator/Entity/AreaInfo.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TextLocator.Entity
 {
diff --git a/TextLocator/Properties/AssemblyInfo.cs b/TextLocator/Properties/AssemblyInfo.cs
index f0befdf..01cd66b 100644
--- a/TextLocator/Properties/AssemblyInfo.cs
+++ b/TextLocator/Properties/AssemblyInfo.cs
@@ -49,8 +49,8 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.0.1.0")]
+[assembly: AssemblyFileVersion("2.0.1.0")]
 
 // log4net
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
\ No newline at end of file
-- 
Gitee


From 662c6e025d135dd703c40808732c2bdb8fd76ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Wed, 20 Apr 2022 18:59:14 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/MainWindow.xaml    | 14 --------------
 TextLocator/MainWindow.xaml.cs | 11 -----------
 2 files changed, 25 deletions(-)

diff --git a/TextLocator/MainWindow.xaml b/TextLocator/MainWindow.xaml
index 7bcc3ac..1c8255f 100644
--- a/TextLocator/MainWindow.xaml
+++ b/TextLocator/MainWindow.xaml
@@ -82,20 +82,6 @@
                             <StackPanel Margin="0,10,10,0" Orientation="Horizontal" >
                                 <!-- 扩展信息 -->
                                 <StackPanel>
-                                    <Grid Visibility="Collapsed">
-                                        <TextBlock Text="文件类型：" HorizontalAlignment="Left" Margin="0,5,0,0"/>
-                                        <Border Width="485" Height="25" Margin="65,5,0,0" HorizontalAlignment="Left" BorderBrush="Gray" BorderThickness="1">
-                                            <StackPanel x:Name="FileTypeNames" Orientation="Horizontal">
-                                                <Button Content="Word文档" Background="Gray" Height="20" Margin="2,0,0,0"/>
-                                                <Button Content="Excel表格" Background="Gray" Height="20" Margin="2,0,0,0"/>
-                                                <Button Content="PPT文稿" Background="Gray" Height="20" Margin="2,0,0,0"/>
-                                                <Button Content="PDF文档" Background="Gray" Height="20" Margin="2,0,0,0"/>
-                                                <Button Content="DOM文档" Background="Gray" Height="20" Margin="2,0,0,0"/>
-                                                <Button Content="TXT文本" Background="Gray" Height="20" Margin="2,0,0,0"/>
-                                                <Button Content="常用图片" Background="Gray" Height="20" Margin="2,0,0,0"/>                                                
-                                            </StackPanel>
-                                        </Border>
-                                    </Grid>
                                     <!-- 搜索区域 -->
                                     <Grid>
                                         <TextBlock Text="启用搜索区：" Margin="0,5,0,0" HorizontalAlignment="Left"/>
diff --git a/TextLocator/MainWindow.xaml.cs b/TextLocator/MainWindow.xaml.cs
index a31567d..55c2250 100644
--- a/TextLocator/MainWindow.xaml.cs
+++ b/TextLocator/MainWindow.xaml.cs
@@ -199,7 +199,6 @@ namespace TextLocator
             TaskTime taskTime = TaskTime.StartNew();
             // 文件类型筛选下拉框数据初始化
             FileTypeFilter.Children.Clear();
-            FileTypeNames.Children.Clear();
 
             _radioButtonAll = new RadioButton()
             {
@@ -232,16 +231,6 @@ namespace TextLocator
                 };
                 radioButton.Checked += FileType_Checked;
                 FileTypeFilter.Children.Add(radioButton);
-
-                // 标签
-                FileTypeNames.Children.Add(new Button()
-                {
-                    Content = fileType.ToString(),
-                    Height = 20,
-                    Margin = new Thickness(2, 0, 0, 0),
-                    ToolTip = fileType.GetDescription(),
-                    Background = Brushes.DarkGray
-                });
             }
             log.Debug("InitializeFileTypeFilters 耗时：" + taskTime.ConsumeTime + "。");
         }
-- 
Gitee


From bc36ccfb6472b54eb8140243853897a5d95a3aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Wed, 20 Apr 2022 21:26:46 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E9=A1=B5=E5=AF=BC=E8=87=B4=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=A2=E5=A4=B1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/MainWindow.xaml.cs | 105 ++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 53 deletions(-)

diff --git a/TextLocator/MainWindow.xaml.cs b/TextLocator/MainWindow.xaml.cs
index 55c2250..e9c51fd 100644
--- a/TextLocator/MainWindow.xaml.cs
+++ b/TextLocator/MainWindow.xaml.cs
@@ -453,11 +453,21 @@ namespace TextLocator
                 return;
             }
 
-            // 搜索按钮时，下拉框和其他筛选条件全部恢复默认值
+            // ---- 搜索按钮时，下拉框和其他筛选条件全部恢复默认值
+            // 取消匹配全词
             MatchWords.IsChecked = false;
+            // 取消区分大小写
             OnlyFileName.IsChecked = false;
-            (this.FindName("FileTypeAll") as RadioButton).IsChecked = true;
+
+            // 全部文件类型
+            ToggleButtonAutomationPeer toggleButtonAutomationPeer = new ToggleButtonAutomationPeer(_radioButtonAll);
+            IToggleProvider toggleProvider = toggleButtonAutomationPeer.GetPattern(PatternInterface.Toggle) as IToggleProvider;
+            toggleProvider.Toggle();
+
+            // 默认排序
             SortOptions.SelectedIndex = 0;
+            // 文件名和内容
+            //SearchScope.SelectedIndex = 0;
 
             BeforeSearch();
         }
@@ -471,14 +481,24 @@ namespace TextLocator
         {
             if (e.Key == Key.Enter)
             {
-                // 光标移除文本框
+                // ---- 光标移除文本框
                 SearchText.MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
 
-                // 搜索按钮时，下拉框和其他筛选条件全部恢复默认值
+                // ---- 搜索按钮时，下拉框和其他筛选条件全部恢复默认值
+                // 取消匹配全词
                 MatchWords.IsChecked = false;
+                // 取消区分大小写
                 OnlyFileName.IsChecked = false;
-                (this.FindName("FileTypeAll") as RadioButton).IsChecked = true;
+
+                // 全部文件类型
+                ToggleButtonAutomationPeer toggleButtonAutomationPeer = new ToggleButtonAutomationPeer(_radioButtonAll);
+                IToggleProvider toggleProvider = toggleButtonAutomationPeer.GetPattern(PatternInterface.Toggle) as IToggleProvider;
+                toggleProvider.Toggle();
+
+                // 默认排序
                 SortOptions.SelectedIndex = 0;
+                // 文件名和内容
+                //SearchScope.SelectedIndex = 0;
 
                 BeforeSearch();
 
@@ -496,36 +516,14 @@ namespace TextLocator
         {
             // 如果文本为空则隐藏清空按钮，如果不为空则显示清空按钮
             this.CleanButton.Visibility = this.SearchText.Text.Length > 0 ? Visibility.Visible : Visibility.Hidden;
-            /*try
-            {
-                // 搜索关键词
-                string text = SearchText.Text;
-
-                // 替换特殊字符
-                text = AppConst.REGEX_SPECIAL_CHARACTER.Replace(text, "");
-
-                // 回写处理过的字符
-                SearchText.Text = text;
-
-                // 光标定位到最后
-                SearchText.SelectionStart = SearchText.Text.Length;
-
-                // 如果文本为空则隐藏清空按钮，如果不为空则显示清空按钮
-                CleanButton.Visibility = text.Length > 0 ? Visibility.Visible : Visibility.Hidden;
-            }
-            catch { }*/
         }
 
         /// <summary>
         /// 搜索
         /// </summary>
         /// <param name="timestamp">时间戳，用于校验为同一子任务；时间戳不相同表名父任务结束，子任务跳过执行</param>
-        /// <param name="keywords">关键词</param>
-        /// <param name="fileType">文件类型</param>
-        /// <param name="sortType">排序类型</param>
-        /// <param name="onlyFileName">仅文件名</param>
-        /// <param name="matchWords">匹配全词</param>
-        private void Search(long timestamp, List<string> keywords, string fileType, SortType sortType, bool onlyFileName = false, bool matchWords = false)
+        /// <param name="searchParam">搜索条件</param>
+        private void Search(long timestamp, Entity.SearchParam searchParam)
         {
             if (!CheckIndexExist())
             {
@@ -546,20 +544,8 @@ namespace TextLocator
                         this.SearchResultList.Items.Clear();
                     }));
 
-                    // 保存当前搜索条件
-                    _searchParam = new Entity.SearchParam()
-                    {
-                        Keywords = keywords,
-                        FileType = fileType,
-                        SortType = sortType,
-                        IsMatchWords = matchWords,
-                        IsOnlyFileName = onlyFileName,
-                        PageSize = PageSize,
-                        PageIndex = PageNow
-                    };
-
                     // 查询列表（参数，消息回调）
-                    Entity.SearchResult searchResult = IndexCore.Search(_searchParam, ShowStatus);
+                    Entity.SearchResult searchResult = IndexCore.Search(searchParam, ShowStatus);
 
                     // 验证列表数据
                     if (null == searchResult || searchResult.Results.Count <= 0)
@@ -639,18 +625,23 @@ namespace TextLocator
             }
         }
 
+        /// <summary>
+        /// 分页切换
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void PageBar_PageIndexChanged(object sender, RoutedPropertyChangedEventArgs<int> e)
         {
             log.Debug($"pageIndex : {e.OldValue} => {e.NewValue}");
 
-            // 搜索按钮时，下拉框和其他筛选条件全部恢复默认值
-            MatchWords.IsChecked = false;
-            OnlyFileName.IsChecked = false;
-            (this.FindName("FileTypeAll") as RadioButton).IsChecked = true;
-
             BeforeSearch(e.NewValue);
         }
 
+        /// <summary>
+        /// 分页条数改变
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void PageBar_PageSizeChanged(object sender, RoutedPropertyChangedEventArgs<int> e)
         {
             log.Debug($"pageSize : {e.OldValue} => {e.NewValue}");
@@ -704,7 +695,7 @@ namespace TextLocator
             MatchWords.IsChecked = false;
 
             // 排序类型切换为默认
-            this.SortOptions.SelectedIndex = 0;
+            SortOptions.SelectedIndex = 0;
 
             // -------- 搜索结果列表
             // 搜索结果列表清空
@@ -1500,14 +1491,22 @@ namespace TextLocator
             // 记录时间戳
             _timestamp = Convert.ToInt64((DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0)).TotalMilliseconds);
 
+            // 保存当前搜索条件
+            _searchParam = new Entity.SearchParam()
+            {
+                Keywords = keywords,
+                FileType = filter == null ? null : filter + "",
+                SortType = (SortType)SortOptions.SelectedValue,
+                IsMatchWords = (bool)MatchWords.IsChecked,
+                IsOnlyFileName = (bool)OnlyFileName.IsChecked,
+                // SearchRegion = (SearchRegion)SearchScope.SelectedValue,
+                PageSize = PageSize,
+                PageIndex = PageNow
+            };
             // 搜索
             Search(
                 _timestamp,
-                keywords,
-                filter == null ? null : filter + "",
-                (SortType)SortOptions.SelectedValue,
-                (bool)OnlyFileName.IsChecked,
-                (bool)MatchWords.IsChecked
+                _searchParam
             );
         }
         #endregion
-- 
Gitee


From c69623544fe295303fcd584b05063241a49f9a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Thu, 21 Apr 2022 16:36:48 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/AreaEditWindow.xaml.cs | 14 +++++++++-
 TextLocator/AreaWindow.xaml.cs     | 43 +++++++++++++++++++++++-------
 2 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/TextLocator/AreaEditWindow.xaml.cs b/TextLocator/AreaEditWindow.xaml.cs
index 5c7c122..bb7df2d 100644
--- a/TextLocator/AreaEditWindow.xaml.cs
+++ b/TextLocator/AreaEditWindow.xaml.cs
@@ -71,14 +71,26 @@ namespace TextLocator
         /// <param name="e"></param>
         private void DelButton_Click(object sender, RoutedEventArgs e)
         {
+            // 当前删除文件夹路径
+            string deleteFolderPath = (sender as Button).Tag + "";
+            // UI层删除
             for (int i = 0; i < this.AreaFolders.Items.Count; i++)
             {
-                if ((this.AreaFolders.Items[i] as FolderInfoItem).FolderPath.Text.Equals((sender as Button).Tag))
+                if ((this.AreaFolders.Items[i] as FolderInfoItem).FolderPath.Text.Equals(deleteFolderPath))
                 {
                     this.AreaFolders.Items.RemoveAt(i);
                     break;
                 }
             }
+            // 缓存列表层删除
+            for (int i = 0; i < _areaFolders.Count; i++)
+            {
+                if (_areaFolders[i].Equals(deleteFolderPath))
+                {
+                    _areaFolders.RemoveAt(i);
+                    break;
+                }
+            }
         }
 
         /// <summary>
diff --git a/TextLocator/AreaWindow.xaml.cs b/TextLocator/AreaWindow.xaml.cs
index ae3d393..6cfc8fa 100644
--- a/TextLocator/AreaWindow.xaml.cs
+++ b/TextLocator/AreaWindow.xaml.cs
@@ -1,8 +1,10 @@
-using System;
+using log4net;
+using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
+using System.IO;
 using System.Windows;
 using System.Windows.Controls;
+using TextLocator.Core;
 using TextLocator.Entity;
 using TextLocator.Message;
 using TextLocator.Util;
@@ -14,6 +16,8 @@ namespace TextLocator
     /// </summary>
     public partial class AreaWindow : Window
     {
+        private static readonly ILog log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>
         /// 正常区域列表区域信息列表
         /// </summary>
@@ -71,7 +75,7 @@ namespace TextLocator
                     this.AreaInfoList.Children.Add(item);
                 }
             }
-            _normalAreaInfos.AddRange(areaInfos);
+            _normalAreaInfos = areaInfos;
         }
 
         /// <summary>
@@ -82,14 +86,18 @@ namespace TextLocator
         private void AreaIsEnable_Unchecked(object sender, RoutedEventArgs e)
         {
             AreaInfo areaInfo = (AreaInfo)(sender as CheckBox).Tag;
+            areaInfo.IsEnable = false;
+
             // 修改本地列表缓存
             if (_normalAreaInfos!= null)
             {
                 for(int i = 0; i < _normalAreaInfos.Count; i++)
                 {
-                    if (_normalAreaInfos[i].AreaId.Equals(areaInfo.AreaId))
+                    AreaInfo info = _normalAreaInfos[i];
+                    if (info.AreaId.Equals(areaInfo.AreaId))
                     {
-                        _normalAreaInfos[i].IsEnable = false;
+                        info = areaInfo;
+                        _normalAreaInfos[i] = info;
                     }
                 }
             }
@@ -103,15 +111,18 @@ namespace TextLocator
         private void AreaIsEnable_Checked(object sender, RoutedEventArgs e)
         {
             AreaInfo areaInfo = (AreaInfo)(sender as CheckBox).Tag;
+            areaInfo.IsEnable = true;
 
             // 修改本地列表缓存
             if (_normalAreaInfos != null)
             {
                 for (int i = 0; i < _normalAreaInfos.Count; i++)
                 {
-                    if (_normalAreaInfos[i].AreaId.Equals(areaInfo.AreaId))
+                    AreaInfo info = _normalAreaInfos[i];
+                    if (info.AreaId.Equals(areaInfo.AreaId))
                     {
-                        _normalAreaInfos[i].IsEnable = true;
+                        info = areaInfo;
+                        _normalAreaInfos[i] = info;
                     }
                 }
             }
@@ -127,6 +138,7 @@ namespace TextLocator
             AreaInfo areaInfo = (AreaInfo)(sender as Button).Tag;
             if (areaInfo != null)
             {
+                // AreaUtil.DeleteAreaInfo(areaInfo);
                 for( int i = 0; i < _normalAreaInfos.Count; i++)
                 {
                     AreaInfo normalAreaInfo = _normalAreaInfos[i];
@@ -201,6 +213,21 @@ namespace TextLocator
                     areaInfo.AreaName = null;
                     areaInfo.AreaFolders = null;
                     AreaUtil.DeleteAreaInfo(areaInfo);
+
+
+                    // 删除区域索引目录
+                    try
+                    {
+                        string areaIndexDir = Path.Combine(AppConst.APP_INDEX_DIR, areaInfo.AreaId);
+                        if (Directory.Exists(areaIndexDir))
+                        {
+                            Directory.Delete(areaIndexDir, true);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        log.Error("删除区域【" + areaInfo.AreaId + "】索引目录失败：" + ex.Message, ex);
+                    }
                 }
             }
             this.DialogResult = true;
@@ -216,8 +243,6 @@ namespace TextLocator
             this.DialogResult = false;
         }
 
-
-
         /// <summary>
         /// 显示区域编辑
         /// </summary>
-- 
Gitee


From 01d5ed23bdf9df8a7e48c0466f0546963d640ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Thu, 21 Apr 2022 22:04:41 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E7=B4=A2=E5=BC=95=E5=88=86=E5=8C=BA?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA5,?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/Core/AppConst.cs   | 4 ++++
 TextLocator/Index/IndexCore.cs | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/TextLocator/Core/AppConst.cs b/TextLocator/Core/AppConst.cs
index d3614d4..6e8f10e 100644
--- a/TextLocator/Core/AppConst.cs
+++ b/TextLocator/Core/AppConst.cs
@@ -112,6 +112,10 @@ namespace TextLocator.Core
         public static readonly Regex REGEX_CONTENT_PAGE = new Regex(@"----\d+----");
 
 
+        /// <summary>
+        /// 索引写入器
+        /// </summary>
+        public const int INDEX_PARTITION_COUNT = 5;
         /// <summary>
         /// 比例最小值
         /// </summary>
diff --git a/TextLocator/Index/IndexCore.cs b/TextLocator/Index/IndexCore.cs
index 9aed7a6..52cf45f 100644
--- a/TextLocator/Index/IndexCore.cs
+++ b/TextLocator/Index/IndexCore.cs
@@ -144,7 +144,7 @@ namespace TextLocator.Index
             if (index <= -1)
             {
                 // 创建10个写入器
-                for (int i = 0; i < 10; i++)
+                for (int i = 0; i < AppConst.INDEX_PARTITION_COUNT; i++)
                 {
                     BuiltIn(i, true);
                 }                
@@ -571,7 +571,7 @@ namespace TextLocator.Index
         {
             // -------- 获取索引写入器
             // 随机索引写入器
-            int index = filePath.Length % 10; // new Random().Next(10);
+            int index = filePath.Length % AppConst.INDEX_PARTITION_COUNT; // new Random().Next(10);
 
             try
             {
@@ -625,7 +625,7 @@ namespace TextLocator.Index
             // 构造全部搜索区索引路径
             foreach(Entity.AreaInfo areaInfo in AreaUtil.GetEnableAreaInfoList())
             {
-                for(int i = 0; i < 10; i++)
+                for(int i = 0; i < AppConst.INDEX_PARTITION_COUNT; i++)
                 {
                     try
                     {
-- 
Gitee


From 45f0413b73de65a6d452e1df857ef171277b8239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Thu, 21 Apr 2022 22:25:16 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E7=B4=A2=E5=BC=95=E5=88=86=E5=8C=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA5=EF=BC=9B=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BB=85=E6=96=87=E4=BB=B6=E5=90=8D=EF=BC=8C=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=9F=9F=EF=BC=88=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E5=92=8C=E5=86=85=E5=AE=B9=E3=80=81=E4=BB=85=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E3=80=81=E4=BB=85=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/Entity/SearchParam.cs |  4 +-
 TextLocator/Enums/SearchRegion.cs | 22 ++++++++++
 TextLocator/Index/IndexCore.cs    | 34 +++++++++-------
 TextLocator/MainWindow.xaml       | 12 ++++--
 TextLocator/MainWindow.xaml.cs    | 68 +++++++++++--------------------
 TextLocator/TextLocator.csproj    |  1 +
 6 files changed, 77 insertions(+), 64 deletions(-)
 create mode 100644 TextLocator/Enums/SearchRegion.cs

diff --git a/TextLocator/Entity/SearchParam.cs b/TextLocator/Entity/SearchParam.cs
index 0f27a60..d7fd3bc 100644
--- a/TextLocator/Entity/SearchParam.cs
+++ b/TextLocator/Entity/SearchParam.cs
@@ -29,9 +29,9 @@ namespace TextLocator.Entity
         /// </summary>
         public bool IsMatchWords { get; set; }
         /// <summary>
-        /// 仅文件名
+        /// 搜索域
         /// </summary>
-        public bool IsOnlyFileName { get; set; }
+        public SearchRegion SearchRegion { get; set; }
         /// <summary>
         /// 分页索引
         /// </summary>
diff --git a/TextLocator/Enums/SearchRegion.cs b/TextLocator/Enums/SearchRegion.cs
new file mode 100644
index 0000000..d1a3330
--- /dev/null
+++ b/TextLocator/Enums/SearchRegion.cs
@@ -0,0 +1,22 @@
+namespace TextLocator.Enums
+{
+    /// <summary>
+    /// 搜索域
+    /// </summary>
+    public enum SearchRegion
+    {
+        /// <summary>
+        /// 文件名和内容
+        /// </summary>
+        文件名和内容,
+        /// <summary>
+        /// 仅文件名
+        /// </summary>
+        仅文件名,
+        /// <summary>
+        /// 进文件内容
+        /// </summary>
+        仅文件内容
+
+    }
+}
diff --git a/TextLocator/Index/IndexCore.cs b/TextLocator/Index/IndexCore.cs
index 52cf45f..f49139f 100644
--- a/TextLocator/Index/IndexCore.cs
+++ b/TextLocator/Index/IndexCore.cs
@@ -241,7 +241,7 @@ namespace TextLocator.Index
                 create = isRebuild;
             }
 
-            // 创建还是更新？
+            // 创建则删除全部标记
             if (create)
             {
                 // 重建时，删除全部标记
@@ -647,21 +647,23 @@ namespace TextLocator.Index
             {
                 // 搜索域加权
                 Dictionary<string, float> boosts = new Dictionary<string, float>();
-                boosts["Content"] = 1.2f;
-                boosts["FileName"] = 1.0f;
-
                 // 搜索域列表
                 List<string> fields = new List<string>();
-                fields.Add("FileName");
 
-                if (!param.IsOnlyFileName)
+                // 搜索域设置
+                if (param.SearchRegion == SearchRegion.文件名和内容 || param.SearchRegion == SearchRegion.仅文件名)
+                {
+                    boosts["FileName"] = 1.0f;
+                    fields.Add("FileName");
+                }
+                if (param.SearchRegion == SearchRegion.文件名和内容 || param.SearchRegion == SearchRegion.仅文件内容)
                 {
+                    boosts["Content"] = 1.2f;
                     fields.Add("Content");
                 }
 
                 // 查询转换器
-                Lucene.Net.QueryParsers.QueryParser parser =
-                    new Lucene.Net.QueryParsers.MultiFieldQueryParser(
+                Lucene.Net.QueryParsers.QueryParser queryParser = new Lucene.Net.QueryParsers.MultiFieldQueryParser(
                         // Lucence版本
                         Lucene.Net.Util.Version.LUCENE_30,
                         // 搜索域列表
@@ -684,21 +686,25 @@ namespace TextLocator.Index
                     if (AppConst.REGEX_SUPPORT_WILDCARDS.IsMatch(keyword))
                     {
                         tag = "正则";
-                        // 文件名
-                        RegexQuery regexFileName = new RegexQuery(new Lucene.Net.Index.Term("FileName", keyword));
-                        boolQuery.Add(regexFileName, Lucene.Net.Search.Occur.SHOULD);
 
-                        if (!param.IsOnlyFileName)
+                        // 搜索域设置
+                        if (param.SearchRegion == SearchRegion.文件名和内容 || param.SearchRegion == SearchRegion.仅文件名)
+                        {
+                            // 文件名
+                            RegexQuery regexFileName = new RegexQuery(new Lucene.Net.Index.Term("FileName", keyword));
+                            boolQuery.Add(regexFileName, Lucene.Net.Search.Occur.SHOULD);
+                        }
+                        if (param.SearchRegion == SearchRegion.文件名和内容 || param.SearchRegion == SearchRegion.仅文件内容)
                         {
                             // 文件内容
                             RegexQuery regexContentQuery = new RegexQuery(new Lucene.Net.Index.Term("Content", keyword));
                             boolQuery.Add(regexContentQuery, Lucene.Net.Search.Occur.SHOULD);
-                        }                        
+                        }
                     }
                     // 常规
                     else
                     {
-                        Lucene.Net.Search.Query query = parser.Parse(Lucene.Net.QueryParsers.QueryParser.Escape(keyword));
+                        Lucene.Net.Search.Query query = queryParser.Parse(Lucene.Net.QueryParsers.QueryParser.Escape(keyword));
                         boolQuery.Add(query, param.IsMatchWords ? Lucene.Net.Search.Occur.MUST : Lucene.Net.Search.Occur.SHOULD);
                     }
                 }
diff --git a/TextLocator/MainWindow.xaml b/TextLocator/MainWindow.xaml
index 1c8255f..a37f5e7 100644
--- a/TextLocator/MainWindow.xaml
+++ b/TextLocator/MainWindow.xaml
@@ -119,11 +119,15 @@
                                 <StackPanel Orientation="Horizontal">
                                     <Grid Margin="10">
                                         <!-- 匹配全词 -->
-                                        <CheckBox x:Name="MatchWords" Content="匹配全词" FontSize="16" HorizontalAlignment="Left" VerticalContentAlignment="Center" Checked="MatchWords_Checked" Unchecked="MatchWords_Unchecked"/>
+                                        <CheckBox x:Name="MatchWords" Content="匹配全词" FontSize="16" HorizontalAlignment="Left" VerticalContentAlignment="Center" Checked="CheckBoxCheckStatusChange" Unchecked="CheckBoxCheckStatusChange"/>
                                     </Grid>
-                                    <Grid Margin="10">
-                                        <!-- 仅文件名 -->
-                                        <CheckBox x:Name="OnlyFileName" Content="仅文件名" FontSize="16" HorizontalAlignment="Left" VerticalContentAlignment="Center" Checked="OnlyFileName_Checked" Unchecked="OnlyFileName_Unchecked"/>
+                                    <!-- 搜索范围 -->
+                                    <Grid Margin="10,0,0,0">
+                                        <ComboBox x:Name="SearchScope" Margin="0,0,10,0" FontSize="16" Width="130" Height="30" HorizontalAlignment="Left" SelectionChanged="SearchScope_SelectionChanged">
+                                            <ComboBoxItem Content="文件名和内容" IsSelected="True"/>
+                                            <ComboBoxItem Content="仅文件名"/>
+                                            <ComboBoxItem Content="仅文件内容"/>
+                                        </ComboBox>
                                     </Grid>
                                 </StackPanel>
                                 <!-- 排序 -->
diff --git a/TextLocator/MainWindow.xaml.cs b/TextLocator/MainWindow.xaml.cs
index e9c51fd..81cad52 100644
--- a/TextLocator/MainWindow.xaml.cs
+++ b/TextLocator/MainWindow.xaml.cs
@@ -456,8 +456,6 @@ namespace TextLocator
             // ---- 搜索按钮时，下拉框和其他筛选条件全部恢复默认值
             // 取消匹配全词
             MatchWords.IsChecked = false;
-            // 取消区分大小写
-            OnlyFileName.IsChecked = false;
 
             // 全部文件类型
             ToggleButtonAutomationPeer toggleButtonAutomationPeer = new ToggleButtonAutomationPeer(_radioButtonAll);
@@ -467,7 +465,7 @@ namespace TextLocator
             // 默认排序
             SortOptions.SelectedIndex = 0;
             // 文件名和内容
-            //SearchScope.SelectedIndex = 0;
+            SearchScope.SelectedIndex = 0;
 
             BeforeSearch();
         }
@@ -487,8 +485,6 @@ namespace TextLocator
                 // ---- 搜索按钮时，下拉框和其他筛选条件全部恢复默认值
                 // 取消匹配全词
                 MatchWords.IsChecked = false;
-                // 取消区分大小写
-                OnlyFileName.IsChecked = false;
 
                 // 全部文件类型
                 ToggleButtonAutomationPeer toggleButtonAutomationPeer = new ToggleButtonAutomationPeer(_radioButtonAll);
@@ -498,7 +494,7 @@ namespace TextLocator
                 // 默认排序
                 SortOptions.SelectedIndex = 0;
                 // 文件名和内容
-                //SearchScope.SelectedIndex = 0;
+                SearchScope.SelectedIndex = 0;
 
                 BeforeSearch();
 
@@ -690,12 +686,13 @@ namespace TextLocator
             IToggleProvider toggleProvider = toggleButtonAutomationPeer.GetPattern(PatternInterface.Toggle) as IToggleProvider;
             toggleProvider.Toggle();
 
-            // 仅文件名 和 全词匹配取消选中
-            OnlyFileName.IsChecked = false;
+            // 全词匹配取消选中
             MatchWords.IsChecked = false;
 
             // 排序类型切换为默认
             SortOptions.SelectedIndex = 0;
+            // 文件名和内容
+            SearchScope.SelectedIndex = 0;
 
             // -------- 搜索结果列表
             // 搜索结果列表清空
@@ -864,6 +861,15 @@ namespace TextLocator
 
         #region 界面事件
         /// <summary>
+        /// 搜索域切换
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SearchScope_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            BeforeSearch();
+        }
+        /// <summary>
         /// 文件类型过滤器选中事件
         /// </summary>
         /// <param name="sender"></param>
@@ -882,43 +888,11 @@ namespace TextLocator
         }
 
         /// <summary>
-        /// 仅文件名选中时
+        /// 复选框选中状态切换
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void OnlyFileName_Checked(object sender, RoutedEventArgs e)
-        {
-
-            BeforeSearch();
-        }
-
-        /// <summary>
-        /// 仅文件名取消选中时
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void OnlyFileName_Unchecked(object sender, RoutedEventArgs e)
-        {
-            BeforeSearch();
-        }
-
-        /// <summary>
-        /// 匹配全瓷选中
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void MatchWords_Checked(object sender, RoutedEventArgs e)
-        {
-
-            BeforeSearch();
-        }
-
-        /// <summary>
-        /// 匹配全瓷取消选中
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void MatchWords_Unchecked(object sender, RoutedEventArgs e)
+        private void CheckBoxCheckStatusChange(object sender, RoutedEventArgs e)
         {
             BeforeSearch();
         }
@@ -1128,6 +1102,13 @@ namespace TextLocator
                     // 不同区域，索引分开记录
                     string areaIdIndex = areaInfo.AreaId + "Index";
 
+                    // 重建则删除全部标记
+                    if (isRebuild)
+                    {
+                        // 重建时，删除全部标记
+                        AppUtil.DeleteSection(areaIdIndex);
+                    }
+
                     // -------- 开始获取文件列表
                     string msg = string.Format("搜索区【{0}】，开始扫描文件...", areaInfo.AreaName);
                     log.Info(msg);
@@ -1498,8 +1479,7 @@ namespace TextLocator
                 FileType = filter == null ? null : filter + "",
                 SortType = (SortType)SortOptions.SelectedValue,
                 IsMatchWords = (bool)MatchWords.IsChecked,
-                IsOnlyFileName = (bool)OnlyFileName.IsChecked,
-                // SearchRegion = (SearchRegion)SearchScope.SelectedValue,
+                SearchRegion = (SearchRegion)SearchScope.SelectedValue,
                 PageSize = PageSize,
                 PageIndex = PageNow
             };
diff --git a/TextLocator/TextLocator.csproj b/TextLocator/TextLocator.csproj
index 05a2417..d81219d 100644
--- a/TextLocator/TextLocator.csproj
+++ b/TextLocator/TextLocator.csproj
@@ -275,6 +275,7 @@
     <Compile Include="Entity\AreaInfo.cs" />
     <Compile Include="Entity\SearchParam.cs" />
     <Compile Include="Entity\SearchResult.cs" />
+    <Compile Include="Enums\SearchRegion.cs" />
     <Compile Include="Exceptions\FileSizeTooBigException.cs" />
     <Compile Include="Exceptions\NotFoundFileServiceException.cs" />
     <Compile Include="Index\RegexQuery.cs" />
-- 
Gitee


From a0e2fd63e00a08e0af0b8c71e2afe99803465426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Thu, 21 Apr 2022 23:11:14 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=85=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E3=80=81=E6=94=B9=E4=B8=BA=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/MainWindow.xaml    | 10 ++--------
 TextLocator/MainWindow.xaml.cs | 35 ++++++++++++++++++++++++----------
 TextLocator/Util/AppUtil.cs    | 10 ++++++----
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/TextLocator/MainWindow.xaml b/TextLocator/MainWindow.xaml
index a37f5e7..b15689b 100644
--- a/TextLocator/MainWindow.xaml
+++ b/TextLocator/MainWindow.xaml
@@ -115,7 +115,7 @@
                         <Grid HorizontalAlignment="Stretch" Grid.Column="0">
                             <!-- 条件和排序 -->
                             <Grid Height="40" VerticalAlignment="Top" Background="#F3F3F3">
-                                <!-- 复选框 -->
+                                <!-- 条件 -->
                                 <StackPanel Orientation="Horizontal">
                                     <Grid Margin="10">
                                         <!-- 匹配全词 -->
@@ -130,8 +130,8 @@
                                         </ComboBox>
                                     </Grid>
                                 </StackPanel>
+                                
                                 <!-- 排序 -->
-                                <!-- <Button Content="默认排序" Margin="0,0,10,0"  Width="65" Height="25" HorizontalAlignment="Right"/> -->
                                 <Label Content="排序：" FontSize="14"  Margin="0,0,110,0"  Height="25" HorizontalAlignment="Right" VerticalContentAlignment="Center" />
                                 <ComboBox x:Name="SortOptions" Margin="0,0,10,0"  Width="100" Height="25" HorizontalAlignment="Right" SelectionChanged="SortOptions_SelectionChanged">
                                     <ComboBoxItem Content="默认排序" IsSelected="True"/>
@@ -140,12 +140,6 @@
                                     <ComboBoxItem Content="从小到大"/>
                                     <ComboBoxItem Content="从大到小"/>
                                 </ComboBox>
-                                <!-- <TextBlock Text="排序：" Margin="0,0,280,0" HorizontalAlignment="Right"/>
-                                <Button x:Name="SortDefault" Content="默认" Margin="0,0,220,0"  Width="60" Height="20" HorizontalAlignment="Right"/>
-                                <Button Content="匹配度" Margin="0,0,150,0"  Width="60" Height="20" HorizontalAlignment="Right" Background="Gray"/>
-
-                                <Button x:Name="SortTime" Content="时间" Margin="0,0,80,0" Width="60" Height="20" HorizontalAlignment="Right" Background="Gray"/>
-                                <Button x:Name="SortSize" Content="大小" Margin="0,0,10,0" Width="60" Height="20" HorizontalAlignment="Right" Background="Gray"/> -->
 
                                 <!-- 分割线 -->
                                 <GridSplitter Grid.Column="1" Height="1" Cursor="Arrow" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" Background="Gray" />
diff --git a/TextLocator/MainWindow.xaml.cs b/TextLocator/MainWindow.xaml.cs
index 81cad52..fe7725a 100644
--- a/TextLocator/MainWindow.xaml.cs
+++ b/TextLocator/MainWindow.xaml.cs
@@ -43,10 +43,6 @@ namespace TextLocator
         /// </summary>
         private long _timestamp;
         /// <summary>
-        /// 总条数
-        /// </summary>
-        private int _totalCount = 0;
-        /// <summary>
         /// 搜索参数
         /// </summary>
         private Entity.SearchParam _searchParam;
@@ -126,6 +122,9 @@ namespace TextLocator
             // 初始化排序类型列表
             InitializeSortType();
 
+            // 初始化搜索域列表
+            InitializeSearchRegion();
+
             // 清理事件（必须放在初始化之后，否则类型筛选的选中Reset可能存在错误）
             ResetSearchResult();
 
@@ -176,6 +175,21 @@ namespace TextLocator
             this.Title = string.Format("{0} v{1} (开放版)", this.Title, version);
         }
 
+        /// <summary>
+        /// 初始化搜索域
+        /// </summary>
+        private void InitializeSearchRegion()
+        {
+            TaskTime taskTime = TaskTime.StartNew();
+            Array regions = Enum.GetValues(typeof(SearchRegion));
+            SearchScope.Items.Clear();
+            foreach (var region in regions)
+            {
+                SearchScope.Items.Add(region);
+            }
+            log.Debug("InitializeSearchRegion 耗时：" + taskTime.ConsumeTime + "。");
+        }
+
         /// <summary>
         /// 初始化排序类型列表
         /// </summary>
@@ -277,7 +291,6 @@ namespace TextLocator
 
             log.Debug("InitializeAppConfig 耗时：" + taskTime.ConsumeTime + "。");
         }
-
         #endregion
 
         #region 热键注册
@@ -425,6 +438,8 @@ namespace TextLocator
                             this.Dispatcher.BeginInvoke(new Action(() =>
                             {
                                 this.SearchText.Text = builder.ToString().Trim();
+                                // 标记为文件
+                                this.SearchText.Tag = "File";
 
                                 // 搜索前
                                 BeforeSearch();
@@ -512,6 +527,11 @@ namespace TextLocator
         {
             // 如果文本为空则隐藏清空按钮，如果不为空则显示清空按钮
             this.CleanButton.Visibility = this.SearchText.Text.Length > 0 ? Visibility.Visible : Visibility.Hidden;
+            // 文本框为空时还原为默认
+            if (this.SearchText.Text.Length <= 0)
+            {
+                this.SearchText.Tag = null;
+            }
         }
 
         /// <summary>
@@ -532,8 +552,6 @@ namespace TextLocator
             {
                 try
                 {
-                    // 重置总数未0
-                    _totalCount = 0;
                     // 清空搜索结果列表
                     Dispatcher.Invoke(new Action(() =>
                     {
@@ -553,9 +571,6 @@ namespace TextLocator
                         return;
                     }
 
-                    // 标记总数
-                    _totalCount = searchResult.Total;
-
                     // 遍历结果
                     foreach (Entity.FileInfo fileInfo in searchResult.Results)
                     {
diff --git a/TextLocator/Util/AppUtil.cs b/TextLocator/Util/AppUtil.cs
index adb5ae7..031b297 100644
--- a/TextLocator/Util/AppUtil.cs
+++ b/TextLocator/Util/AppUtil.cs
@@ -124,9 +124,7 @@ namespace TextLocator.Util
                             sectionDic[key] = value;
                     }
                     else
-                    {
-                        sectionDic.Add(key, value);
-                    }
+                    	sectionDic.Add(key, value);
                     if (_AppIniCache.ContainsKey(section))
                         _AppIniCache[section] = sectionDic;
                     else
@@ -178,7 +176,11 @@ namespace TextLocator.Util
                     lock(locker)
                     {
                         Dictionary<string, string> sectionDic = _AppIniCache.ContainsKey(section) ? _AppIniCache[section] : new Dictionary<string, string>();
-                        sectionDic[key] = def;
+                        if (sectionDic.ContainsKey(key))
+                            sectionDic[key] = def;
+                        else
+                            sectionDic.Add(key, def);
+
                         if (_AppIniCache.ContainsKey(section))
                             _AppIniCache[section] = sectionDic;
                         else
-- 
Gitee


From ebbacf1e79b4a463efbea225f09e34109c146761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Fri, 22 Apr 2022 01:22:42 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AF=8D=E9=AB=98?=
 =?UTF-8?q?=E4=BA=AE=E4=BC=98=E5=8C=96=EF=BC=8C=E6=90=9C=E7=B4=A2=E5=9F=9F?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=EF=BC=8C=E5=85=B3=E9=94=AE=E8=AF=8D=E9=AB=98?=
 =?UTF-8?q?=E4=BA=AE=E4=B9=9F=E4=B8=8D=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/FileInfoItem.xaml.cs | 32 +++++++++++-----
 TextLocator/Index/IndexCore.cs   | 63 ++++++++++++++++----------------
 TextLocator/MainWindow.xaml      | 19 +++++-----
 TextLocator/MainWindow.xaml.cs   |  2 +-
 4 files changed, 65 insertions(+), 51 deletions(-)

diff --git a/TextLocator/FileInfoItem.xaml.cs b/TextLocator/FileInfoItem.xaml.cs
index 050abae..0a42167 100644
--- a/TextLocator/FileInfoItem.xaml.cs
+++ b/TextLocator/FileInfoItem.xaml.cs
@@ -15,7 +15,12 @@ namespace TextLocator
     {
         private static readonly ILog log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
-        public FileInfoItem(Entity.FileInfo fileInfo)
+        /// <summary>
+        /// 文件信息显示条目
+        /// </summary>
+        /// <param name="fileInfo">文件信息</param>
+        /// <param name="searchRegion">搜索域</param>
+        public FileInfoItem(Entity.FileInfo fileInfo, Enums.SearchRegion searchRegion)
         {
             InitializeComponent();
 
@@ -23,14 +28,14 @@ namespace TextLocator
 
             try
             {
-                Refresh(fileInfo);
+                Refresh(fileInfo, searchRegion);
             }
             catch {
                 this.Dispatcher.BeginInvoke(new Action(() =>
                 {
                     try
                     {
-                        Refresh(fileInfo);
+                        Refresh(fileInfo, searchRegion);
                     }
                     catch (Exception ex)
                     {
@@ -43,8 +48,9 @@ namespace TextLocator
         /// <summary>
         /// 刷新数据
         /// </summary>
-        /// <param name="fileInfo"></param>
-        public void Refresh(Entity.FileInfo fileInfo)
+        /// <param name="fileInfo">文件信息</param>
+        /// <param name="searchRegion">搜索域</param>
+        public void Refresh(Entity.FileInfo fileInfo, Enums.SearchRegion searchRegion)
         {
             // 根据文件类型显示图标
             this.FileTypeIcon.Source = FileUtil.GetFileIcon(fileInfo.FileType);
@@ -56,7 +62,10 @@ namespace TextLocator
             string fileName = fileInfo.FileName;
             // 显示文件名称
             RichTextBoxUtil.FillingData(this.FileName, fileName.Length > 55 ? fileName.Substring(0, 55) + "..." : fileName, (Brush)new BrushConverter().ConvertFromString("#1A0DAB"), true);
-            RichTextBoxUtil.Highlighted(this.FileName, Colors.Red, fileInfo.Keywords);
+            if (searchRegion == Enums.SearchRegion.文件名和内容 || searchRegion == Enums.SearchRegion.仅文件名)
+            {
+                RichTextBoxUtil.Highlighted(this.FileName, Colors.Red, fileInfo.Keywords);
+            }
 
             string filePath = fileInfo.FilePath.Replace(fileInfo.FileName, "");
             // 文件路径
@@ -68,13 +77,16 @@ namespace TextLocator
                 this.Dispatcher.BeginInvoke(new Action(() =>
                 {
                     RichTextBoxUtil.FillingData(this.ContentBreviary, breviary, (Brush)new BrushConverter().ConvertFromString("#545454"));
-                    RichTextBoxUtil.Highlighted(this.ContentBreviary, Colors.Red, fileInfo.Keywords);
+                    if (searchRegion == Enums.SearchRegion.文件名和内容 || searchRegion == Enums.SearchRegion.仅文件内容)
+                    {
+                        RichTextBoxUtil.Highlighted(this.ContentBreviary, Colors.Red, fileInfo.Keywords);
+                    }
                 }));
             });
 
-            // 词频统计
+           /* // 词频统计
             Task.Factory.StartNew(() => {
-                string keywordFrequency = IndexCore.GetKeywordFrequency(fileInfo);
+                string keywordFrequency = IndexCore.GetKeywordFrequency(fileInfo, searchRegion);
                 this.Dispatcher.BeginInvoke(new Action(() => {
                     if (!string.IsNullOrWhiteSpace(keywordFrequency))
                     {
@@ -82,7 +94,7 @@ namespace TextLocator
                         this.FileTypeIcon.ToolTip = keywordFrequency;
                     }
                 }));
-            });
+            });*/
         }
     }
 }
diff --git a/TextLocator/Index/IndexCore.cs b/TextLocator/Index/IndexCore.cs
index f49139f..b85e269 100644
--- a/TextLocator/Index/IndexCore.cs
+++ b/TextLocator/Index/IndexCore.cs
@@ -864,53 +864,54 @@ namespace TextLocator.Index
         /// 获取关键词词频
         /// </summary>
         /// <param name="fileInfo">文件信息</param>
+        /// <param name="searchRegion">搜索域</param>
         /// <param name="autoNewLine">自动换行</param>
         /// <returns></returns>
-        public static string GetKeywordFrequency(Entity.FileInfo fileInfo, bool autoNewLine = true)
-        {
-            return GetKeywordFrequency(fileInfo.Keywords, fileInfo.FileName, fileInfo.Preview, autoNewLine);
-        }
-
-        /// <summary>
-        /// 获取关键词词频
-        /// </summary>
-        /// <param name="keywords">关键词列表</param>
-        /// <param name="fileName">文件名</param>
-        /// <param name="preview">文件内容</param>
-        /// <param name="autoNewLine">自动换行</param>
-        /// <returns></returns>
-        private static string GetKeywordFrequency(List<string> keywords, string fileName, string preview, bool autoNewLine = true)
+        public static string GetKeywordFrequency(Entity.FileInfo fileInfo, SearchRegion searchRegion, bool autoNewLine = true)
         {
             try
             {
-                // 获取内容（预览内容替换----\d+----）
-                string content = AppConst.REGEX_CONTENT_PAGE.Replace(preview, "");
-
                 TaskTime taskTime = TaskTime.StartNew();
                 // 定义词频词典
                 Dictionary<string, int> frequencyDic = new Dictionary<string, int>();
 
                 // 遍历关键词
-                foreach (string keyword in keywords)
+                foreach (string keyword in fileInfo.Keywords)
                 {
-                    // 声明正则
-                    Regex regex = new Regex(keyword);
-                    // 匹配文件名
-                    Match matchName = regex.Match(fileName), matchContent = regex.Match(content);
                     // 匹配内容
                     int matchNameCount = 0, matchContentCount = 0;
-                    // 文件名匹配成功
-                    if (matchName.Success)
+                    // 声明正则
+                    Regex regex = new Regex(keyword);
+
+                    // ---- 匹配文件名
+                    if (searchRegion == SearchRegion.文件名和内容 || searchRegion == SearchRegion.仅文件名)
                     {
-                        // 获取匹配次数
-                        matchNameCount = regex.Matches(fileName).Count;
+                        // 匹配文件名
+                        Match matchName = regex.Match(fileInfo.FileName);
+                        // 文件名匹配成功
+                        if (matchName.Success)
+                        {
+                            // 获取匹配次数
+                            matchNameCount = regex.Matches(fileInfo.FileName).Count;
+                        }
                     }
-                    // 文件内容匹配成功
-                    if (matchContent.Success)
+
+                    // ---- 匹配文件内容
+                    if (searchRegion == SearchRegion.文件名和内容 || searchRegion == SearchRegion.仅文件内容)
                     {
-                        // 获取匹配次数
-                        matchContentCount = regex.Matches(content).Count;
+                        // 获取内容（预览内容替换----\d+----）
+                        string content = AppConst.REGEX_CONTENT_PAGE.Replace(fileInfo.Preview, "");
+
+                        // 匹配文件内容
+                        Match matchContent = regex.Match(content);
+                        // 文件内容匹配成功
+                        if (matchContent.Success)
+                        {
+                            // 获取匹配次数
+                            matchContentCount = regex.Matches(content).Count;
+                        }
                     }
+                    
                     // 匹配数量合并
                     int count = matchNameCount + matchContentCount;
                     // 匹配次数大于才是有效值
@@ -936,7 +937,7 @@ namespace TextLocator.Index
                 {
                     text = text.Substring(0, text.Length - 1);
                 }
-                log.Debug(fileName + " -> 词频统计耗时：" + taskTime.ConsumeTime + " 统计词频：" + text);
+                log.Debug(fileInfo.FileName + " -> 词频统计耗时：" + taskTime.ConsumeTime + " 统计词频：" + text);
                 return text;
             }
             catch (Exception ex)
diff --git a/TextLocator/MainWindow.xaml b/TextLocator/MainWindow.xaml
index b15689b..ba95a2e 100644
--- a/TextLocator/MainWindow.xaml
+++ b/TextLocator/MainWindow.xaml
@@ -117,23 +117,24 @@
                             <Grid Height="40" VerticalAlignment="Top" Background="#F3F3F3">
                                 <!-- 条件 -->
                                 <StackPanel Orientation="Horizontal">
-                                    <Grid Margin="10">
-                                        <!-- 匹配全词 -->
-                                        <CheckBox x:Name="MatchWords" Content="匹配全词" FontSize="16" HorizontalAlignment="Left" VerticalContentAlignment="Center" Checked="CheckBoxCheckStatusChange" Unchecked="CheckBoxCheckStatusChange"/>
-                                    </Grid>
-                                    <!-- 搜索范围 -->
-                                    <Grid Margin="10,0,0,0">
-                                        <ComboBox x:Name="SearchScope" Margin="0,0,10,0" FontSize="16" Width="130" Height="30" HorizontalAlignment="Left" SelectionChanged="SearchScope_SelectionChanged">
+                                    <!-- 搜索域 -->
+                                    <Grid Margin="10,0,10,0">
+                                        <ComboBox x:Name="SearchScope" Margin="0,0,10,0" FontSize="16" Width="130" HorizontalAlignment="Left" VerticalAlignment="Center" SelectionChanged="SearchScope_SelectionChanged">
                                             <ComboBoxItem Content="文件名和内容" IsSelected="True"/>
                                             <ComboBoxItem Content="仅文件名"/>
                                             <ComboBoxItem Content="仅文件内容"/>
                                         </ComboBox>
                                     </Grid>
+                                    <!-- 筛选条件 -->
+                                    <Grid Margin="10">
+                                        <!-- 匹配全词 -->
+                                        <CheckBox x:Name="MatchWords" Content="匹配全词" FontSize="16" HorizontalAlignment="Left" VerticalContentAlignment="Center" Checked="CheckBoxCheckStatusChange" Unchecked="CheckBoxCheckStatusChange"/>
+                                    </Grid>                                    
                                 </StackPanel>
                                 
                                 <!-- 排序 -->
-                                <Label Content="排序：" FontSize="14"  Margin="0,0,110,0"  Height="25" HorizontalAlignment="Right" VerticalContentAlignment="Center" />
-                                <ComboBox x:Name="SortOptions" Margin="0,0,10,0"  Width="100" Height="25" HorizontalAlignment="Right" SelectionChanged="SortOptions_SelectionChanged">
+                                <Label Content="排序：" FontSize="14"  Margin="0,0,110,0" HorizontalAlignment="Right" VerticalContentAlignment="Center" />
+                                <ComboBox x:Name="SortOptions" Margin="0,0,10,0"  Width="100" HorizontalAlignment="Right" VerticalAlignment="Center" SelectionChanged="SortOptions_SelectionChanged">
                                     <ComboBoxItem Content="默认排序" IsSelected="True"/>
                                     <ComboBoxItem Content="从远到近"/>
                                     <ComboBoxItem Content="从近到远"/>
diff --git a/TextLocator/MainWindow.xaml.cs b/TextLocator/MainWindow.xaml.cs
index fe7725a..e64d4bc 100644
--- a/TextLocator/MainWindow.xaml.cs
+++ b/TextLocator/MainWindow.xaml.cs
@@ -580,7 +580,7 @@ namespace TextLocator
                         }
                         this.Dispatcher.Invoke(new Action(() =>
                         {
-                            this.SearchResultList.Items.Add(new FileInfoItem(fileInfo));
+                            this.SearchResultList.Items.Add(new FileInfoItem(fileInfo, searchParam.SearchRegion));
                         }));
                     }
 
-- 
Gitee


From 2f7187c3f84ec8548fa84cf890294ac9288bbe78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Fri, 22 Apr 2022 11:06:31 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/Entity/SearchParam.cs |  2 +-
 TextLocator/Enums/FileType.cs     |  5 ++++
 TextLocator/Index/IndexCore.cs    |  4 +--
 TextLocator/MainWindow.xaml.cs    | 48 ++++++++++++-------------------
 4 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/TextLocator/Entity/SearchParam.cs b/TextLocator/Entity/SearchParam.cs
index d7fd3bc..98a5fd3 100644
--- a/TextLocator/Entity/SearchParam.cs
+++ b/TextLocator/Entity/SearchParam.cs
@@ -19,7 +19,7 @@ namespace TextLocator.Entity
         /// <summary>
         /// 文件类型
         /// </summary>
-        public string FileType { get; set; }
+        public FileType FileType { get; set; }
         /// <summary>
         /// 排序规则
         /// </summary>
diff --git a/TextLocator/Enums/FileType.cs b/TextLocator/Enums/FileType.cs
index 2d0aa68..d94aa78 100644
--- a/TextLocator/Enums/FileType.cs
+++ b/TextLocator/Enums/FileType.cs
@@ -7,6 +7,11 @@ namespace TextLocator.Enums
     /// </summary>
     public enum FileType
     {
+        /// <summary>
+        /// 全部
+        /// </summary>
+        [Description("all")]
+        全部,
         /// <summary>
         /// Word文档
         /// </summary>
diff --git a/TextLocator/Index/IndexCore.cs b/TextLocator/Index/IndexCore.cs
index b85e269..c78b542 100644
--- a/TextLocator/Index/IndexCore.cs
+++ b/TextLocator/Index/IndexCore.cs
@@ -713,10 +713,10 @@ namespace TextLocator.Index
 
                 // 文件类型筛选（文件类型为全部时，则为空）
                 Lucene.Net.Search.TermsFilter filter = null;
-                if (!string.IsNullOrEmpty(param.FileType))
+                if (param.FileType != FileType.全部)
                 {
                     filter = new Lucene.Net.Search.TermsFilter();
-                    filter.AddTerm(new Lucene.Net.Index.Term("FileType", param.FileType));
+                    filter.AddTerm(new Lucene.Net.Index.Term("FileType", param.FileType.ToString()));
                 }
                 log.Debug("组合搜索条件：" + boolQuery.ToString());
 
diff --git a/TextLocator/MainWindow.xaml.cs b/TextLocator/MainWindow.xaml.cs
index e64d4bc..aeb47ce 100644
--- a/TextLocator/MainWindow.xaml.cs
+++ b/TextLocator/MainWindow.xaml.cs
@@ -213,39 +213,32 @@ namespace TextLocator
             TaskTime taskTime = TaskTime.StartNew();
             // 文件类型筛选下拉框数据初始化
             FileTypeFilter.Children.Clear();
-
-            _radioButtonAll = new RadioButton()
-            {
-                GroupName = "FileTypeFilter",
-                Width = 80,
-                Margin = new Thickness(1),
-                Tag = "全部",
-                Content = "全部",
-                Name = "FileTypeAll",
-                IsChecked = true,
-                ToolTip = "All"
-            };
-            _radioButtonAll.Checked += FileType_Checked;
-            FileTypeFilter.Children.Add(_radioButtonAll);
-
-
-            // 获取文件类型枚举，遍历并加入下拉列表
+            // 遍历文件类型枚举
             foreach (FileType fileType in Enum.GetValues(typeof(FileType)))
             {
+                // 构造UI元素
                 RadioButton radioButton = new RadioButton()
                 {
                     GroupName = "FileTypeFilter",
+                    Name = "FileType" + fileType.ToString(),
                     Width = 80,
                     Margin = new Thickness(1),
-                    Tag = fileType.ToString(),
+                    Tag = fileType,
                     Content = fileType.ToString(),
-                    Name = "FileType" + fileType.ToString(),
-                    IsChecked = false,
+                    IsChecked = fileType == FileType.全部,
                     ToolTip = fileType.GetDescription()
                 };
                 radioButton.Checked += FileType_Checked;
                 FileTypeFilter.Children.Add(radioButton);
+
+                // 缓存全部，用于还原到默认值（因为默认选中全部）
+                if (fileType == FileType.全部)
+                {
+                    _radioButtonAll = radioButton;
+                }
             }
+            // 搜索筛选条件直接读取的当前值，初始化时默认赋值全部。其他选项修改时会更改此值
+            FileTypeFilter.Tag = FileType.全部;
             log.Debug("InitializeFileTypeFilters 耗时：" + taskTime.ConsumeTime + "。");
         }
 
@@ -891,13 +884,15 @@ namespace TextLocator
         /// <param name="e"></param>
         private void FileType_Checked(object sender, RoutedEventArgs e)
         {
-            if (!"全部".Equals((sender as RadioButton).Content) && GetSearchTextKeywords().Count <= 0)
+            RadioButton radio = sender as RadioButton;
+            FileType fileType = (FileType)radio.Tag;
+            if (fileType != FileType.全部 && GetSearchTextKeywords().Count <= 0)
             {
                 ResetSearchResult();
                 return;
             }
 
-            FileTypeFilter.Tag = (sender as RadioButton).Content;
+            FileTypeFilter.Tag = fileType;
 
             BeforeSearch();
         }
@@ -1446,15 +1441,8 @@ namespace TextLocator
                 }));
             }
 
-            object filter = FileTypeFilter.Tag;
-            if (filter == null || filter.Equals("全部"))
-            {
-                filter = null;
-            }
-
             // 获取搜索关键词列表
             List<string> keywords = GetSearchTextKeywords();
-
             if (keywords.Count <= 0)
             {
                 return;
@@ -1491,7 +1479,7 @@ namespace TextLocator
             _searchParam = new Entity.SearchParam()
             {
                 Keywords = keywords,
-                FileType = filter == null ? null : filter + "",
+                FileType = (FileType)FileTypeFilter.Tag,
                 SortType = (SortType)SortOptions.SelectedValue,
                 IsMatchWords = (bool)MatchWords.IsChecked,
                 SearchRegion = (SearchRegion)SearchScope.SelectedValue,
-- 
Gitee


From fb18aea7235d0c573287d627d8e879cdf93cacab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Fri, 22 Apr 2022 15:57:54 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/Core/AppConst.cs      |   2 -
 TextLocator/Dict/stopwords.txt    |   3 +
 TextLocator/Entity/SearchParam.cs |   4 +
 TextLocator/FileInfoItem.xaml.cs  |   4 +-
 TextLocator/Index/IndexCore.cs    |  21 ++--
 TextLocator/MainWindow.xaml       |  37 +++---
 TextLocator/MainWindow.xaml.cs    | 190 ++++++++++--------------------
 TextLocator/TextLocator.csproj    |  36 +++---
 TextLocator/Util/AppUtil.cs       |   2 +-
 TextLocator/Util/AreaUtil.cs      |   2 -
 10 files changed, 121 insertions(+), 180 deletions(-)

diff --git a/TextLocator/Core/AppConst.cs b/TextLocator/Core/AppConst.cs
index 6e8f10e..e44a81b 100644
--- a/TextLocator/Core/AppConst.cs
+++ b/TextLocator/Core/AppConst.cs
@@ -111,7 +111,6 @@ namespace TextLocator.Core
         /// </summary>
         public static readonly Regex REGEX_CONTENT_PAGE = new Regex(@"----\d+----");
 
-
         /// <summary>
         /// 索引写入器
         /// </summary>
@@ -136,6 +135,5 @@ namespace TextLocator.Core
         /// 区域配置
         /// </summary>
         public const string AREA_CONFIG_KEY = "AreaConfig";
-
     }
 }
diff --git a/TextLocator/Dict/stopwords.txt b/TextLocator/Dict/stopwords.txt
index 4d5f146..d1daf91 100644
--- a/TextLocator/Dict/stopwords.txt
+++ b/TextLocator/Dict/stopwords.txt
@@ -12,6 +12,9 @@ yours
 yourself
 yourselves
 he
+open
+dialog
+window
 him
 his
 himself
diff --git a/TextLocator/Entity/SearchParam.cs b/TextLocator/Entity/SearchParam.cs
index 98a5fd3..67fe5eb 100644
--- a/TextLocator/Entity/SearchParam.cs
+++ b/TextLocator/Entity/SearchParam.cs
@@ -29,6 +29,10 @@ namespace TextLocator.Entity
         /// </summary>
         public bool IsMatchWords { get; set; }
         /// <summary>
+        /// 区分大小写
+        /// </summary>
+        public bool IsMatchCase { get; set; }
+        /// <summary>
         /// 搜索域
         /// </summary>
         public SearchRegion SearchRegion { get; set; }
diff --git a/TextLocator/FileInfoItem.xaml.cs b/TextLocator/FileInfoItem.xaml.cs
index 0a42167..d85ac12 100644
--- a/TextLocator/FileInfoItem.xaml.cs
+++ b/TextLocator/FileInfoItem.xaml.cs
@@ -84,7 +84,7 @@ namespace TextLocator
                 }));
             });
 
-           /* // 词频统计
+            // 词频统计
             Task.Factory.StartNew(() => {
                 string keywordFrequency = IndexCore.GetKeywordFrequency(fileInfo, searchRegion);
                 this.Dispatcher.BeginInvoke(new Action(() => {
@@ -94,7 +94,7 @@ namespace TextLocator
                         this.FileTypeIcon.ToolTip = keywordFrequency;
                     }
                 }));
-            });*/
+            });
         }
     }
 }
diff --git a/TextLocator/Index/IndexCore.cs b/TextLocator/Index/IndexCore.cs
index c78b542..21660df 100644
--- a/TextLocator/Index/IndexCore.cs
+++ b/TextLocator/Index/IndexCore.cs
@@ -650,13 +650,17 @@ namespace TextLocator.Index
                 // 搜索域列表
                 List<string> fields = new List<string>();
 
-                // 搜索域设置
-                if (param.SearchRegion == SearchRegion.文件名和内容 || param.SearchRegion == SearchRegion.仅文件名)
+                // 搜索域判断（文件名 || 文件内容 || 文件名和文件内容）
+                bool isSearchFileName = param.SearchRegion == SearchRegion.文件名和内容 || param.SearchRegion == SearchRegion.仅文件名;
+                bool isSearchContent = param.SearchRegion == SearchRegion.文件名和内容 || param.SearchRegion == SearchRegion.仅文件内容;
+                // 文件名
+                if (isSearchFileName)
                 {
                     boosts["FileName"] = 1.0f;
                     fields.Add("FileName");
                 }
-                if (param.SearchRegion == SearchRegion.文件名和内容 || param.SearchRegion == SearchRegion.仅文件内容)
+                // 文件内容
+                if (isSearchContent)
                 {
                     boosts["Content"] = 1.2f;
                     fields.Add("Content");
@@ -678,25 +682,24 @@ namespace TextLocator.Index
 
                 // 遍历关键词列表
                 string text = "";
-                string tag = "分词";
+                string keywordType = "分词";
                 foreach (string keyword in param.Keywords)
                 {
                     text += keyword + ",";
                     // 正则
                     if (AppConst.REGEX_SUPPORT_WILDCARDS.IsMatch(keyword))
                     {
-                        tag = "正则";
+                        keywordType = "正则";
 
-                        // 搜索域设置
+                        // 文件名
                         if (param.SearchRegion == SearchRegion.文件名和内容 || param.SearchRegion == SearchRegion.仅文件名)
                         {
-                            // 文件名
                             RegexQuery regexFileName = new RegexQuery(new Lucene.Net.Index.Term("FileName", keyword));
                             boolQuery.Add(regexFileName, Lucene.Net.Search.Occur.SHOULD);
                         }
+                        // 文件内容
                         if (param.SearchRegion == SearchRegion.文件名和内容 || param.SearchRegion == SearchRegion.仅文件内容)
                         {
-                            // 文件内容
                             RegexQuery regexContentQuery = new RegexQuery(new Lucene.Net.Index.Term("Content", keyword));
                             boolQuery.Add(regexContentQuery, Lucene.Net.Search.Occur.SHOULD);
                         }
@@ -816,7 +819,7 @@ namespace TextLocator.Index
                     fileInfos.Add(fileInfo);
                 }
 
-                string msg = string.Format("检索完成。{0}：( {1} )，结果：{2}个符合条件的结果 (第 {3} 页)，耗时：{4}。", tag, (text.Length > 50 ? text.Substring(0, 50) + "..." : text), totalHits - deleteCount, param.PageIndex, taskMark.ConsumeTime);
+                string msg = string.Format("检索完成。{0}：( {1} )，结果：{2}个符合条件的结果 (第 {3} 页)，耗时：{4}。", keywordType, (text.Length > 50 ? text.Substring(0, 50) + "..." : text), totalHits - deleteCount, param.PageIndex, taskMark.ConsumeTime);
                 log.Debug(msg);
                 if (_searchCallback != null)
                     _searchCallback(msg);
diff --git a/TextLocator/MainWindow.xaml b/TextLocator/MainWindow.xaml
index ba95a2e..a418d71 100644
--- a/TextLocator/MainWindow.xaml
+++ b/TextLocator/MainWindow.xaml
@@ -27,8 +27,7 @@
                                 <!-- 搜索框 -->
                                 <TextBox x:Name="SearchText" Width="900" Height="36" FontSize="20" HorizontalAlignment="Left" VerticalContentAlignment="Center" BorderThickness="1" BorderBrush="Green" 
                                          PreviewKeyUp="SearchText_PreviewKeyUp" 
-                                         TextChanged="SearchText_TextChanged" 
-                                         MouseDoubleClick="SearchText_MouseDoubleClick">
+                                         TextChanged="SearchText_TextChanged">
                                     <TextBox.Resources>
                                         <VisualBrush x:Key="HintText" TileMode="None" Opacity="0.5" Stretch="None" AlignmentX="Left">
                                             <VisualBrush.Visual>
@@ -61,16 +60,16 @@
 
                             <!-- 条件和排序 -->
                             <Grid Margin="0,10,10,0" VerticalAlignment="Top" Height="40" Background="#F3F3F3">
-                                <StackPanel x:Name="FileTypeFilter" Orientation="Horizontal" HorizontalAlignment="Left">
-                                    <RadioButton GroupName="FileTypeFilter" Width="80" x:Name="FileTypeAll" Margin="1" IsChecked="True">全部</RadioButton>
-                                    <RadioButton GroupName="FileTypeFilter" Width="80" Margin="1">Word文档</RadioButton>
-                                    <RadioButton GroupName="FileTypeFilter" Width="80" Margin="1">Excel表格</RadioButton>
-                                    <RadioButton GroupName="FileTypeFilter" Width="80" Margin="1">PPT文稿</RadioButton>
-                                    <RadioButton GroupName="FileTypeFilter" Width="80" Margin="1">PDF文档</RadioButton>
-                                    <RadioButton GroupName="FileTypeFilter" Width="80" Margin="1">DOM文档</RadioButton>
-                                    <RadioButton GroupName="FileTypeFilter" Width="80" Margin="1">TXT文本</RadioButton>
-                                    <RadioButton GroupName="FileTypeFilter" Width="80" Margin="1">常用图片</RadioButton>
-                                    <RadioButton GroupName="FileTypeFilter" Width="80" Margin="1">代码文件</RadioButton>
+                                <StackPanel x:Name="SearchFileType" Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <RadioButton GroupName="SearchFileType" Width="80" Margin="1" IsChecked="True">全部</RadioButton>
+                                    <RadioButton GroupName="SearchFileType" Width="80" Margin="1">Word文档</RadioButton>
+                                    <RadioButton GroupName="SearchFileType" Width="80" Margin="1">Excel表格</RadioButton>
+                                    <RadioButton GroupName="SearchFileType" Width="80" Margin="1">PPT文稿</RadioButton>
+                                    <RadioButton GroupName="SearchFileType" Width="80" Margin="1">PDF文档</RadioButton>
+                                    <RadioButton GroupName="SearchFileType" Width="80" Margin="1">DOM文档</RadioButton>
+                                    <RadioButton GroupName="SearchFileType" Width="80" Margin="1">TXT文本</RadioButton>
+                                    <RadioButton GroupName="SearchFileType" Width="80" Margin="1">常用图片</RadioButton>
+                                    <RadioButton GroupName="SearchFileType" Width="80" Margin="1">代码文件</RadioButton>
                                 </StackPanel>
                             </Grid>
                         </StackPanel>
@@ -85,12 +84,12 @@
                                     <!-- 搜索区域 -->
                                     <Grid>
                                         <TextBlock Text="启用搜索区：" Margin="0,5,0,0" HorizontalAlignment="Left"/>
-                                        <TextBox x:Name="EnableAreaInfos" Text="默认区域" IsReadOnly="true" Width="470" Height="25" Margin="80,5,0,0" HorizontalAlignment="Left" MouseDoubleClick="FolderPaths_MouseDoubleClick"/>
+                                        <TextBox x:Name="EnableAreaInfos" Text="默认区域" IsReadOnly="true" Width="470" Height="25" Margin="80,5,0,0" HorizontalAlignment="Left" MouseDoubleClick="AreaInfos_MouseDoubleClick"/>
                                     </Grid>
                                     <!-- 排除区域 -->
                                     <Grid>
                                         <TextBlock Text="禁用搜索区：" Margin="0,9,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                                        <TextBox x:Name="DisableAreaInfos" Text="" Foreground="Gray" IsReadOnly="true" Width="470" Height="25" Margin="80,5,0,0" HorizontalAlignment="Left" MouseDoubleClick="FolderPaths_MouseDoubleClick" Grid.ColumnSpan="2" Cursor="IBeam"/>
+                                        <TextBox x:Name="DisableAreaInfos" Text="" Foreground="Gray" IsReadOnly="true" Width="470" Height="25" Margin="80,5,0,0" HorizontalAlignment="Left" MouseDoubleClick="AreaInfos_MouseDoubleClick" Grid.ColumnSpan="2" Cursor="IBeam"/>
                                     </Grid>
                                 </StackPanel>
                             </StackPanel>
@@ -125,13 +124,11 @@
                                             <ComboBoxItem Content="仅文件内容"/>
                                         </ComboBox>
                                     </Grid>
-                                    <!-- 筛选条件 -->
-                                    <Grid Margin="10">
-                                        <!-- 匹配全词 -->
-                                        <CheckBox x:Name="MatchWords" Content="匹配全词" FontSize="16" HorizontalAlignment="Left" VerticalContentAlignment="Center" Checked="CheckBoxCheckStatusChange" Unchecked="CheckBoxCheckStatusChange"/>
-                                    </Grid>                                    
+                                    <!-- 匹配全词 -->
+                                    <Grid Margin="10">                                        
+                                        <CheckBox x:Name="MatchWords" Content="匹配全词" FontSize="16" HorizontalAlignment="Left" VerticalContentAlignment="Center" Checked="CheckChange" Unchecked="CheckChange"/>
+                                    </Grid>
                                 </StackPanel>
-                                
                                 <!-- 排序 -->
                                 <Label Content="排序：" FontSize="14"  Margin="0,0,110,0" HorizontalAlignment="Right" VerticalContentAlignment="Center" />
                                 <ComboBox x:Name="SortOptions" Margin="0,0,10,0"  Width="100" HorizontalAlignment="Right" VerticalAlignment="Center" SelectionChanged="SortOptions_SelectionChanged">
diff --git a/TextLocator/MainWindow.xaml.cs b/TextLocator/MainWindow.xaml.cs
index aeb47ce..eedd27f 100644
--- a/TextLocator/MainWindow.xaml.cs
+++ b/TextLocator/MainWindow.xaml.cs
@@ -46,12 +46,10 @@ namespace TextLocator
         /// 搜索参数
         /// </summary>
         private Entity.SearchParam _searchParam;
-
         /// <summary>
         /// 上次预览区搜索文本
         /// </summary>
         private string _lastPreviewSearchText;
-
         /// <summary>
         /// 索引构建中
         /// </summary>
@@ -116,8 +114,8 @@ namespace TextLocator
             // 初始化配置文件信息
             InitializeAppConfig();
 
-            // 初始化文件类型过滤器列表
-            InitializeFileTypeFilters();
+            // 初始化文件类型列表
+            InitializeSearchFileType();
 
             // 初始化排序类型列表
             InitializeSortType();
@@ -170,24 +168,10 @@ namespace TextLocator
         {
             // 获取程序版本
             Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-
-            // 设置标题
+			
+			// 设置标题
             this.Title = string.Format("{0} v{1} (开放版)", this.Title, version);
-        }
 
-        /// <summary>
-        /// 初始化搜索域
-        /// </summary>
-        private void InitializeSearchRegion()
-        {
-            TaskTime taskTime = TaskTime.StartNew();
-            Array regions = Enum.GetValues(typeof(SearchRegion));
-            SearchScope.Items.Clear();
-            foreach (var region in regions)
-            {
-                SearchScope.Items.Add(region);
-            }
-            log.Debug("InitializeSearchRegion 耗时：" + taskTime.ConsumeTime + "。");
         }
 
         /// <summary>
@@ -205,31 +189,49 @@ namespace TextLocator
             log.Debug("InitializeSortType 耗时：" + taskTime.ConsumeTime + "。");
         }
 
+        /// <summary>
+        /// 初始化搜索域
+        /// </summary>
+        private void InitializeSearchRegion()
+        {
+            TaskTime taskTime = TaskTime.StartNew();
+            Array regions = Enum.GetValues(typeof(SearchRegion));
+            SearchScope.Items.Clear();
+            foreach (var region in regions)
+            {
+                SearchScope.Items.Add(region);
+            }
+            log.Debug("InitializeSearchRegion 耗时：" + taskTime.ConsumeTime + "。");
+        }
+
         /// <summary>
         /// 初始化文件类型过滤器列表
         /// </summary>
-        private void InitializeFileTypeFilters()
+        private void InitializeSearchFileType()
         {
             TaskTime taskTime = TaskTime.StartNew();
             // 文件类型筛选下拉框数据初始化
-            FileTypeFilter.Children.Clear();
+            SearchFileType.Children.Clear();
             // 遍历文件类型枚举
             foreach (FileType fileType in Enum.GetValues(typeof(FileType)))
             {
                 // 构造UI元素
                 RadioButton radioButton = new RadioButton()
                 {
-                    GroupName = "FileTypeFilter",
+                    GroupName = "SearchFileType",
                     Name = "FileType" + fileType.ToString(),
                     Width = 80,
                     Margin = new Thickness(1),
                     Tag = fileType,
-                    Content = fileType.ToString(),
-                    IsChecked = fileType == FileType.全部,
-                    ToolTip = fileType.GetDescription()
+                    Content = fileType.ToString(),                    
+                    IsChecked = fileType == FileType.全部
                 };
+                if (fileType != FileType.全部)
+                {
+                    radioButton.ToolTip = fileType.GetDescription();
+                }
                 radioButton.Checked += FileType_Checked;
-                FileTypeFilter.Children.Add(radioButton);
+                SearchFileType.Children.Add(radioButton);
 
                 // 缓存全部，用于还原到默认值（因为默认选中全部）
                 if (fileType == FileType.全部)
@@ -238,8 +240,8 @@ namespace TextLocator
                 }
             }
             // 搜索筛选条件直接读取的当前值，初始化时默认赋值全部。其他选项修改时会更改此值
-            FileTypeFilter.Tag = FileType.全部;
-            log.Debug("InitializeFileTypeFilters 耗时：" + taskTime.ConsumeTime + "。");
+            SearchFileType.Tag = FileType.全部;
+            log.Debug("InitializeSearchFileTypes 耗时：" + taskTime.ConsumeTime + "。");
         }
 
         /// <summary>
@@ -284,6 +286,7 @@ namespace TextLocator
 
             log.Debug("InitializeAppConfig 耗时：" + taskTime.ConsumeTime + "。");
         }
+
         #endregion
 
         #region 热键注册
@@ -395,58 +398,6 @@ namespace TextLocator
 
         #region 搜索
         /// <summary>
-        /// 搜索文本框双击
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void SearchText_MouseDoubleClick(object sender, MouseButtonEventArgs e)
-        {
-            var openFileDialog = new OpenFileDialog()
-            {
-                Filter = "关键词 (*.txt)|*.txt"
-            };
-            var result = openFileDialog.ShowDialog();
-            if (result == true)
-            {
-                Task.Factory.StartNew(() =>
-                {
-                    try
-                    {
-                        // 打开文本，解析内容调用搜索
-                        if (File.Exists(openFileDialog.FileName))
-                        {
-                            StringBuilder builder = new StringBuilder();
-                            using (FileStream fs = File.OpenRead(openFileDialog.FileName))
-                            {
-                                using (StreamReader reader = new StreamReader(fs, FileUtil.GetEncoding(openFileDialog.FileName)))
-                                {
-                                    string line;
-                                    while ((line = reader.ReadLine()) != null)
-                                    {
-                                        // 按行分词
-                                        builder.Append(line + " ");
-                                    }
-                                }
-                            }
-                            this.Dispatcher.BeginInvoke(new Action(() =>
-                            {
-                                this.SearchText.Text = builder.ToString().Trim();
-                                // 标记为文件
-                                this.SearchText.Tag = "File";
-
-                                // 搜索前
-                                BeforeSearch();
-                            }));
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        log.Error("读取关键词文档错误：" + ex.Message, ex);
-                    }
-                });
-            }
-        }
-        /// <summary>
         /// 搜索
         /// </summary>
         /// <param name="sender"></param>
@@ -473,7 +424,7 @@ namespace TextLocator
             // 默认排序
             SortOptions.SelectedIndex = 0;
             // 文件名和内容
-            SearchScope.SelectedIndex = 0;
+            // SearchScope.SelectedIndex = 0;
 
             BeforeSearch();
         }
@@ -502,7 +453,7 @@ namespace TextLocator
                 // 默认排序
                 SortOptions.SelectedIndex = 0;
                 // 文件名和内容
-                SearchScope.SelectedIndex = 0;
+                // SearchScope.SelectedIndex = 0;
 
                 BeforeSearch();
 
@@ -520,11 +471,6 @@ namespace TextLocator
         {
             // 如果文本为空则隐藏清空按钮，如果不为空则显示清空按钮
             this.CleanButton.Visibility = this.SearchText.Text.Length > 0 ? Visibility.Visible : Visibility.Hidden;
-            // 文本框为空时还原为默认
-            if (this.SearchText.Text.Length <= 0)
-            {
-                this.SearchText.Tag = null;
-            }
         }
 
         /// <summary>
@@ -545,13 +491,13 @@ namespace TextLocator
             {
                 try
                 {
-                    // 清空搜索结果列表
+                    // 1、---- 清空搜索结果列表
                     Dispatcher.Invoke(new Action(() =>
                     {
                         this.SearchResultList.Items.Clear();
                     }));
 
-                    // 查询列表（参数，消息回调）
+                    // 2、---- 查询列表（参数，消息回调）
                     Entity.SearchResult searchResult = IndexCore.Search(searchParam, ShowStatus);
 
                     // 验证列表数据
@@ -564,7 +510,7 @@ namespace TextLocator
                         return;
                     }
 
-                    // 遍历结果
+                    // 3、---- 遍历结果
                     foreach (Entity.FileInfo fileInfo in searchResult.Results)
                     {
                         if (_timestamp != timestamp)
@@ -577,7 +523,7 @@ namespace TextLocator
                         }));
                     }
 
-                    // 分页总数
+                    // 4、---- 分页总数
                     this.Dispatcher.BeginInvoke(new Action(() =>
                     {
                         // 如果总条数小于等于分页条数，则不显示分页
@@ -629,11 +575,7 @@ namespace TextLocator
             }
         }
 
-        /// <summary>
-        /// 分页切换
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        // 切换页码
         private void PageBar_PageIndexChanged(object sender, RoutedPropertyChangedEventArgs<int> e)
         {
             log.Debug($"pageIndex : {e.OldValue} => {e.NewValue}");
@@ -641,11 +583,6 @@ namespace TextLocator
             BeforeSearch(e.NewValue);
         }
 
-        /// <summary>
-        /// 分页条数改变
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         private void PageBar_PageSizeChanged(object sender, RoutedPropertyChangedEventArgs<int> e)
         {
             log.Debug($"pageSize : {e.OldValue} => {e.NewValue}");
@@ -694,8 +631,8 @@ namespace TextLocator
             IToggleProvider toggleProvider = toggleButtonAutomationPeer.GetPattern(PatternInterface.Toggle) as IToggleProvider;
             toggleProvider.Toggle();
 
-            // 全词匹配取消选中
-            MatchWords.IsChecked = false;
+            // 匹配全词
+            MatchWords.IsChecked = false;      
 
             // 排序类型切换为默认
             SortOptions.SelectedIndex = 0;
@@ -868,8 +805,9 @@ namespace TextLocator
         #endregion
 
         #region 界面事件
+
         /// <summary>
-        /// 搜索域切换
+        /// 搜索域切换事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -884,25 +822,23 @@ namespace TextLocator
         /// <param name="e"></param>
         private void FileType_Checked(object sender, RoutedEventArgs e)
         {
-            RadioButton radio = sender as RadioButton;
-            FileType fileType = (FileType)radio.Tag;
-            if (fileType != FileType.全部 && GetSearchTextKeywords().Count <= 0)
+            if (!"全部".Equals((sender as RadioButton).Content) && GetSearchTextKeywords().Count <= 0)
             {
                 ResetSearchResult();
                 return;
             }
 
-            FileTypeFilter.Tag = fileType;
+            SearchFileType.Tag = (sender as RadioButton).Tag;
 
             BeforeSearch();
         }
 
         /// <summary>
-        /// 复选框选中状态切换
+        /// 匹配全词
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void CheckBoxCheckStatusChange(object sender, RoutedEventArgs e)
+        private void CheckChange(object sender, RoutedEventArgs e)
         {
             BeforeSearch();
         }
@@ -966,18 +902,18 @@ namespace TextLocator
         }
 
         /// <summary>
-        /// 搜索区域
+        /// 搜索区双击事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void FolderPaths_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        private void AreaInfos_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
         {
             AreaWindow areaDialog = new AreaWindow();
             areaDialog.Owner = this;
             areaDialog.Topmost = true;
             areaDialog.ShowDialog();
-
-            // 不管是否修改都刷新
+            
+			// 不管是否修改都刷新
             InitializeAppConfig();
         }
 
@@ -1137,7 +1073,7 @@ namespace TextLocator
                     {
                         log.Info("目录：" + s);
                         // 获取文件信息列表
-                        FileUtil.GetAllFiles(allFilePaths, s);
+                        FileUtil.GetAllFiles(allFilePaths, s, null);
                     }
 
                     msg = string.Format("搜索区【{0}】，文件扫描完成；文件数：{1}，耗时：{2}；开始分析需要更新的文件列表...", areaInfo.AreaName, allFilePaths.Count, scanTaskMark.ConsumeTime);
@@ -1278,7 +1214,7 @@ namespace TextLocator
         {
             if (OpenFile.Tag != null)
             {
-                string filePath = OpenFile.Tag + "";                
+                string filePath = OpenFile.Tag + "";
                 try
                 {
                     System.Diagnostics.Process.Start(filePath);
@@ -1381,6 +1317,7 @@ namespace TextLocator
         private List<string> GetSearchTextKeywords()
         {
             string searchText = SearchText.Text.Trim();
+
             // 清理特殊字符
 
             // 申明关键词列表
@@ -1429,6 +1366,7 @@ namespace TextLocator
         /// <param name="page">指定页</param>
         private void BeforeSearch(int page = 1)
         {
+            // 1、---- 搜索信息预处理
             // 还原分页count
             if (page != PageNow)
             {
@@ -1447,12 +1385,9 @@ namespace TextLocator
             {
                 return;
             }
-            /*if (build)
-            {
-                MessageCore.ShowWarning("索引构建中，请稍等。");
-                return;
-            }*/
 
+
+            // 2、---- 预览信息还原
             // 预览区打开文件和文件夹标记清空
             OpenFile.Tag = null;
             OpenFolder.Tag = null;
@@ -1472,21 +1407,24 @@ namespace TextLocator
             // 预览切换标记清空
             SwitchPreview.Tag = null;
 
-            // 记录时间戳
+
+            // 3、---- 生成本次搜索时间戳
             _timestamp = Convert.ToInt64((DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0)).TotalMilliseconds);
 
-            // 保存当前搜索条件
+
+            // 4、---- 构造搜索条件并保存（保存的搜索条件需要用于数据导出）
             _searchParam = new Entity.SearchParam()
             {
                 Keywords = keywords,
-                FileType = (FileType)FileTypeFilter.Tag,
+                FileType = (FileType)SearchFileType.Tag,
                 SortType = (SortType)SortOptions.SelectedValue,
                 IsMatchWords = (bool)MatchWords.IsChecked,
                 SearchRegion = (SearchRegion)SearchScope.SelectedValue,
                 PageSize = PageSize,
                 PageIndex = PageNow
             };
-            // 搜索
+
+            // 5、---- 搜索
             Search(
                 _timestamp,
                 _searchParam
diff --git a/TextLocator/TextLocator.csproj b/TextLocator/TextLocator.csproj
index d81219d..6d1712a 100644
--- a/TextLocator/TextLocator.csproj
+++ b/TextLocator/TextLocator.csproj
@@ -270,6 +270,9 @@
     <Compile Include="AreaInfoItem.xaml.cs">
       <DependentUpon>AreaInfoItem.xaml</DependentUpon>
     </Compile>
+    <Compile Include="AreaWindow.xaml.cs">
+      <DependentUpon>AreaWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Cache\LFUCache.cs" />
     <Compile Include="Cache\LFUCacheEntity.cs" />
     <Compile Include="Entity\AreaInfo.cs" />
@@ -308,9 +311,6 @@
     <Compile Include="HotKey\HotKeySettingManager.cs" />
     <Compile Include="HotKey\HotKey.cs" />
     <Compile Include="Index\IndexCore.cs" />
-    <Compile Include="AreaWindow.xaml.cs">
-      <DependentUpon>AreaWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Index\MutipleThreadResetEvent.cs" />
     <Compile Include="Jieba\JiebaAnalyzer.cs" />
     <Compile Include="Jieba\JiebaTokenizer.cs" />
@@ -339,10 +339,14 @@
     <Compile Include="Util\MD5Util.cs" />
     <Compile Include="Util\RichTextBoxUtil.cs" />
     <Page Include="AreaEditWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="AreaInfoItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="AreaWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -374,10 +378,6 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="AreaWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Resource\GenericDictionary.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -402,22 +402,22 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
     <None Include="Dict\char_state_tab.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="Dict\pos_prob_emit.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="Dict\pos_prob_start.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="Dict\pos_prob_trans.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="Dict\prob_emit.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="Dict\prob_trans.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
@@ -446,16 +446,16 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Dict\cn_synonym.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="Dict\dict.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="Dict\idf.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="Dict\stopwords.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
diff --git a/TextLocator/Util/AppUtil.cs b/TextLocator/Util/AppUtil.cs
index 031b297..f6b2b43 100644
--- a/TextLocator/Util/AppUtil.cs
+++ b/TextLocator/Util/AppUtil.cs
@@ -35,7 +35,7 @@ namespace TextLocator.Util
         /// <summary>
         /// App.ini路径：_AppDir\\_AppName.ini
         /// </summary>
-        private static readonly string _AppIniFile =  _AppDir + "\\" + _AppName + ".ini";
+        private static readonly string _AppIniFile = _AppDir + "\\" + _AppName + ".ini";
         
         /// <summary>
         /// Ini文件内容缓存
diff --git a/TextLocator/Util/AreaUtil.cs b/TextLocator/Util/AreaUtil.cs
index 1440a76..12af3e9 100644
--- a/TextLocator/Util/AreaUtil.cs
+++ b/TextLocator/Util/AreaUtil.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using TextLocator.Core;
 using TextLocator.Entity;
 
-- 
Gitee


From 3a828b099d8086d5eebc09f650808b2402e89e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Fri, 22 Apr 2022 16:01:42 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/MainWindow.xaml.cs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/TextLocator/MainWindow.xaml.cs b/TextLocator/MainWindow.xaml.cs
index eedd27f..f7eb192 100644
--- a/TextLocator/MainWindow.xaml.cs
+++ b/TextLocator/MainWindow.xaml.cs
@@ -1026,7 +1026,7 @@ namespace TextLocator
                 // 提示语
                 string tag = isRebuild ? "重建" : "更新";
 
-                // --------定义总数
+                // 1、-------- 定义总数
                 // 文件总数
                 int fileTotalCount = 0;
                 // 更新总数
@@ -1039,7 +1039,7 @@ namespace TextLocator
                 // 总任务消耗时间
                 var totalTaskMark = TaskTime.StartNew();
 
-                // ---------------- 遍历搜索区
+                // 2、-------- 遍历搜索区
                 List<Entity.AreaInfo> areaInfos = AreaUtil.GetEnableAreaInfoList();
                 foreach(Entity.AreaInfo areaInfo in areaInfos)
                 {
@@ -1055,7 +1055,7 @@ namespace TextLocator
                         AppUtil.DeleteSection(areaIdIndex);
                     }
 
-                    // -------- 开始获取文件列表
+                    // 2.1、-------- 开始获取文件列表
                     string msg = string.Format("搜索区【{0}】，开始扫描文件...", areaInfo.AreaName);
                     log.Info(msg);
                     ShowStatus(msg);
@@ -1073,14 +1073,14 @@ namespace TextLocator
                     {
                         log.Info("目录：" + s);
                         // 获取文件信息列表
-                        FileUtil.GetAllFiles(allFilePaths, s, null);
+                        FileUtil.GetAllFiles(allFilePaths, s);
                     }
 
                     msg = string.Format("搜索区【{0}】，文件扫描完成；文件数：{1}，耗时：{2}；开始分析需要更新的文件列表...", areaInfo.AreaName, allFilePaths.Count, scanTaskMark.ConsumeTime);
                     log.Info(msg);
                     ShowStatus(msg);
 
-                    // -------- 获取需要删除的文件列表
+                    // 2.2、-------- 获取需要删除的文件列表
                     if (AppUtil.ReadSectionList(areaIdIndex) != null)
                     {
                         foreach (string filePath in AppUtil.ReadSectionList(areaIdIndex))
@@ -1094,7 +1094,7 @@ namespace TextLocator
                         }
                     }
 
-                    // -------- 如果是更新操作，判断文件格式是否变化 -> 判断文件更新时间变化找到最终需要更新的文件列表
+                    // 2.3、-------- 如果是更新操作，判断文件格式是否变化 -> 判断文件更新时间变化找到最终需要更新的文件列表
                     var analysisTaskMark = TaskTime.StartNew();
                     // 更新是才需要校验，重建是直接跳过
                     if (!isRebuild)
@@ -1129,7 +1129,7 @@ namespace TextLocator
                     log.Info(msg);
                     ShowStatus(msg);
 
-                    // -------- 验证扫描文件列表是否为空（如果是更新操作，判断文件格式是否变化 -> 判断文件更新时间变化找到最终需要更新的文件列表）
+                    // 2.4、-------- 验证扫描文件列表是否为空（如果是更新操作，判断文件格式是否变化 -> 判断文件更新时间变化找到最终需要更新的文件列表）
                     if (updateFilePaths.Count <= 0 && deleteFilePaths.Count <= 0)
                     {
                         build = false;
@@ -1142,10 +1142,10 @@ namespace TextLocator
                     // 后台执行时修改为最小线程单位，反之恢复为系统配置线程数
                     AppCore.SetThreadPoolSize(!isBackground);
 
-                    // -------- 创建索引方法
+                    // 2.5、-------- 创建索引方法
                     int errorCount = IndexCore.CreateIndex(areaInfo.AreaId, updateFilePaths, deleteFilePaths, isRebuild, ShowStatus);
 
-                    // 索引完成日志
+                    // 2.6、-------- 当前区域完成日志
                     msg = string.Format("搜索区【{0}】，索引{1}完成；{2}数：{3}，删除数：{4}，错误数：{5}，共用时：{6}。", areaInfo.AreaName, tag, tag, updateFilePaths.Count, deleteFilePaths.Count, errorCount, singleTaskMark.ConsumeTime);
                     log.Info(msg);
                     ShowStatus(msg);
@@ -1156,23 +1156,23 @@ namespace TextLocator
                     }));
 
 
-                    // 记录文件总数、更新总数、删除总数、错误总数
+                    // 2.7、-------- 记录文件总数、更新总数、删除总数、错误总数
                     fileTotalCount = fileTotalCount + allFilePaths.Count;
                     updateTotalCount = updateTotalCount + updateFilePaths.Count;
                     deleteTotalCount = deleteTotalCount + deleteFilePaths.Count;
                     errorTotalCount = errorTotalCount + errorCount;
                 }
 
-                // 索引完成日志
+                // 3、-------- 完成日志
                 string message = string.Format("索引{0}完成。区域数：{1}，{2}数：{3}，删除数：{4}，错误数：{5}，共用时：{6}。", tag, areaInfos.Count, tag, updateTotalCount, deleteTotalCount, errorTotalCount, totalTaskMark.ConsumeTime);
                 log.Info(message);
                 ShowStatus(message);
 
-                // 标记索引文件数量 和 最后更新时间
+                // 4、-------- 标记索引文件数量 和 最后更新时间
                 AppUtil.WriteValue("AppConfig", "FileTotalCount", fileTotalCount + "");
                 AppUtil.WriteValue("AppConfig", "LastIndexTime", DateTime.Now.ToString());
 
-                // 构建结束
+                // 5、-------- 构建结束
                 build = false;
             }
             catch (Exception ex)
-- 
Gitee


From a18baa1716491979578ed5767c9eba22b16f1c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Fri, 22 Apr 2022 16:09:30 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=B2=BE=E7=AE=80?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/Core/AppConst.cs           |  4 ----
 TextLocator/FileInfoItem.xaml.cs       |  4 ++--
 TextLocator/Properties/AssemblyInfo.cs |  4 ++--
 TextLocator/SettingWindow.xaml         | 12 ------------
 TextLocator/SettingWindow.xaml.cs      |  7 -------
 5 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/TextLocator/Core/AppConst.cs b/TextLocator/Core/AppConst.cs
index e44a81b..2184c5d 100644
--- a/TextLocator/Core/AppConst.cs
+++ b/TextLocator/Core/AppConst.cs
@@ -46,10 +46,6 @@ namespace TextLocator.Core
         /// 索引更新任务间隔时间，单位：分
         /// </summary>
         public static int INDEX_UPDATE_TASK_INTERVAL = int.Parse(AppUtil.ReadValue("AppConfig", "IndexUpdateTaskInterval", "10"));
-        /// <summary>
-        /// 启用XpsDocument预览
-        /// </summary>
-        public static bool ENABLE_XPSDOCUMENT_VIEW = bool.Parse(AppUtil.ReadValue("AppConfig", "EnableXpsDocumentView", "True"));
 
         /// <summary>
         /// AppName
diff --git a/TextLocator/FileInfoItem.xaml.cs b/TextLocator/FileInfoItem.xaml.cs
index d85ac12..7ac0429 100644
--- a/TextLocator/FileInfoItem.xaml.cs
+++ b/TextLocator/FileInfoItem.xaml.cs
@@ -84,7 +84,7 @@ namespace TextLocator
                 }));
             });
 
-            // 词频统计
+            /*// 词频统计
             Task.Factory.StartNew(() => {
                 string keywordFrequency = IndexCore.GetKeywordFrequency(fileInfo, searchRegion);
                 this.Dispatcher.BeginInvoke(new Action(() => {
@@ -94,7 +94,7 @@ namespace TextLocator
                         this.FileTypeIcon.ToolTip = keywordFrequency;
                     }
                 }));
-            });
+            });*/
         }
     }
 }
diff --git a/TextLocator/Properties/AssemblyInfo.cs b/TextLocator/Properties/AssemblyInfo.cs
index 01cd66b..74f692e 100644
--- a/TextLocator/Properties/AssemblyInfo.cs
+++ b/TextLocator/Properties/AssemblyInfo.cs
@@ -49,8 +49,8 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyVersion("2.0.10.0")]
+[assembly: AssemblyFileVersion("2.0.10.0")]
 
 // log4net
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
\ No newline at end of file
diff --git a/TextLocator/SettingWindow.xaml b/TextLocator/SettingWindow.xaml
index 4b8c038..81b6b5a 100644
--- a/TextLocator/SettingWindow.xaml
+++ b/TextLocator/SettingWindow.xaml
@@ -80,18 +80,6 @@
                             </Grid>
                         </Grid>
                     </Grid>
-                    <!-- 分割线 -->
-                    <Line X1="0" Y1="0" X2="500" Y2="0" Margin="0,10,0,10" Stroke="Gray" StrokeThickness="1"></Line>
-                    <!-- 索引更新任务间隔时间 -->
-                    <Grid>
-                        <TextBlock Text="启用内置预览界面：" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-                        <Grid Margin="20,30,20,0">
-                            <Grid HorizontalAlignment="Left">
-                                <CheckBox x:Name="EnableXpsDocument" Content="启用内置Office预览窗口" HorizontalAlignment="Left" VerticalAlignment="Top" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
-                            </Grid>
-                        </Grid>
-                        
-                    </Grid>
                 </StackPanel>
             </ScrollViewer>
         </Grid>
diff --git a/TextLocator/SettingWindow.xaml.cs b/TextLocator/SettingWindow.xaml.cs
index a99786c..483be7a 100644
--- a/TextLocator/SettingWindow.xaml.cs
+++ b/TextLocator/SettingWindow.xaml.cs
@@ -74,9 +74,6 @@ namespace TextLocator
             this.EnableIndexUpdateTask.IsChecked = AppConst.ENABLE_INDEX_UPDATE_TASK;
             // 索引更新时间间隔
             this.IndexUpdateTaskInterval.Text = AppConst.INDEX_UPDATE_TASK_INTERVAL + "";
-
-            // 启用XpsDocument预览
-            this.EnableXpsDocument.IsChecked = AppConst.ENABLE_XPSDOCUMENT_VIEW;
         }
 
         #region 保存并关闭
@@ -230,10 +227,6 @@ namespace TextLocator
                 log.Debug("修改索引更新任务间隔时间：" + AppConst.INDEX_UPDATE_TASK_INTERVAL);
             }
 
-            AppConst.ENABLE_XPSDOCUMENT_VIEW = (bool)this.EnableXpsDocument.IsChecked;
-            AppUtil.WriteValue("AppConfig", "EnableXpsDocumentView", AppConst.ENABLE_XPSDOCUMENT_VIEW + "");
-            log.Debug("修改使用XpsDocument预览：" + AppConst.ENABLE_XPSDOCUMENT_VIEW);
-
             this.Close();
         }
         #endregion
-- 
Gitee


From 21f1a51a0707c81e69cdbf97fd61baf68b1c85dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Fri, 22 Apr 2022 18:45:16 +0800
Subject: [PATCH 18/18] =?UTF-8?q?1=E3=80=81=E6=90=9C=E7=B4=A2=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E6=94=AF=E6=8C=81=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=202=E3=80=81=E7=B4=A2=E5=BC=95=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=90=9C=E7=B4=A2=E5=8C=BA=E5=9F=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/AreaEditWindow.xaml    | 21 ++++++-
 TextLocator/AreaEditWindow.xaml.cs | 91 ++++++++++++++++++++++++++++--
 TextLocator/AreaInfoItem.xaml      | 15 ++---
 TextLocator/AreaInfoItem.xaml.cs   |  2 +
 TextLocator/AreaWindow.xaml        | 40 +++++++------
 TextLocator/Core/AppConst.cs       |  4 --
 TextLocator/Entity/AreaInfo.cs     |  5 ++
 TextLocator/MainWindow.xaml.cs     | 18 +++---
 TextLocator/Util/AreaUtil.cs       | 30 +++++++++-
 TextLocator/Util/FileTypeUtil.cs   | 32 +++++++++--
 TextLocator/Util/FileUtil.cs       |  7 ++-
 11 files changed, 210 insertions(+), 55 deletions(-)

diff --git a/TextLocator/AreaEditWindow.xaml b/TextLocator/AreaEditWindow.xaml
index 97c3a2b..f983051 100644
--- a/TextLocator/AreaEditWindow.xaml
+++ b/TextLocator/AreaEditWindow.xaml
@@ -5,19 +5,19 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:TextLocator"
         mc:Ignorable="d"
-        Title="区域编辑" Height="350" Width="600" WindowStartupLocation="CenterOwner" WindowStyle="ToolWindow" ResizeMode="CanMinimize" Icon="/Resource/App.ico" Loaded="Window_Loaded" >
+        Title="区域编辑" Height="465" Width="830" WindowStartupLocation="CenterOwner" WindowStyle="ToolWindow" ResizeMode="CanMinimize" Icon="/Resource/App.ico" Loaded="Window_Loaded" >
     <Grid Margin="10">
         <StackPanel>
             <!-- 文字提示 -->
             <TextBlock Text="请为区域设置名字，并选择文件夹保存。" FontWeight="Bold" Foreground="OrangeRed"/>
             <!-- 区域名称 -->
             <Grid Margin="0,10,0,0" VerticalAlignment="Center">
-                <TextBlock Text="区域名称：" Margin="0,0,480,0" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                <TextBlock Text="区域名称：" Margin="0,0,710,0" VerticalAlignment="Center" HorizontalAlignment="Right"/>
                 <TextBox x:Name="AreaName" Margin="100,0,0,0" Width="440" VerticalAlignment="Center" HorizontalAlignment="Left"/>
             </Grid>
             <!-- 区域名称 -->
             <Grid Margin="0,10,0,0" VerticalAlignment="Center">
-                <TextBlock Text="区域文件夹：" Margin="0,10,480,0" VerticalAlignment="Top" HorizontalAlignment="Right"/>
+                <TextBlock Text="区域文件夹：" Margin="0,10,710,0" VerticalAlignment="Top" HorizontalAlignment="Right"/>
                 <ListBox x:Name="AreaFolders" Margin="100,0,0,0" Height="165">
                     <ListBoxItem>
                         <Grid Width="440" Height="30">
@@ -29,6 +29,21 @@
                     </ListBoxItem>
                 </ListBox>
             </Grid>
+            <!-- 搜索文件类型 -->
+            <StackPanel Margin="0,10,0,0" VerticalAlignment="Center">
+                <TextBlock Text="文件类型：" Margin="0,10,710,0" VerticalAlignment="Top" HorizontalAlignment="Right"/>
+                <WrapPanel x:Name="AreaFileTypes" Orientation="Horizontal" >
+                    <CheckBox Content="Word文档（doc,docx）" Margin="10"/>
+                    <CheckBox Content="Excel表格（xls,xlsx）" Margin="10"/>
+                    <CheckBox Content="PPT文稿（ppt,pptx）" Margin="10"/>
+                    <CheckBox Content="PDF文档（pdf）" Margin="10"/>
+                    <CheckBox Content="DOM文档（html,xml）" Margin="10"/>
+                    <CheckBox Content="TXT文档（txt）" Margin="10"/>
+                    <CheckBox Content="常用图片（jpg,png,gif,jpeg,bmp）" Margin="10"/>
+                    <CheckBox Content="常用压缩包（rar,zip,7z,tar,jar）" Margin="10"/>
+                    <CheckBox Content="程序员代码（cs,java,js,css,md,py,c,h,cpp,lua,sql,jsp,json,php,rs,rb,yml,yaml,bat,ps1）" Margin="10"/>
+                </WrapPanel>
+            </StackPanel>
         </StackPanel>
 
         <Grid Margin="0,10,0,0" VerticalAlignment="Bottom">
diff --git a/TextLocator/AreaEditWindow.xaml.cs b/TextLocator/AreaEditWindow.xaml.cs
index bb7df2d..26fa9e4 100644
--- a/TextLocator/AreaEditWindow.xaml.cs
+++ b/TextLocator/AreaEditWindow.xaml.cs
@@ -1,8 +1,10 @@
-using System;
+using log4net;
+using System;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
 using TextLocator.Entity;
+using TextLocator.Enums;
 using TextLocator.Message;
 using TextLocator.Util;
 
@@ -13,11 +15,17 @@ namespace TextLocator
     /// </summary>
     public partial class AreaEditWindow : Window
     {
+        private static readonly ILog log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>
-        /// 索引区文件夹
+        /// 搜索区文件夹
         /// </summary>
         private List<string> _areaFolders = new List<string>();
         /// <summary>
+        /// 搜索区文件类型
+        /// </summary>
+        private List<FileType> _areaFileTypes = new List<FileType>();
+        /// <summary>
         /// 区域信息
         /// </summary>
         private AreaInfo _areaInfo;
@@ -35,7 +43,8 @@ namespace TextLocator
             {
                 _areaInfo = new AreaInfo()
                 {
-                    AreaId = "Area" + DateTime.Now.ToString("yyyyMMddHHmmssffff")
+                    AreaId = "Area" + DateTime.Now.ToString("yyyyMMddHHmmssffff"),
+                    AreaFileTypes = FileTypeUtil.GetFileTypesNotAll()
                 };
             }
         }
@@ -47,7 +56,21 @@ namespace TextLocator
         /// <param name="e"></param>
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
+            // 初始化加载文件类型
+            LoadFileType();
+
+            // 加载区域信息
+            LoadAreaInfo();
+        }
+
+        /// <summary>
+        /// 加载区域信息
+        /// </summary>
+        private void LoadAreaInfo()
+        {
+            // 区域名称
             this.AreaName.Text = _areaInfo.AreaName;
+            // 区域文件夹
             this.AreaFolders.Items.Clear();
             if (_areaInfo.AreaFolders != null)
             {
@@ -62,6 +85,57 @@ namespace TextLocator
                     this.AreaFolders.Items.Add(folder);
                 }
             }
+            // 区域文件夹类型
+            foreach (UIElement element in this.AreaFileTypes.Children)
+            {
+                CheckBox checkbox = element as CheckBox;
+                if (_areaInfo.AreaFileTypes.Contains((FileType)checkbox.Tag))
+                {
+                    checkbox.IsChecked = true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 初始化加载文件类型
+        /// </summary>
+        private void LoadFileType()
+        {
+            this.AreaFileTypes.Children.Clear();
+            // 遍历文件类型枚举
+            foreach (FileType fileType in FileTypeUtil.GetFileTypesNotAll())
+            {
+                // 构造UI元素
+                CheckBox checkbox = new CheckBox()
+                {
+                    Name = "FileType_" + (int)fileType,
+                    Margin = new Thickness(10),
+                    Tag = fileType,
+                    Content = fileType.ToString() + "（" + fileType.GetDescription() + "）"
+                };
+                checkbox.Checked += FileTypeStatusChange;
+                checkbox.Unchecked += FileTypeStatusChange;
+                this.AreaFileTypes.Children.Add(checkbox);
+            }
+        }
+
+        /// <summary>
+        /// 文件类型选中状态切换
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FileTypeStatusChange(object sender, RoutedEventArgs e)
+        {
+            List<FileType> fileTypes = new List<FileType>();
+            foreach(UIElement element in this.AreaFileTypes.Children)
+            {
+                CheckBox checkBox = element as CheckBox;
+                if (checkBox.IsChecked == true)
+                {
+                    fileTypes.Add((Enums.FileType)System.Enum.Parse(typeof(Enums.FileType), checkBox.Tag.ToString()));
+                }
+            }
+            _areaFileTypes = fileTypes;
         }
 
         /// <summary>
@@ -144,14 +218,19 @@ namespace TextLocator
                 MessageCore.ShowWarning("区域名称为空");
                 return;
             }
+            if (AreaUtil.GetAreaNameListRuleOut(_areaInfo).Contains(areaName))
+            {
+                MessageCore.ShowWarning("区域名称不能重复");
+                return;
+            }
             if (this.AreaFolders.Items.Count <= 0)
             {
                 MessageCore.ShowWarning("至少需要一个文件夹");
                 return;
             }
-            if (AreaUtil.GetAreaNameListRuleOut(_areaInfo).Contains(areaName))
+            if (_areaFileTypes.Count <= 0)
             {
-                MessageCore.ShowWarning("区域名称不能重复");
+                MessageCore.ShowWarning("至少需要一个支持的文件类型");
                 return;
             }
 
@@ -159,6 +238,8 @@ namespace TextLocator
             _areaInfo.AreaName = areaName;
             // 搜索区文件夹
             _areaInfo.AreaFolders = _areaFolders;
+            // 搜索区文件类型
+            _areaInfo.AreaFileTypes = _areaFileTypes;
 
             // 保存区域信息
             // AreaUtil.SaveAreaInfo(_areaInfo);
diff --git a/TextLocator/AreaInfoItem.xaml b/TextLocator/AreaInfoItem.xaml
index a35547f..d83e250 100644
--- a/TextLocator/AreaInfoItem.xaml
+++ b/TextLocator/AreaInfoItem.xaml
@@ -7,21 +7,22 @@
              mc:Ignorable="d" 
              d:DesignHeight="50" d:DesignWidth="800">
     <Grid>
-        <Grid Margin="0,10,0,10">
-            <CheckBox x:Name="AreaIsEnable" Margin="10,0,0,0" Width="20" Height="20" VerticalAlignment="Center" HorizontalAlignment="Left"/>
-            <Grid Margin="50,0,0,0" Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
+        <StackPanel Orientation="Horizontal" Margin="0,10,0,10">
+            <CheckBox x:Name="AreaIsEnable" Margin="10,0,0,0" Width="30" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+            <Grid Width="120" VerticalAlignment="Center" HorizontalAlignment="Left">
                 <TextBlock x:Name="AreaName" Text="默认区域"/>
             </Grid>
-            <StackPanel x:Name="AreaFolders" Margin="230,0,0,0" Width="380" VerticalAlignment="Center" HorizontalAlignment="Left">
+            <StackPanel x:Name="AreaFolders" Width="360" VerticalAlignment="Center" HorizontalAlignment="Left">
                 <TextBlock Text="C:\Users\liulei\Desktop\"/>
                 <TextBlock Text="C:\Users\liulei\Documents\"/>
             </StackPanel>
-            <Grid Margin="630,0,10,0" Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
+            <TextBlock x:Name="AreaFileTypes" Width="140" Text="C:\Users\liulei\Desktop\" VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="Wrap"/>
+            <Grid Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
                 <Button x:Name="EditButton" Content="编辑" Margin="0,0,70,0" Width="60" />
                 <Button x:Name="DeleteButton" Content="删除" Margin="70,0,0,0" Width="60" Background="Red"/>
             </Grid>
-        </Grid>
+        </StackPanel>
         <!-- 分割线 -->
-        <Line X1="0" Y1="0" X2="800" Y2="0" Margin="0,0,0,0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="0.5"></Line>
+        <Line X1="10" Y1="0" X2="800" Y2="0" Margin="0,0,0,0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="0.5"></Line>
     </Grid>
 </UserControl>
diff --git a/TextLocator/AreaInfoItem.xaml.cs b/TextLocator/AreaInfoItem.xaml.cs
index 2f430d6..1d89946 100644
--- a/TextLocator/AreaInfoItem.xaml.cs
+++ b/TextLocator/AreaInfoItem.xaml.cs
@@ -56,6 +56,8 @@ namespace TextLocator
                     this.AreaFolders.Children.Add(text);
                 }
             }
+            // 区域文件类型
+            this.AreaFileTypes.Text =  string.Join("，", areaInfo.AreaFileTypes.ToArray());
         }
     }
 }
diff --git a/TextLocator/AreaWindow.xaml b/TextLocator/AreaWindow.xaml
index abced05..c8d945f 100644
--- a/TextLocator/AreaWindow.xaml
+++ b/TextLocator/AreaWindow.xaml
@@ -12,43 +12,47 @@
             <TextBlock Text="“区域”代表搜索范围，即已选定的目录（需要启用才能用于搜索）。" FontWeight="Bold" Foreground="OrangeRed"/>
             <!-- 表头 -->
             <Grid>
-                <Grid Margin="0,10,0,10">
-                    <Grid Margin="10,0,0,0" Width="50" VerticalAlignment="Center" HorizontalAlignment="Left">
-                        <TextBlock Text="启用" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                <StackPanel Orientation="Horizontal" Margin="0,10,0,10">
+                    <Grid Width="30" VerticalAlignment="Center" HorizontalAlignment="Left">
+                        <TextBlock Text="启用" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                     </Grid>
-                    <Grid Margin="50,0,0,0" Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
-                        <TextBlock Text="区域名称" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                    <Grid Width="120" VerticalAlignment="Center" HorizontalAlignment="Left">
+                        <TextBlock Text="区域名称" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                     </Grid>
-                    <Grid Margin="230,0,0,0" Width="380" VerticalAlignment="Center" HorizontalAlignment="Left">
-                        <TextBlock Text="文件夹" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                    <Grid Width="360" VerticalAlignment="Center" HorizontalAlignment="Left">
+                        <TextBlock Text="文件夹" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                     </Grid>
-                    <Grid Margin="640,0,10,0" Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
-                        <TextBlock Text="操作" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                    <Grid Width="140" VerticalAlignment="Center" HorizontalAlignment="Left">
+                        <TextBlock Text="文件类型" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                     </Grid>
-                </Grid>
+                    <Grid Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
+                        <TextBlock Text="操作" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    </Grid>
+                </StackPanel>
                 <!-- 分割线 -->
-                <Line X1="0" Y1="0" X2="800" Y2="0" Margin="0,0,0,0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="0.5"></Line>
+                <Line X1="0" Y1="0" X2="810" Y2="0" Margin="0,0,0,0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="0.5"></Line>
             </Grid>
             <!-- 列表区 -->
             <ScrollViewer Height="310" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden">
                 <StackPanel x:Name="AreaInfoList">
                     <Grid>
-                        <Grid Margin="0,10,0,10">
-                            <CheckBox Margin="10,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
-                            <Grid Margin="50,0,0,0" Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
+                        <StackPanel Orientation="Horizontal" Margin="0,10,0,10">
+                            <CheckBox Margin="10,0,0,0" Width="30" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                            <Grid Width="120" VerticalAlignment="Center" HorizontalAlignment="Left">
                                 <TextBlock Text="默认区域"/>
                             </Grid>
-                            <StackPanel Margin="230,0,0,0" Width="380" VerticalAlignment="Center" HorizontalAlignment="Left">
+                            <StackPanel Width="360" VerticalAlignment="Center" HorizontalAlignment="Left">
                                 <TextBlock Text="C:\Users\liulei\Desktop\"/>
                                 <TextBlock Text="C:\Users\liulei\Documents\"/>
                             </StackPanel>
-                            <Grid Margin="630,0,10,0" Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
+                            <TextBlock Width="140" Text="C:\Users\liulei\Desktop\" VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="Wrap"/>
+                            <Grid Width="150" VerticalAlignment="Center" HorizontalAlignment="Left">
                                 <Button Content="编辑" Margin="0,0,70,0" Width="60" />
                                 <Button Content="删除" Margin="70,0,0,0" Width="60" Background="Red"/>
                             </Grid>
-                        </Grid>
+                        </StackPanel>
                         <!-- 分割线 -->
-                        <Line X1="0" Y1="0" X2="800" Y2="0" Margin="0,0,0,0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="0.5"></Line>
+                        <Line X1="10" Y1="0" X2="800" Y2="0" Margin="0,0,0,0" VerticalAlignment="Bottom" Stroke="Gray" StrokeThickness="0.5"></Line>
                     </Grid>
                 </StackPanel>
             </ScrollViewer>
diff --git a/TextLocator/Core/AppConst.cs b/TextLocator/Core/AppConst.cs
index 2184c5d..2964a58 100644
--- a/TextLocator/Core/AppConst.cs
+++ b/TextLocator/Core/AppConst.cs
@@ -91,10 +91,6 @@ namespace TextLocator.Core
         /// </summary>
         public static readonly Regex REGEX_TAG = new Regex("\\<.[^<>]*\\>");
         /// <summary>
-        /// 匹配文件后缀
-        /// </summary>
-        public static readonly Regex REGEX_FILE_EXT = new Regex(@"^.+\.(" + FileTypeUtil.GetFileTypeExts("|") + ")$");
-        /// <summary>
         /// 匹配排除关键词
         /// </summary>
         public static readonly Regex REGEX_EXCLUDE_KEYWORD = new Regex(@"(\$RECYCLE|360REC|SYSTEM|TEMP|SYSTEM VOLUME INFOMATION|\{(.*)\})");
diff --git a/TextLocator/Entity/AreaInfo.cs b/TextLocator/Entity/AreaInfo.cs
index 9b73147..66c10be 100644
--- a/TextLocator/Entity/AreaInfo.cs
+++ b/TextLocator/Entity/AreaInfo.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using TextLocator.Enums;
 
 namespace TextLocator.Entity
 {
@@ -24,5 +25,9 @@ namespace TextLocator.Entity
         /// 区域文件夹路径
         /// </summary>
         public List<string> AreaFolders { get; set; }
+        /// <summary>
+        /// 区域文件类型
+        /// </summary>
+        public List<FileType> AreaFileTypes { get; set; }
     }
 }
diff --git a/TextLocator/MainWindow.xaml.cs b/TextLocator/MainWindow.xaml.cs
index f7eb192..17f2c0a 100644
--- a/TextLocator/MainWindow.xaml.cs
+++ b/TextLocator/MainWindow.xaml.cs
@@ -7,6 +7,7 @@ using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -1068,19 +1069,22 @@ namespace TextLocator
                     // 定义删除文件列表
                     List<string> deleteFilePaths = new List<string>();
 
+                    // 2.2、-------- 获取支持的文件类型后缀
+                    Regex fileExtRegex = new Regex(@"^.+\.(" + FileTypeUtil.ConvertToFileTypeExts(areaInfo.AreaFileTypes, "|") + ")$");
+
                     // 扫描需要建立索引的文件列表
                     foreach (string s in areaInfo.AreaFolders)
                     {
                         log.Info("目录：" + s);
                         // 获取文件信息列表
-                        FileUtil.GetAllFiles(allFilePaths, s);
+                        FileUtil.GetAllFiles(allFilePaths, s, fileExtRegex);
                     }
 
                     msg = string.Format("搜索区【{0}】，文件扫描完成；文件数：{1}，耗时：{2}；开始分析需要更新的文件列表...", areaInfo.AreaName, allFilePaths.Count, scanTaskMark.ConsumeTime);
                     log.Info(msg);
                     ShowStatus(msg);
 
-                    // 2.2、-------- 获取需要删除的文件列表
+                    // 2.3、-------- 获取需要删除的文件列表
                     if (AppUtil.ReadSectionList(areaIdIndex) != null)
                     {
                         foreach (string filePath in AppUtil.ReadSectionList(areaIdIndex))
@@ -1094,7 +1098,7 @@ namespace TextLocator
                         }
                     }
 
-                    // 2.3、-------- 如果是更新操作，判断文件格式是否变化 -> 判断文件更新时间变化找到最终需要更新的文件列表
+                    // 2.4、-------- 如果是更新操作，判断文件格式是否变化 -> 判断文件更新时间变化找到最终需要更新的文件列表
                     var analysisTaskMark = TaskTime.StartNew();
                     // 更新是才需要校验，重建是直接跳过
                     if (!isRebuild)
@@ -1129,7 +1133,7 @@ namespace TextLocator
                     log.Info(msg);
                     ShowStatus(msg);
 
-                    // 2.4、-------- 验证扫描文件列表是否为空（如果是更新操作，判断文件格式是否变化 -> 判断文件更新时间变化找到最终需要更新的文件列表）
+                    // 2.5、-------- 验证扫描文件列表是否为空（如果是更新操作，判断文件格式是否变化 -> 判断文件更新时间变化找到最终需要更新的文件列表）
                     if (updateFilePaths.Count <= 0 && deleteFilePaths.Count <= 0)
                     {
                         build = false;
@@ -1142,10 +1146,10 @@ namespace TextLocator
                     // 后台执行时修改为最小线程单位，反之恢复为系统配置线程数
                     AppCore.SetThreadPoolSize(!isBackground);
 
-                    // 2.5、-------- 创建索引方法
+                    // 2.6、-------- 创建索引方法
                     int errorCount = IndexCore.CreateIndex(areaInfo.AreaId, updateFilePaths, deleteFilePaths, isRebuild, ShowStatus);
 
-                    // 2.6、-------- 当前区域完成日志
+                    // 2.7、-------- 当前区域完成日志
                     msg = string.Format("搜索区【{0}】，索引{1}完成；{2}数：{3}，删除数：{4}，错误数：{5}，共用时：{6}。", areaInfo.AreaName, tag, tag, updateFilePaths.Count, deleteFilePaths.Count, errorCount, singleTaskMark.ConsumeTime);
                     log.Info(msg);
                     ShowStatus(msg);
@@ -1156,7 +1160,7 @@ namespace TextLocator
                     }));
 
 
-                    // 2.7、-------- 记录文件总数、更新总数、删除总数、错误总数
+                    // 2.8、-------- 记录文件总数、更新总数、删除总数、错误总数
                     fileTotalCount = fileTotalCount + allFilePaths.Count;
                     updateTotalCount = updateTotalCount + updateFilePaths.Count;
                     deleteTotalCount = deleteTotalCount + deleteFilePaths.Count;
diff --git a/TextLocator/Util/AreaUtil.cs b/TextLocator/Util/AreaUtil.cs
index 12af3e9..06a4167 100644
--- a/TextLocator/Util/AreaUtil.cs
+++ b/TextLocator/Util/AreaUtil.cs
@@ -23,6 +23,10 @@ namespace TextLocator.Util
         /// 区域文件夹
         /// </summary>
         private static string AreaFolders = "AreaFolders";
+        /// <summary>
+        /// 区域文件类型
+        /// </summary>
+        private static string AreaFileTypes = "AreaFileTypes";
 
         /// <summary>
         /// 私有构造方法
@@ -48,17 +52,34 @@ namespace TextLocator.Util
                     string areaName = AppUtil.ReadValue(areaId, AreaName, "区域名称");
                     // 区域文件夹
                     string folders = AppUtil.ReadValue(areaId, AreaFolders, "");
+                    // 区域文件类型
+                    string fileTypeNames = AppUtil.ReadValue(areaId, AreaFileTypes, "");
+
+                    // 区域文件夹解析
                     List<string> areaFolders = new List<string>();
                     if (!string.IsNullOrEmpty(folders))
                     {
                         areaFolders = folders.Split(',').ToList();
                     }
+                    // 区域文件类型解析
+                    List<Enums.FileType> areaFileTypes = new List<Enums.FileType>();
+                    if (!string.IsNullOrEmpty(fileTypeNames))
+                    {
+                        List<string> tmps = fileTypeNames.Split(',').ToList();
+                        foreach (string tmp in tmps)
+                        {
+                            areaFileTypes.Add((Enums.FileType)System.Enum.Parse(typeof(Enums.FileType), tmp));
+                        }
+                    }
+                    
+                    // 构造数据对象
                     AreaInfo areaInfo = new AreaInfo()
                     {
                         IsEnable = isEnable,
                         AreaId = areaId,
                         AreaName = areaName,
-                        AreaFolders = areaFolders
+                        AreaFolders = areaFolders,
+                        AreaFileTypes = areaFileTypes
                     };
                     // 全部搜索区
                     areaInfoList.Add(areaInfo);
@@ -72,7 +93,8 @@ namespace TextLocator.Util
                     IsEnable = true,
                     AreaId = "AreaDefault",
                     AreaName = "默认区域",
-                    AreaFolders = new string[] { Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), Environment.GetFolderPath(Environment.SpecialFolder.Desktop) }.ToList()
+                    AreaFolders = new string[] { Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), Environment.GetFolderPath(Environment.SpecialFolder.Desktop) }.ToList(),
+                    AreaFileTypes = FileTypeUtil.GetFileTypesNotAll()
                 };
                 areaInfoList.Add(areaInfo);
             }
@@ -121,6 +143,8 @@ namespace TextLocator.Util
             AppUtil.WriteValue(areaInfo.AreaId, AreaName, areaInfo.AreaName);
             // 区域文件夹
             AppUtil.WriteValue(areaInfo.AreaId, AreaFolders, areaInfo.AreaFolders != null ? string.Join(",", areaInfo.AreaFolders.ToArray()) : null);
+            // 区域文件类型
+            AppUtil.WriteValue(areaInfo.AreaId, AreaFileTypes, areaInfo.AreaFileTypes != null ? string.Join(",", areaInfo.AreaFileTypes.ToArray()) : null);
 
             // 区域列表
             AppUtil.WriteValue(AreaConfig, areaInfo.AreaId, areaInfo.IsEnable + "");
@@ -136,6 +160,8 @@ namespace TextLocator.Util
             AppUtil.WriteValue(areaInfo.AreaId, AreaName, null);
             // 区域文件夹
             AppUtil.WriteValue(areaInfo.AreaId, AreaFolders, null);
+            // 区域文件类型
+            AppUtil.WriteValue(areaInfo.AreaId, AreaFileTypes, null);
 
             // 区域列表
             AppUtil.WriteValue(AreaConfig, areaInfo.AreaId, null);
diff --git a/TextLocator/Util/FileTypeUtil.cs b/TextLocator/Util/FileTypeUtil.cs
index c9a0d5b..3ba5a95 100644
--- a/TextLocator/Util/FileTypeUtil.cs
+++ b/TextLocator/Util/FileTypeUtil.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using TextLocator.Enums;
 
 namespace TextLocator.Util
@@ -55,21 +57,39 @@ namespace TextLocator.Util
         /// <summary>
         /// 文件类型后缀列表（ext1,ext2...）
         /// </summary>
+        /// <param name="fileTypes">文件类型列表</param>
         /// <param name="separator">分隔符，默认【，】</param>
         /// <returns></returns>
-        public static string GetFileTypeExts(string separator = ",")
+        public static string ConvertToFileTypeExts(List<FileType> fileTypes, string separator = ",")
         {
-            string fileTypeExts = "";
+            string exts = "";
             // 遍历文件类型，根据后缀查找文件类型
-            foreach (FileType ft in Enum.GetValues(typeof(FileType)))
+            foreach (FileType ft in fileTypes)
             {
-                // 获取描述
                 string description = ft.GetDescription();
                 if (!string.IsNullOrEmpty(description)) {
-                    fileTypeExts += description + separator;
+                    exts += description + separator;
+                }
+            }
+            return exts.Substring(0, exts.Length - 1).Replace(",", separator);
+        }
+
+        /// <summary>
+        /// 获取不包含全部的文件类型列表
+        /// </summary>
+        /// <returns></returns>
+        public static List<FileType> GetFileTypesNotAll()
+        {
+            List<FileType> fileTypes = new List<FileType>();
+            foreach(FileType ft in Enum.GetValues(typeof(FileType)))
+            {
+                if (ft == FileType.全部)
+                {
+                    continue;
                 }
+                fileTypes.Add(ft);
             }
-            return fileTypeExts.Substring(0, fileTypeExts.Length - 1).Replace(",", separator);
+            return fileTypes;
         }
     }
 }
diff --git a/TextLocator/Util/FileUtil.cs b/TextLocator/Util/FileUtil.cs
index 30a3087..e1e0337 100644
--- a/TextLocator/Util/FileUtil.cs
+++ b/TextLocator/Util/FileUtil.cs
@@ -125,7 +125,8 @@ namespace TextLocator.Util
         /// </summary>
         /// <param name="filePaths">文档列表</param>
         /// <param name="rootPath">根目录路径</param>
-        public static void GetAllFiles(List<string> filePaths, string rootPath)
+        /// <param name="fileExtRegex">文件后缀正则</param>
+        public static void GetAllFiles(List<string> filePaths, string rootPath, Regex fileExtRegex)
         {
             // 根目录
             DirectoryInfo rootDir = new DirectoryInfo(rootPath);
@@ -148,7 +149,7 @@ namespace TextLocator.Util
                         continue;
                     }
                     // 递归调用
-                    GetAllFiles(filePaths, dirPath);
+                    GetAllFiles(filePaths, dirPath, fileExtRegex);
                 }
             }
             catch (UnauthorizedAccessException ex) {
@@ -164,7 +165,7 @@ namespace TextLocator.Util
             {
                 // 查找word文件
                 string[] paths = Directory.GetFiles(rootPath)
-                    .Where(file => AppConst.REGEX_FILE_EXT.IsMatch(file))
+                    .Where(file => fileExtRegex.IsMatch(file))
                     .ToArray();
                 // 遍历每个文档
                 foreach (string path in paths)
-- 
Gitee