Ver Fonte

Merge branch 'fix/Process.item_desciption_exception' into 'develop'

Merge of fix/[流程管理]修复文本组件只读情况下预览报错的问题 to develop

See merge request o2oa/o2oa!347
蔡祥熠 há 5 anos atrás
pai
commit
9f91379486

+ 9 - 1
o2web/source/x_component_cms_Index/Newer.js

@@ -469,7 +469,15 @@ MWF.xApplication.cms.Index.Newer = new Class({
                 //this.app.refreshAll();
                 this.app.notice(this.lp.Started, "success");
                 //    this.app.processConfig();
-            }.bind(this), null);
+            }.bind(this), function(xhr, text, error){
+                if( xhr && xhr.response && typeOf(xhr.response)==="string" ){
+                    try{
+                        var eObj = JSON.parse(xhr.response);
+                        this.app.notice( eObj.message, "error");
+                    }catch (e) {}
+                }
+                if( this.mask )this.mask.hide();
+            }.bind(this));
         }
     },
     _openDocument: function(id,el){

+ 1 - 1
o2web/source/x_component_process_Xform/$Input.js

@@ -203,7 +203,7 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class({
 //				"left": "-18px"
 //			});
 //		}
-        if (!this.readonly){
+        if (!this.readonly && !this.json.isReadonly ){
             this.loadDescription();
         }
 	},