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/templates/sharecomponent/actioncomponent/dragaction/card.jsx | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/dragaction/card.jsx b/src/templates/sharecomponent/actioncomponent/dragaction/card.jsx
index d1d61c5..f4b209a 100644
--- a/src/templates/sharecomponent/actioncomponent/dragaction/card.jsx
+++ b/src/templates/sharecomponent/actioncomponent/dragaction/card.jsx
@@ -42,6 +42,8 @@
}
} else if (card.funcType === 'print') {
hasProfile = true
+ } else if (card.funcType === 'megvii') {
+ hasProfile = true
}
return (
@@ -56,7 +58,7 @@
<div className="page-card" style={{ opacity: opacity}}>
<div ref={node => drag(drop(node))}>
<Button
- className={'mk-btn mk-' + card.class}
+ className={'mk-btn mk-' + card.class + (card.hidden === 'true' ? ' mk-hidden' : '')}
icon={card.icon}
key={card.uuid}
onDoubleClick={() => doubleClickCard(id)}
--
Gitblit v1.8.0