* [refac] add groupby.

This commit is contained in:
songchenxuan
2024-07-15 02:26:00 +00:00
committed by qixinzhi
parent 078f9c44fa
commit 3840d107f6
2 changed files with 12 additions and 0 deletions
+11
View File
@@ -266,6 +266,14 @@ class pivotState
*/
public $step2FinishSql = '';
/**
* useGroupBy
*
* @var bool
* @access public
*/
public $useGroupBy = false;
/**
* __construct method.
*
@@ -305,6 +313,7 @@ class pivotState
$this->setPager();
$this->formatSettingColumns();
$this->setStep2FinishSql();
$this->setUseGroupBy();
}
/**
@@ -752,6 +761,7 @@ class pivotState
$this->formatSettingColumns();
$this->processFieldSettingsLang();
$this->completeFiltersDefault();
$this->setUseGroupBy();
}
/**
@@ -844,6 +854,7 @@ class pivotState
if($this->issetSettings()) $this->step2FinishSql = $this->sql;
}
public function issetSettings()
{
if($this->isSummaryNotUse()) return true;
+1
View File
@@ -293,6 +293,7 @@ $lang->pivot->clearSettings = '查询数据的配置已修改,是否清空
$lang->pivot->draftSave = '该透视表已发布,将变为草稿态,是否继续?';
$lang->pivot->cannotAddQuery = '已添加结果筛选器,无法添加查询筛选器';
$lang->pivot->cannotAddResult = '已添加查询筛选器,无法添加结果筛选器';
$lang->pivot->cannotAddDrill = '查询语句中存在GROUP BY或配置了筛选器,暂时无法配置数据下钻';
$lang->pivot->drillModalTip = <<<EOT
1.请先选择需要下钻的列及其下钻的目标对象,系统将根据您的选择自动生成下钻SQL语句。