jiangyc/ruoyi-plus-soybean
1
0
Fork 0
mirror of https://github.com/m-xlsea/ruoyi-plus-soybean.git synced 2025-09-24 07:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复正则校验问题

Browse Source
This commit is contained in:
xlsea
2025-04-24 18:21:53 +08:00
parent ed875f7786
commit e381db8ba7
7 changed files with 39 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/_builtin/login/modules/pwd-login.vue
View File

@ -40,8 +40,8 @@ const rules = computed<Record<RuleKey, App.Global.FormRule[]>>(() => {
const { formRules, createRequiredRule } = useFormRules();
const loginRules: Record<RuleKey, App.Global.FormRule[]> = {
username: formRules.userName,
password: formRules.pwd,
username: [...formRules.userName, { required: true }],
password: [...formRules.pwd, { required: true }],
code: captchaEnabled.value ? [createRequiredRule($t('form.code.required'))] : [],
tenantId: tenantEnabled.value ? formRules.tenantId : []
};

4
src/views/_builtin/login/modules/register.vue
View File

@ -35,8 +35,8 @@ const rules = computed<Record<RuleKey, App.Global.FormRule[]>>(() => {
return {
tenantId: tenantEnabled.value ? formRules.tenantId : [],
username: formRules.userName,
password: formRules.pwd,
username: [...formRules.userName, { required: true }],
password: [...formRules.pwd, { required: true }],
confirmPassword: createConfirmPwdRule(model.password!),
code: captchaEnabled.value ? [createRequiredRule($t('form.code.required'))] : []
};

4
src/views/system/user/index.vue
View File

@ -10,7 +10,6 @@ import { useAuth } from '@/hooks/business/auth';
import ButtonIcon from '@/components/custom/button-icon.vue';
import DictTag from '@/components/custom/dict-tag.vue';
import { $t } from '@/locales';
import ButtonPopconfirm from '@/components/custom/button-popconfirm.vue';
import UserOperateDrawer from './modules/user-operate-drawer.vue';
import UserSearch from './modules/user-search.vue';
@ -129,10 +128,11 @@ const {
return null;
}
return (
<ButtonPopconfirm
<ButtonIcon
text
type="error"
icon="material-symbols:delete-outline"
tooltipContent={$t('common.delete')}
popconfirmContent={$t('common.confirmDelete')}
onPositiveClick={() => handleDelete(row.userId!)}
/>

2
src/views/system/user/modules/user-operate-drawer.vue
View File

@ -70,7 +70,7 @@ type RuleKey = Extract<keyof Model, 'userName' | 'nickName' | 'password' | 'stat
const rules: Record<RuleKey, App.Global.FormRule[]> = {
userName: [createRequiredRule('用户名称不能为空')],
nickName: [createRequiredRule('用户昵称不能为空')],
password: [createRequiredRule('密码不能为空'), patternRules.pwd],
password: [{ ...patternRules.pwd, required: true }],
phonenumber: [patternRules.phone],
status: [createRequiredRule('帐号状态不能为空')]
};