From 5046d0d13dc6a8563b8e54e31913bc44cfa1072f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 19:23:18 +0800
Subject: [PATCH] 2022-04-26

---
 src/tabviews/zshare/topSearch/mkDatePicker/index.jsx |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/tabviews/zshare/topSearch/mkDatePicker/index.jsx b/src/tabviews/zshare/topSearch/mkDatePicker/index.jsx
index 4ebc9b2..859be1a 100644
--- a/src/tabviews/zshare/topSearch/mkDatePicker/index.jsx
+++ b/src/tabviews/zshare/topSearch/mkDatePicker/index.jsx
@@ -23,9 +23,19 @@
     } else if (config.type === 'week') {
       mode = 'week'
       format = 'YYYY-MM-DD'
-    } else if (config.type === 'daterange') {
-      mode = 'daterange'
-      format = 'YYYY-MM-DD'
+    } else {
+      if (config.type === 'daterange') {
+        mode = 'daterange'
+      }
+      if (config.precision === 'day') {
+        format = 'YYYY-MM-DD'
+      } else if (config.precision === 'hour') {
+        format = 'YYYY-MM-DD HH'
+      } else if (config.precision === 'minute') {
+        format = 'YYYY-MM-DD HH:mm'
+      } else if (config.precision === 'second') {
+        format = 'YYYY-MM-DD HH:mm:ss'
+      }
     }
     let value = config.initval || null
 
@@ -43,6 +53,7 @@
     this.state = {
       value,
       mode,
+      precision: config.precision || 'day',
       format
     }
   }
@@ -74,16 +85,16 @@
   }
 
   render() {
-    const { value, mode } = this.state
+    const { value, mode, format, precision } = this.state
 
     if (mode === 'date') {
-      return <DatePicker value={value} onChange={this.onChange}/>
+      return <DatePicker dropdownClassName={'mk-date-picker ' + precision} value={value} showTime={format !== 'YYYY-MM-DD'} format={format} onChange={this.onChange}/>
     } else if (mode === 'month') {
       return <MonthPicker value={value} onChange={this.onChange}/>
     } else if (mode === 'week') {
       return <WeekPicker value={value} onChange={this.onChange}/>
     } else if (mode === 'daterange') {
-      return <RangePicker placeholder={['寮�濮嬫棩鏈�', '缁撴潫鏃ユ湡']} value={value} onChange={this.onChange}/>
+      return <RangePicker dropdownClassName={'mk-date-picker ' + precision} placeholder={['寮�濮嬫棩鏈�', '缁撴潫鏃ユ湡']} showTime={format !== 'YYYY-MM-DD'} format={format} value={value} onChange={this.onChange}/>
     }
   }
 }

--
Gitblit v1.8.0