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

VIZ.Package.Module.Resource/VIZ.Package.Module.Resource.csproj

@@ -197,11 +197,6 @@
     <Resource Include="Icons\image_20x20.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\Vedio.jpeg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
     <Resource Include="Images\logo_large.png" />
   </ItemGroup>
   <ItemGroup>

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

@@ -258,7 +258,7 @@ namespace VIZ.Package.Module
             if (e.File == null)
                 return;
 
-            this.Path = e.File?.Path;
+            this.Path = e.File?.Path.Replace(@"\", @"\\");
         }
     }
 }

VIZ.Package.sln

@@ -231,7 +231,7 @@ Global
 		{75B39591-4BC3-4B09-BD7D-EC9F67EFA96E} = {38A2D690-6AB3-421E-857E-DE55B4CAF78F}
 		{06B80C09-343D-4BB2-AEB1-61CFBFBF5CAD} = {DA43E9E0-AFD0-4764-8228-44A01DF922A3}
 		{28661E82-C86A-4611-A028-C34F6AC85C97} = {7E1F0C7E-1A9C-4E9E-AB5F-C38BBB1B3E4A}
-		{92834C05-703E-4F05-9224-F36220939D8F} = {F27A68C8-FD86-4CE8-B832-0582BEF95953}
+		{92834C05-703E-4F05-9224-F36220939D8F} = {DA43E9E0-AFD0-4764-8228-44A01DF922A3}
 		{76EF480A-E486-41B7-B7A5-2A849FC8D5BF} = {F27A68C8-FD86-4CE8-B832-0582BEF95953}
 		{E07528DD-9DEE-47C2-B79D-235ECFA6B003} = {13578EF6-3708-4541-AD15-1432CCBB6A76}
 		{47CF6FB0-E37D-4EF1-AFC7-03DB2BCA8892} = {3EF92943-B3E1-4D8F-857E-B8C3B6999096}