From c00b188a331394f5729166ffa391425713a3933b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 01 四月 2025 09:09:38 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils.js | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index cc06e69..c655419 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1877,6 +1877,7 @@
let _initColfields = []
let _declarefields = []
let verifyValSql = ''
+ let datavars = {}
// 鑾峰彇瀛楁閿�煎
formdata && formdata.forEach(form => {
@@ -1891,6 +1892,7 @@
}
let _key = form.key.toLowerCase()
+ datavars[_key] = form.value
if (!_initvars.includes(_key)) {
_initvars.push(_key)
@@ -1945,6 +1947,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 +2243,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 +2254,6 @@
if (_key === 'bid') {
_val2 = BID
- } else {
- _val2 = `' + @${_field} + '`
}
_fieldValue.push(`${_key}=${_val}`)
--
Gitblit v1.8.0