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/search/main-search/dragsearch/card.jsx | 67 +++++++++++++++++----------------
1 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/src/menu/components/search/main-search/dragsearch/card.jsx b/src/menu/components/search/main-search/dragsearch/card.jsx
index 84a30c3..2b56c5b 100644
--- a/src/menu/components/search/main-search/dragsearch/card.jsx
+++ b/src/menu/components/search/main-search/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'
@@ -22,6 +22,9 @@
drop: ({ id: draggedId }) => {
if (!draggedId) return
if (draggedId !== id) {
+ const { index: originIndex } = findCard(draggedId)
+ if (originIndex === -1) return
+
const { index: overIndex } = findCard(id)
moveCard(draggedId, overIndex)
}
@@ -64,37 +67,37 @@
} trigger="hover">
<div className={'page-card ' + card.labelShow} style={{ opacity: opacity}}>
<div ref={node => drag(drop(node))}>
- <div className="ant-row ant-form-item">
- <div className="ant-col ant-form-item-label ant-col-xs-24 ant-col-sm-8">
- <label className={card.required === 'true' ? 'ant-form-item-required' : ''} title={card.label}>{card.label}</label>
- </div>
- <div className="ant-col ant-form-item-control-wrapper ant-col-xs-24 ant-col-sm-16">
- {card.type === 'text' ?
- <Input style={{marginTop: '4px'}} placeholder={card.labelShow === 'false' ? card.label : ''} 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 }
- </div>
- </div>
+ <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 style={{marginTop: '4px'}} placeholder={card.labelShow === 'false' ? card.label : ''} 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 }
+ </Form.Item>
</div>
</div>
</Popover>
--
Gitblit v1.8.0