From 128e7f51affe686e1e218896599c37931edd47da Mon Sep 17 00:00:00 2001 From: zhouxin Date: Fri, 29 Dec 2023 15:28:13 +0800 Subject: [PATCH] * Remove usage report screen in open edition. --- module/screen/config.php | 3 +++ module/screen/model.php | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/module/screen/config.php b/module/screen/config.php index bd4b624a01..fb9ae1ca84 100644 --- a/module/screen/config.php +++ b/module/screen/config.php @@ -3,6 +3,9 @@ $config->screen->builtinScreen = array(6, 8); $config->screen->builtinChart = array(10018, 10019, 10020, 10021, 10022, 10211, 10212, 10213, 10214, 10215, 10216, 10217, 10218, 10219, 10220); $config->screen->builtinPivot = array(1000, 1001, 1002); +$config->screen->phpScreen = array(); +$config->screen->phpScreen['usageReport'] = 1001; + $config->screen->chartConfig = array(); $config->screen->chartConfig['cluBarX'] = '{"category" : "Bars", "categoryName" : "柱状图", "chartFrame" : "echarts", "chartKey" : "VBarCommon", "conKey" : "VCBarCommon", "image" : "bar_x.png", "key" : "BarCommon", "package" : "Charts", "title" : "簇状柱形图", "dataset" : {}}'; $config->screen->chartConfig['cluBarY'] = '{"category" : "Bars", "categoryName" : "柱状图", "chartFrame" : "echarts", "chartKey" : "VBarCrossrange", "conKey" : "VCBarCrossrange", "image" : "bar_y.png", "key" : "BarCrossrange", "package" : "Charts", "title" : "簇状条形图", "dataset" : {}}'; diff --git a/module/screen/model.php b/module/screen/model.php index 54ebf2a2ce..86520ed960 100755 --- a/module/screen/model.php +++ b/module/screen/model.php @@ -51,7 +51,11 @@ class screenModel extends model */ public function getList(int $dimensionID): array { - return $this->dao->select('*')->from(TABLE_SCREEN)->where('dimension')->eq($dimensionID)->andWhere('deleted')->eq('0')->fetchAll('id'); + return $this->dao->select('*')->from(TABLE_SCREEN) + ->where('dimension')->eq($dimensionID) + ->beginIF($this->config->edition == 'open')->andWhere('id')->ne($this->config->screen->phpScreen['usageReport'])->fi() + ->andWhere('deleted')->eq('0') + ->fetchAll('id'); } /**