From 1424bd59f250fd3b5cc316711054a4756c8d47fe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 一月 2025 11:00:48 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/tabviews/custom/index.jsx | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index e1871a4..7e1cae0 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -224,7 +224,7 @@
let keys = Object.keys(urlparam)
config.allSqls.forEach(item => {
item.id = md5(window.GLOB.appkey + item.v_id)
- if (item.type === 'datasource' || item.type === 'excelOut') {
+ if (['datasource', 'interface', 'excelOut'].includes(item.type)) {
item.urlkeys = keys
item.urlparam = urlparam
if (config.flow_code) {
@@ -583,8 +583,9 @@
Utils.initSearchVal(item)
if (urlparam.$searchkey) {
+ let reg = new RegExp('(^|,)' + urlparam.$searchkey + '($|,)', 'ig')
item.search.forEach(cell => {
- if (urlparam.$searchkey === cell.field.toLowerCase() && ['text', 'select', 'link', 'checkcard'].includes(cell.type)) {
+ if (reg.test(cell.field) && ['text', 'select', 'link', 'checkcard'].includes(cell.type)) {
cell.initval = urlparam.$searchval
}
})
@@ -830,6 +831,13 @@
group.subButton = this.resetButton(item, group.subButton)
+ if (group.subButton.linkmenu) {
+ if (Array.isArray(group.subButton.linkmenu) && group.subButton.linkmenu.length > 0) {
+ group.subButton.openmenu = group.subButton.linkmenu
+ }
+ delete group.subButton.linkmenu
+ }
+
if (item.$cache && item.$time) { // 琛ㄥ崟缂撳瓨
group.$cache = item.$cache
group.$time = item.$time
@@ -1056,6 +1064,7 @@
}
} else if (cell.syncComponentId === 'multiComponent') {
let ids = cell.syncComponents.map(m => {
+ if (Array.isArray(m)) return m.pop() || ''
return m.syncComId.pop() || ''
})
--
Gitblit v1.8.0