From 137fb8ea6af2789b3238b22bac31d80bced41dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 11:39:39 +0800
Subject: [PATCH] 2021-07-28
---
src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx | 54 +++++++++++++++++++++++++++++-------------------------
1 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
index 812ed31..1981f06 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
@@ -4,11 +4,13 @@
import moment from 'moment'
import DateGroup from '../dategroup'
+import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
const { MonthPicker, WeekPicker, RangePicker } = DatePicker
+const CheckCard = asyncComponent(() => import('@/templates/modalconfig/checkCard'))
-const Card = ({ id, card, moveCard, copyCard, findCard, editCard, delCard }) => {
+const Card = ({ id, card, showField, moveCard, copyCard, findCard, editCard, delCard }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'search', id, originalIndex },
@@ -57,6 +59,30 @@
}
}
+ let formItem = null
+ if (card.type === 'text') {
+ formItem = (<Input style={{marginTop: '4px'}} placeholder={card.labelShow === 'false' ? card.label : ''} value={card.initval} />)
+ } else if (card.type === 'multiselect' || card.type === 'select' || card.type === 'link') {
+ formItem = (<Select value={_defaultValue}></Select>)
+ } else if (card.type === 'date') {
+ formItem = (<DatePicker value={card.initval ? moment().subtract(card.initval, 'days') : null} />)
+ } else if (card.type === 'dateweek') {
+ formItem = (<WeekPicker value={card.initval ? moment().subtract(card.initval * 7, 'days') : null} />)
+ } else if (card.type === 'datemonth') {
+ formItem = (<MonthPicker value={card.initval ? moment().subtract(card.initval, 'month') : null} />)
+ } else if (card.type === 'daterange') {
+ formItem = (<RangePicker
+ className="data-range"
+ placeholder={['BeginTime', 'EndTime']}
+ renderExtraFooter={() => 'extra footer'}
+ value={_defaultValue}
+ />)
+ } else if (card.type === 'group') {
+ formItem = (<DateGroup card={card} />)
+ } else if (card.type === 'checkcard') {
+ formItem = <CheckCard config={card} />
+ }
+
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
@@ -72,31 +98,9 @@
wrapperCol = {{xs: { span: 24 }, sm: { span: 16 }}}
label={card.labelShow !== 'false' ? card.label : ''}
required={card.required === 'true'}
+ help={showField ? card.field + (card.datefield ? ', ' + card.datefield : '') : ''}
>
- {card.type === 'text' ?
- <Input style={{marginTop: '4px'}} value={card.initval} /> : null
- }
- {(card.type === 'multiselect' || card.type === 'select' || card.type === 'link') ?
- <Select value={_defaultValue}></Select> : null
- }
- {card.type === 'date' ?
- <DatePicker value={card.initval ? moment().subtract(card.initval, 'days') : null} /> : null
- }
- {card.type === 'dateweek' ?
- <WeekPicker value={card.initval ? moment().subtract(card.initval * 7, 'days') : null} /> : null
- }
- {card.type === 'datemonth' ?
- <MonthPicker value={card.initval ? moment().subtract(card.initval, 'month') : null} /> : null
- }
- {card.type === 'daterange' ?
- <RangePicker
- className="data-range"
- placeholder={['BeginTime', 'EndTime']}
- renderExtraFooter={() => 'extra footer'}
- value={_defaultValue}
- /> : null
- }
- {card.type === 'group' ? <DateGroup card={card} /> : null }
+ {formItem}
</Form.Item>
</div>
</div>
--
Gitblit v1.8.0