From ed7d889f7d9dfca77fd7f055ad8d6ec6ad85ae91 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 20 七月 2022 18:28:13 +0800
Subject: [PATCH] 2022-07-20
---
src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
index 75bf193..c5856d5 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
@@ -12,7 +12,7 @@
const { MonthPicker, WeekPicker, RangePicker } = DatePicker
const CheckCard = asyncComponent(() => import('@/templates/modalconfig/checkCard'))
-const Card = ({ id, card, showField, moveCard, copyCard, findCard, editCard, delCard }) => {
+const Card = ({ id, card, moveCard, copyCard, findCard, editCard, delCard }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'search', id, originalIndex },
@@ -113,6 +113,11 @@
formItem = <CheckCard config={card} />
}
+ let labelwidth = card.labelwidth || 33.3
+ if (card.labelShow === 'false') {
+ labelwidth = 0
+ }
+
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
@@ -121,14 +126,14 @@
<CloseOutlined className="close" onClick={() => delCard(id)} />
</div>
} trigger="hover">
- <div className={'page-card ' + (card.labelShow || '') + ' ' + type} style={{ opacity: opacity}}>
+ <div className={'page-card ' + (card.labelShow === 'false' ? 'label-hide ' : '') + type + (card.advanced === 'true' ? ' advanced' : '')} style={{ opacity: opacity}}>
<div ref={node => drag(drop(node))} onDoubleClick={() => editCard(id)}>
<Form.Item
- labelCol={{xs: { span: 24 }, sm: { span: 8 }}}
- wrapperCol = {{xs: { span: 24 }, sm: { span: 16 }}}
+ labelCol={{style: {width: labelwidth + '%'}}}
+ wrapperCol={{style: {width: (100 - labelwidth) + '%'}}}
label={card.labelShow !== 'false' ? card.label : ''}
required={card.required === 'true'}
- help={showField ? card.field + (card.datefield ? ', ' + card.datefield : '') : ''}
+ help={(card.field || '') + (card.datefield ? ', ' + card.datefield : '') + (card.advanced === 'true' ? '锛堥珮绾ф悳绱級' : '')}
>
{formItem}
</Form.Item>
--
Gitblit v1.8.0