From dadfc9a2409d2c0ffa6595971c3f2d26a9731f83 Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Mon, 3 Mar 2025 10:50:51 +0800 Subject: [PATCH 1/6] perf: translate --- src/views/dashboard/Pam/MissionSummery.vue | 6 +++--- src/views/dashboard/Pam/SummaryChart.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/dashboard/Pam/MissionSummery.vue b/src/views/dashboard/Pam/MissionSummery.vue index 60ef56215..083c9c7c6 100644 --- a/src/views/dashboard/Pam/MissionSummery.vue +++ b/src/views/dashboard/Pam/MissionSummery.vue @@ -25,8 +25,8 @@ export default { data() { return { config: { - title: this.$t('TaskDistribution'), - tip: this.$t('TaskDistribution') + title: this.$t('TaskSummary'), + tip: this.$t('TaskSummary') }, counter: { total_count_change_secret_automation: 0, @@ -61,7 +61,7 @@ export default { }, series: [ { - name: this.$t('TaskDistribution'), + name: this.$t('TaskSummary'), type: 'pie', top: '10%', radius: ['45%', '60%'], diff --git a/src/views/dashboard/Pam/SummaryChart.vue b/src/views/dashboard/Pam/SummaryChart.vue index 32b02bcb8..1dc57b0ff 100644 --- a/src/views/dashboard/Pam/SummaryChart.vue +++ b/src/views/dashboard/Pam/SummaryChart.vue @@ -7,7 +7,7 @@
-
Total accounts
+
{{ $t('TotalAccounts') }}
{{ config.total }}
{{ $t('WeekAdd') }}
From 2a0f6dc1df19d5b614e5dac1af96520c98369272 Mon Sep 17 00:00:00 2001 From: w940853815 <940853815@qq.com> Date: Mon, 3 Mar 2025 10:59:11 +0800 Subject: [PATCH 2/6] fix: Zone list: Click on the details page, then click on the Assets tab, but fail to retrieve asset data. --- src/views/assets/Domain/DomainDetail/AssetList.vue | 2 +- src/views/assets/Domain/DomainDetail/GatewayList.vue | 2 +- src/views/assets/Domain/components/AddGatewayDialog.vue | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/assets/Domain/DomainDetail/AssetList.vue b/src/views/assets/Domain/DomainDetail/AssetList.vue index a86db58b1..3a3cac613 100644 --- a/src/views/assets/Domain/DomainDetail/AssetList.vue +++ b/src/views/assets/Domain/DomainDetail/AssetList.vue @@ -29,7 +29,7 @@ export default { return { tableConfig: { category: 'all', - url: `/api/v1/assets/assets/?domain=${this.$route.params.id}&is_gateway=0`, + url: `/api/v1/assets/assets/?domain=${this.object.id}&is_gateway=0`, tableConfig: { columns: ['name', 'address', 'platform', 'actions'], columnsMeta: { diff --git a/src/views/assets/Domain/DomainDetail/GatewayList.vue b/src/views/assets/Domain/DomainDetail/GatewayList.vue index 6c66b9aa6..3c6542144 100644 --- a/src/views/assets/Domain/DomainDetail/GatewayList.vue +++ b/src/views/assets/Domain/DomainDetail/GatewayList.vue @@ -39,7 +39,7 @@ export default { data() { return { tableConfig: { - url: `/api/v1/assets/gateways/?domain=${this.$route.params.id}`, + url: `/api/v1/assets/gateways/?domain=${this.object.id}`, columnsExclude: [ 'info', 'spec_info', 'auto_config' ], diff --git a/src/views/assets/Domain/components/AddGatewayDialog.vue b/src/views/assets/Domain/components/AddGatewayDialog.vue index 5782cd1ec..81afaa69d 100644 --- a/src/views/assets/Domain/components/AddGatewayDialog.vue +++ b/src/views/assets/Domain/components/AddGatewayDialog.vue @@ -41,6 +41,7 @@ export default { } }, data() { + const vm = this return { formConfig: { getUrl: () => { @@ -53,7 +54,7 @@ export default { createSuccessMsg: this.$t('AddSuccessMsg'), updateSuccessNextRoute: { name: 'ZoneDetail', - params: { id: this.$route.params.id } + params: { id: this.object.id } }, fields: ['gateways'], fieldsMeta: { @@ -73,7 +74,7 @@ export default { cleanFormValue(values) { const data = [] values.gateways.forEach(item => { - const d = { id: item.pk, domain: this.$route.params.id } + const d = { id: item.pk, domain: vm.object.id } data.push(d) }) return data From 880c44fdaadbc7c5a3d903c3b91d318a041ed590 Mon Sep 17 00:00:00 2001 From: zhaojisen <1301338853@qq.com> Date: Mon, 3 Mar 2025 11:07:26 +0800 Subject: [PATCH 3/6] Fixed: Form update Validated --- .../DataForm/components/el-form-renderer/el-form-renderer.vue | 3 +++ 1 file changed, 3 insertions(+) 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 a78520869..efa8bf191 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 @@ -169,6 +169,9 @@ export default { */ updateValue({ id, value }) { 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 156715ede583f10ad24ef8b6e5ebe7adea61deff Mon Sep 17 00:00:00 2001 From: zhaojisen <1301338853@qq.com> Date: Mon, 3 Mar 2025 11:18:46 +0800 Subject: [PATCH 4/6] Fixed: Empty Value Update --- .../DataForm/components/el-form-renderer/el-form-renderer.vue | 1 + src/views/pam/Integration/ApplicationCreateUpdate.vue | 2 ++ 2 files changed, 3 insertions(+) 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 efa8bf191..ae0e592a6 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,6 +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) diff --git a/src/views/pam/Integration/ApplicationCreateUpdate.vue b/src/views/pam/Integration/ApplicationCreateUpdate.vue index f341ba016..238fe3c9e 100644 --- a/src/views/pam/Integration/ApplicationCreateUpdate.vue +++ b/src/views/pam/Integration/ApplicationCreateUpdate.vue @@ -59,6 +59,8 @@ export default { }, on: { fileChange: ([value], updateForm) => { + console.log('fileChange', value) + console.log('updateForm', updateForm) this.logo_file = value } } From 72a0a200a8d0edfc9e178cfb3fd8616f145bc8c2 Mon Sep 17 00:00:00 2001 From: zhaojisen <1301338853@qq.com> Date: Mon, 3 Mar 2025 11:20:06 +0800 Subject: [PATCH 5/6] Fixed: Remove Log --- src/views/pam/Integration/ApplicationCreateUpdate.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/pam/Integration/ApplicationCreateUpdate.vue b/src/views/pam/Integration/ApplicationCreateUpdate.vue index 238fe3c9e..f341ba016 100644 --- a/src/views/pam/Integration/ApplicationCreateUpdate.vue +++ b/src/views/pam/Integration/ApplicationCreateUpdate.vue @@ -59,8 +59,6 @@ export default { }, on: { fileChange: ([value], updateForm) => { - console.log('fileChange', value) - console.log('updateForm', updateForm) this.logo_file = value } } From 82a4dd5b3bcfc3d97de4f3664579c09309048ba5 Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Mon, 3 Mar 2025 14:08:26 +0800 Subject: [PATCH 6/6] perf: change secret linkage --- src/views/accounts/AccountChangeSecret/Overview/CardSummary.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/accounts/AccountChangeSecret/Overview/CardSummary.vue b/src/views/accounts/AccountChangeSecret/Overview/CardSummary.vue index 782426fc2..bc994aee6 100644 --- a/src/views/accounts/AccountChangeSecret/Overview/CardSummary.vue +++ b/src/views/accounts/AccountChangeSecret/Overview/CardSummary.vue @@ -49,6 +49,7 @@ export default { { title: this.$t('Tasks'), body: { + route: { name: 'AccountChangeSecret' }, count: this.data.total_count_change_secrets } }, @@ -71,6 +72,7 @@ export default { { title: this.$t('Total'), body: { + route: { name: 'AccountChangeSecretExecutionList' }, count: this.data.total_count_change_secret_executions } },