에러 수정

2025-12-18 16:35:55 +09:00
parent 66bd21ee65
commit 84efaed1eb
16 changed files with 331 additions and 82 deletions
--- a/frontend/components/admin/MenuCopyDialog.tsx
+++ b/frontend/components/admin/MenuCopyDialog.tsx
@@ -61,6 +61,7 @@ export function MenuCopyDialog({
  const [copyNumberingRules, setCopyNumberingRules] = useState(false);
  const [copyCategoryMapping, setCopyCategoryMapping] = useState(false);
  const [copyTableTypeColumns, setCopyTableTypeColumns] = useState(false);
+  const [copyCascadingRelation, setCopyCascadingRelation] = useState(false);

  // 회사 목록 로드
  useEffect(() => {
@@ -76,6 +77,7 @@ export function MenuCopyDialog({
      setCopyNumberingRules(false);
      setCopyCategoryMapping(false);
      setCopyTableTypeColumns(false);
+      setCopyCascadingRelation(false);
    }
  }, [open]);

@@ -128,6 +130,7 @@ export function MenuCopyDialog({
        copyNumberingRules,
        copyCategoryMapping,
        copyTableTypeColumns,
+        copyCascadingRelation,
      };

      const response = await menuApi.copyMenu(
@@ -344,6 +347,20 @@ export function MenuCopyDialog({
                    테이블 타입관리 입력타입 설정 복사
                  </Label>
                </div>
+                <div className="flex items-center gap-2">
+                  <Checkbox
+                    id="copyCascadingRelation"
+                    checked={copyCascadingRelation}
+                    onCheckedChange={(checked) => setCopyCascadingRelation(checked as boolean)}
+                    disabled={copying}
+                  />
+                  <Label
+                    htmlFor="copyCascadingRelation"
+                    className="text-xs cursor-pointer"
+                  >
+                    연쇄관계 설정 복사
+                  </Label>
+                </div>
              </div>
            </div>
          )}
@@ -410,6 +427,12 @@ export function MenuCopyDialog({
                    <span className="font-medium">{result.copiedTableTypeColumns}개</span>
                  </div>
                )}
+                {(result.copiedCascadingRelations ?? 0) > 0 && (
+                  <div>
+                    <span className="text-muted-foreground">연쇄관계:</span>{" "}
+                    <span className="font-medium">{result.copiedCascadingRelations}개</span>
+                  </div>
+                )}
              </div>
            </div>
          )}
--- a/frontend/contexts/ActiveTabContext.tsx
+++ b/frontend/contexts/ActiveTabContext.tsx
@@ -138,3 +138,4 @@ export const useActiveTabOptional = () => {
 };


+
--- a/frontend/hooks/useAutoFill.ts
+++ b/frontend/hooks/useAutoFill.ts
@@ -195,3 +195,4 @@ export function applyAutoFillToFormData(



+
--- a/frontend/lib/api/menu.ts
+++ b/frontend/lib/api/menu.ts
@@ -163,7 +163,7 @@ export const menuApi = {
    }
  },

-  // 메뉴 복사
+  // 메뉴 복사 (타임아웃 5분 - 대량 데이터 처리)
  copyMenu: async (
    menuObjid: number,
    targetCompanyCode: string,
@@ -176,6 +176,7 @@ export const menuApi = {
      copyNumberingRules?: boolean;
      copyCategoryMapping?: boolean;
      copyTableTypeColumns?: boolean;
+      copyCascadingRelation?: boolean;
    }
  ): Promise<ApiResponse<MenuCopyResult>> => {
    try {
@@ -185,11 +186,24 @@ export const menuApi = {
          targetCompanyCode,
          screenNameConfig,
          additionalCopyOptions 
+        },
+        {
+          timeout: 300000, // 5분 (메뉴 복사는 많은 데이터를 처리하므로 긴 타임아웃 필요)
        }
      );
      return response.data;
    } catch (error: any) {
      console.error("❌ 메뉴 복사 실패:", error);
+      
+      // 타임아웃 에러 구분 처리
+      if (error.code === "ECONNABORTED" || error.message?.includes("timeout")) {
+        return {
+          success: false,
+          message: "메뉴 복사 요청 시간이 초과되었습니다. 백엔드에서 작업이 완료되었을 수 있으니 잠시 후 확인해주세요.",
+          errorCode: "MENU_COPY_TIMEOUT",
+        };
+      }
+      
      return {
        success: false,
        message: error.response?.data?.message || "메뉴 복사 중 오류가 발생했습니다",
@@ -211,6 +225,7 @@ export interface MenuCopyResult {
  copiedNumberingRules?: number;
  copiedCategoryMappings?: number;
  copiedTableTypeColumns?: number;
+  copiedCascadingRelations?: number;
  menuIdMap: Record<number, number>;
  screenIdMap: Record<number, number>;
  flowIdMap: Record<number, number>;
--- a/frontend/lib/registry/components/universal-form-modal/UniversalFormModalComponent.tsx
+++ b/frontend/lib/registry/components/universal-form-modal/UniversalFormModalComponent.tsx
@@ -269,7 +269,7 @@ export function UniversalFormModalComponent({
      // 설정에 정의된 필드 columnName 목록 수집
      const configuredFields = new Set<string>();
      config.sections.forEach((section) => {
-        section.fields.forEach((field) => {
+        (section.fields || []).forEach((field) => {
          if (field.columnName) {
            configuredFields.add(field.columnName);
          }
@@ -319,7 +319,7 @@ export function UniversalFormModalComponent({

      // 모든 섹션의 필드에서 linkedFieldGroup.sourceTable 수집
      config.sections.forEach((section) => {
-        section.fields.forEach((field) => {
+        (section.fields || []).forEach((field) => {
          if (field.linkedFieldGroup?.enabled && field.linkedFieldGroup?.sourceTable) {
            tablesToLoad.add(field.linkedFieldGroup.sourceTable);
          }
@@ -374,7 +374,7 @@ export function UniversalFormModalComponent({
        newRepeatSections[section.id] = items;
      } else {
        // 일반 섹션 필드 초기화
-        for (const field of section.fields) {
+        for (const field of section.fields || []) {
          // 기본값 설정
          let value = field.defaultValue ?? "";

@@ -405,7 +405,7 @@ export function UniversalFormModalComponent({
                console.log(`[initializeForm] 옵셔널 그룹 자동 활성화: ${key}, triggerField=${group.triggerField}, value=${triggerValue}`);
                
                // 활성화된 그룹의 필드값도 초기화
-                for (const field of group.fields) {
+                for (const field of group.fields || []) {
                  let value = field.defaultValue ?? "";
                  const parentField = field.parentFieldName || field.columnName;
                  if (effectiveInitialData[parentField] !== undefined) {
@@ -448,7 +448,7 @@ export function UniversalFormModalComponent({
      _index: index,
    };

-    for (const field of section.fields) {
+    for (const field of section.fields || []) {
      item[field.columnName] = field.defaultValue ?? "";
    }

@@ -481,7 +481,7 @@ export function UniversalFormModalComponent({
      for (const section of config.sections) {
        if (section.repeatable) continue;

-        for (const field of section.fields) {
+        for (const field of section.fields || []) {
          if (
            field.numberingRule?.enabled &&
            field.numberingRule?.generateOnOpen &&
@@ -653,7 +653,7 @@ export function UniversalFormModalComponent({
    }

    // 옵셔널 필드 그룹 필드 값 초기화
-    group.fields.forEach((field) => {
+    (group.fields || []).forEach((field) => {
      handleFieldChange(field.columnName, field.defaultValue || "");
    });
  }, [config, handleFieldChange]);
@@ -783,7 +783,7 @@ export function UniversalFormModalComponent({
    for (const section of config.sections) {
      if (section.repeatable) continue; // 반복 섹션은 별도 검증

-      for (const field of section.fields) {
+      for (const field of section.fields || []) {
        if (field.required && !field.hidden && !field.numberingRule?.hidden) {
          const value = formData[field.columnName];
          if (value === undefined || value === null || value === "") {
@@ -809,7 +809,7 @@ export function UniversalFormModalComponent({

    // 저장 시점 채번규칙 처리 (generateOnSave만 처리)
    for (const section of config.sections) {
-      for (const field of section.fields) {
+      for (const field of section.fields || []) {
        if (field.numberingRule?.enabled && field.numberingRule?.generateOnSave && field.numberingRule?.ruleId) {
          const response = await allocateNumberingCode(field.numberingRule.ruleId);
          if (response.success && response.data?.generatedCode) {
@@ -840,7 +840,7 @@ export function UniversalFormModalComponent({
    // 공통 필드가 설정되지 않은 경우, 기본정보 섹션의 모든 필드를 공통 필드로 사용
    if (commonFields.length === 0) {
      const nonRepeatableSections = config.sections.filter((s) => !s.repeatable);
-      commonFields = nonRepeatableSections.flatMap((s) => s.fields.map((f) => f.columnName));
+      commonFields = nonRepeatableSections.flatMap((s) => (s.fields || []).map((f) => f.columnName));
    }

    // 반복 섹션 ID가 설정되지 않은 경우, 첫 번째 반복 섹션 사용
@@ -886,7 +886,7 @@ export function UniversalFormModalComponent({

      // 반복 섹션의 필드 값 추가
      const repeatSection = config.sections.find((s) => s.id === repeatSectionId);
-      repeatSection?.fields.forEach((field) => {
+      (repeatSection?.fields || []).forEach((field) => {
        if (item[field.columnName] !== undefined) {
          subRow[field.columnName] = item[field.columnName];
        }
@@ -903,7 +903,7 @@ export function UniversalFormModalComponent({
    for (const section of config.sections) {
      if (section.repeatable) continue;

-      for (const field of section.fields) {
+      for (const field of section.fields || []) {
        if (field.numberingRule?.enabled && field.numberingRule?.ruleId) {
          // generateOnSave 또는 generateOnOpen 모두 저장 시 실제 순번 할당
          const shouldAllocate = field.numberingRule.generateOnSave || field.numberingRule.generateOnOpen;
@@ -952,7 +952,7 @@ export function UniversalFormModalComponent({
    const mainData: Record<string, any> = {};
    config.sections.forEach((section) => {
      if (section.repeatable) return; // 반복 섹션은 제외
-      section.fields.forEach((field) => {
+      (section.fields || []).forEach((field) => {
        const value = formData[field.columnName];
        if (value !== undefined && value !== null && value !== "") {
          mainData[field.columnName] = value;
@@ -964,7 +964,7 @@ export function UniversalFormModalComponent({
    for (const section of config.sections) {
      if (section.repeatable) continue;

-      for (const field of section.fields) {
+      for (const field of section.fields || []) {
        // 채번규칙이 활성화된 필드 처리
        if (field.numberingRule?.enabled && field.numberingRule?.ruleId) {
          // 신규 생성이거나 값이 없는 경우에만 채번
@@ -1055,7 +1055,7 @@ export function UniversalFormModalComponent({
            else {
              config.sections.forEach((section) => {
                if (section.repeatable) return;
-                const matchingField = section.fields.find((f) => f.columnName === mapping.targetColumn);
+                const matchingField = (section.fields || []).find((f) => f.columnName === mapping.targetColumn);
                if (matchingField && mainData[matchingField.columnName] !== undefined) {
                  mainFieldMappings!.push({
                    formField: matchingField.columnName,
@@ -1560,7 +1560,7 @@ export function UniversalFormModalComponent({
              <CardContent>
                <div className="grid gap-4" style={{ gridTemplateColumns: `repeat(12, 1fr)` }}>
                  {/* 일반 필드 렌더링 */}
-                  {section.fields.map((field) =>
+                  {(section.fields || []).map((field) =>
                    renderFieldWithColumns(
                      field,
                      formData[field.columnName],
@@ -1582,7 +1582,7 @@ export function UniversalFormModalComponent({
            <CardContent>
              <div className="grid gap-4" style={{ gridTemplateColumns: `repeat(12, 1fr)` }}>
                {/* 일반 필드 렌더링 */}
-                {section.fields.map((field) =>
+                {(section.fields || []).map((field) =>
                  renderFieldWithColumns(
                    field,
                    formData[field.columnName],
@@ -1719,7 +1719,7 @@ export function UniversalFormModalComponent({
          </div>
          <CollapsibleContent>
            <div className="grid gap-3 px-3 pb-3" style={{ gridTemplateColumns: "repeat(12, 1fr)" }}>
-              {group.fields.map((field) =>
+              {(group.fields || []).map((field) =>
                renderFieldWithColumns(
                  field,
                  formData[field.columnName],
@@ -1763,7 +1763,7 @@ export function UniversalFormModalComponent({
          </Button>
        </div>
        <div className="grid gap-3" style={{ gridTemplateColumns: "repeat(12, 1fr)" }}>
-          {group.fields.map((field) =>
+          {(group.fields || []).map((field) =>
            renderFieldWithColumns(
              field,
              formData[field.columnName],
@@ -1819,7 +1819,7 @@ export function UniversalFormModalComponent({
                </div>
                <div className="grid gap-4" style={{ gridTemplateColumns: `repeat(12, 1fr)` }}>
                  {/* 일반 필드 렌더링 */}
-                  {section.fields.map((field) =>
+                  {(section.fields || []).map((field) =>
                    renderFieldWithColumns(
                      field,
                      item[field.columnName],
@@ -1898,7 +1898,7 @@ export function UniversalFormModalComponent({
        <div className="text-muted-foreground text-center">
          <p className="font-medium">{config.modal.title || "범용 폼 모달"}</p>
          <p className="mt-1 text-xs">
-            {config.sections.length}개 섹션 |{config.sections.reduce((acc, s) => acc + s.fields.length, 0)}개 필드
+            {config.sections.length}개 섹션 |{config.sections.reduce((acc, s) => acc + (s.fields?.length || 0), 0)}개 필드
          </p>
          <p className="mt-1 text-xs">저장 테이블: {config.saveConfig.tableName || "(미설정)"}</p>
        </div>
				`@@ -138,3 +138,4 @@ export const useActiveTabOptional = () => {`
				`};`
				`@@ -195,3 +195,4 @@ export function applyAutoFillToFormData(`