Merge branch 'fix/cmsstart' into 'develop'

Merge of fix/cmsstart 修复内容管理分类关联草稿模式流程，启动时报错 to develop

See merge request o2oa/o2oa!1288

o2web/source/x_component_cms_Index/Newer.js

@@ -623,6 +623,28 @@ MWF.xApplication.cms.Index.Newer = new Class({
         }
     },
     afterStartProcess: function(data, title, processName, workData){
+        if (data.work){
+            this.startProcessDraft(data, title, processName, workData);
+        }else{
+            this.startProcessInstance(data, title, processName, workData);
+        }
+    },
+    startProcessDraft: function(data, title, processName, workData){
+        var work = data.work;
+        if(workData){
+            delete workData.identity;
+            delete workData.attachmentList;
+        }
+        var options = {
+            "draft": work,
+            "draftData": workData,
+            "appId": "process.Work"+(new o2.widget.UUID).toString(),
+            "desktopReload": false
+        };
+        var win = this.app.desktop.openApplication(null, "process.Work", options);
+        this.fireEvent("started", ["", workData, win]);
+    },
+    startProcessInstance: function(data, title, processName, workData){
         var workInfors = [];
         var currentTask = [];
 
@@ -633,9 +655,6 @@ MWF.xApplication.cms.Index.Newer = new Class({
         var workId = currentTask[0];
 
         MWF.Actions.get("x_processplatform_assemble_surface").saveData(function(){
-
-
-
             if (currentTask.length==1){
                 var options = {"workId": workId};
                 var handle = this.app.desktop.openApplication(null, "process.Work", options);

o2web/source/x_component_process_Work/Main.js

@@ -140,7 +140,7 @@ MWF.xApplication.process.Work.Main = new Class({
                 this.loadWorkByDraft(json.data.work, json.data.data);
             }.bind(this));
         }else if (this.options.draft){
-            this.loadWorkByDraft(this.options.draft);
+            this.loadWorkByDraft(this.options.draft, this.options.draftData);
         }else if (this.options.jobId || this.options.jobid || this.options.job){
             var jobId = this.options.jobId || this.options.jobid || this.options.job;
             delete this.options.jobId;