From 2ae980243b7ad705dea575eadcfc4cf4e24073bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:57:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/index.jsx | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index c5d426f..f3d603c 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -460,7 +460,7 @@
delete item.style.shadowColor
}
- item.$menuname = this.props.MenuName + '-' + (item.name || '')
+ item.$menuname = (this.props.MenuName || '') + '-' + (item.name || '')
if (item.type === 'tabs') {
if (
@@ -593,6 +593,8 @@
let tabId = this.props.Tab ? this.props.Tab.uuid : '' // 寮圭獥鏍囩鎸夐挳Id
if (item.action && item.action.length > 0) {
item.action = item.action.filter(cell => {
+ if (item.hidden === 'true') return false
+
cell.logLabel = item.$menuname + '-' + cell.label
cell.ContainerId = this.state.ContainerId
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
@@ -631,6 +633,8 @@
card.elements = card.elements.filter(cell => {
if (cell.eleType === 'button') {
+ if (cell.hidden === 'true') return false
+
cell.logLabel = item.$menuname + '-' + cell.label
cell.Ot = cell.Ot || 'requiredSgl'
cell.ContainerId = this.state.ContainerId
@@ -659,6 +663,8 @@
})
card.backElements = card.backElements.filter(cell => {
if (cell.eleType === 'button') {
+ if (cell.hidden === 'true') return false
+
cell.logLabel = item.$menuname + '-' + cell.label
cell.Ot = cell.Ot || 'requiredSgl'
cell.ContainerId = this.state.ContainerId
@@ -692,6 +698,8 @@
}
item.elements = item.elements.filter(cell => {
if (cell.eleType === 'button') {
+ if (cell.hidden === 'true') return false
+
cell.logLabel = item.$menuname + '-' + cell.label
cell.ContainerId = this.state.ContainerId
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
@@ -718,6 +726,8 @@
let _hasheight = card.style.height && card.style.height !== 'auto'
card.elements = card.elements.filter(cell => {
if (cell.eleType === 'button') {
+ if (cell.hidden === 'true') return false
+
cell.logLabel = item.$menuname + '-' + cell.label
cell.Ot = cell.Ot || 'requiredSgl'
cell.ContainerId = this.state.ContainerId
@@ -748,6 +758,8 @@
item.cols = item.cols.filter(col => {
if (col.type !== 'action') return true
col.elements = col.elements.filter(cell => {
+ if (cell.hidden === 'true') return false
+
cell.logLabel = item.$menuname + '-' + cell.label
cell.Ot = cell.Ot || 'requiredSgl'
cell.ContainerId = this.state.ContainerId
--
Gitblit v1.8.0