From 69cd43786253e299f6856a200554ae7fc0621877 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 六月 2021 21:26:20 +0800
Subject: [PATCH] 2021-06-27
---
src/menu/datasource/verifycard/index.jsx | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 27c3934..0d6dcc5 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -469,7 +469,7 @@
* @param {Array} searches 鎼滅储鏉′欢鏁扮粍
*/
formatSearch (searches) {
- if (!searches || searches.length === 0) return []
+ if (!searches) return []
let newsearches = []
searches.forEach(search => {
@@ -484,35 +484,30 @@
required: search.required === 'true'
}
if (item.type === 'group') {
- let copy = fromJS(item).toJS()
-
- item.value = search.initval && search.initval[0] ? search.initval[0] : '@$@'
- item.match = '='
-
- copy.key = search.datefield
- copy.type = 'daterange'
- copy.match = 'between'
- copy.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
+ item.key = search.datefield
+ item.type = 'daterange'
+ item.match = 'between'
+ item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',')
newsearches.push(item)
- newsearches.push(copy)
return
} else if (item.type === 'date') {
item.value = moment().format('YYYY-MM-DD')
} else if (item.type === 'datemonth') {
item.value = moment().format('YYYY-MM')
} else if (item.type === 'dateweek') {
- item.value = [moment().startOf('week').format('YYYY-MM-DD'), moment().endOf('week').format('YYYY-MM-DD')]
+ item.value = moment().format('YYYY-MM-DD')
} else if (item.type === 'daterange') {
- item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
- } else if (item.type === 'multiselect') {
- item.value = ['@$@']
+ item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',')
+ } else if (item.type === 'multiselect' || (item.type === 'checkcard' && search.multiple === 'true')) {
+ item.type = 'multi'
+ item.value = '@$@'
} else {
item.value = '@$@'
}
newsearches.push(item)
})
-
+
return newsearches
}
--
Gitblit v1.8.0