From f30bc9d11d18e93626e4530dd2de54d479c2521d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 08 十一月 2021 21:48:22 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
index e65b6ec..b0c3855 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
@@ -50,7 +50,11 @@
}
} else if (card.type === 'daterange') {
_defaultValue = [null, null]
- if (card.initval) {
+ if (card.initval === 'week') {
+ _defaultValue = [moment().startOf('week'), moment().endOf('week')]
+ } else if (card.initval === 'month') {
+ _defaultValue = [moment().startOf('month'), moment().endOf('month')]
+ } else if (card.initval) {
try {
let _initval = JSON.parse(card.initval)
_defaultValue = [moment().subtract(_initval[0], 'days'), moment().subtract(_initval[1], 'days')]
--
Gitblit v1.8.0