From 17014ea028b2b0ce3aafab3c16eed14bf3fbc83a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 07 六月 2023 17:55:50 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/popview/index.jsx | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index 92c41c2..0093459 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -421,6 +421,30 @@
return true
})
+ if (card.setting.click === 'menus') {
+ if (card.menus) {
+ card.menus = card.menus.filter(m => !!m.MenuID)
+ if (card.menus.length === 0) {
+ card.menus = null
+ }
+ }
+ if (!card.menus || item.subtype !== 'datacard' || card.$cardType === 'extendCard') {
+ card.setting.click = ''
+ }
+ } else if (card.setting.click === 'menu') {
+ if (!Array.isArray(card.setting.menu)) {
+ card.setting.click = ''
+ }
+ }
+
+ if (item.subtype === 'dualdatacard' && card.$cardType !== 'extendCard') {
+ if (card.backSetting && card.backSetting.click === 'menu') {
+ if (!Array.isArray(card.backSetting.menu)) {
+ card.backSetting.click = ''
+ }
+ }
+ }
+
if (!card.backElements || card.backElements.length === 0) return
card.backElements = card.backElements.filter(cell => {
--
Gitblit v1.8.0