From d2392435048a5d75f2d10b4d88a2c8ac29a254f1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 六月 2025 22:34:05 +0800
Subject: [PATCH] 2025-06-18
---
src/utils/utils-custom.js | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 83834d2..2607966 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -1083,7 +1083,7 @@
} else if (item.type === 'daterange') {
value = '1949-10-01 00:00:00.000,1949-10-02 00:00:00.000'
} else if (item.type === 'range') {
- value = item.initval || `${item.minValue || '-999999999'},${item.maxValue || '999999999'}`
+ value = item.initval || `${item.minValue || '-99999999'},${item.maxValue || '99999999'}`
} else if (item.type === 'multiselect' || (item.type === 'checkcard' && item.multiple === 'true')) {
type = 'multi'
} else {
@@ -1134,7 +1134,7 @@
searchText.push('(' + item.key + ' >= \'' + val[0] + '\' AND ' + item.key + ' < \'' + val[1] + '\')')
} else if (item.type === 'range') {
let val = item.value.split(',')
- searchText.push('(' + item.key + ' >= ' + (val[0] || -999999999) + ' AND ' + item.key + ' <= ' + (val[1] || 999999999) + ')')
+ searchText.push('(' + item.key + ' >= ' + (val[0] || -99999999) + ' AND ' + item.key + ' <= ' + (val[1] || 99999999) + ')')
} else if (item.type === 'datemonth') {
if (item.match === '=') {
searchText.push('(' + item.key + ' = \'' + item.value + '\')')
@@ -1198,10 +1198,10 @@
let val = item.value.split(',')
options.push({
reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `${val[0] || -999999999}`
+ value: `${val[0] || -99999999}`
}, {
reg: new RegExp('@' + item.key + '1@', 'ig'),
- value: `${val[1] || 999999999}`
+ value: `${val[1] || 99999999}`
})
} else if (item.type === 'datemonth') {
if (item.match === '=') {
@@ -2553,6 +2553,9 @@
filterSql(script.sql)
})
}
+ if (item.setting.supModTip) {
+ sql.push(item.setting.supModTip)
+ }
}
if (item.columns) {
@@ -2728,6 +2731,9 @@
item.scripts && item.scripts.forEach(script => {
filterSql(script.sql)
})
+ }
+ if (item.setting.supModTip) {
+ sql.push(item.setting.supModTip)
}
})
}
@@ -3150,6 +3156,9 @@
script.sql = filterSql(script.sql)
})
}
+ if (item.setting.supModTip) {
+ item.setting.supModTip = replaceTitle(item.setting.supModTip)
+ }
}
if (item.columns) {
@@ -3325,6 +3334,9 @@
item.scripts && item.scripts.forEach(script => {
script.sql = filterSql(script.sql)
})
+ }
+ if (item.setting.supModTip) {
+ item.setting.supModTip = replaceTitle(item.setting.supModTip)
}
})
}
@@ -3571,6 +3583,9 @@
script.sql = filterSql(script.sql)
})
}
+ if (item.setting.supModTip) {
+ item.setting.supModTip = replaceTitle(item.setting.supModTip)
+ }
}
if (item.columns) {
@@ -3731,6 +3746,9 @@
script.sql = filterSql(script.sql)
})
}
+ if (item.setting.supModTip) {
+ item.setting.supModTip = replaceTitle(item.setting.supModTip)
+ }
})
}
--
Gitblit v1.8.0