From 89f85223ff7b1b5ee3931ae01efa3dd17d5524fc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:03:27 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/data-card/options.jsx | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 3733162..c750cfc 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -1,4 +1,3 @@
-import { fromJS } from 'immutable'
import MenuUtils from '@/utils/utils-custom.js'
/**
@@ -7,7 +6,7 @@
export default function (wrap, subtype, columns = [], id = '', supNodes = [], setting) {
let appType = sessionStorage.getItem('appType')
let MenuType = ''
- let menu = fromJS(window.GLOB.customMenu).toJS()
+ let menu = window.GLOB.customMenu
let laypage = setting && setting.laypage !== 'false'
let interfaces = []
if (subtype === 'propcard' && menu.interfaces) {
@@ -26,7 +25,14 @@
}
let modules = []
if (subtype === 'propcard' || subtype === 'datacard') {
- modules = MenuUtils.getSupModules(menu.components, id) || []
+ modules = MenuUtils.getSupModules(menu.components, id, menu.interfaces)
+
+ if (subtype === 'propcard' && wrap.supModule && wrap.supModule.length > 0 && wrap.supModule[0] !== 'empty') {
+ let has = MenuUtils.checkSupModules(modules, wrap.supModule.slice(-1)[0])
+ if (!has) {
+ wrap.supModule = ''
+ }
+ }
}
let roleList = sessionStorage.getItem('sysRoles')
--
Gitblit v1.8.0