From b1fc0a89ce16dd14a6dff98c228a308e85a53828 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 18 十月 2024 16:33:54 +0800 Subject: [PATCH] Merge branch 'positec' into dms --- src/utils/utils-custom.js | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js index f53084c..88c4d03 100644 --- a/src/utils/utils-custom.js +++ b/src/utils/utils-custom.js @@ -3100,8 +3100,14 @@ item.setting.$name = item.$menuname || '' let msg = getDataSource(item, mainSearch) + let roleId = config.uuid + if (item.wrap && item.wrap.permission === 'false') { + roleId = '' + } else if (item.setting.database === 'sso') { + roleId = '' + } - sqls.push({uuid: item.uuid, roleId: item.wrap && item.wrap.permission === 'false' ? '' : config.uuid, type: 'datasource', ...msg}) + sqls.push({uuid: item.uuid, roleId: roleId, type: 'datasource', ...msg}) } else if (item.setting && item.setting.useMSearch === 'true') { let searches = item.search || [] if (mainSearch.length > 0) { @@ -3231,6 +3237,8 @@ roleId = '' } else if (cell.hidden === 'true' || cell.permission === 'false') { roleId = '' + } else if (cell.database === 'sso') { + roleId = '' } if (['exec', 'prompt', 'pop', 'form', 'formSubmit'].includes(cell.OpenType)) { -- Gitblit v1.8.0