Merge branch 'feature/video' of http://git.yoho.cn/platform/platform-cms into feature/video

@@ -389,7 +389,12 @@
                         index = $(this).attr("index");
                         if(sort == '1'){
                             articleEditer(data.rows[index]);
-                        }else{
+                        }
+                        // 短视频
+                        else if (sort == 4) {
+                            videoEditor(data.rows[index])
+                        }
+                        else{
                             longArticleEditer(data.rows[index]);
                         }
 
@@ -573,6 +578,22 @@
 
 
     // 编辑
+    function videoEditor(data){
+        var articleEditer = $("<div id='articleEditer'>").appendTo($(document.body));
+        var title =  "编辑";
+
+        data.draftEditFlag = 1;
+        window.self.paramObject.mkData = data;
+        $(articleEditer).myDialog({
+            title: title,
+            width: "80%",
+            height: "100%",
+            resizable:false,
+            modal: true,
+            href: contextPath + "/html/grass/article/editorVideoDetail.html"
+        });
+    }
+    // 编辑
     function articleEditer(data){
         var articleEditer = $("<div id='articleEditer'>").appendTo($(document.body));
         var title =  "编辑";

@@ -40,6 +40,9 @@
 <div region="center" id="labelGroupList" style="margin-left: 20px;width: 100%">
     <div id="tt" class="easyui-layout"  style="margin-right:20px;height:100%;overflow-y: scroll">
         <form name="publishArticleForm" id="publishArticleForm" method="post">
+            <input id="operateType" name="operateType" hidden="hidden"/>
+            <input id="draftType" name="draftType" hidden="hidden"/>
+            <input type="hidden" name="articleId" :value="articleId">
             <input type="hidden" name="sort" id="sort" value="4">
             <input type="hidden" name="fileId" :value="videoUploaderInfo.fileId">
             <div style="margin-top: 20px;margin-left: 30px">
@@ -170,17 +173,23 @@
     var searchType = 1;
     var checkType = 1;
     var data = paramObject.mkData;
+    var submitUrl = "/grassArticle/publishArticle";
     $(function () {
         console.log(data);
         if(data && data.editFlag == 1){
             $("#draftBotton").hide();
             $("#timerBotton").hide();
             $("#operateType").val(1);
+            $("#draftType").val(2);
+            submitUrl = "/grassArticle/editArticle";
         }
 
+        if (data && data.draftEditFlag == 1) {
+            $("#draftType").val(1);
+            submitUrl = "/grassArticle/updateArticleDraft";
+        }
         if (data){
             $("#articleUid").textbox("setValue", data.authorUid);
-            $("#draftArticleId").val(data.articleId);
 
             // $("#content").val(data.articleContent);
             $("#content").emojioneArea()[0].emojioneArea.setText(data.articleContent);
@@ -909,10 +918,12 @@
         // state
         data () {
             return {
+                articleId: data ? data.articleId : 0,
                 videoUploaderInfo: {
                     progress: 0,
                     videoUrl: data ? data.videoUrl : "",
                     coverImg: data ? data.coverImg : "",
+                    fileId: data ? data.fileId : ""
                 }
             }
         },