diff --git a/o2web/source/o2_core/o2/xScript/Environment.js b/o2web/source/o2_core/o2/xScript/Environment.js index bae46c5e167a7ea316c72457e704b2bc5a638370..8524e6f0e6f9c13b1682c95fb25fec2e941d76db 100644 --- a/o2web/source/o2_core/o2/xScript/Environment.js +++ b/o2web/source/o2_core/o2/xScript/Environment.js @@ -496,7 +496,7 @@ MWF.xScript.Environment = function(ev){ * @static * @return {Record[]} 流程记录(Record)对象. * @o2syntax - * var workLogList = this.workContext.getRecordList(); + * var recordList = this.workContext.getRecordList(); */ "getRecordList": function(){return ev.recordList;}, /** @@ -523,7 +523,7 @@ MWF.xScript.Environment = function(ev){ * @summary 重新设置流程实例标题。。 * @method setTitle * @static - * @param {String} title - 路由字符串数组. + * @param {String} title - 标题字符串. * @o2syntax * this.workContext.setTitle(title); * @example diff --git a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js index fb24538669a49a354751bfa7d839dac0f40919e0..cd63864334ce8d109da6f16d36fce944af3d4360 100644 --- a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js +++ b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js @@ -3428,7 +3428,7 @@ MWF.xScript.ViewEnvironment = function (ev) { */ /** - * 当查询视图被嵌入到门户页面、流程表单或内容管理表单的时候,可以通过这个方法来获取页面或表单的上下文。 + * 当查询视图被嵌入到门户页面、流程表单或内容管理表单的时候,可以在查询视图写脚本的地方通过这个方法来获取页面或表单的上下文。 * @method getParentEnvironment * @memberOf module:queryStatement * @static @@ -3571,7 +3571,7 @@ MWF.xScript.ViewEnvironment = function (ev) { */ this.page = this.form = this.queryView = this.queryStatement = { /** - * 当视图被嵌入到门户页面、流程表单或内容管理表单的时候,可以通过这个方法来获取页面或表单的上下文。 + * 当视图被嵌入到门户页面、流程表单或内容管理表单的时候,可以在视图可以写脚本的地方中通过这个方法来获取页面或表单的上下文。 * @method getParentEnvironment * @static * @return {MWF.xScript.Environment|MWF.xScript.CMSEnvironment} 页面或表单的上下文. diff --git a/o2web/source/x_component_cms_Document/Main.js b/o2web/source/x_component_cms_Document/Main.js index 0a5917df29a56b122d55fc031940209fe1511569..3a0e44928fac14ebf2f6ba306341802912fff926 100644 --- a/o2web/source/x_component_cms_Document/Main.js +++ b/o2web/source/x_component_cms_Document/Main.js @@ -641,6 +641,7 @@ MWF.xApplication.cms.Document.Main = new Class({ "document": this.document, "control": this.control, "attachmentList": this.attachmentList, + "formInfor": this.formInfor, "status": { //"readonly": (this.options.readonly) ? true : false "readonly": this.readonly diff --git a/o2web/source/x_component_process_FormDesigner/Property.js b/o2web/source/x_component_process_FormDesigner/Property.js index 5f1b09191ee4692368636221400f52baa963aff1..4ad20d91ef9329d5b8662ef4fce545aba341c24f 100644 --- a/o2web/source/x_component_process_FormDesigner/Property.js +++ b/o2web/source/x_component_process_FormDesigner/Property.js @@ -1135,7 +1135,7 @@ debugger; var htmlArea = new MWF.widget.HtmlEditorArea(node, { "title": title, //"maxObj": this.propertyNode.parentElement.parentElement.parentElement, - "maxObj": this.designer.formContentNode, + "maxObj": this.designer.formContentNode || this.designer.pageContentNode, "onChange": function(){ this.data[name] = htmlArea.getValue(); this.changeData(name); diff --git a/o2web/source/x_desktop/printWork.html b/o2web/source/x_desktop/printWork.html index 2568bd39a0ae87f6dcef2b05bc71eaf6a6504c2f..861d83a3173afbce194363a0074792745ee11d77 100644 --- a/o2web/source/x_desktop/printWork.html +++ b/o2web/source/x_desktop/printWork.html @@ -7,6 +7,7 @@ + WORK