From d809a13b67656a59149353d73d6bfa4d4cdb44ac Mon Sep 17 00:00:00 2001 From: zhaojisen <1301338853@qq.com> Date: Tue, 4 Mar 2025 19:23:38 +0800 Subject: [PATCH 1/4] Fixed: User Detail --- .../Table/TableFormatters/AccountInfoFormatter.vue | 3 ++- .../AssetPermission/AssetPermissionDetail/index.vue | 1 + src/views/perms/const.js | 7 ++++++- src/views/users/User/UserList.vue | 10 ++++++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/components/Table/TableFormatters/AccountInfoFormatter.vue b/src/components/Table/TableFormatters/AccountInfoFormatter.vue index 45d6135d6..ac4cc7f7d 100644 --- a/src/components/Table/TableFormatters/AccountInfoFormatter.vue +++ b/src/components/Table/TableFormatters/AccountInfoFormatter.vue @@ -37,7 +37,8 @@ export default { }, methods: { async getAsyncItems() { - const userId = this.$route.params.id || 'self' + const drawActionMeta = await this.$store.dispatch('common/getDrawerActionMeta') + const userId = drawActionMeta.row.id || 'self' const url = `/api/v1/perms/users/${userId}/assets/${this.row.id}` this.$axios.get(url).then(res => { this.accountData = res?.permed_accounts || [] diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue index 21e5336ef..acbe26123 100644 --- a/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue +++ b/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue @@ -41,6 +41,7 @@ export default { date_expired: '' }, config: { + url: '/api/v1/perms/asset-permissions', activeMenu: 'AssetPermissionDetail', submenu: [ { diff --git a/src/views/perms/const.js b/src/views/perms/const.js index 1fdf487fd..8c54cbbda 100644 --- a/src/views/perms/const.js +++ b/src/views/perms/const.js @@ -1,5 +1,6 @@ import i18n from '@/i18n/i18n' import AmountFormatter from '@/components/Table/TableFormatters/AmountFormatter.vue' +import DetailFormatter from '@/components/Table/TableFormatters/DetailFormatter.vue' export const UserAssetPermissionListPageSearchConfigOptions = [ { label: i18n.t('Name'), value: 'name' }, @@ -33,10 +34,14 @@ export const UserAssetPermissionListPageSearchConfigOptions = [ export const AssetPermissionTableMeta = { name: { + formatter: DetailFormatter, minWidth: '120px', formatterArgs: { route: 'AssetPermissionDetail', - drawer: true + drawer: true, + routeQuery: { + tab: 'Basic' + } } }, action: { diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue index a96982ffc..21211714a 100644 --- a/src/views/users/User/UserList.vue +++ b/src/views/users/User/UserList.vue @@ -31,6 +31,7 @@ import InviteUsersDialog from './components/InviteUsersDialog' import AmountFormatter from '@/components/Table/TableFormatters/AmountFormatter.vue' import store from '@/store' import { MFASystemSetting } from '../const' +import DetailFormatter from '@/components/Table/TableFormatters/DetailFormatter.vue' export default { components: { @@ -129,6 +130,15 @@ export default { ] }, columnsMeta: { + name: { + formatter: DetailFormatter, + formatterArgs: { + route: 'UserDetail', + routeQuery: { + tab: 'Basic' + } + } + }, mfa_level: { width: '130px', formatter: (row) => { From 702d26822bf7cc7a0eb7e7aa1903ebbbda85d896 Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Wed, 5 Mar 2025 10:18:57 +0800 Subject: [PATCH 2/4] perf: updateValue --- .../DataForm/components/el-form-renderer/el-form-renderer.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/Form/DataForm/components/el-form-renderer/el-form-renderer.vue b/src/components/Form/DataForm/components/el-form-renderer/el-form-renderer.vue index ae0e592a6..a78520869 100755 --- a/src/components/Form/DataForm/components/el-form-renderer/el-form-renderer.vue +++ b/src/components/Form/DataForm/components/el-form-renderer/el-form-renderer.vue @@ -168,11 +168,7 @@ export default { * @param {All} options.value 表单数据 */ updateValue({ id, value }) { - if (!value) return this.value = { ...this.value, [id]: value } - this.$nextTick(() => { - this.$refs.elForm.validateField(id) - }) }, /** * @return {object} key is item's id, value is item's value From be5be83dfce7250663cebc9981e8c0b5febb799c Mon Sep 17 00:00:00 2001 From: w940853815 <940853815@qq.com> Date: Wed, 5 Mar 2025 10:20:21 +0800 Subject: [PATCH 3/4] fix: Risk detect prohibit import csv --- src/views/pam/RiskDetect/AccountRiskList.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/pam/RiskDetect/AccountRiskList.vue b/src/views/pam/RiskDetect/AccountRiskList.vue index 3b7c16d21..515ec41af 100644 --- a/src/views/pam/RiskDetect/AccountRiskList.vue +++ b/src/views/pam/RiskDetect/AccountRiskList.vue @@ -142,6 +142,7 @@ export default { }, headerActions: { hasCreate: false, + hasImport: false, extraMoreActions: [ { name: 'resolveSelected', From 2d56ee79120d0115b91f4256c7f959beb99912c2 Mon Sep 17 00:00:00 2001 From: w940853815 <940853815@qq.com> Date: Wed, 5 Mar 2025 10:45:57 +0800 Subject: [PATCH 4/4] fix: Platform type was created is wrong --- src/views/assets/Platform/PlatformCreateUpdate.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/assets/Platform/PlatformCreateUpdate.vue b/src/views/assets/Platform/PlatformCreateUpdate.vue index eda9a04f7..b2b6b1b76 100644 --- a/src/views/assets/Platform/PlatformCreateUpdate.vue +++ b/src/views/assets/Platform/PlatformCreateUpdate.vue @@ -124,8 +124,8 @@ export default { this.initial.su_method = this.suMethodLimits[0] }, async setCategories() { - const category = this.$route.query.category - const type = this.$route.query.type + const category = this.$route.query._category + const type = this.$route.query._type const state = await this.$store.dispatch('assets/getAssetCategories') this.fieldsMeta.category_type.el.options = state.assetCategoriesCascader if (category && type) {