From c8dec113736cc78c47cd63377d756d364b42a94e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 四月 2025 16:39:15 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/actioncomponent/dragaction/card.jsx | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/dragaction/card.jsx b/src/menu/components/share/actioncomponent/dragaction/card.jsx
index 4735517..e65eb9b 100644
--- a/src/menu/components/share/actioncomponent/dragaction/card.jsx
+++ b/src/menu/components/share/actioncomponent/dragaction/card.jsx
@@ -46,6 +46,8 @@
hasProfile = true
} else if (card.funcType === 'megvii') {
hasProfile = true
+ } else if (card.payMode === 'system') {
+ hasProfile = true
}
let btnElement = null
@@ -106,10 +108,10 @@
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<EditOutlined className="edit" onClick={() => editCard(id)} />
- <CopyOutlined className="copy" onClick={() => copyCard(id)} />
- <CloseOutlined className="close" onClick={() => delCard(id)} />
- {type !== 'datacard' && type !== 'basetable' ? <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)}/> : ''}
- {hasProfile ? <ProfileOutlined className="profile" title="楠岃瘉" onClick={() => profileCard(id)} /> : null}
+ {!card.$fixed ? <CopyOutlined className="copy" onClick={() => copyCard(id)} /> : null}
+ {!card.$fixed ? <CloseOutlined className="close" onClick={() => delCard(id)} /> : null}
+ {type !== 'datacard' && type !== 'basetable' && !card.$fixed ? <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)}/> : ''}
+ {hasProfile ? <ProfileOutlined className="profile" title="楠岃瘉淇℃伅" onClick={() => profileCard(id)} /> : null}
{updateTime}
</div>
} trigger="hover">
--
Gitblit v1.8.0