From 047dbd742341e268ca772eda8d2ff0b6ba09cb44 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 05 六月 2025 16:57:36 +0800
Subject: [PATCH] 2025-06-05
---
src/utils/utils.js | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index cc06e69..d9502c6 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1188,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) { // 闀垮害鏍￠獙
@@ -1877,6 +1881,7 @@
let _initColfields = []
let _declarefields = []
let verifyValSql = ''
+ let datavars = {}
// 鑾峰彇瀛楁閿�煎
formdata && formdata.forEach(form => {
@@ -1891,6 +1896,7 @@
}
let _key = form.key.toLowerCase()
+ datavars[_key] = form.value
if (!_initvars.includes(_key)) {
_initvars.push(_key)
@@ -1945,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()
@@ -2239,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') {
@@ -2250,8 +2258,6 @@
if (_key === 'bid') {
_val2 = BID
- } else {
- _val2 = `' + @${_field} + '`
}
_fieldValue.push(`${_key}=${_val}`)
--
Gitblit v1.8.0