From 52de73f6fc13894cb2ec7305beadc40606ead509 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Fri, 10 May 2024 15:05:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/typings/api.d.ts                           |  4 ++--
 .../modules/user-manager-operate-drawer.vue    | 18 ++++++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index f0b1df4..ad66544 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -1150,9 +1150,9 @@ declare namespace Api {
       /** 用户名 */
       username: string;
       /** 密码 */
-      password: string;
+      password: string | null;
       /** 确认密码 */
-      checkPassword: string;
+      checkPassword?: string;
       /** 角色 */
       role: Role;
       /** 组 */
diff --git a/src/views/user/manager/modules/user-manager-operate-drawer.vue b/src/views/user/manager/modules/user-manager-operate-drawer.vue
index c1a66f8..64f3230 100644
--- a/src/views/user/manager/modules/user-manager-operate-drawer.vue
+++ b/src/views/user/manager/modules/user-manager-operate-drawer.vue
@@ -72,7 +72,7 @@ const rules = computed<RuleRecord>(() => {
   return {
     username: [defaultRequiredRule],
     password: formRules.pwd,
-    checkPassword: createConfirmPwdRule(model.password),
+    checkPassword: createConfirmPwdRule(model.password!),
     role: [defaultRequiredRule],
     permissions: [defaultRequiredRule]
   };
@@ -101,13 +101,10 @@ async function handleSubmit() {
   await validate();
   // request
   if (props.operateType === 'add') {
-    const { username, password, checkPassword, role, permissions } = model;
-    const passwordMd5 = md5(password);
-    const checkPasswordMd5 = md5(checkPassword);
+    const { username, password, role, permissions } = model;
     const { error } = await fetchAddUser({
       username,
-      password: passwordMd5,
-      checkPassword: checkPasswordMd5,
+      password: md5(password!),
       role,
       permissions
     });
@@ -116,20 +113,18 @@ async function handleSubmit() {
   }
 
   if (props.operateType === 'edit') {
-    const { id, username, password, checkPassword, role, permissions } = model;
-    const passwordMd5 = md5(password);
-    const checkPasswordMd5 = md5(checkPassword);
+    const { id, username, password, role, permissions } = model;
     const { error } = await fetchEditUser({
       id,
       username,
-      password: passwordMd5,
-      checkPassword: checkPasswordMd5,
+      password: updatePass.value ? md5(password!) : null,
       role,
       permissions
     });
     if (error) return;
     window.$message?.success($t('common.updateSuccess'));
   }
+
   closeDrawer();
   emit('submitted');
 }
@@ -219,7 +214,6 @@ function updatePermissions(p: OptionValue[]) {
       </NFormItem>
       <NFormItem v-if="model.role === 1" :label="$t('page.userManager.permissions')" path="permissions">
         <NTransfer
-          ref="transfer"
           v-model:value="valueRef"
           virtual-scroll
           :options="groupConfigs"