From 43110510aebd76a3b2e0bc84b9ced6ba25ebfc26 Mon Sep 17 00:00:00 2001
From: unknown <caixiangyi@zoneland.net>
Date: Wed, 4 Nov 2020 10:44:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=AD=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../source/x_component_query_Query/Statement.js | 17 ++++++++++-------
 .../$Statement/view.json                        |  2 +-
 .../Statement.js                                |  4 +++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/o2web/source/x_component_query_Query/Statement.js b/o2web/source/x_component_query_Query/Statement.js
index 11a61a657f..d1afda7120 100644
--- a/o2web/source/x_component_query_Query/Statement.js
+++ b/o2web/source/x_component_query_Query/Statement.js
@@ -300,7 +300,7 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
         this.getViewRes = o2.Actions.load("x_query_assemble_surface").StatementAction.get(this.json.statementId || this.json.statementName, function(json){
             debugger;
             var viewData = JSON.decode(json.data.view);
-            if( !this.json.pageSize )this.json.pageSize = viewData.pageSize;
+            if( !this.json.pageSize )this.json.pageSize = viewData.pageSize || "20";
             this.viewJson = viewData.data;
             this.json.application = json.data.query;
             //this.json = Object.merge(this.json, json.data);
@@ -573,18 +573,21 @@ MWF.xApplication.query.Query.Statement.Item = new Class({
     },
     getText : function(c, k, td){
         var path = c.path, code = c.code, obj = this.data;
-        if( path ){
+        if( path && path!=="$all") {
             var pathList = path.split(".");
-            for( var i=0; i<pathList.length; i++ ){
+            for (var i = 0; i < pathList.length; i++) {
                 var p = pathList[i];
-                if( (/(^[1-9]\d*$)/.test(p)) )p = p.toInt();
-                if( obj[ p ] ){
-                    obj = obj[ p ];
-                }else{
+                if ((/(^[1-9]\d*$)/.test(p))) p = p.toInt();
+                if (obj[p]) {
+                    obj = obj[p];
+                } else {
                     obj = "";
                     break;
                 }
             }
+        }else if( path === "$all" ){
+        }else{
+            return "";
         }
 
         if( code && code.trim())obj = this.view.Macro.exec( code, {"value": obj,  "data": this.data, "entry": c, "node" : td, "json" : c, "row" : this});
diff --git a/o2web/source/x_component_query_StatementDesigner/$Statement/view.json b/o2web/source/x_component_query_StatementDesigner/$Statement/view.json
index 345e65c1d7..ec6cce1501 100644
--- a/o2web/source/x_component_query_StatementDesigner/$Statement/view.json
+++ b/o2web/source/x_component_query_StatementDesigner/$Statement/view.json
@@ -6,7 +6,7 @@
   "description": "",
   "display": true,
   "type": "View",
-
+  "pageSize" : "20",
   "data": {
 //    "exportGrid": true,
 //    "exportGoupGrid": true,
diff --git a/o2web/source/x_component_query_StatementDesigner/Statement.js b/o2web/source/x_component_query_StatementDesigner/Statement.js
index e5ee18c6db..5d2ee60b3a 100644
--- a/o2web/source/x_component_query_StatementDesigner/Statement.js
+++ b/o2web/source/x_component_query_StatementDesigner/Statement.js
@@ -939,8 +939,9 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         }
 
         if (typeOf(this.viewJson) === "object") {
+            if(!this.viewJson.group)this.viewJson.group = {};
+            if(!this.viewJson.pageSize)this.viewJson.pageSize = "20";
             this.data.view = JSON.stringify(this.viewJson);
-            if(!this.data.view.group)this.data.view.group = {};
         }
         //if( !this.data.tableType ){
         //    this.data.tableType = "dynamic";
@@ -969,6 +970,7 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         }
 
         if (typeOf(this.viewJson) === "object") {
+            if( !this.viewJson.pageSize )this.viewJson.pageSize = "20";
             this.data.view = JSON.stringify(this.viewJson);
         }
 
-- 
GitLab