From 89afb4a7dde11292f4b34cb728bdc4f1860b1917 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 13 Jan 2026 14:05:54 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
packages/utils/common/index.js | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/packages/utils/common/index.js b/packages/utils/common/index.js
index 962fc3e..7f36aa7 100644
--- a/packages/utils/common/index.js
+++ b/packages/utils/common/index.js
@@ -1,11 +1,16 @@
-export function fieldRules(required, max) {
+export function fieldRules(required,isSelect = false, max = 50, ) {
const trigger = ['blur', 'change']
- return [
- required ? { required: true, message: max ? '请输入' : '请选择', trigger } : {},
- max ? { max, message: `长度不超过${max}`, trigger } : {},
- ]
+ const rules = []
+ if (required) {
+ rules.push({ required: true, message: isSelect ? '请选择' : '请输入', trigger, })
+ }
+ if (!isSelect) {
+ rules.push({ max, message: `长度不超过${max}`, trigger })
+ }
+ return rules
}
+
export function getDictLabel(value, dictList) {
return dictList.find(item => item.dictKey === value)?.dictValue || value || '-'
}
--
Gitblit v1.9.3