From 9f9d68cf40f1d7470bfb49220266b26663cbb722 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 23 十一月 2019 14:55:11 +0800
Subject: [PATCH] 2019-11-23-01

---
 src/templates/comtableconfig/dragelement/card.jsx |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/templates/comtableconfig/dragelement/card.jsx b/src/templates/comtableconfig/dragelement/card.jsx
index 5b4d873..85766a9 100644
--- a/src/templates/comtableconfig/dragelement/card.jsx
+++ b/src/templates/comtableconfig/dragelement/card.jsx
@@ -5,6 +5,8 @@
 import ItemTypes from './itemtypes'
 import './index.scss'
 
+const { MonthPicker, WeekPicker } = DatePicker
+
 const Card = ({ id, type, card, moveCard, findCard, editCard, copyCard, hasDrop }) => {
   const originalIndex = findCard(id).index
   const [{ isDragging }, drag] = useDrag({
@@ -47,17 +49,23 @@
             <label title={card.label}>{card.label}</label>
           </div>
           <div className="ant-col ant-form-item-control-wrapper">
-            {card.type === 'text' &&
-              <Input style={{marginTop: '4px'}} defaultValue={card.initval} />
+            {card.type === 'text' ?
+              <Input style={{marginTop: '4px'}} defaultValue={card.initval} /> : null
             }
-            {(card.type === 'select' || card.type === 'link') &&
-              <Select defaultValue={card.initval}></Select>
+            {(card.type === 'select' || card.type === 'link') ?
+              <Select defaultValue={card.initval}></Select> : null
             }
-            {card.type === 'date' &&
-              <DatePicker defaultValue={card.initval ? moment(card.initval, 'YYYY-MM-DD') : null} />
+            {card.type === 'date' ?
+              <DatePicker defaultValue={card.initval ? moment().subtract(card.initval, 'days') : null} /> : null
             }
-            {card.type === 'datetime' &&
-              <DatePicker showTime defaultValue={card.initval ? moment(card.initval, 'YYYY-MM-DD HH:mm:ss') : null} />
+            {card.type === 'dateweek' ?
+              <WeekPicker defaultValue={card.initval ? moment().subtract(card.initval * 7, 'days') : null} /> : null
+            }
+            {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
             }
             <div className="input-mask"></div>
           </div>

--
Gitblit v1.8.0