From 9f02620e3dca6395caaccca5feb43122099129d1 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 01 六月 2023 10:44:44 +0800 Subject: [PATCH] Merge branch 'develop' --- src/tabviews/custom/components/card/cardcellList/index.jsx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx index 8e9c1f8..16a16f4 100644 --- a/src/tabviews/custom/components/card/cardcellList/index.jsx +++ b/src/tabviews/custom/components/card/cardcellList/index.jsx @@ -100,7 +100,7 @@ node && node.scrollIntoView({behavior: 'smooth', block: 'center', inline: 'nearest'}) } - if (!card.link) return + if (!card.link || (card.linkType === 'qywx' || card.linkType === 'linkmenu')) return e.stopPropagation() let url = '' @@ -131,7 +131,7 @@ } window.open(_url) return - } else if (card.linkType === 'qywx' || card.linkType === 'linkmenu') { + } else if (card.linkType === 'other' && /^@menuid@/ig.test(url)) { return } -- Gitblit v1.8.0