From 5a0d0f98d334a96a6716727579a673f60a3f4cd3 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 20 Feb 2023 12:15:57 +0800 Subject: [PATCH 01/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20rbac=20?= =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BD=8D=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/users/Role/RoleDetail/RoleInfo.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue index 65c9575fa..226a750df 100644 --- a/src/views/users/Role/RoleDetail/RoleInfo.vue +++ b/src/views/users/Role/RoleDetail/RoleInfo.vue @@ -108,10 +108,10 @@ export default { 'accounts.view_gatheredaccount': ['assets.view_asset', 'assets.view_node'], 'accounts.view_account': ['assets.view_node'], 'accounts.view_accountsecret': ['accounts.view_account'], - 'accounts.view_historyaccount': ['accounts.view_account'], + 'accounts.view_historyaccount': ['accounts.view_account', 'accounts.view_accountsecret'], 'accounts.view_accounttemplatesecret': ['accounts.view_accounttemplate'], 'accounts.change_accounttemplatesecret': ['accounts.view_accounttemplate'], - 'accounts.view_historyaccountsecret': ['accounts.view_account'], + 'accounts.view_historyaccountsecret': ['accounts.view_account', 'accounts.view_accountsecret'], 'accounts.add_account': ['assets.view_asset'], 'assets.gathereduser': ['assets.view_node'], 'assets.refresh_assethardwareinfo': ['assets.change_asset'], From b6258dd32c402c8a19a37ded78823a4498b6aa3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Mon, 20 Feb 2023 14:47:40 +0800 Subject: [PATCH 02/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=BB=84=E7=BB=87=E5=90=8E=E5=88=87=E6=8D=A2=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E8=BF=98=E4=BC=9A?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/users.js | 7 ++++++- src/views/settings/Org/OrganizationList.vue | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/store/modules/users.js b/src/store/modules/users.js index b24911aa2..6d2a66467 100644 --- a/src/store/modules/users.js +++ b/src/store/modules/users.js @@ -61,8 +61,10 @@ const mutations = { ADD_ORG: (state, org) => { state.consoleOrgs.push(org) }, + DELETE_ORG: (state, org) => { + state.consoleOrgs = state.consoleOrgs.filter(i => i.id !== org.id) + }, SET_CURRENT_ORG(state, org) { - console.log('set pre org: ', state.currentOrg) if (state.currentOrg?.name !== 'System') { state.preOrg = state.currentOrg } @@ -103,6 +105,9 @@ const actions = { addAdminOrg({ commit, state }, org) { commit('ADD_ORG', org) }, + deleteAdminOrg({ commit }, org) { + commit('DELETE_ORG', org) + }, modifyOrg({ commit, state }, org) { commit('MODIFY_ORG', org) }, diff --git a/src/views/settings/Org/OrganizationList.vue b/src/views/settings/Org/OrganizationList.vue index 7f819f957..877214921 100644 --- a/src/views/settings/Org/OrganizationList.vue +++ b/src/views/settings/Org/OrganizationList.vue @@ -76,6 +76,7 @@ export default { instance.confirmButtonLoading = true try { await performDelete.bind(this)({ row: row, col: col }) + this.$store.dispatch('users/deleteAdminOrg', { id: row.id, name: row.name }) done() reload() this.$message.success(this.$tc('common.deleteSuccessMsg')) From a8a726216e44c9302a3806298c827621d6412e15 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Mon, 20 Feb 2023 14:55:45 +0800 Subject: [PATCH 03/15] =?UTF-8?q?fix:=20=E5=9C=A8=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E7=A6=81=E6=AD=A2=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=92=8C=E6=89=A7=E8=A1=8C=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ops/Job/index.vue | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/views/ops/Job/index.vue b/src/views/ops/Job/index.vue index 4450689f9..ed8c2b4b5 100644 --- a/src/views/ops/Job/index.vue +++ b/src/views/ops/Job/index.vue @@ -9,7 +9,6 @@ import GenericListPage from '@/layout/components/GenericListPage' import { ActionsFormatter, DateFormatter } from '@/components/TableFormatters' import JobRunDialog from '@/views/ops/Job/JobRunDialog' -import { mapGetters } from 'vuex' import { openTaskPage } from '@/utils/jms' export default { @@ -80,7 +79,7 @@ export default { formatter: ActionsFormatter, formatterArgs: { hasUpdate: true, - canUpdate: this.$hasPerm('ops.change_job'), + canUpdate: this.$hasPerm('ops.change_job') && !this.$store.getters.currentOrgIsRoot, updateRoute: 'JobUpdate', hasDelete: true, canDelete: this.$hasPerm('ops.delete_job'), @@ -89,7 +88,7 @@ export default { { title: this.$t('ops.Run'), name: 'run', - can: this.$hasPerm('ops.add_jobexecution'), + can: this.$hasPerm('ops.add_jobexecution') && !this.$store.getters.currentOrgIsRoot, callback: ({ row }) => { const params = JSON.parse(row.parameters_define) if (Object.keys(params).length > 0) { @@ -133,9 +132,6 @@ export default { } } }, - computed: { - ...mapGetters(['currentOrgIsRoot']) - }, methods: { runJob(row, parameters) { this.$axios.post('/api/v1/ops/job-executions/', { From 7d53d444bdaad4711713e4adbbddecffab942283 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Mon, 20 Feb 2023 15:04:19 +0800 Subject: [PATCH 04/15] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=20v2=20?= =?UTF-8?q?=E7=9A=84=E6=A6=82=E5=BF=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OrganizationDetail/OrganizationDetail.vue | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/views/settings/Org/OrganizationDetail/OrganizationDetail.vue b/src/views/settings/Org/OrganizationDetail/OrganizationDetail.vue index 88c54434e..a58c20aca 100644 --- a/src/views/settings/Org/OrganizationDetail/OrganizationDetail.vue +++ b/src/views/settings/Org/OrganizationDetail/OrganizationDetail.vue @@ -38,26 +38,10 @@ export default { key: this.$t('xpack.Organization.assets_amount'), value: this.object.resource_statistics.assets_amount }, - { - key: this.$t('xpack.Organization.admin_users_amount'), - value: this.object.resource_statistics.admin_users_amount - }, - { - key: this.$t('xpack.Organization.system_users_amount'), - value: this.object.resource_statistics.system_users_amount - }, - { - key: this.$t('xpack.Organization.applications_amount'), - value: this.object.resource_statistics.applications_amount - }, { key: this.$t('xpack.Organization.asset_perms_amount'), value: this.object.resource_statistics.asset_perms_amount }, - { - key: this.$t('xpack.Organization.app_perms_amount'), - value: this.object.resource_statistics.app_perms_amount - }, 'date_created', 'comment' ] } From b6d9a20d8ff7b548952a4196b9a957073704d0ec Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 20 Feb 2023 15:15:35 +0800 Subject: [PATCH 05/15] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/assets/Platform/PlatformDetail/Detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/assets/Platform/PlatformDetail/Detail.vue b/src/views/assets/Platform/PlatformDetail/Detail.vue index 63affc4df..1cb3f615c 100644 --- a/src/views/assets/Platform/PlatformDetail/Detail.vue +++ b/src/views/assets/Platform/PlatformDetail/Detail.vue @@ -80,7 +80,7 @@ export default { updateProtocols() { const url = `/api/v1/assets/platforms/${this.object.id}/` this.$axios.patch(url, { protocols: this.object.protocols }).then(() => { - this.$message.success(this.$tc('common.UpdateSuccess')) + this.$message.success(this.$tc('common.updateSuccessMsg')) }) }, async getTypeConstraints() { From 7a5bd01ed55b335f8de438d9e585dec6dd81d81d Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Mon, 20 Feb 2023 15:25:59 +0800 Subject: [PATCH 06/15] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=AE=A1=E7=90=86v2=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/settings/Org/OrganizationList.vue | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/views/settings/Org/OrganizationList.vue b/src/views/settings/Org/OrganizationList.vue index 877214921..1f765bd7f 100644 --- a/src/views/settings/Org/OrganizationList.vue +++ b/src/views/settings/Org/OrganizationList.vue @@ -26,11 +26,7 @@ export default { 'resource_statistics.users_amount', 'resource_statistics.groups_amount', 'resource_statistics.assets_amount', - 'resource_statistics.admin_users_amount', - 'resource_statistics.system_users_amount', - 'resource_statistics.applications_amount', 'resource_statistics.asset_perms_amount', - 'resource_statistics.app_perms_amount', 'comment', 'actions'], columnsMeta: { 'resource_statistics.users_amount': { @@ -42,21 +38,9 @@ export default { 'resource_statistics.assets_amount': { label: this.$t('xpack.Organization.assets_amount') }, - 'resource_statistics.admin_users_amount': { - label: this.$t('xpack.Organization.admin_users_amount') - }, - 'resource_statistics.system_users_amount': { - label: this.$t('xpack.Organization.system_users_amount') - }, - 'resource_statistics.applications_amount': { - label: this.$t('xpack.Organization.applications_amount') - }, 'resource_statistics.asset_perms_amount': { label: this.$t('xpack.Organization.asset_perms_amount') }, - 'resource_statistics.app_perms_amount': { - label: this.$t('xpack.Organization.app_perms_amount') - }, actions: { prop: 'id', formatterArgs: { From 71e73e9302992f57bc3c2f42cf905ce6b5914631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Mon, 20 Feb 2023 16:13:59 +0800 Subject: [PATCH 07/15] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=88=91?= =?UTF-8?q?=E7=9A=84=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/myassets/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/myassets/index.vue b/src/views/myassets/index.vue index 482a8ef4b..700e9a555 100644 --- a/src/views/myassets/index.vue +++ b/src/views/myassets/index.vue @@ -45,6 +45,7 @@ export default { default: ['name', 'address', 'platform', 'accounts', 'actions'], min: ['name', 'address', 'actions'] }, + columns: ['name', 'address', 'platform', 'accounts', 'comment', 'actions'], columnsMeta: { name: { prop: 'name', From 494bb8ddcc57e4b97fa761a3cc98c0b35b35d7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Mon, 20 Feb 2023 17:19:20 +0800 Subject: [PATCH 08/15] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/index.scss | 4 ++++ src/views/assets/Asset/AssetList/components/BaseList.vue | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/styles/index.scss b/src/styles/index.scss index db5cea63b..33b7cd073 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -200,6 +200,10 @@ input[type=file] { overflow: auto; } +.el-table .el-table__row > td > .cell.el-tooltip { + width: auto!important; +} + .el-table .el-table__row .show-full-content > .cell { white-space: normal!important; } diff --git a/src/views/assets/Asset/AssetList/components/BaseList.vue b/src/views/assets/Asset/AssetList/components/BaseList.vue index c8d1f4fa9..31b21bce8 100644 --- a/src/views/assets/Asset/AssetList/components/BaseList.vue +++ b/src/views/assets/Asset/AssetList/components/BaseList.vue @@ -107,7 +107,6 @@ export default { sortable: true }, platform: { - width: '100px', sortable: true }, protocols: { From 413feb6372c881bd98c25ea88e2a3fc8ba8f20fc Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 20 Feb 2023 17:18:46 +0800 Subject: [PATCH 09/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84?= =?UTF-8?q?=E4=BA=A7info=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BAlist=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DetailCard/auto.vue | 38 ++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/src/components/DetailCard/auto.vue b/src/components/DetailCard/auto.vue index 828aba1d4..02719300c 100644 --- a/src/components/DetailCard/auto.vue +++ b/src/components/DetailCard/auto.vue @@ -64,21 +64,39 @@ export default { } let value = this.object[name] + const label = fieldMeta.label if (Array.isArray(value)) { - value.forEach(item => { - const fieldName = `${name}.${item.name}` - if (excludes.includes(fieldName)) { - return - } - this.items.push({ - key: item.label, - value: item.value + if (typeof value[0] === 'object') { + value.forEach(item => { + const fieldName = `${name}.${item.name}` + if (excludes.includes(fieldName)) { + return + } + this.items.push({ + key: item.label, + value: item.value + }) }) - }) + } else if (typeof value[0] === 'string') { + value.forEach((item, index) => { + let data = {} + if (index === 0) { + data = { + key: label, + value: value[index] + } + } else { + data = { + key: '', + value: value[index] + } + } + this.items.push(data) + }) + } continue } - const label = fieldMeta.label if (value === null || value === '') { value = '-' } else if (fieldMeta.type === 'datetime') { From 174e7cb0e344636ae06af30c9b9c232e11b90c2a Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Mon, 20 Feb 2023 16:59:23 +0800 Subject: [PATCH 10/15] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=97=A5=E5=BF=97=E8=BF=87=E6=BB=A4=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/audits/JobExecutionLogList.vue | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/views/audits/JobExecutionLogList.vue b/src/views/audits/JobExecutionLogList.vue index 6096d29d2..cd2bfa585 100644 --- a/src/views/audits/JobExecutionLogList.vue +++ b/src/views/audits/JobExecutionLogList.vue @@ -101,15 +101,7 @@ export default { options: [ { label: this.$t('audits.User'), - value: 'user__name' - }, - { - label: this.$t('audits.Username'), - value: 'user__username' - }, - { - label: this.$t('audits.SystemUserName'), - value: 'run_as__username' + value: 'creator__name' } ] } From 385764c3be4402c7a07413456f7a8da2e3cb4ab6 Mon Sep 17 00:00:00 2001 From: jiangweidong Date: Mon, 20 Feb 2023 18:34:50 +0800 Subject: [PATCH 11/15] =?UTF-8?q?fix:=20SSL=E8=B5=84=E4=BA=A7=E5=85=8B?= =?UTF-8?q?=E9=9A=86=E6=97=A0SSL=E7=AD=89=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/assets/Asset/AssetList/components/BaseList.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/assets/Asset/AssetList/components/BaseList.vue b/src/views/assets/Asset/AssetList/components/BaseList.vue index 31b21bce8..2c71b1fdb 100644 --- a/src/views/assets/Asset/AssetList/components/BaseList.vue +++ b/src/views/assets/Asset/AssetList/components/BaseList.vue @@ -70,6 +70,7 @@ export default { if (action === 'Clone') { route.query.clone_from = row.id route.query.platform = row.platform.id + route.query.platform_type = row.type.value } else if (action === 'Update') { route.params.id = row.id route.query.platform = row.platform.id From 26508ae87b2639eb21be8771b106419e1ae9311a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Mon, 20 Feb 2023 19:23:04 +0800 Subject: [PATCH 12/15] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AutoDataTable/index.vue | 10 +++++++--- src/utils/common.js | 7 +++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue index 26ea2428c..b1a74c196 100644 --- a/src/components/AutoDataTable/index.vue +++ b/src/components/AutoDataTable/index.vue @@ -26,7 +26,7 @@ import { ObjectRelatedFormatter } from '@/components/TableFormatters' import i18n from '@/i18n/i18n' -import { newURL } from '@/utils/common' +import { newURL, replaceAllUUID } from '@/utils/common' import ColumnSettingPopover from './components/ColumnSettingPopover' export default { @@ -323,7 +323,8 @@ export default { const _tableConfig = localStorage.getItem('tableConfig') ? JSON.parse(localStorage.getItem('tableConfig')) : {} - const tableName = this.config.name || this.$route.name + '_' + newURL(this.iConfig.url).pathname + let tableName = this.config.name || this.$route.name + '_' + newURL(this.iConfig.url).pathname + tableName = replaceAllUUID(tableName) const configShowColumnsNames = _.get(_tableConfig[tableName], 'showColumns', null) let showColumnsNames = configShowColumnsNames || defaultColumnsNames if (showColumnsNames.length === 0) { @@ -371,7 +372,10 @@ export default { const _tableConfig = localStorage.getItem('tableConfig') ? JSON.parse(localStorage.getItem('tableConfig')) : {} - const tableName = this.config.name || this.$route.name + '_' + newURL(url).pathname + let tableName = this.config.name || this.$route.name + '_' + newURL(url).pathname + // 替换url中的uuid，避免同一个类型接口生成多个key，localStorage中的数据无法共用 + tableName = replaceAllUUID(tableName) + _tableConfig[tableName] = { 'showColumns': columns } diff --git a/src/utils/common.js b/src/utils/common.js index 845e2d285..dc3be3411 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -168,6 +168,13 @@ export function replaceUUID(s, n) { return s.replace(uuidPattern, n) } +export function replaceAllUUID(string, replacement = '*') { + if (hasUUID(string)) { + string = string.replace(/[0-9a-zA-Z\-]{36}/g, replacement) + } + return string +} + export function getDaysAgo(days, now) { if (!now) { now = new Date() From 90ac325cbb03c9b865ff5df1c639dc64ba049f48 Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Mon, 20 Feb 2023 19:44:29 +0800 Subject: [PATCH 13/15] perf: applet host perm --- src/views/users/Role/RoleDetail/RoleInfo.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue index 226a750df..9b0f67376 100644 --- a/src/views/users/Role/RoleDetail/RoleInfo.vue +++ b/src/views/users/Role/RoleDetail/RoleInfo.vue @@ -136,6 +136,8 @@ export default { 'terminal.view_status': ['settings.change_terminal'], 'terminal.view_task': ['settings.change_terminal'], 'terminal.view_terminal': ['settings.change_terminal'], + 'terminal.add_applethost': ['assets.view_platform'], + 'terminal.change_applethost': ['assets.view_platform'], 'ops.view_job': ['assets.view_asset', 'assets.view_node', 'ops.view_adhoc', 'ops.view_playbook'], 'ops.change_job': ['assets.view_asset', 'assets.view_node', 'ops.view_adhoc', 'ops.view_playbook'], 'ops.add_job': ['assets.view_asset', 'assets.view_node', 'ops.view_adhoc', 'ops.view_playbook'], From 93431df62b2394af9a0834c95efd9f2abb65b70c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Tue, 21 Feb 2023 10:33:14 +0800 Subject: [PATCH 14/15] =?UTF-8?q?perf:=20=E7=BD=91=E7=BB=9C=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E3=80=81=E4=BA=91=E6=9C=8D=E5=8A=A1=E3=80=81web?= =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BD=91=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Asset/AssetList/components/AssetBulkUpdateDialog.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/assets/Asset/AssetList/components/AssetBulkUpdateDialog.vue b/src/views/assets/Asset/AssetList/components/AssetBulkUpdateDialog.vue index 20d23790d..a375feca4 100644 --- a/src/views/assets/Asset/AssetList/components/AssetBulkUpdateDialog.vue +++ b/src/views/assets/Asset/AssetList/components/AssetBulkUpdateDialog.vue @@ -34,6 +34,7 @@ export default { }, data() { const meta = assetFieldsMeta(this) + const exclude = ['device', 'cloud', 'web'] return { tips: this.$t('assets.AssetBulkUpdateTips'), formSetting: { @@ -49,7 +50,7 @@ export default { domain: { ...meta.domain, label: this.$t('assets.Domain'), - disabled: this.category === 'cloud' + disabled: exclude.includes(this.category) }, labels: { ...meta.labels, From 1e1533a0c94228f4094a529b7a465c4b57f61eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Tue, 21 Feb 2023 11:27:52 +0800 Subject: [PATCH 15/15] =?UTF-8?q?perf:=20=E8=B4=A6=E5=8F=B7=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=89=B9=E6=AE=8A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue b/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue index 28a67de04..851d598e7 100644 --- a/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue +++ b/src/views/accounts/AssetAccount/AssetAccountDetail/Detail.vue @@ -115,7 +115,7 @@ export default { url: `/api/v1/accounts/accounts/${this.object.id}`, excludes: [ 'asset', 'template', 'privileged', 'secret', - 'passphrase', 'specific' + 'passphrase', 'specific', 'spec_info' ] } },