From 208104d596bc784d3e261e7664af5a13cf199302 Mon Sep 17 00:00:00 2001
From: skyselang <215817969@qq.com>
Date: Thu, 9 May 2024 15:49:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=97=B6=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=BC=B9=E6=A1=86=E9=A1=B5=E9=9D=A2=E6=8A=96=E5=8A=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Settings/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index a2e3b46e..65c9c6f8 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -3,6 +3,7 @@
     v-model="settingsVisible"
     size="300"
     :title="$t('settings.project')"
+    :lockScroll="false"
   >
     <el-divider>{{ $t("settings.theme") }}</el-divider>
 

From aa8bc5d5122cc04150208874de56357a479ed51c Mon Sep 17 00:00:00 2001
From: dreamnyj <dreamnyj@qq.com>
Date: Sat, 11 May 2024 20:34:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=8F=91=E9=80=81=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=87=8D=E5=90=AF=E5=AF=86=E7=A0=81=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=80=E5=B0=91=E4=B8=BA6=E4=BD=8D=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=EF=BC=88=E5=B0=8F=E4=BA=8E6=E4=BD=8D=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=85=81=E8=AE=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 5e98bf53..8b202496 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -445,8 +445,9 @@ function resetPassword(row: { [key: string]: any }) {
       cancelButtonText: "取消",
     }
   ).then(({ value }) => {
-    if (!value) {
-      ElMessage.warning("请输入新密码");
+    if (!value || value.length < 6) {
+      // 检查密码是否为空或少于6位
+      ElMessage.warning("密码至少需要6位字符，请重新输入");
       return false;
     }
     UserAPI.updatePassword(row.id, value).then(() => {