From 2031a460f6c0827fe80f8c625dd98333d1631d2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 五月 2020 22:10:48 +0800
Subject: [PATCH] 2020-05-08
---
src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx
index 0281328..8dcf32f 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/index.jsx
@@ -90,6 +90,15 @@
let newcard = {}
newcard.uuid = Utils.getuuid()
newcard.focus = true
+
+ newcard.label = 'label'
+ newcard.initval = ''
+ newcard.type = item.subType
+ newcard.resourceType = '0'
+ newcard.options = []
+ newcard.setAll = 'false'
+ newcard.orderType = 'asc'
+ newcard.display = 'dropdown'
let _match = 'like'
if (item.subType === 'select' || item.subType === 'link') {
@@ -98,17 +107,12 @@
_match = '>='
} else if (item.subType === 'dateweek' || item.subType === 'daterange') {
_match = 'between'
+ } else if (item.subType === 'group') {
+ _match = 'between'
+ newcard.items = ['day', 'week', 'month', 'quarter', 'year', 'customized']
}
- newcard.label = 'label'
- newcard.initval = ''
- newcard.type = item.subType
- newcard.resourceType = '0'
- newcard.options = []
- newcard.setAll = 'false'
- newcard.orderType = 'asc'
newcard.match = _match
- newcard.display = 'dropdown'
let targetId = cards.length > 0 ? cards[cards.length - 1].uuid : 0
if (target) {
--
Gitblit v1.8.0