From b6c698c8833836971184a0a9c2645a15f8174d37 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 08 五月 2025 16:31:18 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/utils/utils-custom.js | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js index 2e221c7..e66d16d 100644 --- a/src/utils/utils-custom.js +++ b/src/utils/utils-custom.js @@ -2431,6 +2431,8 @@ * @description 鑾峰彇璇█杞崲淇℃伅 */ export function getLangTrans (config) { + if (sessionStorage.getItem('lang') !== 'zh-CN') return '' + let langList = sessionStorage.getItem('langList') let appType = sessionStorage.getItem('appType') @@ -2438,18 +2440,19 @@ langList = sessionStorage.getItem('applangList') } - if (!langList) return - - let defLang = '' + if (!langList) return '' try { langList = JSON.parse(langList) - defLang = langList[0] } catch (e) { - defLang = '' + langList = '' } - if (!defLang) return '' + if (!langList) return '' + + langList = langList.filter(n => n !== 'zh-CN') + + if (langList.length === 0) return '' let sql = [] let btn = [] @@ -2778,8 +2781,6 @@ let result = [] langList.forEach(lan => { - if (lan === defLang) return - list.forEach(n => { result.push(`'${lan}',${n}`) }) -- Gitblit v1.8.0