From e7062fee38bd54850e521ae7498275bc0f370702 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 19 七月 2023 17:13:26 +0800
Subject: [PATCH] 2023-07-19
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index 34fbe37..4cbb8a3 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -219,9 +219,11 @@
_style_ = {float: 'right'}
}
- let tableHCell = false
+ let mark = ['text', 'number', 'slider', 'sequence', 'formula'].includes(card.eleType)
if (parent.setting && parent.setting.cardRole === 'header') {
- tableHCell = true
+ mark = false
+ } else if (card.eleType === 'formula' && card.eval === 'func') {
+ mark = false
}
return (
@@ -231,7 +233,7 @@
<CopyOutlined className="copy" title="澶嶅埗" onClick={() => copyCard(id)} />
<CloseOutlined className="close" title="鍒犻櫎" onClick={() => delCard(id)} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)}/>
- {['text', 'number', 'slider', 'sequence', 'formula'].includes(card.eleType) && !tableHCell ? <MarkColumn field={card.field || ''} columns={fields} type={card.eleType} marks={card.marks} onSubmit={(vals) => updateMarks({...card, marks: vals})} /> : null }
+ {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}>
--
Gitblit v1.8.0