From 106263ec10e60ce6c406e4fd5eb76d195772d0f0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 18 十二月 2020 18:07:05 +0800
Subject: [PATCH] 2020-12-18
---
src/menu/components/share/searchcomponent/dragsearch/card.jsx | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/menu/components/share/searchcomponent/dragsearch/card.jsx b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
index 6e023ff..6d7e365 100644
--- a/src/menu/components/share/searchcomponent/dragsearch/card.jsx
+++ b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
@@ -1,6 +1,6 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon, Select, DatePicker, Input, Popover } from 'antd'
+import { Icon, Select, DatePicker, Input, Popover, Form } from 'antd'
import moment from 'moment'
import DateGroup from '../dategroup'
@@ -19,8 +19,7 @@
const [, drop] = useDrop({
accept: 'search',
canDrop: () => true,
- drop: () => {},
- hover({ id: draggedId }) {
+ drop: ({ id: draggedId }) => {
if (!draggedId || draggedId === id) return
const { index: originIndex } = findCard(draggedId)
@@ -29,7 +28,7 @@
const { index: overIndex } = findCard(id)
moveCard(draggedId, overIndex)
- },
+ }
})
const opacity = isDragging ? 0 : 1
@@ -66,9 +65,14 @@
<Icon className="close" title="delete" type="close" onClick={() => delCard(id)} />
</div>
} trigger="hover">
- <div className="page-card" style={{ opacity: opacity}}>
+ <div className={'page-card ' + (card.labelShow || '')} style={{ opacity: opacity}}>
<div ref={node => drag(drop(node))}>
- <div className="ant-form-item">
+ <Form.Item
+ labelCol={{xs: { span: 24 }, sm: { span: 8 }}}
+ wrapperCol = {{xs: { span: 24 }, sm: { span: 16 }}}
+ label={card.labelShow !== 'false' ? card.label : ''}
+ required={card.required === 'true'}
+ >
{card.type === 'text' ?
<Input placeholder={card.label} value={card.initval} /> : null
}
@@ -93,7 +97,7 @@
/> : null
}
{card.type === 'group' ? <DateGroup card={card} /> : null }
- </div>
+ </Form.Item>
</div>
</div>
</Popover>
--
Gitblit v1.8.0