feat: added mandatory check presets for multiple selections

vbenjs · Jan 13, 2025 · a91019a · a91019a
1 parent eec4265
commit a91019a
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 1 deletion.
diff --git a/apps/web-antd/src/adapter/form.ts b/apps/web-antd/src/adapter/form.ts
@@ -36,6 +36,12 @@ setupVbenForm<ComponentType>({
       }
       return true;
     },
+    multipleRequired: (value, _params, ctx) => {
+      if (value === undefined || value === null || value.length === 0) {
+        return $t('ui.formRules.selectRequired', [ctx.label]);
+      }
+      return true;
+    },
   },
 });
 

diff --git a/apps/web-ele/src/adapter/form.ts b/apps/web-ele/src/adapter/form.ts
@@ -28,6 +28,12 @@ setupVbenForm<ComponentType>({
       }
       return true;
     },
+    multipleRequired: (value, _params, ctx) => {
+      if (value === undefined || value === null || value.length === 0) {
+        return $t('ui.formRules.selectRequired', [ctx.label]);
+      }
+      return true;
+    },
   },
 });
 

diff --git a/apps/web-naive/src/adapter/form.ts b/apps/web-naive/src/adapter/form.ts
@@ -32,6 +32,12 @@ setupVbenForm<ComponentType>({
       }
       return true;
     },
+    multipleRequired: (value, _params, ctx) => {
+      if (value === undefined || value === null || value.length === 0) {
+        return $t('ui.formRules.selectRequired', [ctx.label]);
+      }
+      return true;
+    },
   },
 });
 

diff --git a/docs/src/_env/adapter/form.ts b/docs/src/_env/adapter/form.ts
@@ -24,6 +24,12 @@ setupVbenForm<ComponentType>({
     },
   },
   defineRules: {
+    multipleRequired: (value, _params, ctx) => {
+      if (value === undefined || value === null || value.length === 0) {
+        return $t('ui.formRules.selectRequired', [ctx.label]);
+      }
+      return true;
+    },
     required: (value, _params, ctx) => {
       if (value === undefined || value === null || value.length === 0) {
         return $t('ui.formRules.required', [ctx.label]);

diff --git a/docs/src/components/common-ui/vben-form.md b/docs/src/components/common-ui/vben-form.md
@@ -48,6 +48,12 @@ setupVbenForm<ComponentType>({
     },
   },
   defineRules: {
+    multipleRequired: (value, _params, ctx) => {
+      if (value === undefined || value === null || value.length === 0) {
+        return $t('ui.formRules.selectRequired', [ctx.label]);
+      }
+      return true;
+    },
     // 输入项目必填国际化适配
     required: (value, _params, ctx) => {
       if (value === undefined || value === null || value.length === 0) {

diff --git a/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue b/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue
@@ -109,7 +109,9 @@ const shouldRequired = computed(() => {
   }
 
   if (isString(currentRules.value)) {
-    return ['required', 'selectRequired'].includes(currentRules.value);
+    return ['multipleRequired', 'required', 'selectRequired'].includes(
+      currentRules.value,
+    );
   }
 
   let isOptional = currentRules?.value?.isOptional?.();

diff --git a/packages/@core/ui-kit/form-ui/src/types.ts b/packages/@core/ui-kit/form-ui/src/types.ts
@@ -395,6 +395,11 @@ export interface VbenFormAdapterOptions<
     modelPropNameMap?: Partial<Record<T, string>>;
   };
   defineRules?: {
+    multipleRequired?: (
+      value: any,
+      params: any,
+      ctx: Record<string, any>,
+    ) => boolean | string;
     required?: (
       value: any,
       params: any,

diff --git a/playground/src/adapter/form.ts b/playground/src/adapter/form.ts
@@ -21,6 +21,12 @@ setupVbenForm<ComponentType>({
     },
   },
   defineRules: {
+    multipleRequired: (value, _params, ctx) => {
+      if (value === undefined || value === null || value.length === 0) {
+        return $t('ui.formRules.selectRequired', [ctx.label]);
+      }
+      return true;
+    },
     // 输入项目必填国际化适配
     required: (value, _params, ctx) => {
       if (value === undefined || value === null || value.length === 0) {