From ea06034e06a30d3e97838c7885ae7694273a8ca1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 05 十二月 2024 20:03:51 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/utils/utils-custom.js |  117 ++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 344ec41..36ec3ff 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -4433,12 +4433,8 @@
       return true
     })
 
-    reps.forEach(n => {
-      _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
-    })
-
     if (/\$@/ig.test(_sql)) {
-      _sql = _sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+      _sql = _sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
       reps.push('datam_begin', 'datam_end')
     }
     if (btn.procMode === 'system') {
@@ -4447,10 +4443,15 @@
       }
     } else {
       if (/\$check@|@check\$/ig.test(_sql)) {
-        _sql = _sql.replace(/\$check@/ig, '@mk_check_begin@').replace(/@check\$/ig, '@mk_check_end@')
+        _sql = _sql.replace(/\$check@/ig, ' @mk_check_begin@ ').replace(/@check\$/ig, ' @mk_check_end@ ')
         reps.push('mk_check_begin', 'mk_check_end')
       }
     }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end', 'mk_check_begin', 'mk_check_end'].includes(n)) return
+
+      _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
     if (/@db@/ig.test(_sql)) {
       reps.push('db')
     }
@@ -4749,14 +4750,15 @@
       return true
     })
 
-    reps.forEach(n => {
-      _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
-    })
-
     if (/\$@/ig.test(_sql)) {
-      _sql = _sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+      _sql = _sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
       reps.push('datam_begin', 'datam_end')
     }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end'].includes(n)) return
+
+      _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
     if (/@db@/ig.test(_sql)) {
       reps.push('db')
     }
@@ -4888,7 +4890,7 @@
     let DateCount = ''
     if (_dataresource) {
       /*system_query*/
-      if (/@pageSize@|@orderBy@|@mk_total/i.test(testSql)) {
+      if (/@pageSize@|@orderBy@|@mk_total/i.test(testSql) || (item.wrap && item.wrap.tree === 'true')) {
         LText = `select ${arr_field} from ${_dataresource} ${_search} `
       } else if (item.setting.laypage === 'true' && item.setting.order) {
         LText = `select top @pageSize@ ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by @orderBy@) as rows from ${_dataresource} ${_search}) tmptable where rows > @pageSize@ * (@pageIndex@ - 1) order by tmptable.rows `
@@ -5023,16 +5025,16 @@
 
       return true
     })
-    
+
+    if (/\$@/ig.test(sql)) {
+      sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+      reps.push('datam_begin', 'datam_end')
+    }
     reps.forEach(n => {
-      if (['orderBy', 'pageSize', 'pageIndex'].includes(n)) return
+      if (['orderBy', 'pageSize', 'pageIndex', 'datam_begin', 'datam_end'].includes(n)) return
 
       sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
     })
-    if (/\$@/ig.test(sql)) {
-      sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
-      reps.push('datam_begin', 'datam_end')
-    }
     if (/@db@/ig.test(sql)) {
       reps.push('db')
     }
@@ -5327,18 +5329,20 @@
       return true
     })
 
-    reps.forEach(n => {
-      sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
-    })
-
     if (/\$@/ig.test(sql)) {
-      sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+      sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
       reps.push('datam_begin', 'datam_end')
     }
     if (/\$check@|@check\$/ig.test(sql)) {
-      sql = sql.replace(/\$check@/ig, '@mk_check_begin@').replace(/@check\$/ig, '@mk_check_end@')
+      sql = sql.replace(/\$check@/ig, ' @mk_check_begin@ ').replace(/@check\$/ig, ' @mk_check_end@ ')
       reps.push('mk_check_begin', 'mk_check_end')
     }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end', 'mk_check_begin', 'mk_check_end'].includes(n)) return
+
+      sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
+    
     if (/@db@/ig.test(sql)) {
       reps.push('db')
     }
@@ -5603,14 +5607,15 @@
       return true
     })
 
-    reps.forEach(n => {
-      sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
-    })
-
     if (/\$@/ig.test(sql)) {
-      sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+      sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
       reps.push('datam_begin', 'datam_end')
     }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end'].includes(n)) return
+
+      sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
     if (/@db@/ig.test(sql)) {
       reps.push('db')
     }
@@ -5887,14 +5892,15 @@
       return true
     })
 
-    reps.forEach(n => {
-      _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
-    })
-
     if (/\$@/ig.test(_sql)) {
-      _sql = _sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+      _sql = _sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
       reps.push('datam_begin', 'datam_end')
     }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end'].includes(n)) return
+
+      _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
     if (/@db@/ig.test(_sql)) {
       reps.push('db')
     }
@@ -6000,14 +6006,15 @@
 
     reps.push(...sysVars)
 
-    reps.forEach(n => {
-      sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
-    })
-
     if (/\$@/ig.test(sql)) {
-      sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+      sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
       reps.push('datam_begin', 'datam_end')
     }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end'].includes(n)) return
+
+      sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
     if (/@db@/ig.test(sql)) {
       reps.push('db')
     }
@@ -6125,15 +6132,15 @@
       return true
     })
 
+    if (/\$@/ig.test(sql)) {
+      sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+      reps.push('datam_begin', 'datam_end')
+    }
     reps.forEach(n => {
-      if (['orderBy', 'pageSize', 'pageIndex'].includes(n)) return
+      if (['orderBy', 'pageSize', 'pageIndex', 'datam_begin', 'datam_end'].includes(n)) return
 
       sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
     })
-    if (/\$@/ig.test(sql)) {
-      sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
-      reps.push('datam_begin', 'datam_end')
-    }
     if (/@db@/ig.test(sql)) {
       reps.push('db')
     }
@@ -6172,13 +6179,15 @@
       }
     })
 
-    reps.forEach(n => {
-      _script = _script.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
-    })
     if (/\$@/ig.test(_script)) {
-      _script = _script.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+      _script = _script.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
       reps.push('datam_begin', 'datam_end')
     }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end'].includes(n)) return
+
+      _script = _script.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
     if (/@db@/ig.test(_script)) {
       reps.push('db')
     }
@@ -6294,15 +6303,17 @@
       }
     })
 
+    if (/\$@/ig.test(testSql)) {
+      _prev = _prev.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+      _back = _back.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+      reps.push('datam_begin', 'datam_end')
+    }
     reps.forEach(n => {
+      if (['datam_begin', 'datam_end'].includes(n)) return
+
       _prev = _prev.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
       _back = _back.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
     })
-    if (/\$@/ig.test(testSql)) {
-      _prev = _prev.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
-      _back = _back.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
-      reps.push('datam_begin', 'datam_end')
-    }
     if (/@db@/ig.test(testSql)) {
       reps.push('db')
     }

--
Gitblit v1.8.0