From 6473ae0ce0cd27491e9a1596ae702e22e167d253 Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Fri, 21 Apr 2023 10:01:46 +0800
Subject: [PATCH] * Finish task #91811.

---
 module/chart/lang/de.php    | 14 ++++++++++++++
 module/chart/lang/en.php    | 14 ++++++++++++++
 module/chart/lang/fr.php    | 14 ++++++++++++++
 module/chart/lang/zh-cn.php | 15 +++++++++++++++
 module/chart/model.php      |  3 +--
 module/pivot/model.php      |  9 +--------
 6 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/module/chart/lang/de.php b/module/chart/lang/de.php
index 08b6301449..a00d5645c4 100644
--- a/module/chart/lang/de.php
+++ b/module/chart/lang/de.php
@@ -31,3 +31,17 @@ $lang->chart->aggList['avg']      = 'AVG';
 $lang->chart->aggList['sum']      = 'SUM';
 $lang->chart->aggList['max']      = 'MAX';
 $lang->chart->aggList['min']      = 'MIN';
+
+$lang->chart->typeList = array();
+$lang->chart->typeList['table']       = 'Table';
+$lang->chart->typeList['agg']         = 'Agg';
+$lang->chart->typeList['value']       = 'Value';
+$lang->chart->typeList['bar']         = 'Bar';
+$lang->chart->typeList['piecircle']   = 'Circle Pie';
+$lang->chart->typeList['pie']         = 'Pie';
+$lang->chart->typeList['line']        = 'Line';
+$lang->chart->typeList['radar']       = 'Radar';
+$lang->chart->typeList['cluBarY']     = 'clustered Bar Y';
+$lang->chart->typeList['stackedBarY'] = 'stacked Bar Y';
+$lang->chart->typeList['cluBarX']     = 'clustered Bar X';
+$lang->chart->typeList['stackedBar']  = 'stacked Bar';
diff --git a/module/chart/lang/en.php b/module/chart/lang/en.php
index 08b6301449..a00d5645c4 100644
--- a/module/chart/lang/en.php
+++ b/module/chart/lang/en.php
@@ -31,3 +31,17 @@ $lang->chart->aggList['avg']      = 'AVG';
 $lang->chart->aggList['sum']      = 'SUM';
 $lang->chart->aggList['max']      = 'MAX';
 $lang->chart->aggList['min']      = 'MIN';
+
+$lang->chart->typeList = array();
+$lang->chart->typeList['table']       = 'Table';
+$lang->chart->typeList['agg']         = 'Agg';
+$lang->chart->typeList['value']       = 'Value';
+$lang->chart->typeList['bar']         = 'Bar';
+$lang->chart->typeList['piecircle']   = 'Circle Pie';
+$lang->chart->typeList['pie']         = 'Pie';
+$lang->chart->typeList['line']        = 'Line';
+$lang->chart->typeList['radar']       = 'Radar';
+$lang->chart->typeList['cluBarY']     = 'clustered Bar Y';
+$lang->chart->typeList['stackedBarY'] = 'stacked Bar Y';
+$lang->chart->typeList['cluBarX']     = 'clustered Bar X';
+$lang->chart->typeList['stackedBar']  = 'stacked Bar';
diff --git a/module/chart/lang/fr.php b/module/chart/lang/fr.php
index 08b6301449..a00d5645c4 100644
--- a/module/chart/lang/fr.php
+++ b/module/chart/lang/fr.php
@@ -31,3 +31,17 @@ $lang->chart->aggList['avg']      = 'AVG';
 $lang->chart->aggList['sum']      = 'SUM';
 $lang->chart->aggList['max']      = 'MAX';
 $lang->chart->aggList['min']      = 'MIN';
