From be8f81fe2eb52e841efead8586e514842471e0ba Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 九月 2023 16:50:35 +0800
Subject: [PATCH] 2023-09-14
---
src/menu/datasource/verifycard/utils.jsx | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index b04140c..4ab7ea0 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -103,46 +103,53 @@
if (!item.field) return
if (item.datefield) {
_regoptions.push({
- var: new RegExp('@' + item.datefield, 'ig'),
reg: new RegExp('@' + item.datefield + '@', 'ig')
})
_regoptions.push({
- var: new RegExp('@' + item.datefield + '1', 'ig'),
reg: new RegExp('@' + item.datefield + '1@', 'ig')
})
}
- if (['dateweek', 'datemonth', 'daterange', 'range'].includes(item.type)) {
+ if (['dateweek', 'datemonth', 'range'].includes(item.type)) {
_regoptions.push({
- var: new RegExp('@' + item.field, 'ig'),
reg: new RegExp('@' + item.field + '@', 'ig')
})
_regoptions.push({
- var: new RegExp('@' + item.field + '1', 'ig'),
reg: new RegExp('@' + item.field + '1@', 'ig')
+ })
+ } else if (item.type === 'daterange') {
+ let _skey = item.field
+ let _ekey = item.field + '1'
+
+ if (/,/.test(item.field)) {
+ _skey = item.field.split(',')[0]
+ _ekey = item.field.split(',')[1]
+ }
+
+ _regoptions.push({
+ reg: new RegExp('@' + _skey + '@', 'ig')
+ })
+ _regoptions.push({
+ reg: new RegExp('@' + _ekey + '@', 'ig')
})
} else if (item.type === 'date') {
if (_fields.includes(item.field)) {
_regoptions.push({
- var: new RegExp('@' + item.field + '1', 'ig'),
reg: new RegExp('@' + item.field + '1@', 'ig')
})
} else {
_fields.push(item.field)
_regoptions.push({
- var: new RegExp('@' + item.field, 'ig'),
reg: new RegExp('@' + item.field + '@', 'ig')
})
}
} else if (item.type === 'text' || item.type === 'select') {
item.field.split(',').forEach(field => {
_regoptions.push({
- var: new RegExp('@' + field, 'ig'),
reg: new RegExp('@' + field + '@', 'ig')
})
})
} else {
_regoptions.push({
- var: new RegExp('@' + item.field, 'ig'),
reg: new RegExp('@' + item.field + '@', 'ig')
})
}
--
Gitblit v1.8.0