From b199fb9173179314dc0edaf6cbc912d00577f32b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 04 十一月 2021 10:16:10 +0800
Subject: [PATCH] 2021-11-04
---
src/menu/components/share/searchcomponent/dragsearch/card.jsx | 6 +++++-
src/templates/formtabconfig/dragelement/card.jsx | 6 +++++-
src/mob/searchconfig/searchdragelement/card.jsx | 6 +++++-
src/menu/components/search/main-search/dragsearch/card.jsx | 6 +++++-
src/utils/option.js | 4 +++-
src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx | 6 +++++-
src/utils/utils.js | 6 +++++-
7 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/menu/components/search/main-search/dragsearch/card.jsx b/src/menu/components/search/main-search/dragsearch/card.jsx
index 788cdbd..d5f7835 100644
--- a/src/menu/components/search/main-search/dragsearch/card.jsx
+++ b/src/menu/components/search/main-search/dragsearch/card.jsx
@@ -49,7 +49,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')]
diff --git a/src/menu/components/share/searchcomponent/dragsearch/card.jsx b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
index a484993..85b3b7b 100644
--- a/src/menu/components/share/searchcomponent/dragsearch/card.jsx
+++ b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
@@ -46,7 +46,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')]
diff --git a/src/mob/searchconfig/searchdragelement/card.jsx b/src/mob/searchconfig/searchdragelement/card.jsx
index 97e27f9..228865a 100644
--- a/src/mob/searchconfig/searchdragelement/card.jsx
+++ b/src/mob/searchconfig/searchdragelement/card.jsx
@@ -82,7 +82,11 @@
</div>)
} else if (card.type === 'daterange') {
let value = '璇烽�夋嫨'
- if (card.initval) {
+ if (card.initval === 'week') {
+ value = [moment().startOf('week').format('YYYY-MM-DD'), moment().endOf('week').format('YYYY-MM-DD')].join(' ~ ')
+ } else if (card.initval === 'month') {
+ value = [moment().startOf('month').format('YYYY-MM-DD'), moment().endOf('month').format('YYYY-MM-DD')].join(' ~ ')
+ } else if (card.initval) {
try {
let _initval = JSON.parse(card.initval)
value = [moment().subtract(_initval[0], 'days').format('YYYY-MM-DD'), moment().subtract(_initval[1], 'days').format('YYYY-MM-DD')].join(' ~ ')
diff --git a/src/templates/formtabconfig/dragelement/card.jsx b/src/templates/formtabconfig/dragelement/card.jsx
index d2817df..7648091 100644
--- a/src/templates/formtabconfig/dragelement/card.jsx
+++ b/src/templates/formtabconfig/dragelement/card.jsx
@@ -63,7 +63,11 @@
}
} else if (type === 'search' && 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')]
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')]
diff --git a/src/utils/option.js b/src/utils/option.js
index df5e76b..37bd999 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -145,7 +145,9 @@
{value: '[30, -30]', text: '鍓嶅悗30澶�'},
{value: '[90, -90]', text: '鍓嶅悗90澶�'},
{value: '[-1, -1]', text: '鏄庡ぉ'},
- {value: '[-2, -2]', text: '鍚庡ぉ'}
+ {value: '[-2, -2]', text: '鍚庡ぉ'},
+ {value: 'week', text: '鏈懆'},
+ {value: 'month', text: '鏈湀'},
],
datetime: [
{value: '', text: _dict['model.empty']},
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 86fd067..6890210 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -256,7 +256,11 @@
} else if (item.type === 'dateweek') {
item.initval = item.initval ? moment().subtract(item.initval * 7, 'days').format('YYYY-MM-DD') : ''
} else if (item.type === 'daterange') {
- if (item.initval) {
+ if (item.initval === 'week') {
+ item.initval = [moment().startOf('week').format('YYYY-MM-DD'), moment().endOf('week').format('YYYY-MM-DD')].join(',')
+ } else if (item.initval === 'month') {
+ item.initval = [moment().startOf('month').format('YYYY-MM-DD'), moment().endOf('month').format('YYYY-MM-DD')].join(',')
+ } else if (item.initval) {
try {
let _initval = JSON.parse(item.initval)
let _vals = [moment().subtract(_initval[0], 'days').format('YYYY-MM-DD'), moment().subtract(_initval[1], 'days').format('YYYY-MM-DD')]
--
Gitblit v1.8.0