From 4ce77c01c1adcbd1b3cb2aa5b7103a827d189811 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 20:53:22 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
index b8e407f..2b1fda7 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
@@ -57,6 +57,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