Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4

Browse Source
This commit is contained in:
tianshujie
2023-04-24 20:05:19 +08:00
parent da3ce6e392 d8a1234ecd
commit 99956b799d
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/chart/lang/de.php
+4 -4
View File
@@ -36,7 +36,7 @@ $lang->chart->typeList = array();
$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';
$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';
module/chart/lang/en.php
+4 -4
View File
@@ -36,7 +36,7 @@ $lang->chart->typeList = array();
$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';
$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';
module/chart/lang/fr.php
+4 -4
View File
@@ -36,7 +36,7 @@ $lang->chart->typeList = array();
$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';
$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';
module/chart/model.php
+1 -1
View File
@@ -72,7 +72,7 @@ class chartModel extends model
if(!empty($chart->sql)) $chart->sql = trim(str_replace(';', '', $chart->sql));
if(!empty($chart->settings)) $chart->settings = json_decode($chart->settings, true);
if(!empty($chart->settings) and is_array($chart->settings))
if(empty($chart->type) and !empty($chart->settings) and is_array($chart->settings))
{
$firstSetting = current($chart->settings);
if(isset($firstSetting['type'])) $chart->type = $firstSetting['type'];