From 93a08d265b91807acc2148adedd0a9560c96b8cc Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Tue, 15 Feb 2022 14:53:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=B5=81=E5=8F=AA=E5=9C=A8=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=88=96=E7=B3=BB=E7=BB=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tickets/TicketList.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/tickets/TicketList.vue b/src/views/tickets/TicketList.vue index 83aa9e86e..090a5ecf3 100644 --- a/src/views/tickets/TicketList.vue +++ b/src/views/tickets/TicketList.vue @@ -50,7 +50,9 @@ export default { icon: 'fa-gear', name: 'TicketFlow', hidden: () => { - return !(vm.$store.getters.currentUserIsSuperAdmin || vm.$store.getters.currentUserIsAdmin) + const currentUser = vm.$store.getters.currentUser + const IsAdmin = currentUser.current_org_roles.filter(value => value === 'Admin').length !== 0 + return !(vm.$store.getters.currentUserIsSuperAdmin || IsAdmin) } } ] From 2bb4ca3ec0586555247f5304a9b317be05deaeae Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Tue, 15 Feb 2022 17:54:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9LDAP=20SYNC?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/settings/Ldap/ImportDialog.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/settings/Ldap/ImportDialog.vue b/src/views/settings/Ldap/ImportDialog.vue index c8bc92068..cf474fe5d 100644 --- a/src/views/settings/Ldap/ImportDialog.vue +++ b/src/views/settings/Ldap/ImportDialog.vue @@ -105,11 +105,17 @@ export default { settings: { visible: false, url: '/api/v1/settings/setting/?category=ldap', - fields: ['AUTH_LDAP_SYNC_IS_PERIODIC', 'AUTH_LDAP_SYNC_INTERVAL', 'AUTH_LDAP_SYNC_CRONTAB'], + fields: ['AUTH_LDAP_SYNC_IS_PERIODIC', 'AUTH_LDAP_SYNC_CRONTAB', 'AUTH_LDAP_SYNC_INTERVAL'], fieldsMeta: { + AUTH_LDAP_SYNC_IS_PERIODIC: { + type: 'switch' + }, AUTH_LDAP_SYNC_CRONTAB: { component: CronTab, helpText: this.$t('xpack.HelpText.CrontabOfCreateUpdatePage') + }, + AUTH_LDAP_SYNC_INTERVAL: { + helpText: this.$t('xpack.HelpText.IntervalOfCreateUpdatePage') } }, submitMethod: () => 'patch' From fa860dbd85eac7a66bb84ec57d1517eefdf3cd41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com> Date: Tue, 15 Feb 2022 16:38:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E7=AD=9B=E9=80=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=97=B6tree=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sessions/CommandList.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue index a01e4e3b7..f1cd58e3e 100644 --- a/src/views/sessions/CommandList.vue +++ b/src/views/sessions/CommandList.vue @@ -209,7 +209,6 @@ export default { const queryStr = (url.indexOf('?') > -1 ? '&' : '?') + queryUtil.stringify(_query, '=', '&') const treeUrl = url + queryStr this.$set(this.treeSetting, 'treeUrl', treeUrl) - this.treeTable.forceRerenderTree() }, handleDateChange(object) { this.query = { From e7bdf6276d6399965ffa915e072e941e5cf8eb40 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Wed, 16 Feb 2022 14:39:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E5=B7=A5=E5=8D=95=E6=B5=81=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tickets/TicketList.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/tickets/TicketList.vue b/src/views/tickets/TicketList.vue index 090a5ecf3..ced18c232 100644 --- a/src/views/tickets/TicketList.vue +++ b/src/views/tickets/TicketList.vue @@ -50,9 +50,7 @@ export default { icon: 'fa-gear', name: 'TicketFlow', hidden: () => { - const currentUser = vm.$store.getters.currentUser - const IsAdmin = currentUser.current_org_roles.filter(value => value === 'Admin').length !== 0 - return !(vm.$store.getters.currentUserIsSuperAdmin || IsAdmin) + return !vm.$store.getters.currentUserIsSuperAdmin } } ] From 9c6281cf020ac0acddf32a7695abeb002bcaa0d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com> Date: Wed, 16 Feb 2022 15:03:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=AF=BC=E5=87=BA=E6=9D=A1=E6=95=B0=E4=B8=8D?= =?UTF-8?q?=E5=87=86=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AccountListTable/index.vue | 1 + .../AssetAccount/AssetAccountList.vue | 32 +++++++++---------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue index 96e81abbd..40134de82 100644 --- a/src/components/AccountListTable/index.vue +++ b/src/components/AccountListTable/index.vue @@ -161,6 +161,7 @@ export default { watch: { url(iNew) { this.$set(this.tableConfig, 'url', iNew) + this.$set(this.headerActions.exportOptions, 'url', iNew.replace('/accounts/', '/account-secrets/')) } }, mounted() { diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue index d86fea912..e543dfe7c 100644 --- a/src/views/accounts/AssetAccount/AssetAccountList.vue +++ b/src/views/accounts/AssetAccount/AssetAccountList.vue @@ -17,7 +17,6 @@ export default { GenericTreeListPage, AccountListTable }, data() { - const vm = this return { isInit: true, clickedRow: null, @@ -30,24 +29,25 @@ export default { url: '/api/v1/assets/accounts/', treeUrl: '/api/v1/assets/nodes/children/tree/?assets=1', callback: { - onSelected: function(event, treeNode) { - let url = '/api/v1/assets/accounts/' - if (treeNode.meta.type === 'node') { - const nodeId = treeNode.meta.data.id - url = setUrlParam(url, 'asset', '') - url = setUrlParam(url, 'node', nodeId) - } else if (treeNode.meta.type === 'asset') { - const assetId = treeNode.meta.data.id - url = setUrlParam(url, 'node', '') - url = setUrlParam(url, 'asset', assetId) - } - setTimeout(() => { - vm.accountsUrl = url - }, 100) - } + onSelected: (event, treeNode) => this.getAccountsUrl(event, treeNode) } } } + }, + methods: { + getAccountsUrl(event, treeNode) { + let url = '/api/v1/assets/accounts/' + if (treeNode.meta.type === 'node') { + const nodeId = treeNode.meta.data.id + url = setUrlParam(url, 'asset', '') + url = setUrlParam(url, 'node', nodeId) + } else if (treeNode.meta.type === 'asset') { + const assetId = treeNode.meta.data.id + url = setUrlParam(url, 'node', '') + url = setUrlParam(url, 'asset', assetId) + } + this.accountsUrl = url + } } }