+
+$lang->chart->typeList = array();
+$lang->chart->typeList['table']       = 'Table';
+$lang->chart->typeList['agg']         = 'Agg';
+$lang->chart->typeList['value']       = 'Value';
+$lang->chart->typeList['bar']         = 'Bar';
+$lang->chart->typeList['piecircle']   = 'Circle Pie';
+$lang->chart->typeList['pie']         = 'Pie';
+$lang->chart->typeList['line']        = 'Line';
+$lang->chart->typeList['radar']       = 'Radar';
+$lang->chart->typeList['cluBarY']     = 'clustered Bar Y';
+$lang->chart->typeList['stackedBarY'] = 'stacked Bar Y';
+$lang->chart->typeList['cluBarX']     = 'clustered Bar X';
+$lang->chart->typeList['stackedBar']  = 'stacked Bar';
diff --git a/module/chart/lang/zh-cn.php b/module/chart/lang/zh-cn.php
index f3cdbe9097..bf29261c66 100644
--- a/module/chart/lang/zh-cn.php
+++ b/module/chart/lang/zh-cn.php
@@ -31,3 +31,18 @@ $lang->chart->aggList['avg']      = '平均值';
 $lang->chart->aggList['sum']      = '求和';
 $lang->chart->aggList['max']      = '最大值';
 $lang->chart->aggList['min']      = '最小值';
+
+$lang->chart->typeList = array();
+$lang->chart->typeList['table']       = '报表';
+$lang->chart->typeList['agg']         = '计数';
+$lang->chart->typeList['value']       = '取值';
+$lang->chart->typeList['bar']         = '柱状图';
+$lang->chart->typeList['piecircle']   = '环形饼图';
+$lang->chart->typeList['pie']         = '饼图';
+$lang->chart->typeList['card']        = '卡片';
+$lang->chart->typeList['line']        = '折线图';
+$lang->chart->typeList['radar']       = '雷达图';
+$lang->chart->typeList['cluBarY']     = '簇状条形图';
+$lang->chart->typeList['stackedBarY'] = '堆积条形图';
+$lang->chart->typeList['cluBarX']     = '簇状柱形图';
+$lang->chart->typeList['stackedBar']  = '堆积柱形图';
diff --git a/module/chart/model.php b/module/chart/model.php
index f5f90609c9..9192c34b29 100644
--- a/module/chart/model.php
+++ b/module/chart/model.php
@@ -580,8 +580,7 @@ class chartModel extends model
      */
     public static function isClickable($chart, $action)
     {
-        global $config;
-        if($chart->builtin and in_array($chart->id, $config->screen->builtinChart)) return false;
+        if($chart->builtin) return false;
         return true;
     }
 
diff --git a/module/pivot/model.php b/module/pivot/model.php
index 2d8b4ff058..f5cf6ff821 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -75,9 +75,6 @@ class pivotModel extends model
             {
                 $pivots += $this->dao->select('*')->from(TABLE_PIVOT)
                     ->where('deleted')->eq(0)
-                    ->andWhere('builtin', true)->eq('0')
-                    ->orWhere('id')->in($this->config->screen->builtinPivot)
-                    ->markRight(1)
                     ->beginIF(!empty($groupID))->andWhere("FIND_IN_SET($groupID, `group`)")->fi()
                     ->beginIF(!empty($dimensionID))->andWhere('dimension')->eq($dimensionID)->fi()
                     ->orderBy($orderBy)
@@ -89,9 +86,6 @@ class pivotModel extends model
         {
             $pivots = $this->dao->select('*')->from(TABLE_PIVOT)
                 ->where('deleted')->eq(0)
-                ->andWhere('builtin', true)->eq('0')
-                ->orWhere('id')->in($this->config->screen->builtinPivot)
-                ->markRight(1)
                 ->beginIF(!empty($dimensionID))->andWhere('dimension')->eq($dimensionID)->fi()
                 ->orderBy($orderBy)
                 ->page($pager)
@@ -1988,8 +1982,7 @@ class pivotModel extends model
      */
     public static function isClickable($pivot, $action)
     {
-        global $config;
-        if($pivot->builtin and in_array($pivot->id, $config->screen->builtinPivot)) return false;
+        if($pivot->builtin) return false;
         return true;
     }