From 0bb14cace6c3eeb3d1ee6903324b15fdb0c6e562 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 15 九月 2024 14:00:41 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/utils/utils-custom.js |   45 +++++++++++++++++++++++++++++++--------------
 1 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 734009d..b2de0d7 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -3698,6 +3698,7 @@
         item.field.split(',').forEach((_field, index) => {
           let _key = _field.toLowerCase()
           let _val = ''
+          let _val2 = ''
   
           arr.push(_key)
           if (_key === 'bid') { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
@@ -3707,7 +3708,14 @@
           }
 
           _fieldValue.push(`${_key}=${_val}`)
-          _value.push(`${_labels[index] || ''}锛�${_val || ''}`)
+
+          if (_key === 'bid') { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
+            _val2 = `' + ${BID} + '`
+          } else {
+            _val2 = `@mk_${_key}_mk@`
+          }
+
+          _value.push(`${_labels[index] || ''}锛�${_val2}`)
         })
   
         if (!arr.includes(primaryKey.toLowerCase())) {
@@ -3797,7 +3805,11 @@
         let _key = item.key.toLowerCase()
   
         keys.push(_key)
-        values.push('@mk_' + _key + '_mk@')
+        if (item.type === 'number' || item.type === 'rate') {
+          values.push('@mk_' + _key + '_mk@')
+        } else {
+          values.push(`'@mk_${_key}_mk@'`)
+        }
       })
   
       if (!keys.includes(primaryKey.toLowerCase())) {
@@ -3841,7 +3853,11 @@
         let _key = item.key.toLowerCase()
         
         _arr.push(_key)
-        _form.push(_key + '=@mk_' + _key + '_mk@')
+        if (item.type === 'number' || item.type === 'rate') {
+          _form.push(`${_key}=@mk_${_key}_mk@`)
+        } else {
+          _form.push(`${_key}='@mk_${_key}_mk@'`)
+        }
       })
   
       if (_actionType === 'audit') {
@@ -4190,8 +4206,8 @@
       columns.forEach(col => {
         let _key = col.field.toLowerCase()
 
-        if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(_sql)) return
-        if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return
+        if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(_sql)) return
+        // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return
 
         colreps.push(col.field)
   
@@ -4301,6 +4317,7 @@
       return true
     })
 
+    colreps = Array.from(new Set(colreps))
     reps = [...reps, ...colreps]
     
     return { LText: _sql, md5: md5(_sql), reps }
@@ -4447,7 +4464,7 @@
         `
     }
 
-    let testSql = _prev + _back
+    let testSql = _prev + _back + (btn.output || '')
 
     // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
     if (btn.Ot !== 'notRequired' && columns.length > 0) {
@@ -4455,8 +4472,8 @@
       columns.forEach(col => {
         let _key = col.field.toLowerCase()
 
-        if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(testSql)) return
-        if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(testSql)) return
+        if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(testSql)) return
+        // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(testSql)) return
 
         colreps.push(col.field)
   
@@ -4772,7 +4789,7 @@
         arr_field='${arr_field}',tabid='${tabid}',parid='${parid}',sub_name='${sub_name}',sub_field='${sub_field}'
       `
 
-      _tailScript += `${_tailScript}
+      _tailScript = `${_tailScript}
         select @ErrorCode as ErrorCode,@retmsg as retmsg
         ${callback}
       `
@@ -4782,7 +4799,7 @@
         arr_field='${arr_field}',tabid='${tabid}',parid='${parid}',sub_name='${sub_name}',sub_field='${sub_field}'
       `
 
-      _tailScript += `${_tailScript}
+      _tailScript = `${_tailScript}
         select @ErrorCode as ErrorCode,@retmsg as retmsg
       `
     }
@@ -5544,8 +5561,8 @@
       component.columns.forEach(col => {
         let _key = col.field.toLowerCase()
 
-        if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(msg.LText)) return
-        if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(msg.LText)) return
+        if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(msg.LText)) return
+        // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(msg.LText)) return
 
         colreps.push(col.field)
   
@@ -5631,8 +5648,8 @@
     component.columns.forEach(col => {
       let _key = col.field.toLowerCase()
 
-      if (syses.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(_sql)) return
-      if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return
+      if (syses.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(_sql)) return
+      // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return
 
       colreps.push(col.field)
       

--
Gitblit v1.8.0