From 2c573446cd5059b09c06c8673eaf1f51f43967ce Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 六月 2024 13:44:27 +0800
Subject: [PATCH] 2024-06-14
---
src/utils/utils-custom.js | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 3dd8fbb..644475e 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -2080,25 +2080,16 @@
* @description 鑾峰彇璇█杞崲淇℃伅
*/
export function getLangTrans (config) {
- let defLang = window.GLOB.defLang || ''
let langList = sessionStorage.getItem('langList')
- if (langList) {
- try {
- langList = JSON.parse(langList)
- if (langList.length === 1) {
- defLang = ''
- } else if (!defLang || langList.findIndex(item => item.Lang === defLang) === -1) {
- if (langList.findIndex(item => item.Lang === 'zh-CN') === -1) {
- defLang = langList[0].Lang
- } else {
- defLang = 'zh-CN'
- }
- }
- } catch (e) {
- defLang = ''
- }
- } else {
+ if (!langList) return
+
+ let defLang = ''
+
+ try {
+ langList = JSON.parse(langList)
+ defLang = langList[0]
+ } catch (e) {
defLang = ''
}
@@ -2110,7 +2101,7 @@
let text = []
let filterElement = (card) => {
- if (card.datatype === 'static' && card.eleType === 'text') {
+ if (card.datatype === 'static' && card.eleType === 'text' && !/@.+@/g.test(card.value)) {
sql.push(card.value)
}
if (card.prefix) {
@@ -2362,15 +2353,35 @@
list.unshift(`'${config.MenuName}','menu'`)
}
+ if (config.fstMenuId && config.parentId) {
+ let menulist = sessionStorage.getItem('fstMenuList')
+ try {
+ menulist = JSON.parse(menulist)
+ } catch(e) {
+ menulist = []
+ }
+
+ menulist.forEach(item => {
+ if (item.MenuID !== config.fstMenuId) return
+ list.unshift(`'${item.MenuName}','menu'`)
+ item.children.forEach(cell => {
+ if (cell.MenuID !== config.parentId) return
+ list.unshift(`'${cell.MenuName}','menu'`)
+ })
+ })
+ }
+
let result = []
langList.forEach(lan => {
- if (lan.Lang === defLang) return
+ if (lan === defLang) return
list.forEach(n => {
- result.push(`'${lan.Lang}',${n}`)
+ result.push(`'${lan}',${n}`)
})
})
+
+ config.trans = true
return result.join(';')
}
\ No newline at end of file
--
Gitblit v1.8.0