- {revision.attachments.map((file, index) => (
+ {revision.attachments.map((file) => (
{
- // B3 리비전 패턴: 단일 알파벳(A-Z) 또는 R01-R99
- const alphabetPattern = /^[A-Z]$/
- const numericPattern = /^R(0[1-9]|[1-9][0-9])$/
-
- return alphabetPattern.test(value) || numericPattern.test(value)
-}
-// B4 리비전 검증 함수
-const validateB4Revision = (value: string) => {
- // B4 리비전 패턴: R01-R99
- const numericPattern = /^R(0[1-9]|[1-9][0-9])$/
- return numericPattern.test(value)
-}
-// drawingKind에 따른 동적 스키마 생성
-const createRevisionUploadSchema = (drawingKind: string) => {
- const baseSchema = {
- usage: z.string().min(1, "Please select a usage"),
- comment: z.string().optional(),
- attachments: z
- .array(z.instanceof(File))
- .min(1, "Please upload at least 1 file")
- .refine(
- (files) => files.every((file) => file.size <= MAX_FILE_SIZE),
- "File size must be 50MB or less"
- ),
- }
- // B3와 B4에 따른 리비전 검증 추가
- const revisionField = drawingKind === 'B3'
- ? z.string()
- .min(1, "Please enter a revision")
- .max(3, "Revision must be 3 characters or less")
- .refine(
- validateB3Revision,
- "Invalid format. Use A-Z or R01-R99"
- )
- : z.string()
- .min(1, "Please enter a revision")
- .max(3, "Revision must be 3 characters or less")
- .refine(
- validateB4Revision,
- "Invalid format. Use R01-R99"
- )
-
- // B3인 경우에만 usageType 필드 추가
- if (drawingKind === 'B3') {
- return z.object({
- ...baseSchema,
- revision: revisionField,
- usageType: z.string().min(1, "Please select a usage type"),
- })
- } else {
- return z.object({
- ...baseSchema,
- revision: revisionField,
- usageType: z.string().optional(),
- })
- }
-}
-// drawingKind에 따른 용도 옵션
-const getUsageOptions = (drawingKind: string) => {
- switch (drawingKind) {
- case 'B3':
- return [
- { value: "Approval", label: "Approval" },
- { value: "Working", label: "Working" },
- { value: "Comments", label: "Comments" },
- ]
- case 'B4':
- return [
- { value: "Pre", label: "Pre" },
- { value: "Working", label: "Working" },
- ]
- case 'B5':
- return [
- { value: "Pre", label: "Pre" },
- { value: "Working", label: "Working" },
- ]
- default:
- return [
- { value: "Pre", label: "Pre" },
- { value: "Working", label: "Working" },
- ]
- }
-}
-// B3 전용 용도 타입 옵션
-const getUsageTypeOptions = (usage: string) => {
- switch (usage) {
- case 'Approval':
- return [
- { value: "Full", label: "Full" },
- { value: "Partial", label: "Partial" },
- ]
- case 'Working':
- return [
- { value: "Full", label: "Full" },
- { value: "Partial", label: "Partial" },
- ]
- case 'Comments':
- return [
- { value: "Comments", label: "Comments" },
- ]
- default:
- return []
- }
-}
-
-// 리비전 형식 가이드 생성
-const getRevisionGuide = (drawingKind: string) => {
- if (drawingKind === 'B3') {
- return {
- placeholder: "e.g., A, B, C or R01, R02",
- helpText: "Use single letter (A-Z) or R01-R99 format",
- examples: [
- "A, B, C, ... Z (alphabetic revisions)",
- "R01, R02, ... R99 (numeric revisions)"
- ]
- }
- }
- return {
- placeholder: "e.g., R01, R02, R03",
- helpText: "Enter in R01, R02, R03... format",
- examples: ["R01, R02, R03, ... R99"]
- }
-}
-
-// B3 리비전 자동 포맷팅 함수
-const formatB3RevisionInput = (value: string): string => {
- // 입력값을 대문자로 변환
- const upperValue = value.toUpperCase()
-
- // 단일 알파벳인 경우
- if (/^[A-Z]$/.test(upperValue)) {
- return upperValue
- }
-
- // R로 시작하는 경우
- if (upperValue.startsWith('R')) {
- // R 뒤의 숫자 추출
- const numPart = upperValue.slice(1).replace(/\D/g, '')
- if (numPart) {
- const num = parseInt(numPart, 10)
- // 1-99 범위 체크
- if (num >= 1 && num <= 99) {
- // 01-09는 0을 붙이고, 10-99는 그대로
- return `R${num.toString().padStart(2, '0')}`
- }
- }
- }
-
- return upperValue
-}
interface NewRevisionDialogProps {
open: boolean
@@ -217,7 +68,7 @@ interface NewRevisionDialogProps {
documentId: number
documentTitle?: string
drawingKind: string
- onSuccess?: (result?: any) => void
+ onSuccess?: (result?: unknown) => void
}
/* -------------------------------------------------------------------------------------------------
@@ -329,55 +180,6 @@ function FileUploadArea({
)
}
-/* -------------------------------------------------------------------------------------------------
- * Revision Input Component for B3
- * -----------------------------------------------------------------------------------------------*/
-function B3RevisionInput({
- value,
- onChange,
- error
-}: {
- value: string
- onChange: (value: string) => void
- error?: string
-}) {
- const [inputValue, setInputValue] = React.useState(value)
-
- const handleInputChange = (e: React.ChangeEvent
) => {
- const rawValue = e.target.value
- const formattedValue = formatB3RevisionInput(rawValue)
-
- // 길이 제한 (알파벳은 1자, R숫자는 3자)
- if (rawValue.length <= 3) {
- setInputValue(formattedValue)
- onChange(formattedValue)
- }
- }
-
- const revisionGuide = getRevisionGuide('B3')
-
- return (
-
-
-
-
-
- {revisionGuide.helpText}
-
- {revisionGuide.examples.map((example, idx) => (
-
• {example}
- ))}
-
-
Drawing Type: {drawingKind} | Serial No: {nextSerialNo}
{isLoadingSerialNo && (
-
+ <>
+
+
Loading...
+
)}
+ {/* 디버그용 임시 표시 */}
+
+ Debug: nextSerialNo={nextSerialNo}, isLoading={isLoadingSerialNo}
+
+
+
+
+
+ {revisionGuide.helpText}
+
+ {revisionGuide.examples.map((example, idx) => (
+
• {example}
+ ))}
+
+