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

VIZ.Package.Module/Resource/MediaResource/View/MediaResourceView.xaml

@@ -26,6 +26,8 @@
                     <MenuItem Header="删除文件" Command="{Binding Path=PlacementTarget.DataContext.DeleteFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <MenuItem Header="删除文件" Command="{Binding Path=PlacementTarget.DataContext.DeleteFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <MenuItem Header="移动文件" Command="{Binding Path=PlacementTarget.DataContext.MoveFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <MenuItem Header="移动文件" Command="{Binding Path=PlacementTarget.DataContext.MoveFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <MenuItem Header="导出素材" Command="{Binding Path=PlacementTarget.DataContext.ExportFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <MenuItem Header="导出素材" Command="{Binding Path=PlacementTarget.DataContext.ExportFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
+
+                    <!--<MenuItem Header="编辑图片" Command="{Binding Path=PlacementTarget.DataContext.EditImageCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>-->
                     <Separator/>
                     <Separator/>
                     <MenuItem Header="文件列表" Command="{Binding Path=PlacementTarget.DataContext.FilesListCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                     <MenuItem Header="文件列表" Command="{Binding Path=PlacementTarget.DataContext.FilesListCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}"/>
                 </ContextMenu>
                 </ContextMenu>

VIZ.Package.Module/Resource/MediaResource/ViewModel/MediaResourcePanelViewModel.cs

@@ -65,6 +65,7 @@ namespace VIZ.Package.Module
             this.FileFilterCommand = new VCommand<ResourceFileType>(this.FileFilter);
             this.FileFilterCommand = new VCommand<ResourceFileType>(this.FileFilter);
             this.FileRowFilterCommand = new DevExpress.Mvvm.DelegateCommand<RowFilterArgs>(this.FileRowFilter);
             this.FileRowFilterCommand = new DevExpress.Mvvm.DelegateCommand<RowFilterArgs>(this.FileRowFilter);
             this.FileDoubleClickCommand = new VCommand(this.FileDoubleClick);
             this.FileDoubleClickCommand = new VCommand(this.FileDoubleClick);
+            this.EditImageCommand = new VCommand(EditImage);
             //this.FileContextMenuOpendCommand = new VCommand(this.FileContextMenuOpend);
             //this.FileContextMenuOpendCommand = new VCommand(this.FileContextMenuOpend);
             //this.AddProgramTemplateCommand = new VCommand(this.AddProgramTemplate, this.CanAddProgramTemplate);
             //this.AddProgramTemplateCommand = new VCommand(this.AddProgramTemplate, this.CanAddProgramTemplate);
             // this.CopyFilePathCommand = new VCommand(this.CopyFilePath, this.CanCopyFilePath);
             // this.CopyFilePathCommand = new VCommand(this.CopyFilePath, this.CanCopyFilePath);
@@ -790,6 +791,20 @@ namespace VIZ.Package.Module
         }
         }
         #endregion
         #endregion
 
 
+        #region
+
+        /// <summary>
+        /// 编辑图片
+        /// </summary>
+        public VCommand EditImageCommand { get; set; }
+
+        private void EditImage()
+        {
+
+        }
+
+        #endregion
+
 
 
 
 
 
 

VIZ.Package.Module/Setting/Media/ViewModel/MediaSettingViewModel.cs

@@ -107,7 +107,7 @@ namespace VIZ.Package.Module
             config.Url = this.Url;
             config.Url = this.Url;
             config.MediaFilter = this.MediaFilter;
             config.MediaFilter = this.MediaFilter;
 
 
-            ApplicationDomainEx.LocalDbContext.MediaConfig.Update(config);
+            ApplicationDomainEx.LocalDbContext.MediaConfig.Upsert(config);
         }
         }
     }
     }
 }
 }
\ No newline at end of file