Merge branch 'fix/bug_process' into 'develop'

Merge of fix/bug_process to develop 修正通过JOB打开文档的问题

See merge request o2oa/o2oa!901

o2web/source/x_component_portal_PageDesigner/Script.js

@@ -534,7 +534,7 @@ MWF.xApplication.portal.PageDesigner.Script = new Class({
                 this.scriptAreaNode.setStyle("margin-left", width+3);
                 this.listAreaNode.setStyle("width", width);
 
-                if (this.editor) this.editor.resize();
+                if (this.jsEditor) this.jsEditor.resize();
             }.bind(this)
         });
     },
@@ -709,9 +709,9 @@ MWF.xApplication.portal.PageDesigner.Script.Item = new Class({
         // if (this.value){
         if (!this.node) this.createNode();
             //if (this.isShow)
-        if (this.editor){
-            this.editor.setValue(this.value);
-            this.editor.session.setValue(this.value);
+        if (this.jsEditor){
+            this.jsEditor.setValue(this.value);
+            //this.editor.session.setValue(this.value);
             //this.jsEditor.node.show();
         }
         // }else{
@@ -821,7 +821,7 @@ MWF.xApplication.portal.PageDesigner.Script.Item = new Class({
         this.script.designer.saveForm();
     },
     change: function(){
-        this.data[this.key] = this.editor.getValue();
+        this.data[this.key] = this.jsEditor.getValue();
     },
     setSize: function(){
         var size = this.script.scriptTabNode.getComputedSize();
@@ -830,7 +830,7 @@ MWF.xApplication.portal.PageDesigner.Script.Item = new Class({
         var tabMarginBottom = this.script.scriptTab.tabNodeContainer.getStyle("margin-bottom").toFloat();
         var h = size.height-tabSize.totalHeight-tabMarginTop-tabMarginBottom;
         this.scriptPageNode.setStyle("height", ""+h+"px");
-        if (this.editor) this.editor.resize();
+        if (this.jsEditor) this.jsEditor.resize();
     },
     createScriptEditor: function(){
         this.scriptPageNode = new Element("div");

o2web/source/x_component_process_Application/MyWorkExplorer.js

@@ -63,10 +63,10 @@ MWF.xApplication.process.Application.MyWorkExplorer = new Class({
         this.actions.removeWork(work.data.id, this.app.options.id, all, function(json){
             json.data.each(function(item){
                 this.items.erase(this.works[item.id]);
-                this.works[item.id].destroy();
+                if (this.works[item.id]) this.works[item.id].destroy();
                 MWF.release(this.works[item.id]);
                 delete this.works[item.id];
             }.bind(this));
         }.bind(this));
     }
-});
+});

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/empty.html

@@ -83,7 +83,7 @@
         <P class=MsoNormal style='font-size:16.0pt;font-family:仿宋'><span>&nbsp</span></P>
     </div>
 
-    <div class="MsoNormal doc_block doc_layout_filetext" style="font-family: '仿宋'; font-size: 16pt;letter-spacing:-0.4pt">
+    <div class="MsoNormal doc_block doc_layout_filetext" style="font-family: '仿宋'; text-align:justify; font-size: 16pt;letter-spacing:-0.4pt">
         <p class=MsoNormal>　　文件正文</p>
     </div>
 

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/letter.html

@@ -154,7 +154,7 @@
 
     <p class="MsoNormal doc_block" align=left style='text-align:left'><span class="doc_layout_mainSend" style='font-size:16.0pt;font-family:仿宋'>主送单位：</span></p>
 
-    <div class="MsoNormal doc_block doc_layout_filetext" style='font-family:仿宋;font-size: 16pt;letter-spacing:-0.4pt'>
+    <div class="MsoNormal doc_block doc_layout_filetext" style='font-family:仿宋; text-align:justify; font-size: 16pt;letter-spacing:-0.4pt'>
         <p class=MsoNormal>　　文件正文</p>
     </div>
 

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/meeting.html

@@ -141,7 +141,7 @@
 
     <p class="MsoNormal doc_block" align=left style='text-align:left'><span class="doc_layout_mainSend" style='font-size:16.0pt;font-family:仿宋'>主送单位：</span></p>
 
-    <div class="MsoNormal doc_block doc_layout_filetext" style='font-family:仿宋;text-align:left;font-size: 16pt;letter-spacing:-0.4pt'>
+    <div class="MsoNormal doc_block doc_layout_filetext" style='font-family:仿宋;text-align:justify;font-size: 16pt;letter-spacing:-0.4pt'>
         <p class=MsoNormal>　　文件正文</p>
     </div>
 

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/party-meeting.html

@@ -151,7 +151,7 @@
 
     <p class="MsoNormal doc_block" align=left style='text-align:left'><span class="doc_layout_mainSend" style='font-size:16.0pt;font-family:仿宋'>主送单位：</span></p>
 
-    <div class="MsoNormal doc_block doc_layout_filetext" style='font-family:仿宋;text-align:left;font-size: 16pt;letter-spacing:-0.4pt'>
+    <div class="MsoNormal doc_block doc_layout_filetext" style='font-family:仿宋;text-align:justify;font-size: 16pt;letter-spacing:-0.4pt'>
         <p class=MsoNormal>　　文件正文</p>
     </div>
 

o2web/source/x_component_process_FormDesigner/Module/Documenteditor/templete/standard.html

@@ -156,7 +156,7 @@
 
     <p class="MsoNormal doc_block" align=left style='text-align:left'><span class="doc_layout_mainSend" style='font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt'>主送单位：</span></p>
 
-    <div class="MsoNormal doc_block doc_layout_filetext" style='font-family:仿宋;text-align:left;font-size: 16pt;letter-spacing:-0.4pt'>
+    <div class="MsoNormal doc_block doc_layout_filetext" style='font-family:仿宋;text-align:justify;font-size: 16pt;letter-spacing:-0.4pt'>
         <p class=MsoNormal>　　文件正文</p>
     </div>
 

o2web/source/x_component_process_Work/Main.js

@@ -170,7 +170,7 @@ MWF.xApplication.process.Work.Main = new Class({
                         }
                     }
                 }.bind(this), "failure": function(){
-                    this.close();
+                    //this.close();
                 }.bind(this)}, [this.options.form.id, this.options.form.app], id);
         }else{
             o2.Actions.invokeAsync([
@@ -199,7 +199,7 @@ MWF.xApplication.process.Work.Main = new Class({
                         }
                     }
                 }.bind(this), "failure": function(){
-                    this.close();
+                    //this.close();
                 }.bind(this)}, id);
         }
     },
