From cc5083df13263e8da2a092f5360df4c45c171e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E9=BE=992023?= <yanghailong26@huawei.com>
Date: Sat, 14 Sep 2024 14:21:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=AE=A1=E7=90=86=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=AF=81=E4=B9=A6=E5=BC=B9=E6=A1=86=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 杨海龙2023 <yanghailong26@huawei.com>
---
 CertManager/src/main/ets/pages/trustedCa.ets | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/CertManager/src/main/ets/pages/trustedCa.ets b/CertManager/src/main/ets/pages/trustedCa.ets
index 57efb1a..bab3a6a 100644
--- a/CertManager/src/main/ets/pages/trustedCa.ets
+++ b/CertManager/src/main/ets/pages/trustedCa.ets
@@ -442,6 +442,9 @@ struct ComponentUser {
 
   rootCertificateDialog: CustomDialogController = new CustomDialogController({
     alignment: DialogAlignment.Center,
+    cancel: () => {
+      this.setStatus.updateUserTrustedCertificateList();
+    },
     builder: CustomContentDialog({
       contentBuilder: () => {
         this.rootCertificateContent();
@@ -472,6 +475,9 @@ struct ComponentUser {
 
   userDetailsDialog: CustomDialogController = new CustomDialogController({
     alignment: DialogAlignment.Center,
+    cancel: () => {
+      this.setStatus.updateUserTrustedCertificateList();
+    },
     builder: CustomContentDialog({
       contentBuilder: () => {
         this.userDetailContent(this.setStatus.certList[this.indexNum].status);
@@ -490,7 +496,6 @@ struct ComponentUser {
           value: $r('app.string.CustomDialogExampleUser_Flex_secButton_text'),
           buttonStyle: ButtonStyleMode.TEXTUAL,
           action: () => {
-            this.setStatus.updateUserTrustedCertificateList();
             this.onShowDeleteWarnDialog();
           },
           role: ButtonRole.ERROR
@@ -500,6 +505,9 @@ struct ComponentUser {
   })
 
   deleteCertWarnDialog: CustomDialogController = new CustomDialogController({
+    cancel: () => {
+      this.setStatus.updateUserTrustedCertificateList();
+    },
     builder: CustomContentDialog({
       contentBuilder: () => {
         this.deleteWarnContent();
@@ -510,8 +518,8 @@ struct ComponentUser {
           value: $r('app.string.deleteAllCredCancel'),
           buttonStyle: ButtonStyleMode.TEXTUAL,
           action: () => {
-            this.setStatus.updateUserTrustedCertificateList();
             this.deleteCertWarnDialog?.close();
+            this.setStatus.updateUserTrustedCertificateList();
           }
         },
         {