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({ 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( - `确认要${ - row.status === 0 ? "停用" : "启用" - }${ - row.roleName + `确认要${row.status === 0 ? "停用" : "启用" + }${row.roleName }吗?`, "系统提示", { @@ -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;