From a8d8d2fdb83f21e76f90cb13ea91ad6e9bf98a9b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 24 三月 2025 10:53:52 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/searchcomponent/dragsearch/card.jsx | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/menu/components/share/searchcomponent/dragsearch/card.jsx b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
index f13b469..e1fb8a8 100644
--- a/src/menu/components/share/searchcomponent/dragsearch/card.jsx
+++ b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
@@ -56,6 +56,10 @@
_defaultValue = [moment().startOf('month'), moment().endOf('month')]
} else if (card.initval === 'lastMonth') {
_defaultValue = [moment().subtract(1, 'months').startOf('month'), moment().subtract(1, 'months').endOf('month')]
+ } else if (card.initval === 'year') {
+ _defaultValue = [moment().startOf('year'), moment().endOf('year')]
+ } else if (card.initval === 'lastYear') {
+ _defaultValue = [moment().subtract(1, 'years').startOf('year'), moment().subtract(1, 'years').endOf('year')]
} else if (card.initval) {
try {
let _initval = JSON.parse(card.initval)
--
Gitblit v1.8.0