From 93ace1795e0e9b1a443b1c447a646fa8932f9678 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 七月 2023 20:43:25 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/utils/utils.js | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index c62e490..bd37d3d 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -292,12 +292,17 @@
* @description 鍒濆鍖栨悳绱㈡潯浠跺垵濮嬪��
* @param {Array} searches 鎼滅储鏉′欢
*/
- static initSearchVal (searches) {
- if (!searches) return []
+ static initSearchVal (config) {
+ if (!config.search) {
+ config.search = []
+ return
+ }
let roleId = sessionStorage.getItem('role_id') || ''
+ let required = false
+ let keys = []
- return searches.map(item => {
+ config.search = config.search.map(item => {
item.hidden = item.Hide === 'true'
item.required = !item.hidden && item.required === 'true'
item.advanced = item.advanced === 'true'
@@ -413,8 +418,28 @@
}
}
+ if (item.required) {
+ required = true
+ }
+
+ if (item.type === 'text' || item.type === 'select') {
+ if (/,/.test(item.field)) {
+ item.field.split(',').forEach(field => {
+ keys.push(field.toLowerCase())
+ })
+ } else {
+ keys.push(item.field.toLowerCase())
+ }
+ } else if (item.type === 'group') {
+ keys.push(item.field.toLowerCase())
+ keys.push(item.datefield.toLowerCase())
+ }
+
return item
})
+
+ config.$s_keys = keys
+ config.$s_req = required
}
/**
@@ -835,10 +860,9 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- sql = sql.replace(/\$@/ig, '/*')
- sql = sql.replace(/@\$/ig, '*/')
+ sql = sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- sql = sql.replace(/@\$|\$@/ig, '')
+ sql = sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
// 澶栬仈鏁版嵁搴撴浛鎹�
--
Gitblit v1.8.0