From 08df81c4f7cc419caa2a086ba8a30f96fe2de288 Mon Sep 17 00:00:00 2001
From: qixinzhi <qixinzhi@easycorp.ltd>
Date: Tue, 27 Aug 2024 09:01:36 +0000
Subject: [PATCH] * [story#63325,0.5h] add querys.

---
 lib/pivotstate/pivotstate.class.php | 1 +
 module/bi/lang/de.php               | 3 ++-
 module/bi/lang/en.php               | 3 ++-
 module/bi/lang/fr.php               | 3 ++-
 module/bi/lang/zh-cn.php            | 3 ++-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/pivotstate/pivotstate.class.php b/lib/pivotstate/pivotstate.class.php
index 5ce8d3cf61..f157e3157b 100644
--- a/lib/pivotstate/pivotstate.class.php
+++ b/lib/pivotstate/pivotstate.class.php
@@ -537,6 +537,7 @@ class pivotState
             $this->sqlBuilder['funcs']  = array();
             $this->sqlBuilder['wheres'] = array();
             $this->sqlBuilder['groups'] = false;
+            $this->sqlBuilder['querys'] = array();
         }
 
         if(!isset($this->sqlBuilder['from'])) $this->setFrom('');
diff --git a/module/bi/lang/de.php b/module/bi/lang/de.php
index 4e0713f9c0..b9992f19c0 100644
--- a/module/bi/lang/de.php
+++ b/module/bi/lang/de.php
@@ -32,7 +32,6 @@ $lang->bi->do            = 'Do';
 $lang->bi->set           = 'Set';
 $lang->bi->funcAs        = 'calculate，rename result as';
 $lang->bi->enable        = 'Enable';
-$lang->bi->allFields     = 'Select *';
 $lang->bi->previewSql    = 'Preview SQL statement';
 $lang->bi->addFunc       = 'Add function';
 $lang->bi->emptyFuncs    = 'Empty function。';
@@ -43,6 +42,8 @@ $lang->bi->cancelAll     = 'Cancel All';
 $lang->bi->groupField    = 'Group field';
 $lang->bi->aggField      = 'Aggregate field';
 $lang->bi->allFields     = 'Selected/Function field';
+$lang->bi->addQuery      = 'Add a dynamic query filter';
+$lang->bi->emptyQuerys   = 'Empty dynamic query filter.';
 
 $lang->bi->allFieldsTip  = 'Selected and function field is already checked.';
 $lang->bi->groupFieldTip = 'Group by the result with group field.';
diff --git a/module/bi/lang/en.php b/module/bi/lang/en.php
index 4e0713f9c0..b9992f19c0 100644
--- a/module/bi/lang/en.php
+++ b/module/bi/lang/en.php
@@ -32,7 +32,6 @@ $lang->bi->do            = 'Do';
 $lang->bi->set           = 'Set';
 $lang->bi->funcAs        = 'calculate，rename result as';
 $lang->bi->enable        = 'Enable';
-$lang->bi->allFields     = 'Select *';
 $lang->bi->previewSql    = 'Preview SQL statement';
 $lang->bi->addFunc       = 'Add function';
 $lang->bi->emptyFuncs    = 'Empty function。';
@@ -43,6 +42,8 @@ $lang->bi->cancelAll     = 'Cancel All';
 $lang->bi->groupField    = 'Group field';
 $lang->bi->aggField      = 'Aggregate field';
 $lang->bi->allFields     = 'Selected/Function field';
+$lang->bi->addQuery      = 'Add a dynamic query filter';
+$lang->bi->emptyQuerys   = 'Empty dynamic query filter.';
 
 $lang->bi->allFieldsTip  = 'Selected and function field is already checked.';
 $lang->bi->groupFieldTip = 'Group by the result with group field.';
diff --git a/module/bi/lang/fr.php b/module/bi/lang/fr.php
index 4e0713f9c0..b9992f19c0 100644
--- a/module/bi/lang/fr.php
+++ b/module/bi/lang/fr.php
@@ -32,7 +32,6 @@ $lang->bi->do            = 'Do';
 $lang->bi->set           = 'Set';
 $lang->bi->funcAs        = 'calculate，rename result as';
 $lang->bi->enable        = 'Enable';
-$lang->bi->allFields     = 'Select *';
 $lang->bi->previewSql    = 'Preview SQL statement';
 $lang->bi->addFunc       = 'Add function';
 $lang->bi->emptyFuncs    = 'Empty function。';
@@ -43,6 +42,8 @@ $lang->bi->cancelAll     = 'Cancel All';
 $lang->bi->groupField    = 'Group field';
 $lang->bi->aggField      = 'Aggregate field';
 $lang->bi->allFields     = 'Selected/Function field';
+$lang->bi->addQuery      = 'Add a dynamic query filter';
+$lang->bi->emptyQuerys   = 'Empty dynamic query filter.';
 
 $lang->bi->allFieldsTip  = 'Selected and function field is already checked.';
 $lang->bi->groupFieldTip = 'Group by the result with group field.';
diff --git a/module/bi/lang/zh-cn.php b/module/bi/lang/zh-cn.php
index c7577260ab..82660d57ba 100644
--- a/module/bi/lang/zh-cn.php
+++ b/module/bi/lang/zh-cn.php
@@ -36,7 +36,6 @@ $lang->bi->do            = '对';
 $lang->bi->set           = '进行';
 $lang->bi->funcAs        = '运算，对结果重命名为';
 $lang->bi->enable        = '启用';
-$lang->bi->allFields     = '全部字段(*)';
 $lang->bi->previewSql    = '预览构建的sql语句';
 $lang->bi->addFunc       = '新增函数字段';
 $lang->bi->emptyFuncs    = '暂未新增函数字段。';
@@ -47,6 +46,8 @@ $lang->bi->cancelAll     = '取消全选';
 $lang->bi->groupField    = '分组字段';
 $lang->bi->aggField      = '聚合字段';
 $lang->bi->allFields     = '已选/新增字段';
+$lang->bi->addQuery      = '添加动态查询筛选器';
+$lang->bi->emptyQuerys   = '暂未添加动态查询筛选器。';
 
 $lang->bi->allFieldsTip  = '已选的查询字段和新增的函数字段。';
 $lang->bi->groupFieldTip = '使用分组字段对查询结果进行分组。';