From f561deb896de5754d94d17447f3d87aedcbd3198 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 18 九月 2023 20:02:38 +0800
Subject: [PATCH] Merge branch 'positec' into bms
---
src/tabviews/custom/popview/index.jsx | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index 4555cbd..2c36b13 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -123,6 +123,11 @@
})
}
+ if (Tab.$process && window.GLOB.UserCacheMap.has(Tab.$flowId)) {
+ let flow = window.GLOB.UserCacheMap.get(Tab.$flowId)
+ regs.push({ reg: /@works_flow_code@/ig, value: flow.flow_code || '' })
+ }
+
config.components = this.filterComponent(config.components, roleId, balMap, param, Tab, Tab.uuid, Tab.uuid)
// 鑾峰彇涓绘悳绱㈡潯浠�
@@ -395,7 +400,7 @@
if (col.linkmenu && col.linkmenu.length > 0) {
let menu_id = col.linkmenu.pop()
- col.linkThdMenu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ col.linkThdMenu = window.GLOB.mkThdMenus.get(menu_id) || ''
} else {
col.linkThdMenu = ''
}
--
Gitblit v1.8.0