From c0e017668d780c40f85230f227ea0160b5d22d4d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 二月 2024 14:13:00 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/zshare/createinterface/index.jsx | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/templates/zshare/createinterface/index.jsx b/src/templates/zshare/createinterface/index.jsx
index b5d117a..7baa09f 100644
--- a/src/templates/zshare/createinterface/index.jsx
+++ b/src/templates/zshare/createinterface/index.jsx
@@ -55,7 +55,7 @@
_val = ''
}
- if (item.type === 'datemonth' || item.type === 'dateweek' || item.type === 'daterange') {
+ if (['datemonth', 'dateweek', 'daterange', 'range'].includes(item.type)) {
fields = [item.field, item.field]
}
@@ -103,7 +103,10 @@
_fieldMap.set(item.field, true)
searchText.push(item.field + ' ' + item.match + ' @' + _field + '@')
- } else if (item.type === 'datemonth' || item.type === 'dateweek' || item.type === 'daterange') {
+ } else if (['datemonth', 'dateweek', 'daterange'].includes(item.type)) {
+
+ searchText.push('(' + item.field + ' >= @' + item.field + '@ AND ' + item.field + ' < @' + item.field + '1@)')
+ } else if (item.type === 'range') {
searchText.push('(' + item.field + ' >= @' + item.field + '@ AND ' + item.field + ' < @' + item.field + '1@)')
} else {
--
Gitblit v1.8.0