From 1e4a7720c748bc0206b02b30f4a2e0b3dafb54f3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 19 二月 2024 13:31:13 +0800
Subject: [PATCH] 2024-02-19
---
src/menu/components/share/searchcomponent/dragsearch/card.jsx | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/share/searchcomponent/dragsearch/card.jsx b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
index 7c6754f..6061187 100644
--- a/src/menu/components/share/searchcomponent/dragsearch/card.jsx
+++ b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
@@ -54,6 +54,8 @@
_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) {
try {
let _initval = JSON.parse(card.initval)
@@ -65,6 +67,7 @@
}
let formItem = null
+ let type = ''
if (card.type === 'text') {
if (card.inputType !== 'search') {
formItem = <Input placeholder={card.label} value={card.initval} />
@@ -111,6 +114,14 @@
formItem = (<Switch checkedChildren={card.openText || ''} unCheckedChildren={card.closeText || ''} style={{marginTop: '8px'}} checked={card.initval === card.openVal}/>)
} else if (card.type === 'check') {
formItem = <Checkbox style={{lineHeight: '36px'}} 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
@@ -126,7 +137,7 @@
<CloseOutlined className="close" title="鍒犻櫎" onClick={() => delCard(id)} />
</div>
} trigger="hover">
- <div className={'page-card ' + (card.labelShow || '')} style={{ opacity: opacity}}>
+ <div className={`page-card ${type} ${card.labelShow || ''}`} style={{ opacity: opacity}}>
<div ref={node => drag(drop(node))}>
<Form.Item
labelCol={{style: {width: labelwidth + '%'}}}
--
Gitblit v1.8.0