From 80deba0c2dcffd9e6b6f07815c7c52199309ce42 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 23 六月 2025 17:36:03 +0800
Subject: [PATCH] 2025-06-23
---
src/utils/utils-custom.js | 248 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 231 insertions(+), 17 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index e66d16d..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) {
@@ -2729,6 +2732,9 @@
filterSql(script.sql)
})
}
+ if (item.setting.supModTip) {
+ sql.push(item.setting.supModTip)
+ }
})
}
@@ -2762,7 +2768,20 @@
text = text.filter(Boolean)
menu = menu.filter(Boolean)
- sql = sql.map(n => n.replace(/(:|锛�)$/g, ''))
+ sql = sql.map(n => n.replace(/^\s+|\s+$/g, '').replace(/(:|锛�)$/g, ''))
+ btn = btn.map(n => n.replace(/^\s+|\s+$/g, ''))
+ ops = ops.map(n => n.replace(/^\s+|\s+$/g, ''))
+ menu = menu.map(n => n.replace(/^\s+|\s+$/g, ''))
+
+ sql = sql.filter((n) => {
+ if (!n) return false
+ if (/^[a-zA-Z_]+$/.test(n)) return false
+
+ return true
+ })
+ btn = btn.filter(Boolean)
+ ops = ops.filter(Boolean)
+ menu = menu.filter(Boolean)
sql = Array.from(new Set(sql))
btn = Array.from(new Set(btn))
@@ -2810,6 +2829,21 @@
}
let replaceTitle = (val)聽=> {
+ let s = ''
+ let e = ''
+ if (/^\s+/g) {
+ val = val.replace(/^\s+/g,聽(w) => {
+ s = w
+ return ''
+ })
+ }
+ if (/\s+$/g) {
+ val = val.replace(/\s+$/g,聽(w) => {
+ e = w
+ return ''
+ })
+ }
+
if聽(/(:|锛�)$/g.test(val)) {
let _val = val.replace(/(:|锛�)$/g,聽'')
if聽(titDict[_val]) {
@@ -2820,6 +2854,83 @@
}聽else if (titDict[val]) {
val = titDict[val]
}
+
+ val = s + val + e
+
+ return val
+ }
+
+ let replaceBtn = (val)聽=> {
+ let s = ''
+ let e = ''
+ if (/^\s+/g) {
+ val = val.replace(/^\s+/g,聽(w) => {
+ s = w
+ return ''
+ })
+ }
+ if (/\s+$/g) {
+ val = val.replace(/\s+$/g,聽(w) => {
+ e = w
+ return ''
+ })
+ }
+
+ if (btnDict[val]) {
+ val = btnDict[val]
+ }
+
+ val = s + val + e
+
+ return val
+ }
+
+ let replaceList = (val)聽=> {
+ let s = ''
+ let e = ''
+ if (/^\s+/g) {
+ val = val.replace(/^\s+/g,聽(w) => {
+ s = w
+ return ''
+ })
+ }
+ if (/\s+$/g) {
+ val = val.replace(/\s+$/g,聽(w) => {
+ e = w
+ return ''
+ })
+ }
+
+ if (lisDict[val]) {
+ val = lisDict[val]
+ }
+
+ val = s + val + e
+
+ return val
+ }
+
+ let replaceMenu = (val)聽=> {
+ let s = ''
+ let e = ''
+ if (/^\s+/g) {
+ val = val.replace(/^\s+/g,聽(w) => {
+ s = w
+ return ''
+ })
+ }
+ if (/\s+$/g) {
+ val = val.replace(/\s+$/g,聽(w) => {
+ e = w
+ return ''
+ })
+ }
+
+ if (menuDict[val]) {
+ val = menuDict[val]
+ }
+
+ val = s + val + e
return val
}
@@ -2856,8 +2967,8 @@
}
let filterBtn = (btn) => {
- if (btn.label && btnDict[btn.label]) {
- btn.label = btnDict[btn.label]
+ if (btn.label) {
+ btn.label = replaceBtn(btn.label)
}
if (btn.OpenType === 'tab' && btn.linkmenu) {
@@ -2956,8 +3067,8 @@
n.dataSource = filterSql(n.dataSource)
} else if (n.options) {
n.options.forEach(o => {
- if (o.Text && lisDict[o.Text]) {
- o.Text = lisDict[o.Text]
+ if (o.Text) {
+ o.Text = replaceList(o.Text)
}
})
}
@@ -3045,6 +3156,9 @@
script.sql = filterSql(script.sql)
})
}
+ if (item.setting.supModTip) {
+ item.setting.supModTip = replaceTitle(item.setting.supModTip)
+ }
}
if (item.columns) {
@@ -3097,8 +3211,8 @@
item.wrap.linkmenu = item.wrap.linkmenu.slice(0, 24) + tail
} else if (item.type === 'menubar') {
item.subMenus = item.subMenus.map(cell => {
- if (cell.setting.name && menuDict[cell.setting.name]) {
- cell.setting.name = menuDict[cell.setting.name]
+ if (cell.setting.name) {
+ cell.setting.name = replaceMenu(cell.setting.name)
}
if (cell.setting.type === 'linkmenu') {
cell.setting.linkMenuId = cell.setting.linkMenuId.slice(0, 24) + tail
@@ -3221,6 +3335,9 @@
script.sql = filterSql(script.sql)
})
}
+ if (item.setting.supModTip) {
+ item.setting.supModTip = replaceTitle(item.setting.supModTip)
+ }
})
}
@@ -3246,6 +3363,20 @@
}
let replaceTitle = (val)聽=> {
+ let s = ''
+ let e = ''
+ if (/^\s+/g) {
+ val = val.replace(/^\s+/g,聽(w) => {
+ s = w
+ return ''
+ })
+ }
+ if (/\s+$/g) {
+ val = val.replace(/\s+$/g,聽(w) => {
+ e = w
+ return ''
+ })
+ }
if聽(/(:|锛�)$/g.test(val)) {
let _val = val.replace(/(:|锛�)$/g,聽'')
if聽(titDict[_val]) {
@@ -3256,6 +3387,83 @@
}聽else if (titDict[val]) {
val = titDict[val]
}
+
+ val = s + val + e
+
+ return val
+ }
+
+ let replaceBtn = (val)聽=> {
+ let s = ''
+ let e = ''
+ if (/^\s+/g) {
+ val = val.replace(/^\s+/g,聽(w) => {
+ s = w
+ return ''
+ })
+ }
+ if (/\s+$/g) {
+ val = val.replace(/\s+$/g,聽(w) => {
+ e = w
+ return ''
+ })
+ }
+
+ if (btnDict[val]) {
+ val = btnDict[val]
+ }
+
+ val = s + val + e
+
+ return val
+ }
+
+ let replaceList = (val)聽=> {
+ let s = ''
+ let e = ''
+ if (/^\s+/g) {
+ val = val.replace(/^\s+/g,聽(w) => {
+ s = w
+ return ''
+ })
+ }
+ if (/\s+$/g) {
+ val = val.replace(/\s+$/g,聽(w) => {
+ e = w
+ return ''
+ })
+ }
+
+ if (lisDict[val]) {
+ val = lisDict[val]
+ }
+
+ val = s + val + e
+
+ return val
+ }
+
+ let replaceMenu = (val)聽=> {
+ let s = ''
+ let e = ''
+ if (/^\s+/g) {
+ val = val.replace(/^\s+/g,聽(w) => {
+ s = w
+ return ''
+ })
+ }
+ if (/\s+$/g) {
+ val = val.replace(/\s+$/g,聽(w) => {
+ e = w
+ return ''
+ })
+ }
+
+ if (menuDict[val]) {
+ val = menuDict[val]
+ }
+
+ val = s + val + e
return val
}
@@ -3292,8 +3500,8 @@
}
let filterBtn = (btn) => {
- if (btn.label && btnDict[btn.label]) {
- btn.label = btnDict[btn.label]
+ if (btn.label) {
+ btn.label = replaceBtn(btn.label)
}
if (!btn.verify) return
@@ -3341,8 +3549,8 @@
n.dataSource = filterSql(n.dataSource)
} else if (n.options) {
n.options.forEach(o => {
- if (o.Text && lisDict[o.Text]) {
- o.Text = lisDict[o.Text]
+ if (o.Text) {
+ o.Text = replaceList(o.Text)
}
})
}
@@ -3374,6 +3582,9 @@
item.scripts && item.scripts.forEach(script => {
script.sql = filterSql(script.sql)
})
+ }
+ if (item.setting.supModTip) {
+ item.setting.supModTip = replaceTitle(item.setting.supModTip)
}
}
@@ -3423,8 +3634,8 @@
if (item.type === 'menubar') {
item.subMenus = item.subMenus.map(cell => {
- if (cell.setting.name && menuDict[cell.setting.name]) {
- cell.setting.name = menuDict[cell.setting.name]
+ if (cell.setting.name) {
+ cell.setting.name = replaceMenu(cell.setting.name)
}
return cell
})
@@ -3535,6 +3746,9 @@
script.sql = filterSql(script.sql)
})
}
+ if (item.setting.supModTip) {
+ item.setting.supModTip = replaceTitle(item.setting.supModTip)
+ }
})
}
--
Gitblit v1.8.0