diff --git a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js index 4d1fcae40fededf46eec4df4b4e425c5aefda3d0..4adda84d3fc016d577bc6d4816733d401f9a86c5 100644 --- a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js +++ b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js @@ -26,7 +26,8 @@ MWF.xScript.ViewEnvironment = function (ev) { // this.setData(_data); this.viewContext = { - + viewInfor : _form.viewInfor, + getPageNumber : _form.getPageNumber() }; //dict diff --git a/o2web/source/x_component_query_Query/Viewer.js b/o2web/source/x_component_query_Query/Viewer.js index eb365788038ce0ec175fea023575717a07f89300..442eb73d300759db509d9abb5de55b44aee041b1 100644 --- a/o2web/source/x_component_query_Query/Viewer.js +++ b/o2web/source/x_component_query_Query/Viewer.js @@ -55,6 +55,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({ this.load(); }.bind(this)); } + }, loadView: function(){ if (this.viewJson){ @@ -105,6 +106,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({ this.viewPageAreaNode = new Element("div", {"styles": this.css.viewPageAreaNode}).inject(this.viewPageNode); }, loadMacro: function (callback) { + this.viewInfor = this.json; if( !this.Macro ){ //有可能是page\cms\process传入的macro MWF.require("MWF.xScript.Macro", function () { this.Macro = new MWF.Macro.ViewContext(this);