From c531ff4dabff05284bb3fe1ba422497420530424 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 18 三月 2025 14:14:29 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/utils/utils.js | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index dbda559..cc06e69 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 = ''
@@ -467,6 +460,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
}
--
Gitblit v1.8.0