From f497f734966504bd8a7e98bf602da582a53d91e5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 12 九月 2021 02:55:59 +0800
Subject: [PATCH] 2021-09-12

---
 src/tabviews/custom/index.jsx |   19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 521c756..06c8835 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -570,13 +570,12 @@
           cell.ContainerId = this.state.ContainerId
           cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
           cell.$menuId = item.uuid
+          cell.$MenuID = this.props.MenuID
           cell.$tabId = tabId
           cell.$view = 'CustomPage'
 
           if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
             cell = this.getPrinter(cell, item.uuid)
-          } else if (cell.OpenType === 'funcbutton' && cell.funcType === 'closetab') { // 鏍囩鍏抽棴鎸夐挳锛岄噸缃彍鍗旾d
-            cell.$menuId = this.props.MenuID
           }
 
           if (cell.btnstyle) { // 鍏煎
@@ -606,13 +605,12 @@
               cell.ContainerId = this.state.ContainerId
               cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
               cell.$menuId = item.uuid
+              cell.$MenuID = this.props.MenuID
               cell.$tabId = tabId
               cell.$view = 'CustomPage'
 
               if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
                 cell = this.getPrinter(cell, item.uuid)
-              } else if (cell.OpenType === 'funcbutton' && cell.funcType === 'closetab') { // 鏍囩鍏抽棴鎸夐挳锛岄噸缃彍鍗旾d
-                cell.$menuId = this.props.MenuID
               }
               if (card.btnstyle) { // 鍏煎
                 card.style = card.style || {}
@@ -631,13 +629,12 @@
               cell.ContainerId = this.state.ContainerId
               cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
               cell.$menuId = item.uuid
+              cell.$MenuID = this.props.MenuID
               cell.$tabId = tabId
               cell.$view = 'CustomPage'
 
               if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
                 cell = this.getPrinter(cell, item.uuid)
-              } else if (cell.OpenType === 'funcbutton' && cell.funcType === 'closetab') { // 鏍囩鍏抽棴鎸夐挳锛岄噸缃彍鍗旾d
-                cell.$menuId = this.props.MenuID
               }
               if (card.btnstyle) { // 鍏煎
                 card.style = card.style || {}
@@ -660,13 +657,12 @@
             cell.ContainerId = this.state.ContainerId
             cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
             cell.$menuId = item.uuid
+            cell.$MenuID = this.props.MenuID
             cell.$tabId = tabId
             cell.$view = 'CustomPage'
 
             if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
               cell = this.getPrinter(cell, item.uuid)
-            } else if (cell.OpenType === 'funcbutton' && cell.funcType === 'closetab') { // 鏍囩鍏抽棴鎸夐挳锛岄噸缃彍鍗旾d
-              cell.$menuId = this.props.MenuID
             }
           } else if (['text', 'number', 'link'].includes(cell.eleType) && !cell.height) {
             cell.innerHeight = 'auto'
@@ -684,15 +680,13 @@
               cell.ContainerId = this.state.ContainerId
               cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
               cell.$menuId = item.uuid
+              cell.$MenuID = this.props.MenuID
               cell.$tabId = tabId
               cell.$view = 'CustomPage'
 
               if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
                 cell = this.getPrinter(cell, item.uuid)
-              } else if (cell.OpenType === 'funcbutton' && cell.funcType === 'closetab') { // 鏍囩鍏抽棴鎸夐挳锛岄噸缃彍鍗旾d
-                cell.$menuId = this.props.MenuID
               }
-
               if (card.btnstyle) { // 鍏煎
                 card.style = card.style || {}
                 card.style = {...card.style, ...card.btnstyle}
@@ -712,13 +706,12 @@
             cell.ContainerId = this.state.ContainerId
             cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
             cell.$menuId = item.uuid
+            cell.$MenuID = this.props.MenuID
             cell.$tabId = tabId
             cell.$view = 'CustomPage'
 
             if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
               cell = this.getPrinter(cell, item.uuid)
-            } else if (cell.OpenType === 'funcbutton' && cell.funcType === 'closetab') { // 鏍囩鍏抽棴鎸夐挳锛岄噸缃彍鍗旾d
-              cell.$menuId = this.props.MenuID
             }
 
             if (cell.btnstyle) { // 鍏煎

--
Gitblit v1.8.0