From 3acb1b9a10eed7b4e21bed35e6f98b057a5744c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Sat, 28 Jan 2023 11:14:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E5=BA=94=E7=94=A8-=E5=BA=94=E7=94=A8=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=9C=BA=E8=AF=A6=E6=83=85=E9=A1=B5=E6=8C=89=E9=92=AE=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/settings/index.js | 6 +++--- .../settings/Applet/AppletHost/AppletHostDetail/index.vue | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/router/settings/index.js b/src/router/settings/index.js index 2ec65e62a..69d2638e1 100644 --- a/src/router/settings/index.js +++ b/src/router/settings/index.js @@ -238,7 +238,7 @@ export default { hidden: true, meta: { title: i18n.t('route.AppletHostCreate'), - permissions: ['settings.change_terminal'], + permissions: ['terminal.add_applethost'], activeMenu: '/settings/applets' } }, @@ -249,7 +249,7 @@ export default { hidden: true, meta: { title: i18n.t('route.AppletHostDetail'), - permissions: ['settings.change_terminal'], + permissions: ['terminal.view_applethost'], activeMenu: '/settings/applets' } }, @@ -260,7 +260,7 @@ export default { hidden: true, meta: { title: i18n.t('route.AppletHostUpdate'), - permissions: ['settings.change_terminal'], + permissions: ['terminal.change_applethost'], activeMenu: '/settings/applets' } } diff --git a/src/views/settings/Applet/AppletHost/AppletHostDetail/index.vue b/src/views/settings/Applet/AppletHost/AppletHostDetail/index.vue index 750c225e7..83ed9c655 100644 --- a/src/views/settings/Applet/AppletHost/AppletHostDetail/index.vue +++ b/src/views/settings/Applet/AppletHost/AppletHostDetail/index.vue @@ -54,11 +54,12 @@ export default { ], hasRightSide: true, actions: { + canDelete: this.$hasPerm('terminal.delete_applethost'), + canUpdate: this.$hasPerm('terminal.change_applethost'), + deleteSuccessRoute: 'Applets', updateCallback: () => { - const category = this.host.category.value || 'host' - const routerName = _.capitalize(category) + 'Update' this.$router.push({ - name: routerName, + name: 'Applets', params: { id: this.$route.params.id }, query: { platform: this.host.platform.id } }) From 5de8c055c104fd7be903cf51b2556ff3b2a9e0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Sat, 28 Jan 2023 13:58:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?perf:=20=E5=8F=91=E5=B8=83=E6=9C=BA?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8E=BB=E6=8E=89=E7=BD=91=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../settings/Applet/AppletHost/AppletHostDetail/Detail.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/views/settings/Applet/AppletHost/AppletHostDetail/Detail.vue b/src/views/settings/Applet/AppletHost/AppletHostDetail/Detail.vue index 0ca453ce3..cfe50fd36 100644 --- a/src/views/settings/Applet/AppletHost/AppletHostDetail/Detail.vue +++ b/src/views/settings/Applet/AppletHost/AppletHostDetail/Detail.vue @@ -96,10 +96,6 @@ export default { value: this.object.protocols.map(i => i.name).join(',') }, 'public_ip', 'admin_user_display', - { - key: this.$t('assets.Domain'), - value: this.object.domain?.name || '' - }, 'vendor', 'model', 'cpu_model', 'memory', 'disk_info', { key: this.$t('assets.Platform'), From 098eabf308fb1f8090fbc82acdf3e10ded9004d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Sat, 28 Jan 2023 15:07:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=B8=8A=E4=BC=A0=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=BC=B9=E7=AA=97=E6=B8=85=E7=A9=BA=E4=B8=8A?= =?UTF-8?q?=E6=AC=A1=E4=B8=8A=E4=BC=A0=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/settings/Applet/Applet/AppletList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/settings/Applet/Applet/AppletList.vue b/src/views/settings/Applet/Applet/AppletList.vue index e197fc25d..d1bec97ab 100644 --- a/src/views/settings/Applet/Applet/AppletList.vue +++ b/src/views/settings/Applet/Applet/AppletList.vue @@ -1,7 +1,7 @@ From 91a2cc075a247d408e5144b26a480e52e9555876 Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Sun, 29 Jan 2023 13:26:55 +0800 Subject: [PATCH 4/5] perf: ansible enabledt disabled --- src/views/assets/Platform/const.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/assets/Platform/const.js b/src/views/assets/Platform/const.js index fba31a0a7..ab69d3223 100644 --- a/src/views/assets/Platform/const.js +++ b/src/views/assets/Platform/const.js @@ -83,6 +83,10 @@ export const setAutomations = (vm) => { initial['ansible_enabled'] = automation['ansible_enabled'] initial['ansible_config'] = JSON.stringify(automation['ansible_config']) + if (initial['ansible_enabled'] === false) { + _.set(autoFieldsMeta, `ansible_enabled.el.disabled`, true) + } + for (const item of autoFields) { const itemEnabledKey = item + '_enabled' const itemMethodKey = item + '_method' From 906ef63a501e41080457d6d811ad98053c3972d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Sun, 29 Jan 2023 15:07:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E5=BA=94=E7=94=A8=E5=88=97=E8=A1=A8=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/settings/Applet/Applet/AppletList.vue | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/views/settings/Applet/Applet/AppletList.vue b/src/views/settings/Applet/Applet/AppletList.vue index d1bec97ab..b54ac9224 100644 --- a/src/views/settings/Applet/Applet/AppletList.vue +++ b/src/views/settings/Applet/Applet/AppletList.vue @@ -50,8 +50,12 @@ export default { width: '80px' }, protocols: { + showOverflowTooltip: false, formatter: (row) => { - return row.protocols.map(tag => {tag}) + const dom = row.protocols.map(tag => { + return { tag } + }) + return
{dom}
} }, actions: { @@ -94,6 +98,11 @@ export default { } -