From 763e278523dda9bc75c3dd5afe39c25add0b96c2 Mon Sep 17 00:00:00 2001
From: chenwenchang <479999519@qq.com>
Date: Thu, 24 Oct 2024 16:31:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(frontend):=20=E5=AF=86=E7=A0=81=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20#7031=20#=20Reviewed,=20transaction=20id:?=
 =?UTF-8?q?=2021843?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../policy/components/Content.vue             | 58 ++++++++++---------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/dbm-ui/frontend/src/views/password-manage/policy/components/Content.vue b/dbm-ui/frontend/src/views/password-manage/policy/components/Content.vue
index e39b632de8..8a78b17456 100644
--- a/dbm-ui/frontend/src/views/password-manage/policy/components/Content.vue
+++ b/dbm-ui/frontend/src/views/password-manage/policy/components/Content.vue
@@ -119,14 +119,14 @@
           class="mr-8"
           :loading="isSubmitting"
           theme="primary"
-          @click="handleSubmit()">
+          @click="handleSubmit">
           {{ t('保存') }}
         </AuthButton>
         <DbPopconfirm
           :confirm-handler="handleReset"
           :content="t('重置将会恢复默认设置的内容')"
           :title="t('确认重置')">
-          <BkButton :disabled="isSubmitting">
+          <BkButton>
             {{ t('重置') }}
           </BkButton>
         </DbPopconfirm>
@@ -136,7 +136,6 @@
 </template>
 
 <script setup lang="ts">
-  import { Message } from 'bkui-vue';
   import _ from 'lodash';
   import { useI18n } from 'vue-i18n';
   import { useRequest } from 'vue-request';
@@ -145,6 +144,8 @@
 
   import { DBTypes } from '@common/const';
 
+  import { messageSuccess } from '@utils';
+
   interface Props {
     dbType: DBTypes;
   }
@@ -153,8 +154,8 @@
 
   const initData = () => ({
     repeats: 0,
-    max_length: 32,
-    min_length: 8,
+    max_length: 48,
+    min_length: 6,
     include_rule: {
       numbers: true,
       symbols: true,
@@ -224,7 +225,7 @@
     symbols: [] as string[],
     repeats: [] as string[],
   });
-  let message = '';
+  const isSubmitting = ref(false);
 
   const typeMaxCount = computed(() => Object.values(formData.include_rule).filter((item) => item).length);
 
@@ -252,15 +253,8 @@
     });
   };
 
-  const { run: updatePasswordPolicyRun, loading: isSubmitting } = useRequest(updatePasswordPolicy, {
+  const { runAsync: updatePasswordPolicyRunAsync } = useRequest(updatePasswordPolicy, {
     manual: true,
-    onSuccess: () => {
-      Message({
-        theme: 'success',
-        message,
-      });
-      fetchData();
-    },
   });
 
   watch(
@@ -275,27 +269,37 @@
     formRef.value.validate();
   };
 
-  const handleSubmit = async (reset = false) => {
-    if (!reset) {
+  const handleSubmit = async () => {
+    isSubmitting.value = true;
+    try {
       await formRef.value.validate();
-      message = t('保存成功');
-    } else {
-      message = t('重置成功');
-      formRef.value.clearValidate();
+      await updatePasswordPolicyRunAsync({
+        ...passwordPolicyData,
+        rule: {
+          ...formData,
+          symbols_allowed: _.uniq(formData.symbols_allowed.split('')).join(''),
+        },
+        reset: false,
+      });
+      messageSuccess(t('保存成功'));
+      fetchData();
+    } finally {
+      isSubmitting.value = false;
     }
-    updatePasswordPolicyRun({
+  };
+
+  const handleReset = () =>
+    updatePasswordPolicyRunAsync({
       ...passwordPolicyData,
       rule: {
         ...formData,
         symbols_allowed: _.uniq(formData.symbols_allowed.split('')).join(''),
       },
-      reset,
+      reset: true,
+    }).then(() => {
+      messageSuccess(t('重置成功'));
+      fetchData();
     });
-  };
-
-  const handleReset = () => {
-    handleSubmit(true);
-  };
 </script>
 
 <style lang="less" scoped>