From a5bc394eceeaae5923057f1fd919968fd234af23 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 27 五月 2025 17:59:57 +0800
Subject: [PATCH] 2025-05-27

---
 src/utils/utils.js |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index dbda559..d9502c6 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -192,8 +192,10 @@
    * @param {Array}   searches     鎼滅储鏉′欢
    */
   static initSearchVal (config) {
-    if (!config.search) {
+    if (!config.search || config.search.length === 0) {
       config.search = []
+      config.$s_keys = []
+      config.$s_req = false
       return
     }
 
@@ -247,9 +249,6 @@
 
               config.checkBid = true
               item.checkShift = true
-              if (config.setting) {
-                config.setting.checkBid = true
-              }
             }
 
             item.initval = ''
@@ -315,9 +314,6 @@
 
               config.checkBid = true
               item.checkShift = true
-              if (config.setting) {
-                config.setting.checkBid = true
-              }
             }
 
             item.initval = ''
@@ -416,9 +412,6 @@
         if (/@BID@/ig.test(item.dataSource) && supModule) {
           config.checkBid = true
           item.checkBid = true
-          if (config.setting) {
-            config.setting.checkBid = true
-          }
         }
         if (item.initval === '$first') {
           item.initval = ''
@@ -466,6 +459,15 @@
 
       return item
     })
+
+    if (config.checkBid) {
+      if (config.setting) {
+        config.setting.checkBid = true
+      }
+      if (config.type !== 'search') {
+        config.$checkBid = true
+      }
+    }
 
     config.$s_keys = keys
     config.$s_req = required
@@ -1186,6 +1188,10 @@
 
         val = val.replace(/(^\s+$)|\t+|\v+/ig, '')
 
+        if (col.interception !== 'false') {
+          val = val.replace(/^\s+|\s+$/g, '')
+        }
+
         if (!val && col.required === 'true') {            // 蹇呭～鏍￠獙
           errors.push(_position + '鍐呭涓嶅彲涓虹┖')
         } else if (col.limit && val.length > col.limit) { // 闀垮害鏍￠獙
@@ -1875,6 +1881,7 @@
   let _initColfields = []
   let _declarefields = []
   let verifyValSql = ''
+  let datavars = {}
 
   // 鑾峰彇瀛楁閿�煎
   formdata && formdata.forEach(form => {
@@ -1889,6 +1896,7 @@
     }
 
     let _key = form.key.toLowerCase()
+    datavars[_key] = form.value
 
     if (!_initvars.includes(_key)) {
       _initvars.push(_key)
@@ -1943,6 +1951,8 @@
 
   // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
   if (data && btn.Ot !== 'notRequired' && columns && columns.length > 0) {
+    datavars = {..._data, ...datavars}
+
     const setField = (col) => {
       if (!col.field) return
       let _key = col.field.toLowerCase()
@@ -2237,7 +2247,7 @@
       item.field.split(',').forEach((_field, index) => {
         let _key = _field.toLowerCase()
         let _val = ''
-        let _val2 = ''
+        let _val2 = datavars[_key] !== undefined ? datavars[_key] : ''
 
         arr.push(_key)
         if (_key === 'bid') {
@@ -2248,8 +2258,6 @@
         
         if (_key === 'bid') {
           _val2 = BID
-        } else {
-          _val2 = `' + @${_field} + '`
         }
         
         _fieldValue.push(`${_key}=${_val}`)

--
Gitblit v1.8.0