Merge branch 'cherry-pick-82e0542b' into 'develop_java8'

Merge branch 'hotfix/api' into 'master'

See merge request o2oa/o2oa!318

o2web/source/o2_core/o2/xScript/Environment.js

@@ -248,7 +248,10 @@ MWF.xScript.Environment = function(ev){
          *      "resetRange": "department", //重置处理人范围
          *      "resetCount": 0,  //重置处理人数字
          *      "allowReset": true, //是否允许重置
-         *      "manualMode": "single" //处理方式 单人single, 并行parallel, 串行queue, grab抢办
+         *      "manualMode": "single", //处理方式 单人single, 并行parallel, 串行queue, grab抢办
+         *      "customData": { //节点上的自定义属性，如果没有设置，不输出该值
+         *
+         *      }
          * }</code></pre>
          * @o2syntax
          * var activity = this.workContext.getActivity();

o2web/source/x_component_process_Work/Main.js

@@ -40,7 +40,7 @@ MWF.xApplication.process.Work.Main = new Class({
             this.options.jobId = this.status.jobId;
             this.options.draftId = this.status.draftId;
             this.options.priorityWork = this.status.priorityWork;
-            this.options.readonly = (this.status.readonly === "true");
+            this.options.readonly = (this.status.readonly === true || this.status.readonly === "true");
         }
         this.action = MWF.Actions.get("x_processplatform_assemble_surface");
 	},