From 125517c3e09320afa84a9e19a084d56c8ec3317e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 二月 2025 22:49:20 +0800
Subject: [PATCH] 2025-02-05
---
src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
index e8f7af2..2b1fda7 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
@@ -1,6 +1,6 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Select, DatePicker, Input, Popover, Form } from 'antd'
+import { Select, DatePicker, Input, Popover, Form, Switch, Radio, Checkbox } from 'antd'
import { EditOutlined, CopyOutlined, CloseOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -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 },
@@ -34,7 +34,7 @@
}
}
})
- const opacity = isDragging ? 0 : 1
+ const opacity = isDragging ? 0.5 : 1
let _defaultValue = '' // 涓嬫媺鎼滅储銆佹椂闂磋寖鍥寸被鍨嬶紝鍒濆鍊奸渶瑕侀澶勭悊
@@ -55,6 +55,12 @@
_defaultValue = [moment().startOf('week'), moment().endOf('week')]
} else if (card.initval === 'month') {
_defaultValue = [moment().startOf('month'), moment().endOf('month')]
+ } else if (card.initval === 'lastMonth') {
+ _defaultValue = [moment().subtract(1, 'months').startOf('month'), moment().subtract(1, 'months').endOf('month')]
+ } else if (card.initval === 'year') {
+ _defaultValue = [moment().startOf('year'), moment().endOf('year')]
+ } else if (card.initval === 'lastYear') {
+ _defaultValue = [moment().subtract(1, 'years').startOf('year'), moment().subtract(1, 'years').endOf('year')]
} else if (card.initval) {
try {
let _initval = JSON.parse(card.initval)
@@ -76,13 +82,31 @@
} 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} />)
+ 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'}
@@ -93,6 +117,31 @@
} else if (card.type === 'checkcard') {
type = 'checkcard'
formItem = <CheckCard config={card} />
+ } else if (card.type === 'switch') {
+ formItem = (<Switch checkedChildren={card.openText || ''} unCheckedChildren={card.closeText || ''} checked={card.initval === card.openVal}/>)
+ } else if (card.type === 'radio') {
+ let options = card.options
+ if (options.length === 0) {
+ options = [{Value: '1', Text: '閫夐」1'}, {Value: '2', Text: '閫夐」2'}]
+ }
+ formItem = (<Radio.Group value={card.initval} style={{lineHeight: '36px', whiteSpace: 'nowrap'}}>
+ {options.map((item, i) => (<Radio key={i} value={item.Value}> {item.Text} </Radio>))}
+ </Radio.Group>)
+ } else if (card.type === 'check') {
+ formItem = <Checkbox style={{lineHeight: '36px', whiteSpace: 'nowrap'}} checked={card.initval === card.openVal}>{card.checkTip || ''}</Checkbox>
+ } else if (card.type === 'range') {
+ type = 'range-wrap'
+ let vals = card.initval.split(',')
+ formItem = (<>
+ <Input style={{marginTop: '4px'}} value={vals[0] || ''} />
+ 鑷�
+ <Input style={{marginTop: '4px'}} value={vals[1] || ''} />
+ </>)
+ }
+
+ let labelwidth = card.labelwidth || 33.3
+ if (card.labelShow === 'false') {
+ labelwidth = 0
}
return (
@@ -103,14 +152,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' : '') + (card.query === 'false' ? ' no-query' : '')} 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.Hide === 'true' ? '锛堥殣钘忥級' : ''} ${card.advanced === 'true' ? '锛堥珮绾ф悳绱級' : ''}`}
>
{formItem}
</Form.Item>
--
Gitblit v1.8.0