@@ -217,18 +217,26 @@ MWF.xApplication.process.Work.Main = new Class({
                     this.options.workId = id;
                     this.loadWork();
                 }else{
-                    var worksAreaNode = this.createWorksArea();
-                    // for (var x=0;x<3;x++){
-                    json.data.workList.each(function(work){
-                        this.createWorkNode(work, worksAreaNode);
-                    }.bind(this));
-                    json.data.workCompletedList.each(function(work){
-                        this.createWorkCompletedNode(work, worksAreaNode);
-                    }.bind(this));
-                    // }
-                    if (this.mask) this.mask.hide();
-                    this.formNode.setStyles(this.css.formNode_bg);
-
+                    if (this.options.choice){
+                        var worksAreaNode = this.createWorksArea();
+                        // for (var x=0;x<3;x++){
+                        json.data.workList.each(function(work){
+                            this.createWorkNode(work, worksAreaNode);
+                        }.bind(this));
+                        json.data.workCompletedList.each(function(work){
+                            this.createWorkCompletedNode(work, worksAreaNode);
+                        }.bind(this));
+                        // }
+                        if (this.mask) this.mask.hide();
+                        this.formNode.setStyles(this.css.formNode_bg);
+                    }else{
+                        if (json.data.workList.length){
+                            this.options.workId =  json.data.workList[0].id;
+                        }else{
+                            this.options.workId =  json.data.workCompletedList[0].id;
+                        }
+                        this.loadWork();
+                    }
                 }
             }else{
                 this.close();

o2web/source/x_desktop/js/work.js

@@ -8,7 +8,6 @@ layout.addReady(function(){
         var _load = function(){
             // layout.message = new MWF.xDesktop.MessageMobile();
             // layout.message.load();
-
             layout.apps = [];
             layout.node = $("layout");
             var appName=appNames, m_status=statusObj, option=options;
@@ -114,4 +113,4 @@ layout.addReady(function(){
         };
         _load();
     })(layout);
-});
+});