From f308a19516f0f15c0aca1af87c1aa722af0fee5c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 12 四月 2024 17:48:52 +0800
Subject: [PATCH] 2024-04-12
---
src/utils/utils.js | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index a904374..c46bc39 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -204,6 +204,13 @@
values = window.GLOB.SearchBox.get(config.$searchId + 'cache')
}
+ let supModule = ''
+ if (config.setting && config.setting.supModule) {
+ supModule = config.setting.supModule
+ } else if (config.wrap && config.wrap.supModule) {
+ supModule = config.wrap.supModule
+ }
+
config.search = config.search.map(item => {
item.hidden = item.Hide === 'true'
item.required = !item.hidden && item.required === 'true'
@@ -234,12 +241,14 @@
} else {
item.$initval = item.initval
item.$supId = config.$pageId
- if (config.setting && config.setting.supModule) {
- item.$supId = config.setting.supModule
+ if (supModule) {
+ item.$supId = supModule
config.checkBid = true
- config.setting.checkBid = true
item.checkShift = true
+ if (config.setting) {
+ config.setting.checkBid = true
+ }
}
item.initval = ''
@@ -296,12 +305,14 @@
} else {
item.$initval = item.initval
item.$supId = config.$pageId
- if (config.setting && config.setting.supModule) {
- item.$supId = config.setting.supModule
+ if (supModule) {
+ item.$supId = supModule
config.checkBid = true
- config.setting.checkBid = true
item.checkShift = true
+ if (config.setting) {
+ config.setting.checkBid = true
+ }
}
item.initval = ''
@@ -393,10 +404,12 @@
item.initType = ''
}
} else if ((item.type === 'select' || item.type === 'link') && item.resourceType === '1') {
- if (/@BID@/ig.test(item.dataSource) && config.setting && config.setting.supModule) {
+ if (/@BID@/ig.test(item.dataSource) && supModule) {
config.checkBid = true
- config.setting.checkBid = true
item.checkBid = true
+ if (config.setting) {
+ config.setting.checkBid = true
+ }
}
if (item.initval === '$first') {
item.initval = ''
@@ -541,8 +554,8 @@
} else if (item.type === 'range') {
let val = item.value.split(',')
- newsearches[item.key] = val[0] || -999999
- newsearches[item.key + '1'] = val[1] || 999999
+ newsearches[item.key] = val[0] || -999999999
+ newsearches[item.key + '1'] = val[1] || 999999999
} else if (item.type === 'dateweek') {
let _startval = ''
let _endval = ''
@@ -690,7 +703,7 @@
} else if (item.type === 'range') {
let val = item.value.split(',')
- searchText.push('(' + item.key + ' >= ' + (val[0] || -999999) + ' AND ' + item.key + ' < ' + (val[1] || 999999) + ')')
+ searchText.push('(' + item.key + ' >= ' + (val[0] || -999999999) + ' AND ' + item.key + ' <= ' + (val[1] || 999999999) + ')')
} else {
searchText.push('(' + item.key + ' ' + item.match + ' \'' + item.value + '\')')
}
@@ -766,9 +779,9 @@
let copy = JSON.parse(JSON.stringify(item))
copy.key = copy.key + '1'
- copy.value = val[1] || 999999
+ copy.value = val[1] || 999999999
- item.value = val[0] || -999999
+ item.value = val[0] || -999999999
options.push(item)
options.push(copy)
@@ -2313,6 +2326,9 @@
_sql = _sql.replace(/@check_userids@/ig, `''`)
_sql = _sql.replace(/@notice_userids@/ig, `''`)
}
+ } else {
+ _sql = _sql.replace(/@check_userids@/ig, `''`)
+ _sql = _sql.replace(/@notice_userids@/ig, `''`)
}
_sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`)
--
Gitblit v1.8.0