From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/searchcomponent/dragsearch/index.jsx | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/share/searchcomponent/dragsearch/index.jsx b/src/menu/components/share/searchcomponent/dragsearch/index.jsx
index 8a063a7..accf640 100644
--- a/src/menu/components/share/searchcomponent/dragsearch/index.jsx
+++ b/src/menu/components/share/searchcomponent/dragsearch/index.jsx
@@ -44,13 +44,6 @@
let _val = fromJS(copycard).toJS()
try {
- delete _val.$srcId
-
- let srcid = localStorage.getItem(window.location.href.split('#')[0] + 'srcId')
- if (srcid) {
- _val.$srcId = srcid
- }
-
_val.uuid = Utils.getuuid()
_val = window.btoa(window.encodeURIComponent(JSON.stringify(_val)))
} catch (e) {
@@ -98,11 +91,11 @@
newcard.orderType = 'asc'
let _match = 'like'
- if (item.subType === 'select' || item.subType === 'link' || item.subType === 'checkcard') {
+ if (['select', 'link', 'checkcard'].includes(item.subType)) {
_match = '='
- } else if (item.subType === 'date' || item.subType === 'datemonth') {
+ } else if (['date', 'datemonth'].includes(item.subType)) {
_match = '>='
- } else if (item.subType === 'dateweek' || item.subType === 'daterange') {
+ } else if (['dateweek', 'daterange', 'range'].includes(item.subType)) {
_match = 'between'
} else if (item.subType === 'group') {
_match = 'between'
--
Gitblit v1.8.0