From 4499b48444fc13c841ed0fa5b8774a542f4df69f Mon Sep 17 00:00:00 2001
From: unknown <caixiangyi@zoneland.net>
Date: Fri, 20 Mar 2020 14:04:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 o2web/source/o2_core/o2/xScript/ViewEnvironment.js | 3 ++-
 o2web/source/x_component_query_Query/Viewer.js     | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js
index 4d1fcae40f..4adda84d3f 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 eb36578803..442eb73d30 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);
-- 
GitLab