From da7068bd48791cdee966c786ce0dfd46f6e03df9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 一月 2021 19:02:24 +0800
Subject: [PATCH] 2021-01-08

---
 src/menu/pastecontroller/index.jsx |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/menu/pastecontroller/index.jsx b/src/menu/pastecontroller/index.jsx
index 12a510d..a227bf1 100644
--- a/src/menu/pastecontroller/index.jsx
+++ b/src/menu/pastecontroller/index.jsx
@@ -63,7 +63,7 @@
         card.uuid = Utils.getuuid()
         if (card.elements) {
           if (sessionStorage.getItem('editMenuType') === 'popview') {
-            card.elements = card.elements.filter(b => b.OpenType !== 'popview')
+            card.elements = card.elements.filter(b => b.OpenType !== 'popview' && b.OpenType !== 'funcbutton')
           }
           card.elements = card.elements.map(cell => {
             cell.uuid = Utils.getuuid()
@@ -72,7 +72,7 @@
         }
         if (card.backElements) {
           if (sessionStorage.getItem('editMenuType') === 'popview') {
-            card.elements = card.elements.filter(b => b.OpenType !== 'popview')
+            card.elements = card.elements.filter(b => b.OpenType !== 'popview' && b.OpenType !== 'funcbutton')
           }
           card.backElements = card.backElements.map(cell => {
             cell.uuid = Utils.getuuid()
@@ -94,7 +94,7 @@
             })
           } else if (c.type === 'action' && c.elements) {
             if (sessionStorage.getItem('editMenuType') === 'popview') {
-              c.elements = c.elements.filter(b => b.OpenType !== 'popview')
+              c.elements = c.elements.filter(b => b.OpenType !== 'popview' && b.OpenType !== 'funcbutton')
             }
             c.elements = c.elements.map(cell => {
               cell.uuid = Utils.getuuid()
@@ -119,7 +119,7 @@
           })
         } else if (col.type === 'action' && col.elements) {
           if (sessionStorage.getItem('editMenuType') === 'popview') {
-            col.elements = col.elements.filter(c => c.OpenType !== 'popview')
+            col.elements = col.elements.filter(c => c.OpenType !== 'popview' && c.OpenType !== 'funcbutton')
           }
           col.elements = col.elements.map(cell => {
             cell.uuid = Utils.getuuid()
@@ -136,7 +136,7 @@
 
     if (item.action) {
       if (sessionStorage.getItem('editMenuType') === 'popview') {
-        item.action = item.action.filter(c => c.OpenType !== 'popview')
+        item.action = item.action.filter(c => c.OpenType !== 'popview' && c.OpenType !== 'funcbutton')
       }
       item.action = item.action.map(cell => {
         cell.uuid = Utils.getuuid()

--
Gitblit v1.8.0