Merge branch 'master' of http://49.233.21.66/liulongfei/VIZ.Package

VIZ.Package.Module/ControlObject/FieldEdit/Edit/ImageEdit/ImageEditPanelModel.cs

@@ -74,7 +74,7 @@ namespace VIZ.Package.Module
 
 
         #region IShowMedia ---是否显示媒体资源库页签
         #region IShowMedia ---是否显示媒体资源库页签
 
 
-        private Visibility iShowMedia=Visibility.Visible;
+        private Visibility iShowMedia = Visibility.Visible;
 
 
         /// <summary>
         /// <summary>
         /// 是否隐藏媒体资源库页签
         /// 是否隐藏媒体资源库页签
@@ -91,9 +91,9 @@ namespace VIZ.Package.Module
 
 
         private void IsHideMedieTab()
         private void IsHideMedieTab()
         {
         {
-            bool flag= ApplicationDomainEx.IniStorage.GetValue<LogConfig, bool>(p => p.ISSHOWMEDIATAB);
+            bool flag = ApplicationDomainEx.IniStorage.GetValue<LogConfig, bool>(p => p.ISSHOWMEDIATAB);
 
 
-            if(flag)
+            if (flag)
             {
             {
                 IShowMedia = Visibility.Visible;
                 IShowMedia = Visibility.Visible;
             }
             }
@@ -131,7 +131,7 @@ namespace VIZ.Package.Module
             this.IsSendToPreview = false;
             this.IsSendToPreview = false;
             this.GHResourceEditPartModel.SelectedFileModel = null;
             this.GHResourceEditPartModel.SelectedFileModel = null;
             this.IsSendToPreview = true;
             this.IsSendToPreview = true;
-            this.Path = ofd.FileName;
+            this.Path = ofd.FileName.Replace(@"\", @"\\");
         }
         }
 
 
         #endregion
         #endregion

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

@@ -285,9 +285,9 @@ namespace VIZ.Package.Module
             //调用关闭消息
             //调用关闭消息
             ProjectCloseMessage closemsg = new ProjectCloseMessage();
             ProjectCloseMessage closemsg = new ProjectCloseMessage();
             ApplicationDomainEx.MessageManager.Send(closemsg);
             ApplicationDomainEx.MessageManager.Send(closemsg);
-
             this.UpdateCommandStatus();
             this.UpdateCommandStatus();
 
 
+            ApplicationDomainEx.ProjectDbContext?.Dispose();
 
 
 
 
             SaveProjectWindowModel vm = window.DataContext as SaveProjectWindowModel;
             SaveProjectWindowModel vm = window.DataContext as SaveProjectWindowModel;