Преглед изворни кода

Merge branch 'fix/HomePage.create_process_error' into 'develop'

Merge of fix/[平台首页]修复新建流程可能报错的问题 to develop

See merge request o2oa/o2oa!290
蔡祥熠 пре 5 година
родитељ
комит
7b279a90e5

+ 1 - 1
o2web/source/o2_core/o2/o2.core.js

@@ -102,7 +102,7 @@
                 thisLoaded.push(m);
                 o2.runCallback(callback, "every", [m]);
                 if (module.length){
-                    _requireSequence(module, thisLoaded, thisErrorLoaded, callback);
+                    _requireSequence(fun, module, thisLoaded, thisErrorLoaded, callback, async, compression);
                 }else{
                     if (thisErrorLoaded.length){
                         o2.runCallback(callback, "failure", [thisLoaded, thisErrorLoaded]);

+ 4 - 2
o2web/source/x_component_Homepage/TaskContent.js

@@ -23,7 +23,9 @@ MWF.xApplication.Homepage.TaskContent = new Class({
         }.bind(this));
     },
     startProcess: function(){
-        o2.requireApp([["process.TaskCenter", "lp."+o2.language], ["process.TaskCenter", ""]],"", function(){
+        // o2.requireApp("process.TaskCenter", "lp."+o2.language, null, false);
+        // o2.requireApp("process.TaskCenter", "", null, false);
+         o2.requireApp([["process.TaskCenter", "lp."+o2.language], ["process.TaskCenter", ""]],"", function(){
             var obj = {
                 "lp": MWF.xApplication.process.TaskCenter.LP,
                 "content": this.app.content,
@@ -52,7 +54,7 @@ MWF.xApplication.Homepage.TaskContent = new Class({
                 }.bind(this)
             });
             this.processStarter.load();
-        }.bind(this));
+         }.bind(this), true, true);
     },
     initSize: function(){
         this.setContentSize();