From 1121af7441e5bc8fd6e11bd8c3f307439f6d4145 Mon Sep 17 00:00:00 2001 From: w940853815 <940853815@qq.com> Date: Wed, 5 Mar 2025 17:12:01 +0800 Subject: [PATCH 1/2] fix: Asset detail account copy to asset and move to asset failed --- src/components/Apps/AccountListTable/const.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/Apps/AccountListTable/const.js b/src/components/Apps/AccountListTable/const.js index 26e71e3b3..acd5521f0 100644 --- a/src/components/Apps/AccountListTable/const.js +++ b/src/components/Apps/AccountListTable/const.js @@ -148,6 +148,9 @@ export const accountOtherActions = (vm) => [ title: vm.$t('CopyToAsset'), type: 'primary', divided: true, + has: () => { + return !vm.asset + }, callback: ({ row }) => { vm.accountCreateUpdateTitle = vm.$t('CopyToOther') vm.$route.query.flag = 'copy' @@ -160,6 +163,9 @@ export const accountOtherActions = (vm) => [ name: 'MoveToOther', title: vm.$t('MoveToAsset'), type: 'primary', + has: () => { + return !vm.asset + }, callback: ({ row }) => { vm.accountCreateUpdateTitle = vm.$t('MoveToOther') vm.$route.query.flag = 'move' From 9db715e3752156136d037749e6594baebc52e212 Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Wed, 5 Mar 2025 17:28:44 +0800 Subject: [PATCH 2/2] perf: translate --- src/views/accounts/AccountDiscover/DeleteDialog.vue | 2 +- src/views/accounts/AccountDiscover/TaskCreateUpdate.vue | 2 +- src/views/accounts/AccountDiscover/TaskDetail/Detail.vue | 2 +- src/views/accounts/const.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/accounts/AccountDiscover/DeleteDialog.vue b/src/views/accounts/AccountDiscover/DeleteDialog.vue index 9e8a43586..76decae2c 100644 --- a/src/views/accounts/AccountDiscover/DeleteDialog.vue +++ b/src/views/accounts/AccountDiscover/DeleteDialog.vue @@ -11,7 +11,7 @@ v-on="$listeners" > - "{{ this.$t('DeleteWarningMsg') }}" "{{ account.username }} - {{ account.asset.name }}" ? + {{ this.$t('DeleteWarningMsg') }} {{ account.username }}({{ account.asset.name }}) ?
diff --git a/src/views/accounts/AccountDiscover/TaskCreateUpdate.vue b/src/views/accounts/AccountDiscover/TaskCreateUpdate.vue index d5fcaa246..59b6d9d2e 100644 --- a/src/views/accounts/AccountDiscover/TaskCreateUpdate.vue +++ b/src/views/accounts/AccountDiscover/TaskCreateUpdate.vue @@ -16,7 +16,7 @@ export default { return { fields: [ [this.$t('Basic'), ['name', 'nodes', 'assets']], - [this.$t('DiscoverConfig'), ['is_sync_account', 'check_risk', 'recipients']], + [this.$t('Config'), ['is_sync_account', 'check_risk', 'recipients']], [this.$t('Periodic'), ['is_periodic', 'crontab', 'interval']], [this.$t('Other'), ['is_active', 'comment']] ], diff --git a/src/views/accounts/AccountDiscover/TaskDetail/Detail.vue b/src/views/accounts/AccountDiscover/TaskDetail/Detail.vue index 67191c1d8..43f85ee36 100644 --- a/src/views/accounts/AccountDiscover/TaskDetail/Detail.vue +++ b/src/views/accounts/AccountDiscover/TaskDetail/Detail.vue @@ -33,7 +33,7 @@ export default { }, { key: this.$t('DateLastSync'), - value: this.object.date_last_sync ? toSafeLocalDateStr(this.object.date_created) : '-' + value: this.object.last_execution_date ? toSafeLocalDateStr(this.object.last_execution_date) : '-' }, { key: this.$t('DateCreated'), diff --git a/src/views/accounts/const.js b/src/views/accounts/const.js index e8532acb4..8f1d74e0a 100644 --- a/src/views/accounts/const.js +++ b/src/views/accounts/const.js @@ -114,7 +114,7 @@ export const gatherAccountHeaderActions = (vm) => { hasImport: false, hasExport: true, searchConfig: { - exclude: ['asset'], + exclude: ['asset', 'id'], options: [ { label: vm.$t('AssetName'),