From 5046d0d13dc6a8563b8e54e31913bc44cfa1072f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 19:23:18 +0800
Subject: [PATCH] 2022-04-26
---
src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
index e8f7af2..6183e23 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
@@ -76,13 +76,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 +111,11 @@
} else if (card.type === 'checkcard') {
type = 'checkcard'
formItem = <CheckCard config={card} />
+ }
+
+ let labelwidth = card.labelwidth || 33.3
+ if (card.labelShow === 'false') {
+ labelwidth = 0
}
return (
@@ -106,8 +129,10 @@
<div className={'page-card ' + (card.labelShow || '') + ' ' + type} 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) + '%'}}}
+ // labelCol={{xs: { span: 24 }, sm: { span: 8 }}}
+ // 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 : '') : ''}
--
Gitblit v1.8.0