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

Merge branch 'sprint/tsj_nav' into 'zentaopms_289'

Browse Source 
Sprint/tsj nav

See merge request easycorp/zentaopms!7074
This commit is contained in:
王怡栋
2023-02-27 06:28:53 +00:00
parent 1e9fc76676 20b129e8c4
commit b547e0006c
11 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/model.php
+23 -6
View File
@@ -51,14 +51,31 @@ class customModel extends model
$processedLang = array();
foreach($allCustomLang as $id => $customLang)
{
if(isset($sectionLang[$customLang->module][$customLang->section]['all']) && isset($sectionLang[$customLang->module][$customLang->section][$currentLang]) && $customLang->lang == 'all') continue;
if(isset($sectionLang[$customLang->module][$customLang->section]['all']) and isset($sectionLang[$customLang->module][$customLang->section][$currentLang]) and $customLang->lang == 'all') continue;
$sections = explode('-', $customLang->section);
$sectionIndex = count($sections) - 1;
$sectionArr = array($customLang->key => $customLang->value);
for($index = $sectionIndex; $index >= 0; $index --) $sectionArr = array($sections[$index] => $sectionArr);
if(strpos($customLang->section, 'featureBar-') !== false)
{
$sections = explode('-', $customLang->section);
$sectionIndex = count($sections) - 1;
$sectionArr = array($customLang->key => $customLang->value);
$oldSectionArr = empty($processedLang[$customLang->module]) ? array() : $processedLang[$customLang->module];
if(!empty($oldSectionArr))
{
for($i = 0; $i <= $sectionIndex; $i ++)
{
$sectionKey = $sections[$i];
$oldSectionArr = $oldSectionArr[$sectionKey];
}
$sectionArr = array_merge($oldSectionArr, $sectionArr);
}
$processedLang[$customLang->module] = $sectionArr;
for($index = $sectionIndex; $index >= 0; $index --) $sectionArr = array($sections[$index] => $sectionArr);
$processedLang[$customLang->module] = $sectionArr;
}
else
{
$processedLang[$customLang->module][$customLang->section][$customLang->key] = $customLang->value;
}
}
return $processedLang;