From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/calendar/board/index.jsx | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/tabviews/custom/components/calendar/board/index.jsx b/src/tabviews/custom/components/calendar/board/index.jsx
index 77727e6..f4e1e3b 100644
--- a/src/tabviews/custom/components/calendar/board/index.jsx
+++ b/src/tabviews/custom/components/calendar/board/index.jsx
@@ -10,7 +10,9 @@
const { Option } = Select
-moment.locale('zh-cn')
+if (sessionStorage.getItem('lang') === 'zh-CN') {
+ moment.locale('zh-cn')
+}
class CalendarBoard extends Component {
static propTpyes = {
@@ -493,31 +495,29 @@
MKEmitter.emit('modifyTabs', newtab, true)
} else if (config.wrap.click === 'menu') {
- let menuId = config.wrap.MenuID || config.wrap.menu.slice(-1)[0]
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+ let menuId = config.wrap.menu.slice(-1)[0]
+ let menu = null
- if (!menu && config.wrap.MenuName && config.wrap.tabType) {
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (config.wrap.MenuID) {
menu = {
- MenuID: menuId,
+ MenuID: config.wrap.MenuID,
MenuName: config.wrap.MenuName,
- MenuNo: config.wrap.MenuNo || '',
type: config.wrap.tabType
}
}
if (!menu) return
- let newtab = {
- ...menu,
- param: {$BID: data.$$uuid || ''}
- }
+ menu.param = {$BID: data.$$uuid || ''}
Object.keys(data).forEach(key => {
if (/^\$/.test(key)) return
- newtab.param[key] = data[key]
+ menu.param[key] = data[key]
})
- MKEmitter.emit('modifyTabs', newtab, true)
+ MKEmitter.emit('modifyTabs', menu, true)
}
}
--
Gitblit v1.8.0