项目库打开等修复

VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/ListCellEditBase.cs

@@ -4,6 +4,7 @@ using System.Dynamic;
 using System.Linq;
 using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls;
 using VIZ.Package.Domain;
 using VIZ.Package.Domain;
 using VIZ.Package.Service;
 using VIZ.Package.Service;
@@ -39,6 +40,7 @@ namespace VIZ.Package.Module
             if (ApplicationDomainEx.FieldEditWindow == null)
             if (ApplicationDomainEx.FieldEditWindow == null)
             {
             {
                 ApplicationDomainEx.FieldEditWindow = new FieldEditWindow();
                 ApplicationDomainEx.FieldEditWindow = new FieldEditWindow();
+                ApplicationDomainEx.FieldEditWindow.Owner = ApplicationDomainEx.MainWindow;
             }
             }
 
 
             return ApplicationDomainEx.FieldEditWindow as FieldEditWindow;
             return ApplicationDomainEx.FieldEditWindow as FieldEditWindow;

VIZ.Package.Module/ControlObject/FieldTree/View/FieldTreeView.xaml

@@ -37,5 +37,7 @@
                 </dxg:TreeListView>
                 </dxg:TreeListView>
             </dxg:GridControl.View>
             </dxg:GridControl.View>
         </dxg:GridControl>
         </dxg:GridControl>
+
+        <dx:WaitIndicator DeferedVisibility="{Binding IsLoading}" Content="Loading..." />
     </Grid>
     </Grid>
 </UserControl>
 </UserControl>

VIZ.Package.Module/ControlObject/FieldTree/ViewModel/FieldTreeViewModel.cs

@@ -38,6 +38,7 @@ namespace VIZ.Package.Module
         private void InitMessage()
         private void InitMessage()
         {
         {
             ApplicationDomainEx.MessageManager.Register<PageInitedMessage>(this, this.OnPageInitedMessage);
             ApplicationDomainEx.MessageManager.Register<PageInitedMessage>(this, this.OnPageInitedMessage);
+            ApplicationDomainEx.MessageManager.Register<ProjectCloseMessage>(this, this.OnProjectCloseMessage);
         }
         }
 
 
         // =============================================================
         // =============================================================
@@ -138,5 +139,15 @@ namespace VIZ.Package.Module
                 });
                 });
             });
             });
         }
         }
+
+        /// <summary>
+        /// 项目关闭时触发
+        /// </summary>
+        /// <param name="msg"></param>
+        private void OnProjectCloseMessage(ProjectCloseMessage msg)
+        {
+            this.ControlObject = null;
+            this.SelectedControlField = null;
+        }
     }
     }
 }
 }
\ No newline at end of file

VIZ.Package.Module/Main/ViewModel/MainTopViewModel.cs

@@ -149,6 +149,8 @@ namespace VIZ.Package.Module
                 {
                 {
                     this.SaveProject();
                     this.SaveProject();
                 }
                 }
+
+                ApplicationDomainEx.ProjectDbContext.Dispose();
             }
             }
 
 
             OpenFileDialog ofd = new OpenFileDialog();
             OpenFileDialog ofd = new OpenFileDialog();
@@ -224,6 +226,8 @@ namespace VIZ.Package.Module
                 {
                 {
                     this.SaveProject();
                     this.SaveProject();
                 }
                 }
+
+                ApplicationDomainEx.ProjectDbContext.Dispose();
             }
             }
 
 
             this.ProjectName = null;
             this.ProjectName = null;

VIZ.Package.Module/Page/Group/ViewModel/PageGroupViewModel.cs

@@ -330,24 +330,7 @@ namespace VIZ.Package.Module
         /// <param name="msg">消息</param>
         /// <param name="msg">消息</param>
         private void OnProjectSaveMessage(ProjectSaveMessage msg)
         private void OnProjectSaveMessage(ProjectSaveMessage msg)
         {
         {
-            this.IsLoading = true;
-
-            Task.Run(() =>
-            {
-                try
-                {
-                    this.pageService.SavePageGroups(this.PageGroupModels);
-                }
-                catch (Exception ex)
-                {
-                    log.Error(ex);
-                }
-
-                WPFHelper.BeginInvoke(() =>
-                {
-                    this.IsLoading = false;
-                });
-            });
+            this.pageService.SavePageGroups(this.PageGroupModels);
         }
         }
 
 
         // ======================================================================================
         // ======================================================================================
@@ -373,6 +356,8 @@ namespace VIZ.Package.Module
                 return;
                 return;
 
 
             PageModel page = new PageModel();
             PageModel page = new PageModel();
+            page.PageID = Guid.NewGuid();
+            page.PageGroupID = this.SelectedPageGroupModel.GroupID;
             page.Scene = template.Scene;
             page.Scene = template.Scene;
             page.ScenePath = template.ScenePath;
             page.ScenePath = template.ScenePath;
             page.ThumbnailUri = template.ThumbnailUri;
             page.ThumbnailUri = template.ThumbnailUri;

VIZ.Package.Module/Page/Templage/ViewModel/PageTemplateViewModel.cs

@@ -284,24 +284,7 @@ namespace VIZ.Package.Module
         /// <param name="msg">消息</param>
         /// <param name="msg">消息</param>
         private void OnProjectSaveMessage(ProjectSaveMessage msg)
         private void OnProjectSaveMessage(ProjectSaveMessage msg)
         {
         {
-            this.IsLoading = true;
-
-            Task.Run(() =>
-            {
-                try
-                {
-                    this.pageService.SavePageTemplates(this.SceneTemplateModels);
-                }
-                catch (Exception ex)
-                {
-                    log.Error(ex);
-                }
-
-                WPFHelper.BeginInvoke(() =>
-                {
-                    this.IsLoading = false;
-                });
-            });
+            this.pageService.SavePageTemplates(this.SceneTemplateModels);
         }
         }
 
 
         // ======================================================================================
         // ======================================================================================