From 6ed4e1dc4b9575a22f74f57fbf90abe02b315de7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 十一月 2024 10:10:33 +0800
Subject: [PATCH] 2024-11-21
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index abe02a7..1c1b983 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -241,11 +241,17 @@
_style_ = {float: 'right'}
}
- let mark = ['text', 'number', 'slider', 'sequence', 'formula'].includes(card.eleType)
+ let mark = ['text', 'number', 'slider', 'sequence', 'formula', 'icon'].includes(card.eleType)
if (parent.setting && parent.setting.cardRole === 'header') {
mark = false
} else if (card.eleType === 'formula' && card.eval === 'func') {
mark = false
+ }
+
+ let className = 'ant-col card-cell ant-col-' + card.width
+
+ if (card.noValue === 'hide') {
+ className += ' no-value-hide'
}
return (
@@ -258,7 +264,7 @@
{mark ? <MarkColumn field={card.field || ''} columns={fields} type={card.eleType} marks={card.marks} onSubmit={(vals) => updateMarks({...card, marks: vals})} /> : null }
</div>
} trigger="hover">
- <div ref={node => drag(drop(node))} style={_style_} className={'ant-col card-cell ant-col-' + card.width}>
+ <div ref={node => drag(drop(node))} style={_style_} className={className}>
<div style={_style} onClick={clickComponent} onDoubleClick={() => able && editCard(id)} id={card.uuid}>
{getContent()}
</div>
--
Gitblit v1.8.0