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 |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 464d315..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)
+      }
     })
   }
 
@@ -2767,7 +2773,12 @@
   ops = ops.map(n => n.replace(/^\s+|\s+$/g, ''))
   menu = menu.map(n => n.replace(/^\s+|\s+$/g, ''))
 
-  sql = sql.filter(Boolean)
+  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)
@@ -3145,6 +3156,9 @@
               script.sql = filterSql(script.sql)
             })
           }
+          if (item.setting.supModTip) {
+            item.setting.supModTip = replaceTitle(item.setting.supModTip)
+          }
         }
 
         if (item.columns) {
@@ -3320,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)
       }
     })
   }
@@ -3566,6 +3583,9 @@
               script.sql = filterSql(script.sql)
             })
           }
+          if (item.setting.supModTip) {
+            item.setting.supModTip = replaceTitle(item.setting.supModTip)
+          }
         }
 
         if (item.columns) {
@@ -3726,6 +3746,9 @@
           script.sql = filterSql(script.sql)
         })
       }
+      if (item.setting.supModTip) {
+        item.setting.supModTip = replaceTitle(item.setting.supModTip)
+      }
     })
   }
 

--
Gitblit v1.8.0