Merge branch 'fix/invoke-angent-save-bug' into 'develop'

[编辑器]修改代理、接口monaco编辑器打开、保存报错问题

See merge request o2oa/o2oa!1001

o2web/source/x_component_service_AgentDesigner/Agent.js

@@ -241,7 +241,8 @@ MWF.xApplication.service.AgentDesigner.Agent = new Class({
         var tabSize = this.tab.tabNodeContainer.getSize();
         var y = size.y - tabSize.y;
         this.areaNode.setStyle("height", ""+y+"px");
-        if (this.editor) if (this.editor.editor) this.editor.editor.resize();
+        //if (this.editor) if (this.editor.editor) this.editor.editor.resize();
+        if (this.editor) this.editor.resize(y);
     },
 
     addInclude: function(){
@@ -257,7 +258,7 @@ MWF.xApplication.service.AgentDesigner.Agent = new Class({
     },
     save: function(callback){
         if (!this.isSave){
-            var session = this.editor.editor.getSession();
+            /*var session = this.editor.editor.getSession();
             var annotations = session.getAnnotations();
             var validated = true;
             for (var i=0; i<annotations.length; i++){
@@ -265,8 +266,8 @@ MWF.xApplication.service.AgentDesigner.Agent = new Class({
                     validated = false;
                     break;
                 }
-            }
-
+            }*/
+            var validated = this.editor.validated();
             var name = this.designer.propertyNameNode.get("value");
             var alias = this.designer.propertyAliasNode.get("value");
             var description = this.designer.propertyDescriptionNode.get("value");

o2web/source/x_component_service_InvokeDesigner/Invoke.js

@@ -236,7 +236,8 @@ MWF.xApplication.service.InvokeDesigner.Invoke = new Class({
         var tabSize = this.tab.tabNodeContainer.getSize();
         var y = size.y - tabSize.y;
         this.areaNode.setStyle("height", ""+y+"px");
-        if (this.editor) if (this.editor.editor) this.editor.editor.resize();
+        //if (this.editor) if (this.editor.editor) this.editor.editor.resize();
+        if (this.editor) this.editor.resize(y);
     },
 
     addInclude: function(){
@@ -252,7 +253,7 @@ MWF.xApplication.service.InvokeDesigner.Invoke = new Class({
     },
     save: function(callback){
         if (!this.isSave){
-            var session = this.editor.editor.getSession();
+            /*var session = this.editor.editor.getSession();
             var annotations = session.getAnnotations();
             var validated = true;
             for (var i=0; i<annotations.length; i++){
@@ -260,7 +261,8 @@ MWF.xApplication.service.InvokeDesigner.Invoke = new Class({
                     validated = false;
                     break;
                 }
-            }
+            }*/
+            var validated = this.editor.validated();
 
             var name = this.designer.propertyNameNode.get("value");
             var alias = this.designer.propertyAliasNode.get("value");