From 125517c3e09320afa84a9e19a084d56c8ec3317e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 二月 2025 22:49:20 +0800
Subject: [PATCH] 2025-02-05
---
src/menu/components/share/searchcomponent/dragsearch/card.jsx | 4 ++++
src/tabviews/zshare/topSearch/index.jsx | 8 ++++++++
src/menu/components/search/main-search/dragsearch/card.jsx | 4 ++++
src/utils/option.js | 2 ++
src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx | 4 ++++
src/utils/utils.js | 10 +++++++++-
6 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/search/main-search/dragsearch/card.jsx b/src/menu/components/search/main-search/dragsearch/card.jsx
index e10a9d5..6e41e5d 100644
--- a/src/menu/components/search/main-search/dragsearch/card.jsx
+++ b/src/menu/components/search/main-search/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)
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)
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 2c3044e..088db55 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -170,6 +170,10 @@
item.initval = [moment(d).startOf('month').format(item.format), moment(d).endOf('month').format(item.format)].join(',')
} else if (item.$initval === 'lastMonth') {
item.initval = [moment(d).subtract(1, 'months').startOf('month').format(item.format), moment(d).subtract(1, 'months').endOf('month').format(item.format)].join(',')
+ } else if (item.$initval === 'year') {
+ item.initval = [moment(d).startOf('year').format(item.format), moment(d).endOf('year').format(item.format)].join(',')
+ } else if (item.$initval === 'lastYear') {
+ item.initval = [moment(d).subtract(1, 'years').startOf('year').format(item.format), moment(d).subtract(1, 'years').endOf('year').format(item.format)].join(',')
} else {
try {
let _initval = JSON.parse(item.$initval)
@@ -445,6 +449,10 @@
item.initval = [moment(d).startOf('month').format(item.format), moment(d).endOf('month').format(item.format)].join(',')
} else if (item.$initval === 'lastMonth') {
item.initval = [moment(d).subtract(1, 'months').startOf('month').format(item.format), moment(d).subtract(1, 'months').endOf('month').format(item.format)].join(',')
+ } else if (item.$initval === 'year') {
+ item.initval = [moment(d).startOf('year').format(item.format), moment(d).endOf('year').format(item.format)].join(',')
+ } else if (item.$initval === 'lastYear') {
+ item.initval = [moment(d).subtract(1, 'years').startOf('year').format(item.format), moment(d).subtract(1, 'years').endOf('year').format(item.format)].join(',')
} else {
try {
let _initval = JSON.parse(item.$initval)
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)
diff --git a/src/utils/option.js b/src/utils/option.js
index e025897..b311e85 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -133,6 +133,8 @@
{value: 'week', text: '鏈懆'},
{value: 'month', text: '鏈湀'},
{value: 'lastMonth', text: '涓婃湀'},
+ {value: 'year', text: '鏈勾'},
+ {value: 'lastYear', text: '涓婂勾'},
],
datetime: [
{value: '', text: '绌�'},
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 8f21c6f..09650c6 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -265,7 +265,7 @@
}
if (d) {
- item.initval = moment(d).subtract(item.initval, 'month').format('YYYY-MM')
+ item.initval = moment(d).subtract(item.$initval, 'month').format('YYYY-MM')
}
}
}
@@ -294,6 +294,10 @@
item.initval = [moment().startOf('month').format(format), moment().endOf('month').format(format)].join(',')
} else if (item.initval === 'lastMonth') {
item.initval = [moment().subtract(1, 'months').startOf('month').format(format), moment().subtract(1, 'months').endOf('month').format(format)].join(',')
+ } else if (item.initval === 'year') {
+ item.initval = [moment().startOf('year').format(format), moment().endOf('year').format(format)].join(',')
+ } else if (item.initval === 'lastYear') {
+ item.initval = [moment().subtract(1, 'years').startOf('year').format(format), moment().subtract(1, 'years').endOf('year').format(format)].join(',')
} else if (item.initval) {
try {
let _initval = JSON.parse(item.initval)
@@ -335,6 +339,10 @@
item.initval = [moment(d).startOf('month').format(format), moment(d).endOf('month').format(format)].join(',')
} else if (item.$initval === 'lastMonth') {
item.initval = [moment(d).subtract(1, 'months').startOf('month').format(format), moment(d).subtract(1, 'months').endOf('month').format(format)].join(',')
+ } else if (item.$initval === 'year') {
+ item.initval = [moment(d).startOf('year').format(format), moment(d).endOf('year').format(format)].join(',')
+ } else if (item.$initval === 'lastYear') {
+ item.initval = [moment(d).subtract(1, 'years').startOf('year').format(format), moment(d).subtract(1, 'years').endOf('year').format(format)].join(',')
} else {
try {
let _initval = JSON.parse(item.$initval)
--
Gitblit v1.8.0