From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/utils/utils.js | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 06c3017..c655419 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -249,9 +249,6 @@
config.checkBid = true
item.checkShift = true
- if (config.setting) {
- config.setting.checkBid = true
- }
}
item.initval = ''
@@ -317,9 +314,6 @@
config.checkBid = true
item.checkShift = true
- if (config.setting) {
- config.setting.checkBid = true
- }
}
item.initval = ''
@@ -418,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 = ''
@@ -468,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
@@ -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