From bfadd84fbc2b23c59695e5a94778ab7ac40fea03 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 26 六月 2021 22:54:17 +0800
Subject: [PATCH] 2021-06-26

---
 src/menu/components/search/main-search/dragsearch/card.jsx |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/menu/components/search/main-search/dragsearch/card.jsx b/src/menu/components/search/main-search/dragsearch/card.jsx
index c858b2e..1453f0c 100644
--- a/src/menu/components/search/main-search/dragsearch/card.jsx
+++ b/src/menu/components/search/main-search/dragsearch/card.jsx
@@ -8,6 +8,7 @@
 import './index.scss'
 
 const { MonthPicker, WeekPicker, RangePicker } = DatePicker
+const { Search } = Input
 const CheckCard = asyncComponent(() => import('@/templates/modalconfig/checkCard'))
 
 const Card = ({ id, card, showField, moveCard, copyCard, findCard, editCard, delCard }) => {
@@ -59,11 +60,15 @@
 
   let formItem = null
   if (card.type === 'text') {
-    formItem = (<Input style={{marginTop: '4px'}} placeholder={card.labelShow === 'false' ? card.label : ''} value={card.initval} />)
+    if (card.inputType === 'search') {
+      formItem = (<Search style={{marginTop: '4px'}} placeholder={card.labelShow === 'false' ? card.label : ''} value={card.initval} enterButton />)
+    } else {
+      formItem = (<Input style={{marginTop: '4px'}} placeholder={card.labelShow === 'false' ? card.label : ''} value={card.initval} />)
+    }
   } 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} />)
+    formItem = (<Input style={{marginTop: '4px'}} placeholder={card.labelShow === 'false' ? card.label : ''} value={card.initval} />)
   } else if (card.type === 'dateweek') {
     formItem = (<WeekPicker value={card.initval ? moment().subtract(card.initval * 7, 'days') : null} />)
   } else if (card.type === 'datemonth') {

--
Gitblit v1.8.0