From 7d206112a4ca1930639907a7cb131d0c1e6525a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 24 十一月 2019 12:23:08 +0800
Subject: [PATCH] 2019-11-24-01
---
src/templates/comtableconfig/dragelement/card.jsx | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/templates/comtableconfig/dragelement/card.jsx b/src/templates/comtableconfig/dragelement/card.jsx
index 85766a9..4f36985 100644
--- a/src/templates/comtableconfig/dragelement/card.jsx
+++ b/src/templates/comtableconfig/dragelement/card.jsx
@@ -5,7 +5,7 @@
import ItemTypes from './itemtypes'
import './index.scss'
-const { MonthPicker, WeekPicker } = DatePicker
+const { MonthPicker, WeekPicker, RangePicker } = DatePicker
const Card = ({ id, type, card, moveCard, findCard, editCard, copyCard, hasDrop }) => {
const originalIndex = findCard(id).index
@@ -41,6 +41,20 @@
copyCard(id)
}
+ let selectval = ''
+ if (type === 'search' && card.type === 'select') {
+ if (card.initval) {
+ let _option = card.options.filter(option => option.Value === card.initval)[0]
+ if (_option) {
+ selectval = _option.Text || ''
+ } else {
+ selectval = ''
+ }
+ } else if (card.setAll === 'true') {
+ selectval = '鍏ㄩ儴'
+ }
+ }
+
return (
<div className="page-card" style={type === 'columns' ? { flex: card.Width, opacity: opacity} : { opacity: opacity}}>
<div ref={node => drag(drop(node))}>
@@ -53,7 +67,7 @@
<Input style={{marginTop: '4px'}} defaultValue={card.initval} /> : null
}
{(card.type === 'select' || card.type === 'link') ?
- <Select defaultValue={card.initval}></Select> : null
+ <Select defaultValue={selectval}></Select> : null
}
{card.type === 'date' ?
<DatePicker defaultValue={card.initval ? moment().subtract(card.initval, 'days') : null} /> : null
@@ -64,8 +78,12 @@
{card.type === 'datemonth' ?
<MonthPicker defaultValue={card.initval ? moment().subtract(card.initval, 'month') : null} /> : null
}
- {card.type === 'datetime' ?
- <DatePicker showTime defaultValue={card.initval ? moment(card.initval, 'YYYY-MM-DD HH:mm:ss') : null} /> : null
+ {card.type === 'daterange' ?
+ <RangePicker
+ placeholder={['寮�濮嬫棩鏈�', '缁撴潫鏃ユ湡']}
+ renderExtraFooter={() => 'extra footer'}
+ defaultValue={card.initval ? [moment().subtract(card.initval, 'days'), moment().subtract(card.initval === 1 ? 1 : 0, 'days')] : [null, null]}
+ /> : null
}
<div className="input-mask"></div>
</div>
--
Gitblit v1.8.0