@simplysm/angular 14.0.38 → 14.0.39

package/src/data/data-detail/sd-data-detail.base.ts

@@ -1,6 +1,7 @@
 import {
   Directive,
   effect,
+  ErrorHandler,
   inject,
   output,
   signal,
@@ -15,6 +16,7 @@ import { injectViewTypeSignal } from "../../core/routing/injectViewTypeSignal";
 import { withBusy } from "../../core/withBusy";
 import { type SdModalContentDef } from "../../core/modal/sd-modal.provider";
 import { SdToastProvider } from "../../core/toast/sd-toast.provider";
+import { getOrmDataEditToastErrorMessage } from "../getOrmDataEditToastErrorMessage";
 
 export interface SdDataDetailDataInfo {
   isNew: boolean;
@@ -47,6 +49,7 @@ export abstract class SdDataDetailBase<T extends object, R = boolean>
 
   private readonly _sdToast = inject(SdToastProvider);
   private readonly _sdSharedData = inject(SdSharedDataProvider);
+  private readonly _errorHandler = inject(ErrorHandler);
 
   viewType = injectViewTypeSignal(() => this);
 
@@ -72,20 +75,24 @@ export abstract class SdDataDetailBase<T extends object, R = boolean>
       });
 
       queueMicrotask(async () => {
-        if (cancelled) return;
-
-        if (!this.canUse()) {
+        try {
+          if (cancelled) return;
+
+          if (!this.canUse()) {
+            this.initialized.set(true);
+            return;
+          }
+
+          await withBusy(this.busyCount, () =>
+            this._sdToast.try(async () => {
+              await this._sdSharedData.wait();
+              await this.refresh();
+            }),
+          );
           this.initialized.set(true);
-          return;
+        } catch (err) {
+          this._errorHandler.handleError(err);
         }
-
-        await withBusy(this.busyCount, () =>
-          this._sdToast.try(async () => {
-            await this._sdSharedData.wait();
-            await this.refresh();
-          }),
-        );
-        this.initialized.set(true);
       });
     });
 
@@ -137,7 +144,7 @@ export abstract class SdDataDetailBase<T extends object, R = boolean>
 
           this.close.emit(result);
         },
-        (err) => this._getOrmDataEditToastErrorMessage(err),
+        (err) => getOrmDataEditToastErrorMessage(err),
       ),
     );
   }
@@ -172,19 +179,9 @@ export abstract class SdDataDetailBase<T extends object, R = boolean>
 
           await this.refresh();
         },
-        (err) => this._getOrmDataEditToastErrorMessage(err),
+        (err) => getOrmDataEditToastErrorMessage(err),
       ),
     );
   }
 
-  private _getOrmDataEditToastErrorMessage(err: unknown) {
-    const message = err instanceof Error ? err.message : String(err);
-    if (
-      message.includes("a parent row: a foreign key constraint") ||
-      message.includes("conflicted with the REFERENCE")
-    ) {
-      return "경고! 연결된 작업에 의한 처리 거부. 후속작업 확인 요망";
-    }
-    return message;
-  }
 }

package/src/data/data-sheet/sd-data-sheet.base.ts

@@ -25,6 +25,7 @@ import { injectDataSheetRefreshManager } from "./injectDataSheetRefreshManager";
 import { injectDataSheetInlineEditManager } from "./injectDataSheetInlineEditManager";
 import { injectDataSheetModalEditManager } from "./injectDataSheetModalEditManager";
 import { injectDataSheetExcelManager } from "./injectDataSheetExcelManager";
+import { getOrmDataEditToastErrorMessage } from "../getOrmDataEditToastErrorMessage";
 
 export type {
   SdDataSheetItemPropInfo,
@@ -197,7 +198,7 @@ export abstract class SdDataSheetBase<
       refresh: () => this._refreshMgr.refresh(),
       getNewItemFn: () => this.newItem?.bind(this),
       getSubmitFn: () => this.submit?.bind(this),
-      errorMessageFn: (err) => this._getOrmDataEditToastErrorMessage(err),
+      errorMessageFn: (err) => getOrmDataEditToastErrorMessage(err),
     });
 
     //-- modal edit composable
@@ -210,7 +211,7 @@ export abstract class SdDataSheetBase<
       refresh: () => this._refreshMgr.refresh(),
       getEditItemFn: () => this.editItem?.bind(this),
       getToggleDeleteItemsFn: () => this.toggleDeleteItems?.bind(this),
-      errorMessageFn: (err) => this._getOrmDataEditToastErrorMessage(err),
+      errorMessageFn: (err) => getOrmDataEditToastErrorMessage(err),
     });
 
     //-- excel composable
@@ -220,7 +221,7 @@ export abstract class SdDataSheetBase<
       refresh: () => this._refreshMgr.refresh(),
       getDownloadExcelFn: () => this.downloadExcel?.bind(this),
       getUploadExcelFn: () => this.uploadExcel?.bind(this),
-      errorMessageFn: (err) => this._getOrmDataEditToastErrorMessage(err),
+      errorMessageFn: (err) => getOrmDataEditToastErrorMessage(err),
     });
 
     setupCanDeactivate(() => this.viewType() === "modal" || this.checkIgnoreChanges());
