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 | 134 ++++++++++++++++++++++++++++----------------
1 files changed, 85 insertions(+), 49 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
index 3fb2a8b..c5856d5 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
@@ -1,14 +1,18 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon, Select, DatePicker, Input, Popover } from 'antd'
+import { Select, DatePicker, Input, Popover, Form } from 'antd'
+import { EditOutlined, CopyOutlined, CloseOutlined } from '@ant-design/icons'
import moment from 'moment'
import DateGroup from '../dategroup'
+import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
+const { Search } = Input
const { MonthPicker, WeekPicker, RangePicker } = DatePicker
+const CheckCard = asyncComponent(() => import('@/templates/modalconfig/checkCard'))
-const Card = ({ id, card, moveCard, copyCard, findCard, editCard, delCard, hasDrop }) => {
+const Card = ({ id, card, moveCard, copyCard, findCard, editCard, delCard }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'search', id, originalIndex },
@@ -20,17 +24,15 @@
accept: 'search',
canDrop: () => true,
drop: (item) => {
- if (!item.hasOwnProperty('originalIndex')) {
- hasDrop(card)
- }
- },
- hover({ id: draggedId }) {
- if (!draggedId) return
- if (draggedId !== id) {
+ const { id: draggedId, originalIndex } = item
+
+ if (originalIndex === undefined) {
+ item.dropTargetId = id
+ } else if (draggedId && draggedId !== id) {
const { index: overIndex } = findCard(id)
moveCard(draggedId, overIndex)
}
- },
+ }
})
const opacity = isDragging ? 0 : 1
@@ -49,58 +51,92 @@
}
} else if (card.type === 'daterange') {
_defaultValue = [null, null]
- if (card.initval) {
+ if (card.initval === 'week') {
+ _defaultValue = [moment().startOf('week'), moment().endOf('week')]
+ } else if (card.initval === 'month') {
+ _defaultValue = [moment().startOf('month'), moment().endOf('month')]
+ } else if (card.initval) {
try {
let _initval = JSON.parse(card.initval)
_defaultValue = [moment().subtract(_initval[0], 'days'), moment().subtract(_initval[1], 'days')]
- } catch {
+ } catch (e) {
_defaultValue = [null, null]
}
}
}
+ let formItem = null
+ let type = ''
+ if (card.type === 'text') {
+ if (card.inputType === 'search') {
+ formItem = (<Search style={{marginTop: '4px'}} placeholder={card.labelShow === 'false' ? card.label : ''} value={card.initval} enterButton />)
+ } else {
+ 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') {
+ let format = 'YYYY-MM-DD'
+ if (card.precision === 'hour') {
+ format = 'YYYY-MM-DD HH'
+ } else if (card.precision === 'minute') {
+ format = 'YYYY-MM-DD HH:mm'
+ } else if (card.precision === 'second') {
+ format = 'YYYY-MM-DD HH:mm:ss'
+ }
+ formItem = (<DatePicker format={format} 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') {
+ let format = 'YYYY-MM-DD'
+ if (card.precision === 'hour') {
+ format = 'YYYY-MM-DD HH'
+ } else if (card.precision === 'minute') {
+ format = 'YYYY-MM-DD HH:mm'
+ } else if (card.precision === 'second') {
+ format = 'YYYY-MM-DD HH:mm:ss'
+ }
+
+ formItem = (<RangePicker
+ format={format}
+ 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') {
+ type = 'checkcard'
+ 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">
- <Icon className="edit" title="edit" type="edit" onClick={() => editCard(id)} />
- <Icon className="copy" title="copy" type="copy" onClick={() => copyCard(id)} />
- <Icon className="close" title="delete" type="close" onClick={() => delCard(id)} />
+ <EditOutlined className="edit" onClick={() => editCard(id)} />
+ <CopyOutlined className="copy" onClick={() => copyCard(id)} />
+ <CloseOutlined className="close" onClick={() => delCard(id)} />
</div>
} trigger="hover">
- <div className="page-card" 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'}} 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 className="input-mask"></div>
- </div>
- </div>
+ <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={{style: {width: labelwidth + '%'}}}
+ wrapperCol={{style: {width: (100 - labelwidth) + '%'}}}
+ label={card.labelShow !== 'false' ? card.label : ''}
+ required={card.required === 'true'}
+ help={(card.field || '') + (card.datefield ? ', ' + card.datefield : '') + (card.advanced === 'true' ? '锛堥珮绾ф悳绱級' : '')}
+ >
+ {formItem}
+ </Form.Item>
</div>
</div>
</Popover>
--
Gitblit v1.8.0