From d53b90757a6449d4a163cf46aabb5a6ed9d41203 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 01 一月 2025 11:01:28 +0800 Subject: [PATCH] 2025-01-01 --- src/utils/utils-custom.js | 44 ++++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js index 2bba04b..2c0fe3b 100644 --- a/src/utils/utils-custom.js +++ b/src/utils/utils-custom.js @@ -3385,7 +3385,9 @@ }) } - filterComponent(cell.config.components, _mainSearch, '-' + cell.label, true) + let label = (item.name ? '-' + item.name : '') + '-' + cell.label + + filterComponent(cell.config.components, _mainSearch, label, true) } } } @@ -6422,26 +6424,28 @@ filterComponent(config.components, _mainSearch) let keys = sqls.map(item => item.uuid) - if (keys.length > Array.from(new Set(keys)).length) { - let m = new Map() - let n = new Map() - sqls.forEach(item => { - if (m.has(item.uuid)) { - if (!n.has(item.uuid)) { - window.mkInfo(m.get(item.uuid)) - n.set(item.uuid, true) + if (keys.length > Array.from(new Set(keys)).length && !window.GLOB.syscheck) { + if (window.backend) { + let m = new Map() + let n = new Map() + sqls.forEach(item => { + if (m.has(item.uuid)) { + if (!n.has(item.uuid)) { + window.mkInfo(m.get(item.uuid)) + n.set(item.uuid, true) + } + window.mkInfo(item) + } else { + m.set(item.uuid, item) } - window.mkInfo(item) - } else { - m.set(item.uuid, item) - } - }) - - notification.warning({ - top: 92, - message: '瀛樺湪閲嶅鐨勫悗绔剼鏈琁D锛�', - duration: 5 - }) + }) + + notification.warning({ + top: 92, + message: '瀛樺湪閲嶅鐨勫悗绔剼鏈琁D锛�', + duration: 5 + }) + } return [] } -- Gitblit v1.8.0