From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/mutilform/mkDatePicker/index.jsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/mkDatePicker/index.jsx b/src/tabviews/zshare/mutilform/mkDatePicker/index.jsx
index a3d0899..6643b2b 100644
--- a/src/tabviews/zshare/mutilform/mkDatePicker/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkDatePicker/index.jsx
@@ -37,7 +37,7 @@
this.state = {
value,
- minDate: config.minDate ? moment().add(config.minDate, 'days').endOf('day') : '',
+ minDate: config.minDate ? moment().add(config.minDate, 'days').startOf('day') : '',
maxDate: config.maxDate ? moment().add(config.maxDate, 'days').endOf('day') : '',
mode,
format
@@ -76,7 +76,7 @@
if (!current || (!maxDate && !minDate)) {
return false
}
-
+
if (!maxDate) {
return current < minDate
} else if (!minDate) {
--
Gitblit v1.8.0