Merge branch 'dujinkim' of https://github.com/DTS-Development/SHI_EVCP into dujinkim

1 files changed, 11 insertions, 3 deletions

diff --git a/lib/docu-list-rule/code-groups/table/code-groups-add-dialog.tsx b/lib/docu-list-rule/code-groups/table/code-groups-add-dialog.tsx
index 660adfed..bf044f1a 100644
--- a/lib/docu-list-rule/code-groups/table/code-groups-add-dialog.tsx
+++ b/lib/docu-list-rule/code-groups/table/code-groups-add-dialog.tsx
@@ -19,6 +19,7 @@ import {
 import {
   Form,
   FormControl,
+  FormDescription,
   FormField,
   FormItem,
   FormLabel,
@@ -39,8 +40,8 @@ const createCodeGroupSchema = z.object({
   description: z.string().min(1, "Description은 필수입니다."),
   codeFormat: z.string().optional().refine((val) => {
     if (!val) return true; // 빈 값은 허용
-    return /^[AN]*$/.test(val);
-  }, "Code Format은 A(영어 대문자) 또는 N(숫자)만 입력 가능합니다."),
+    return /^[ANX]*$/.test(val);
+  }, "Code Format은 A(영어 대문자), N(숫자), X(영어/숫자)만 입력 가능합니다."),
   controlType: z.string().min(1, "Control Type은 필수입니다."),
 })
 
@@ -80,6 +81,8 @@ export function CodeGroupsAddDialog({ onSuccess }: CodeGroupsAddDialogProps) {
           expression += `[A-Z]{${count}}`
         } else if (currentChar === 'N') {
           expression += `[0-9]{${count}}`
+        } else if (currentChar === 'X') {
+          expression += `[A-Z0-9]{${count}}`
         }
         currentChar = codeFormat[i]
         count = 1
@@ -91,6 +94,8 @@ export function CodeGroupsAddDialog({ onSuccess }: CodeGroupsAddDialogProps) {
       expression += `[A-Z]{${count}}`
     } else if (currentChar === 'N') {
       expression += `[0-9]{${count}}`
+    } else if (currentChar === 'X') {
+      expression += `[A-Z0-9]{${count}}`
     }
     
     expression += '$'
@@ -177,11 +182,14 @@ export function CodeGroupsAddDialog({ onSuccess }: CodeGroupsAddDialogProps) {
                   <FormLabel>Code Format</FormLabel>
                   <FormControl>
                     <Input 
-                      placeholder="예: AANNN (A:영어대문자, N:숫자)" 
+                      placeholder="예: AANNN (A:영어대문자, N:숫자, X:영어/숫자)" 
                       {...field}
                       onBlur={() => form.trigger('codeFormat')}
                     />
                   </FormControl>
+                  <FormDescription>
+                    A: 영어 대문자, N: 숫자, X: 영어 대문자 또는 숫자
+                  </FormDescription>
                   <FormMessage />
                 </FormItem>
               )}