Explorar o código

流程职务选择报错,一些脚本错误修复

huqi %!s(int64=5) %!d(string=hai) anos
pai
achega
f6a78865df

+ 2 - 2
o2web/source/o2_core/o2/widget/O2Identity.js

@@ -284,7 +284,7 @@ o2.widget.O2Duty = new Class({
     getPersonData: function(){
         if (!this.data.woUnit){
             this.action.actions = {"getUnitduty": {"uri": "/jaxrs/unitduty/{id}"}};
-            this.action.invoke({"name": "getUnitduty", "async": false, "parameter": {"id": (this.data.dutyId || this.data.name)}, "success": function(json){
+            this.action.invoke({"name": "getUnitduty", "async": false, "parameter": {"id": (this.data.Id || this.data.name)}, "success": function(json){
                 this.data = json.data;
             }.bind(this)});
         }
@@ -727,4 +727,4 @@ o2.widget.O2Org = function(value, container, options){
 //             }
 //         });
 //     }
-// }, 10000);
+// }, 10000);

+ 9 - 9
o2web/source/x_component_cms_ScriptDesigner/Main.js

@@ -732,15 +732,15 @@ MWF.xApplication.cms.ScriptDesigner.Main = new Class({
                     }.bind(this));
                 }
             };
-            if (!this.scriptHelpMenu){
-                MWF.require("MWF.widget.ScriptHelp", function(){
-                    this.scriptHelpMenu = new MWF.widget.ScriptHelp($("MWFScriptAutoCode"), this.script.editor);
-                    this.scriptHelpMenu.getEditor = function(){
-                        if (this.scriptTab.showPage) return this.scriptTab.showPage.script.editor.editor;
-                        return null;
-                    }.bind(this)
-                }.bind(this));
-            }
+            // if (!this.scriptHelpMenu){
+            //     MWF.require("MWF.widget.ScriptHelp", function(){
+            //         this.scriptHelpMenu = new MWF.widget.ScriptHelp($("MWFScriptAutoCode"), this.script.editor);
+            //         this.scriptHelpMenu.getEditor = function(){
+            //             if (this.scriptTab.showPage) return this.scriptTab.showPage.script.editor.editor;
+            //             return null;
+            //         }.bind(this)
+            //     }.bind(this));
+            // }
 		}.bind(this));
 	},
 

+ 9 - 9
o2web/source/x_component_process_ScriptDesigner/Main.js

@@ -743,15 +743,15 @@ MWF.xApplication.process.ScriptDesigner.Main = new Class({
                     }.bind(this));
                 }
             };
-            if (!this.scriptHelpMenu){
-                MWF.require("MWF.widget.ScriptHelp", function(){
-                    this.scriptHelpMenu = new MWF.widget.ScriptHelp($("MWFScriptAutoCode"), this.script.editor);
-                    this.scriptHelpMenu.getEditor = function(){
-                        if (this.scriptTab.showPage) return this.scriptTab.showPage.script.editor.editor;
-                        return null;
-                    }.bind(this)
-                }.bind(this));
-            }
+            // if (!this.scriptHelpMenu){
+            //     MWF.require("MWF.widget.ScriptHelp", function(){
+            //         this.scriptHelpMenu = new MWF.widget.ScriptHelp($("MWFScriptAutoCode"), this.script.editor);
+            //         this.scriptHelpMenu.getEditor = function(){
+            //             if (this.scriptTab.showPage) return this.scriptTab.showPage.script.editor.editor;
+            //             return null;
+            //         }.bind(this)
+            //     }.bind(this));
+            // }
 		}.bind(this));
 	},
 

+ 14 - 14
o2web/source/x_component_service_AgentDesigner/Agent.js

@@ -133,20 +133,20 @@ MWF.xApplication.service.AgentDesigner.Agent = new Class({
             this.editor.addEvent("save", function(){
                 this.save();
             }.bind(this));
-            this.editor.addEvent("reference", function(editor, e, e1){
-                if (!this.agentReferenceMenu){
-                    MWF.require("MWF.widget.ScriptHelp", function(){
-                        this.agentReferenceMenu = new MWF.widget.ScriptHelp(null, this.editor.editor, {
-                            "onPostLoad": function(){
-                                this.showReferenceMenu();
-                            }.bind(this)
-                        });
-                        this.agentReferenceMenu.getEditor = function(){return this.editor.editor;}.bind(this)
-                    }.bind(this));
-                }else{
-                    this.showReferenceMenu();
-                }
-            }.bind(this));
+            // this.editor.addEvent("reference", function(editor, e, e1){
+            //     if (!this.agentReferenceMenu){
+            //         MWF.require("MWF.widget.ScriptHelp", function(){
+            //             this.agentReferenceMenu = new MWF.widget.ScriptHelp(null, this.editor.editor, {
+            //                 "onPostLoad": function(){
+            //                     this.showReferenceMenu();
+            //                 }.bind(this)
+            //             });
+            //             this.agentReferenceMenu.getEditor = function(){return this.editor.editor;}.bind(this)
+            //         }.bind(this));
+            //     }else{
+            //         this.showReferenceMenu();
+            //     }
+            // }.bind(this));
 
             var options = this.designer.styleSelectNode.options;
             for (var i=0; i<options.length; i++){

+ 14 - 14
o2web/source/x_component_service_InvokeDesigner/Invoke.js

@@ -140,20 +140,20 @@ MWF.xApplication.service.InvokeDesigner.Invoke = new Class({
             this.editor.addEvent("save", function(){
                 this.save();
             }.bind(this));
-            this.editor.addEvent("reference", function(editor, e, e1){
-                if (!this.invokeReferenceMenu){
-                    MWF.require("MWF.widget.ScriptHelp", function(){
-                        this.invokeReferenceMenu = new MWF.widget.ScriptHelp(null, this.editor.editor, {
-                            "onPostLoad": function(){
-                                this.showReferenceMenu();
-                            }.bind(this)
-                        });
-                        this.invokeReferenceMenu.getEditor = function(){return this.editor.editor;}.bind(this)
-                    }.bind(this));
-                }else{
-                    this.showReferenceMenu();
-                }
-            }.bind(this));
+            //this.editor.addEvent("reference", function(editor, e, e1){
+                // if (!this.invokeReferenceMenu){
+                //     MWF.require("MWF.widget.ScriptHelp", function(){
+                //         this.invokeReferenceMenu = new MWF.widget.ScriptHelp(null, this.editor.editor, {
+                //             "onPostLoad": function(){
+                //                 this.showReferenceMenu();
+                //             }.bind(this)
+                //         });
+                //         this.invokeReferenceMenu.getEditor = function(){return this.editor.editor;}.bind(this)
+                //     }.bind(this));
+                // }else{
+                //     this.showReferenceMenu();
+                // }
+            //}.bind(this));
 
             var options = this.designer.styleSelectNode.options;
             for (var i=0; i<options.length; i++){