Merge branch 'master' of https://gitee.com/youlaiorg/vue3-element-admin

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>
 

src/views/system/user/index.vue

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