From 45f7d8abee7a41dd58130f8e7aa5b2d03ee5fab9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 13 九月 2024 23:39:53 +0800
Subject: [PATCH] Merge branch 'develop'

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

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 501e159..968cc1c 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -3214,8 +3214,8 @@
           // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
           if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(form.type) && form.resourceType === '1') {
             let msg = getFormSql(form, '琛ㄥ崟')
-  
-            sqls.push({uuid: form.uuid, type: 'form', ...msg})
+
+            sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'form', ...msg})
           } else if (form.type === 'popSelect') {
             let msg = getPopSelectSql(form)
         
@@ -3248,7 +3248,7 @@
             if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(form.type) && form.resourceType === '1') {
               let msg = getFormSql(form, '琛ㄥ崟')
     
-              sqls.push({uuid: form.uuid, type: 'form', ...msg})
+              sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'form', ...msg})
             } else if (form.type === 'popSelect') {
               let msg = getPopSelectSql(form)
           
@@ -3797,7 +3797,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 +3845,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 +4198,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 +4309,7 @@
       return true
     })
 
+    colreps = Array.from(new Set(colreps))
     reps = [...reps, ...colreps]
     
     return { LText: _sql, md5: md5(_sql), reps }
@@ -4447,7 +4456,7 @@
         `
     }
 
-    let testSql = _prev + _back
+    let testSql = _prev + _back + (btn.output || '')
 
     // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
     if (btn.Ot !== 'notRequired' && columns.length > 0) {
@@ -4455,8 +4464,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)
   
@@ -5544,8 +5553,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 +5640,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