diff --git a/build/version.props b/build/version.props
index 3bb7a5d743e2f2bd847dff657cda5a8d49a2bff9..e7878764affc152d38c81459b75d359f6dff0415 100644
--- a/build/version.props
+++ b/build/version.props
@@ -3,9 +3,9 @@
     <VersionMain>5.0</VersionMain>
     <VersionPrefix>5</VersionPrefix>
     <VersionSuffix>-preview.</VersionSuffix>
-    <VersionSuffixVersion>414</VersionSuffixVersion>
-    <Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
-    <!--<Version>$(VersionMain).$(VersionPrefix)</Version>-->
+    <VersionSuffixVersion>415</VersionSuffixVersion>
+    <!--<Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>-->
+    <Version>$(VersionMain).$(VersionPrefix)</Version>
     <AssemblyVersion>$(VersionMain).$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>
   </PropertyGroup>
diff --git a/src/OSharp.CodeGeneration/Services/DataService.CodeProject.cs b/src/OSharp.CodeGeneration/Services/DataService.CodeProject.cs
index f48942bb8f7e846aa8fc5423967f639cb1c8ff20..1ac3e59f09becf7aee204eb56c8c66484ebed6ea 100644
--- a/src/OSharp.CodeGeneration/Services/DataService.CodeProject.cs
+++ b/src/OSharp.CodeGeneration/Services/DataService.CodeProject.cs
@@ -45,11 +45,14 @@ namespace OSharp.CodeGeneration.Services
             projects = json.FromJsonString<CodeProject[]>();
             foreach (CodeProject project in projects)
             {
-                foreach (CodeModule module in project.Modules.OrderBy(m => m.Order))
+                project.Modules = project.Modules.OrderBy(m => m.Order).ToList();
+                foreach (CodeModule module in project.Modules)
                 {
-                    foreach (CodeEntity entity in module.Entities.OrderBy(m => m.Order))
+                    module.Entities = module.Entities.OrderBy(m => m.Order).ToList();
+                    foreach (CodeEntity entity in module.Entities)
                     {
-                        foreach (CodeProperty property in entity.Properties.OrderBy(m => m.Order))
+                        entity.Properties = entity.Properties.OrderBy(m => m.Order).ToList();
+                        foreach (CodeProperty property in entity.Properties)
                         {
                             property.Entity = entity;
                         }
diff --git a/src/OSharp.CodeGenerator/Views/Entities/EntityListViewModel.cs b/src/OSharp.CodeGenerator/Views/Entities/EntityListViewModel.cs
index 6b57e6a49da85559cc29ff24d12f5fdea7d5ed70..87aa3a12654c708dfa647d76c044464544a5af25 100644
--- a/src/OSharp.CodeGenerator/Views/Entities/EntityListViewModel.cs
+++ b/src/OSharp.CodeGenerator/Views/Entities/EntityListViewModel.cs
@@ -26,6 +26,8 @@ using OSharp.Exceptions;
 using OSharp.Mapping;
 using OSharp.Wpf.Stylet;
 
+using PropertyChanged;
+
 using Stylet;
 
 
@@ -120,6 +122,7 @@ namespace OSharp.CodeGenerator.Views.Entities
         /// Called whenever the error state of any properties changes. Calls NotifyOfPropertyChange("HasErrors") by default
         /// </summary>
         /// <param name="changedProperties">List of property names which have changed validation state</param>
+        [SuppressPropertyChangedWarnings]
         protected override void OnValidationStateChanged(IEnumerable<string> changedProperties)
         {
             base.OnValidationStateChanged(changedProperties);
diff --git a/src/OSharp.CodeGenerator/Views/Modules/ModuleListView.xaml b/src/OSharp.CodeGenerator/Views/Modules/ModuleListView.xaml
index 7a92fba103341903bddd765227e5de8279a86a28..cc703fd36a160c48684587834c34ce7246b9d514 100644
--- a/src/OSharp.CodeGenerator/Views/Modules/ModuleListView.xaml
+++ b/src/OSharp.CodeGenerator/Views/Modules/ModuleListView.xaml
@@ -50,9 +50,9 @@
         <DataGrid.Columns>
           <DataGridTextColumn Header="代码名称" Binding="{Binding Name}" MinWidth="200"/>
           <DataGridTextColumn Header="显示名称" Binding="{Binding Display}" MinWidth="200"/>
-          <DataGridCheckBoxColumn Header="锁定" Binding="{Binding IsLocked}" MinWidth="35"/>
           <DataGridTextColumn Header="命名空间" Binding="{Binding Namespace}" MinWidth="300" IsReadOnly="True"/>
-          <DataGridTextColumn Header="创建时间" Binding="{Binding CreatedTime, StringFormat='yyyy/MM/dd HH:mm'}" MinWidth="120" IsReadOnly="True"/>
+          <DataGridCheckBoxColumn Header="锁定" Binding="{Binding IsLocked}" Width="50"/>
+          <DataGridTextColumn Header="创建时间" Binding="{Binding CreatedTime, StringFormat='yyyy/MM/dd HH:mm'}" Width="120" IsReadOnly="True"/>
           <DataGridTemplateColumn Header="操作" Width="85">
             <DataGridTemplateColumn.CellTemplate>
               <DataTemplate>
diff --git a/src/OSharp.CodeGenerator/Views/Modules/ModuleListViewModel.cs b/src/OSharp.CodeGenerator/Views/Modules/ModuleListViewModel.cs
index 685e106c07c1ff1cd75f8285816d5a97de7c7a63..8ebea0e89760652525b1cf042c7135112ee3a5ff 100644
--- a/src/OSharp.CodeGenerator/Views/Modules/ModuleListViewModel.cs
+++ b/src/OSharp.CodeGenerator/Views/Modules/ModuleListViewModel.cs
@@ -25,6 +25,8 @@ using OSharp.Data;
 using OSharp.Mapping;
 using OSharp.Wpf.Stylet;
 
+using PropertyChanged;
+
 using Stylet;
 
 
@@ -119,6 +121,7 @@ namespace OSharp.CodeGenerator.Views.Modules
         /// Called whenever the error state of any properties changes. Calls NotifyOfPropertyChange("HasErrors") by default
         /// </summary>
         /// <param name="changedProperties">List of property names which have changed validation state</param>
+        [SuppressPropertyChangedWarnings]
         protected override void OnValidationStateChanged(IEnumerable<string> changedProperties)
         {
             base.OnValidationStateChanged(changedProperties);
diff --git a/src/OSharp.CodeGenerator/Views/Projects/ProjectTemplateListViewModel.cs b/src/OSharp.CodeGenerator/Views/Projects/ProjectTemplateListViewModel.cs
index 85795cb52ebbce729f61b031059cccbf99bfba81..1021c5b850d1d79591267b4e4942fd9c26c01df6 100644
--- a/src/OSharp.CodeGenerator/Views/Projects/ProjectTemplateListViewModel.cs
+++ b/src/OSharp.CodeGenerator/Views/Projects/ProjectTemplateListViewModel.cs
@@ -25,6 +25,8 @@ using OSharp.Data;
 using OSharp.Mapping;
 using OSharp.Wpf.Stylet;
 
+using PropertyChanged;
+
 using Stylet;
 
 
@@ -134,6 +136,7 @@ namespace OSharp.CodeGenerator.Views.Projects
         /// Called whenever the error state of any properties changes. Calls NotifyOfPropertyChange("HasErrors") by default
         /// </summary>
         /// <param name="changedProperties">List of property names which have changed validation state</param>
+        [SuppressPropertyChangedWarnings]
         protected override void OnValidationStateChanged(IEnumerable<string> changedProperties)
         {
             base.OnValidationStateChanged(changedProperties);
diff --git a/src/OSharp.CodeGenerator/Views/Projects/ProjectViewModel.cs b/src/OSharp.CodeGenerator/Views/Projects/ProjectViewModel.cs
index 608dac01d367d75b54cf7eb529efc6136e4edc72..0ebc2266b482ab61e5188d0cc6fd3f240a6af6ce 100644
--- a/src/OSharp.CodeGenerator/Views/Projects/ProjectViewModel.cs
+++ b/src/OSharp.CodeGenerator/Views/Projects/ProjectViewModel.cs
@@ -28,6 +28,8 @@ using OSharp.Extensions;
 using OSharp.Mapping;
 using OSharp.Wpf.Stylet;
 
+using PropertyChanged;
+
 using Stylet;
 
 using MessageBox = System.Windows.MessageBox;
@@ -168,6 +170,7 @@ namespace OSharp.CodeGenerator.Views.Projects
         /// Called whenever the error state of any properties changes. Calls NotifyOfPropertyChange("HasErrors") by default
         /// </summary>
         /// <param name="changedProperties">List of property names which have changed validation state</param>
+        [SuppressPropertyChangedWarnings]
         protected override void OnValidationStateChanged(IEnumerable<string> changedProperties)
         {
             base.OnValidationStateChanged(changedProperties);
diff --git a/src/OSharp.CodeGenerator/Views/Properties/PropertyListView.xaml b/src/OSharp.CodeGenerator/Views/Properties/PropertyListView.xaml
index cfea483173eb88aefc8d35f33dbf9c0fe47238a7..2e5b5b004cf95c92c63c9b07039ed626c7674243 100644
--- a/src/OSharp.CodeGenerator/Views/Properties/PropertyListView.xaml
+++ b/src/OSharp.CodeGenerator/Views/Properties/PropertyListView.xaml
@@ -46,12 +46,12 @@
       </StackPanel>
     </GroupBox.Header>
     <Grid>
-      <DataGrid ItemsSource="{Binding Properties}" AutoGenerateColumns="False" GridLinesVisibility="All" CanUserSortColumns="False"
+      <DataGrid ItemsSource="{Binding Properties}" AutoGenerateColumns="False" GridLinesVisibility="All" ColumnWidth="*" CanUserSortColumns="False"
                 SelectionMode="Single" RowDetailsVisibilityMode="Collapsed" CanUserDeleteRows="False">
         <DataGrid.Columns>
           <DataGridTextColumn Header="代码名称" Binding="{Binding Name, ValidatesOnDataErrors=True}" MinWidth="100"/>
           <DataGridTextColumn Header="显示名称" Binding="{Binding Display, ValidatesOnDataErrors=True}" MinWidth="100"/>
-          <DataGridTemplateColumn Header="属性类型命名" MinWidth="120">
+          <DataGridTemplateColumn Header="属性类型全名" MinWidth="120">
             <DataGridTemplateColumn.CellTemplate>
               <DataTemplate>
                 <TextBlock Text="{Binding TypeName}" ToolTip="{Binding TypeName}"/>
@@ -63,12 +63,12 @@
               </DataTemplate>
             </DataGridTemplateColumn.CellEditingTemplate>
           </DataGridTemplateColumn>
-          <DataGridCheckBoxColumn Header="只读" Width="50" Binding="{Binding Readonly}"/>
-          <DataGridCheckBoxColumn Header="编辑" Width="50" Binding="{Binding Updatable}"/>
-          <DataGridCheckBoxColumn Header="排序" Width="50" Binding="{Binding Sortable}"/>
-          <DataGridCheckBoxColumn Header="过滤" Width="50" Binding="{Binding Filterable}"/>
-          <DataGridCheckBoxColumn Header="必填" Width="50" Binding="{Binding IsRequired}"/>
-          <DataGridTemplateColumn Header="最小长度" Width="80">
+          <DataGridCheckBoxColumn Header="只读" MinWidth="50" Width="50" Binding="{Binding Readonly}"/>
+          <DataGridCheckBoxColumn Header="编辑" MinWidth="50" Width="50" Binding="{Binding Updatable}"/>
+          <DataGridCheckBoxColumn Header="排序" MinWidth="50" Width="50" Binding="{Binding Sortable}"/>
+          <DataGridCheckBoxColumn Header="过滤" MinWidth="50" Width="50" Binding="{Binding Filterable}"/>
+          <DataGridCheckBoxColumn Header="必填" MinWidth="50" Width="50" Binding="{Binding IsRequired}"/>
+          <DataGridTemplateColumn Header="最小长度" MinWidth="80" Width="80">
             <DataGridTemplateColumn.CellTemplate>
               <DataTemplate>
                 <TextBlock Text="{Binding MinLength}"/>
@@ -80,7 +80,7 @@
               </DataTemplate>
             </DataGridTemplateColumn.CellEditingTemplate>
           </DataGridTemplateColumn>
-          <DataGridTemplateColumn Header="最大长度" Width="85">
+          <DataGridTemplateColumn Header="最大长度" MinWidth="85" Width="85">
             <DataGridTemplateColumn.CellTemplate>
               <DataTemplate>
                 <TextBlock Text="{Binding MaxLength}"/>
@@ -92,10 +92,10 @@
               </DataTemplate>
             </DataGridTemplateColumn.CellEditingTemplate>
           </DataGridTemplateColumn>
-          <DataGridCheckBoxColumn Header="可空类型" Width="70" Binding="{Binding IsNullable}"/>
-          <DataGridCheckBoxColumn Header="外键" Width="50" Binding="{Binding IsForeignKey}"/>
-          <DataGridCheckBoxColumn Header="导航" Width="50" Binding="{Binding IsNavigation}"/>
-          <DataGridTemplateColumn Header="关联实体" Width="150">
+          <DataGridCheckBoxColumn Header="可空类型" MinWidth="70" Width="70" Binding="{Binding IsNullable}"/>
+          <DataGridCheckBoxColumn Header="外键" MinWidth="50" Width="50" Binding="{Binding IsForeignKey}"/>
+          <DataGridCheckBoxColumn Header="导航" MinWidth="50" Width="50" Binding="{Binding IsNavigation}"/>
+          <DataGridTemplateColumn Header="关联实体" MinWidth="120">
             <DataGridTemplateColumn.CellTemplate>
               <DataTemplate>
                 <TextBlock Text="{Binding RelateEntity}" ToolTip="{Binding RelateEntity}"/>
@@ -107,7 +107,7 @@
               </DataTemplate>
             </DataGridTemplateColumn.CellEditingTemplate>
           </DataGridTemplateColumn>
-          <DataGridTemplateColumn Header="数权标" Width="70">
+          <DataGridTemplateColumn Header="数权标" MinWidth="70" Width="70">
             <DataGridTemplateColumn.CellTemplate>
               <DataTemplate>
                 <TextBlock Text="{Binding DataAuthFlag}" ToolTip="数据权限标识，比如@当前用户"/>
@@ -119,12 +119,12 @@
               </DataTemplate>
             </DataGridTemplateColumn.CellEditingTemplate>
           </DataGridTemplateColumn>
-          <DataGridCheckBoxColumn Header="输入DTO" Width="72" Binding="{Binding IsInputDto}"/>
-          <DataGridCheckBoxColumn Header="输出DTO" Width="72" Binding="{Binding IsOutputDto}"/>
-          <DataGridTextColumn Header="默认值" Width="60" Binding="{Binding DefaultValue}"/>
-          <DataGridCheckBoxColumn Header="锁定" Width="50" Binding="{Binding IsLocked}"/>
-          <DataGridTextColumn Header="创建时间" Width="120" Binding="{Binding CreatedTime, StringFormat='yyyy/MM/dd HH:mm'}" IsReadOnly="True"/>
-          <DataGridTemplateColumn Header="操作" Width="85">
+          <DataGridCheckBoxColumn Header="输入DTO" MinWidth="72" Width="72" Binding="{Binding IsInputDto}"/>
+          <DataGridCheckBoxColumn Header="输出DTO" MinWidth="72" Width="72" Binding="{Binding IsOutputDto}"/>
+          <DataGridTextColumn Header="默认值" MinWidth="60" Width="60" Binding="{Binding DefaultValue}"/>
+          <DataGridCheckBoxColumn Header="锁定" MinWidth="50" Width="50" Binding="{Binding IsLocked}"/>
+          <DataGridTextColumn Header="创建时间" MinWidth="120" Width="120" Binding="{Binding CreatedTime, StringFormat='yyyy/MM/dd HH:mm'}" IsReadOnly="True"/>
+          <DataGridTemplateColumn Header="操作" MinWidth="85" Width="85">
             <DataGridTemplateColumn.CellTemplate>
               <DataTemplate>
                 <StackPanel Orientation="Horizontal">
diff --git a/src/OSharp.CodeGenerator/Views/Properties/PropertyListViewModel.cs b/src/OSharp.CodeGenerator/Views/Properties/PropertyListViewModel.cs
index 7de8bc592b3a1c98dfde3cf39a627d6bf672506a..102c66c9d1f390e63424376a5dac07d3b3896fb5 100644
--- a/src/OSharp.CodeGenerator/Views/Properties/PropertyListViewModel.cs
+++ b/src/OSharp.CodeGenerator/Views/Properties/PropertyListViewModel.cs
@@ -26,6 +26,8 @@ using OSharp.Exceptions;
 using OSharp.Mapping;
 using OSharp.Wpf.Stylet;
 
+using PropertyChanged;
+
 using Stylet;
 
 
@@ -121,6 +123,7 @@ namespace OSharp.CodeGenerator.Views.Properties
         /// Called whenever the error state of any properties changes. Calls NotifyOfPropertyChange("HasErrors") by default
         /// </summary>
         /// <param name="changedProperties">List of property names which have changed validation state</param>
+        [SuppressPropertyChangedWarnings]
         protected override void OnValidationStateChanged(IEnumerable<string> changedProperties)
         {
             base.OnValidationStateChanged(changedProperties);