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 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx index db83147..2b1fda7 100644 --- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx +++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx @@ -57,6 +57,10 @@ _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) @@ -120,11 +124,11 @@ if (options.length === 0) { options = [{Value: '1', Text: '閫夐」1'}, {Value: '2', Text: '閫夐」2'}] } - formItem = (<Radio.Group value={card.initval} style={{lineHeight: '36px'}}> + 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'}} checked={card.initval === card.openVal}>{card.checkTip || ''}</Checkbox> + 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(',') @@ -155,7 +159,7 @@ 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' ? '锛堥珮绾ф悳绱級' : '')} + help={`${card.field || ''} ${card.datefield ? ', ' + card.datefield : ''} ${card.Hide === 'true' ? '锛堥殣钘忥級' : ''} ${card.advanced === 'true' ? '锛堥珮绾ф悳绱級' : ''}`} > {formItem} </Form.Item> -- Gitblit v1.8.0