From e58ea7d14ed8ddf19837440ce90ccfc37500c119 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Sun, 27 Apr 2025 17:10:43 +0800
Subject: [PATCH] =?UTF-8?q?refactor(login):=20=E7=A6=81=E7=94=A8=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=E9=AA=8C=E8=AF=81=E4=BB=A5=E6=8F=90?=
 =?UTF-8?q?=E9=AB=98=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refactor(system/role): 简化角色状态变更提示信息并优化菜单列表查询条件

在登录模块中，禁用了密码格式验证，以避免用户在输入密码时遇到不必要的限制。在系统角色模块中，简化了角色状态变更的提示信息，并优化了菜单列表的查询条件，使其更加灵活。
---
 src/views/login/utils/rule.ts        | 2 +-
 src/views/system/role/utils/hook.tsx | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/login/utils/rule.ts b/src/views/login/utils/rule.ts
index 5a0eb45..e7d135a 100644
--- a/src/views/login/utils/rule.ts
+++ b/src/views/login/utils/rule.ts
@@ -17,7 +17,7 @@ const loginRules = reactive<FormRules>({
       validator: (rule, value, callback) => {
         if (value === "") {
           callback(new Error("请输入密码"));
-        } else if (!REGEXP_PWD.test(value)) {
+        } else if (false && !REGEXP_PWD.test(value)) {
           callback(
             new Error("密码格式应为8-18位数字、字母、符号的任意两种组合")
           );
diff --git a/src/views/system/role/utils/hook.tsx b/src/views/system/role/utils/hook.tsx
index 280ad5b..8614623 100644
--- a/src/views/system/role/utils/hook.tsx
+++ b/src/views/system/role/utils/hook.tsx
@@ -94,10 +94,8 @@ export function useRole() {
 
   function onChange({ row, index }) {
     ElMessageBox.confirm(
-      `确认要<strong>${
-        row.status === 0 ? "停用" : "启用"
-      }</strong><strong style='color:var(--el-color-primary)'>${
-        row.roleName
+      `确认要<strong>${row.status === 0 ? "停用" : "启用"
+      }</strong><strong style='color:var(--el-color-primary)'>${row.roleName
       }</strong>吗?`,
       "系统提示",
       {
@@ -176,7 +174,7 @@ export function useRole() {
     if (menuTree.value?.length) {
       return menuTree.value;
     }
-    const { data } = await getMenuListApi({ isButton: false });
+    const { data } = await getMenuListApi({ isButton: undefined });
     console.log("menu data", data);
     menuTree.value = toTree(data, "id", "parentId");
     return menuTree.value;