@@ -290,16 +291,4 @@ export abstract class SdDataSheetBase<
     await this._excelMgr.doUploadExcel();
   }
 
-  //-- private
-
-  private _getOrmDataEditToastErrorMessage(err: unknown) {
-    const message = err instanceof Error ? err.message : String(err);
-    if (
-      message.includes("a parent row: a foreign key constraint") ||
-      message.includes("conflicted with the REFERENCE")
-    ) {
-      return "경고! 연결된 작업에 의한 처리 거부. 후속작업 확인 요망";
-    }
-    return message;
-  }
 }

package/src/data/getOrmDataEditToastErrorMessage.ts

@@ -0,0 +1,10 @@
+export function getOrmDataEditToastErrorMessage(err: unknown): string {
+  const message = err instanceof Error ? err.message : String(err);
+  if (
+    message.includes("a parent row: a foreign key constraint") ||
+    message.includes("conflicted with the REFERENCE")
+  ) {
+    return "경고! 연결된 작업에 의한 처리 거부. 후속작업 확인 요망";
+  }
+  return message;
+}

package/src/data/permission-table/sd-permission-table.ts

@@ -215,7 +215,7 @@ export class SdPermissionTable<TModule> {
   items = input<SdPermission<TModule>[]>([]);
   disabled = input(false, { transform: booleanAttribute });
 
-  collapsedItems = signal(new Set<SdPermission<TModule>>());
+  collapsedItems = signal(new Set<string>());
 
   depthLength = computed(() => {
     return this._getDepthLength(this.items(), 0);
@@ -347,7 +347,7 @@ export class SdPermissionTable<TModule> {
   }
 
   getIsPermCollapsed(item: SdPermission<TModule>): boolean {
-    return this.collapsedItems().has(item);
+    return this.collapsedItems().has(item.codeChain.join("."));
   }
 
   getAllChildren(item: SdPermission<TModule>): SdPermission<TModule>[] {
@@ -367,15 +367,16 @@ export class SdPermissionTable<TModule> {
   }
 
   onPermCollapseToggle(item: SdPermission<TModule>) {
+    const key = item.codeChain.join(".");
     this.collapsedItems.update((v) => {
       const r = new Set(v);
-      if (r.has(item)) {
-        r.delete(item);
+      if (r.has(key)) {
+        r.delete(key);
       } else {
-        r.add(item);
+        r.add(key);
         const allChildren = this.getAllChildren(item);
         for (const allChild of allChildren) {
-          r.add(allChild);
+          r.add(allChild.codeChain.join("."));
         }
       }
       return r;

package/src/features/editor/sd-tiptap-editor.ts

@@ -22,6 +22,7 @@ import Color from "@tiptap/extension-color";
 import Highlight from "@tiptap/extension-highlight";
 import TextAlign from "@tiptap/extension-text-align";
 import Image from "@tiptap/extension-image";
+import Underline from "@tiptap/extension-underline";
 import Placeholder from "@tiptap/extension-placeholder";
 import { useTiptapToolbar } from "./useTiptapToolbar";
 
@@ -32,6 +33,7 @@ const DEFAULT_EXTENSIONS: AnyExtension[] = [
   Highlight.configure({ multicolor: true }),
   TextAlign.configure({ types: ["heading", "paragraph"] }),
   Image.configure({ inline: false, allowBase64: true }),
+  Underline,
 ];
 
 @Component({

package/src/index.ts

@@ -252,6 +252,9 @@ export {
   type SdDataDetailDataInfo,
 } from "./data/data-detail/sd-data-detail.base";
 
+// data/utils
+export { getOrmDataEditToastErrorMessage } from "./data/getOrmDataEditToastErrorMessage";
+
 // data/data-select-button
 export { SdDataSelectButton } from "./data/data-select-button/sd-data-select-button";
 export { SdDataSelectButtonBase } from "./data/data-select-button/sd-data-select-button.base";

package/src/layout/base-container/sd-base-container.ts

@@ -22,6 +22,7 @@ import {
   type SdViewType,
 } from "../../core/routing/injectViewTypeSignal";
 import { injectParent } from "../../core/injectParent";
+import { SdSystemLogProvider } from "../../core/config/sd-system-log.provider";
 import { NgIcon } from "@ng-icons/core";
 import { tablerAlertTriangle } from "@ng-icons/tabler-icons";
 
@@ -81,6 +82,7 @@ import { tablerAlertTriangle } from "@ng-icons/tabler-icons";
 export class SdBaseContainer {
   private readonly _sdActivatedModal = inject(SdActivatedModalProvider, { optional: true });
   private readonly _sdAppStructure = inject(SdAppStructureProvider);
+  private readonly _systemLog = inject(SdSystemLogProvider);
 
   private readonly _parent = injectParent();
 
@@ -104,7 +106,8 @@ export class SdBaseContainer {
         this._sdActivatedModal?.modalComponent()?.title() ??
         this._sdAppStructure.getTitleByFullCode(this._currPageCode?.() ?? this._fullPageCode())
       );
-    } catch {
+    } catch (err) {
+      void this._systemLog.writeAsync("warn", `modalOrPageTitle 계산 중 에러: ${String(err)}`);
       return "";
     }
   });