GTsoft/ruoyi-plus-soybean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
xlsea 2025-07-08 23:06:21 +08:00
commit 247b98a542
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hooks/common/form.ts
View File

@ -2,6 +2,7 @@ import { ref, toValue } from 'vue';
import type { ComputedRef, Ref } from 'vue'; import type { ComputedRef, Ref } from 'vue';
import type { FormInst } from 'naive-ui'; import type { FormInst } from 'naive-ui';
import { REG_CODE_SIX, REG_EMAIL, REG_PHONE, REG_PWD, REG_USER_NAME } from '@/constants/reg'; import { REG_CODE_SIX, REG_EMAIL, REG_PHONE, REG_PWD, REG_USER_NAME } from '@/constants/reg';
import { isNull } from '@/utils/common';
import { $t } from '@/locales'; import { $t } from '@/locales';
export function useFormRules() { export function useFormRules() {
@ -52,7 +53,7 @@ export function useFormRules() {
required: true, required: true,
trigger: ['input', 'blur'], trigger: ['input', 'blur'],
validator: (_rule: any, value: any) => { validator: (_rule: any, value: any) => {
if (value === null || value === undefined || value === '') { if (isNull(value) || (Array.isArray(value) && value.length === 0)) {
return new Error(message); return new Error(message);
} }
return true; return true;

4
src/utils/common.ts
View File

@ -78,12 +78,12 @@ export function humpToLine(str: string, line: string = '-') {
/** 判断是否为空 */ /** 判断是否为空 */
export function isNotNull(value: any) { export function isNotNull(value: any) {
return value !== undefined && value !== null && value !== '' && value !== 'undefined' && value !== 'null'; return value !== undefined && value !== null && value !== '';
} }
/** 判断是否为空 */ /** 判断是否为空 */
export function isNull(value: any) { export function isNull(value: any) {
return value === undefined || value === null || value === '' || value === 'undefined' || value === 'null'; return value === undefined || value === null || value === '';
} }
/** 判断是否为图片类型 */ /** 判断是否为图片类型 */

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

@ -65,14 +65,15 @@ function createDefaultModel(): Model {
}; };
} }
type RuleKey = Extract<keyof Model, 'userName' | 'nickName' | 'password' | 'status' | 'phonenumber'>; type RuleKey = Extract<keyof Model, 'userName' | 'nickName' | 'password' | 'status' | 'phonenumber' | 'roleIds'>;
const rules: Record<RuleKey, App.Global.FormRule[]> = { const rules: Record<RuleKey, App.Global.FormRule[]> = {
userName: [createRequiredRule($t('page.system.user.form.userName.required'))], userName: [createRequiredRule($t('page.system.user.form.userName.required'))],
nickName: [createRequiredRule($t('page.system.user.form.nickName.required'))], nickName: [createRequiredRule($t('page.system.user.form.nickName.required'))],
password: [{ ...patternRules.pwd, required: props.operateType === 'add' }], password: [{ ...patternRules.pwd, required: props.operateType === 'add' }],
phonenumber: [patternRules.phone], phonenumber: [patternRules.phone],
status: [createRequiredRule($t('page.system.user.form.status.required'))] status: [createRequiredRule($t('page.system.user.form.status.required'))],
roleIds: [{ ...createRequiredRule('请选择角色'), type: 'array' }]
}; };
async function getUserInfo() { async function getUserInfo() {