From 26d0fa42ea8c63a87e8ef93d0915f75f46fb1f9c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 三月 2022 11:09:53 +0800
Subject: [PATCH] 2022-03-24

---
 src/menu/components/share/searchcomponent/dragsearch/card.jsx |   87 +++++++++++++++++++++++++------------------
 1 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/src/menu/components/share/searchcomponent/dragsearch/card.jsx b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
index a118ebc..650c5b6 100644
--- a/src/menu/components/share/searchcomponent/dragsearch/card.jsx
+++ b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
@@ -36,15 +36,11 @@
   let _defaultValue = '' // 涓嬫媺鎼滅储銆佹椂闂磋寖鍥寸被鍨嬶紝鍒濆鍊奸渶瑕侀澶勭悊
 
   if (card.type === 'multiselect' || card.type === 'select' || card.type === 'link') {
-    if (card.initval) {
-      let _option = card.options.filter(option => option.Value === card.initval)[0]
-      if (_option) {
-        _defaultValue = _option.Text || ''
-      } else {
-        _defaultValue = ''
-      }
-    } else if (card.setAll === 'true') {
-      _defaultValue = '鍏ㄩ儴'
+    let _option = card.options.filter(option => option.Value === card.initval)[0]
+    if (_option) {
+      _defaultValue = _option.Text || ''
+    } else {
+      _defaultValue = ''
     }
   } else if (card.type === 'daterange') {
     _defaultValue = [null, null]
@@ -60,6 +56,51 @@
         _defaultValue = [null, null]
       }
     }
+  }
+
+  let formItem = null
+  if (card.type === 'text') {
+    if (card.inputType !== 'search') {
+      formItem = <Input placeholder={card.label} value={card.initval} />
+    } else {
+      formItem = <Search placeholder={card.label} value={card.initval} enterButton/>
+    }
+
+  } else if (card.type === 'multiselect' || card.type === 'select' || card.type === 'link') {
+    formItem = <Select placeholder={card.label} value={_defaultValue}></Select>
+  } else if (card.type === 'date') {
+    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} placeholder={card.label} value={card.initval ? moment().subtract(card.initval, 'days') : null} />
+  } else if (card.type === 'dateweek') {
+    formItem = <WeekPicker placeholder={card.label} value={card.initval ? moment().subtract(card.initval * 7, 'days') : null} />
+  } else if (card.type === 'datemonth') {
+    formItem = <MonthPicker placeholder={card.label} 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'}
+      value={_defaultValue}
+    />
+  } else if (card.type === 'group') {
+    formItem = <DateGroup card={card} />
   }
 
   return (
@@ -78,33 +119,7 @@
             label={card.labelShow !== 'false' ? card.label : ''}
             required={card.required === 'true'}
           >
-            {card.type === 'text' && card.inputType !== 'search' ?
-              <Input placeholder={card.label} value={card.initval} /> : null
-            }
-            {card.type === 'text' && card.inputType === 'search' ?
-              <Search placeholder={card.label} value={card.initval} enterButton/> : null
-            }
-            {(card.type === 'multiselect' || card.type === 'select' || card.type === 'link') ?
-              <Select placeholder={card.label} value={_defaultValue}></Select> : null
-            }
-            {card.type === 'date' ?
-              <DatePicker placeholder={card.label} value={card.initval ? moment().subtract(card.initval, 'days') : null} /> : null
-            }
-            {card.type === 'dateweek' ?
-              <WeekPicker placeholder={card.label} value={card.initval ? moment().subtract(card.initval * 7, 'days') : null} /> : null
-            }
-            {card.type === 'datemonth' ?
-              <MonthPicker placeholder={card.label} value={card.initval ? moment().subtract(card.initval, 'month') : null} /> : null
-            }
-            {card.type === 'daterange' ?
-              <RangePicker
-                className="data-range"
-                placeholder={['BeginTime', 'EndTime']}
-                renderExtraFooter={() => 'extra footer'}
-                value={_defaultValue}
-              /> : null
-            }
-            {card.type === 'group' ? <DateGroup card={card} /> : null }
+            {formItem}
           </Form.Item>
         </div>
       </div>

--
Gitblit v1.8.0