@simplysm/angular 14.0.37 → 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);
 
@@ -63,22 +66,33 @@ export abstract class SdDataDetailBase<T extends object, R = boolean>
   private _dataSnapshot?: T;
 
   constructor() {
-    effect(() => {
+    effect((onCleanup) => {
       this.prepareRefreshEffect?.();
 
+      let cancelled = false;
+      onCleanup(() => {
+        cancelled = true;
+      });
+
       queueMicrotask(async () => {
-        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);
       });
     });
 
@@ -130,7 +144,7 @@ export abstract class SdDataDetailBase<T extends object, R = boolean>
 
           this.close.emit(result);
         },
-        (err) => this._getOrmDataEditToastErrorMessage(err),
+        (err) => getOrmDataEditToastErrorMessage(err),
       ),
     );
   }
@@ -165,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/injectDataSheetExcelManager.ts

@@ -46,7 +46,7 @@ export function injectDataSheetExcelManager<TItem>(options: {
         async () => {
           await uploadExcelFn(file);
           await options.refresh();
-          sdToast.success("엑셀 업로드가 완료 되었습니다.");
+          sdToast.success("엑셀 업로드가 완료되었습니다.");
         },
         (err) => options.errorMessageFn(err),
       ),

package/src/data/data-sheet/injectDataSheetModalEditManager.ts

@@ -51,7 +51,7 @@ export function injectDataSheetModalEditManager<TItem, TKey>(options: {
           if (!result) return;
 
           await options.refresh();
-          sdToast.success(`${del ? "삭제" : "복구"} 되었습니다.`);
+          sdToast.success(`${del ? "삭제" : "복구"}되었습니다.`);
         },
         (err) => options.errorMessageFn(err),
       ),

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,
@@ -84,7 +85,7 @@ export abstract class SdDataSheetBase<
   private readonly _excelMgr: ReturnType<typeof injectDataSheetExcelManager<TItem>>;
 
   //-- shared state (D1: class 소유)
-  key = reflectComponentType(this.constructor as any)?.selector;
+  key = reflectComponentType(this.constructor as any)?.selector ?? this.constructor.name;
 
   viewType = injectViewTypeSignal(() => this);
 
@@ -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/data/shared-data/sd-shared-data-select.ts

@@ -321,23 +321,34 @@ export class SdSharedDataSelect<
     return this._searchTextMatchCache().get(item.__valueKey) ?? false;
   }
 
-  getChildren = (item: SharedDataBase<string | number>): TItem[] => {
-    let result =
-      this.itemByParentKeyMap()?.get(item.__valueKey as TItem["__valueKey"]) ??
-      [];
+  private readonly _sortedChildrenMap = computed(() => {
+    const parentMap = this.itemByParentKeyMap();
+    if (parentMap == null) return undefined;
 
     const orderProp = this.displayOrderKeyProp();
-    if (orderProp != null) {
-      result = [...result].sort((a, b) => {
-        const aVal = (a as any)[orderProp];
-        const bVal = (b as any)[orderProp];
-        if (aVal < bVal) return -1;
-        if (aVal > bVal) return 1;
-        return 0;
-      });
+    if (orderProp == null) return parentMap;
+
+    const sorted = new Map<TItem["__valueKey"] | undefined, TItem[]>();
+    for (const [key, children] of parentMap) {
+      sorted.set(
+        key,
+        [...children].sort((a, b) => {
+          const aVal = (a as any)[orderProp];
+          const bVal = (b as any)[orderProp];
+          if (aVal < bVal) return -1;
+          if (aVal > bVal) return 1;
+          return 0;
+        }),
+      );
     }
+    return sorted;
+  });
 
-    return result;
+  getChildren = (item: SharedDataBase<string | number>): TItem[] => {
+    return (
+      this._sortedChildrenMap()?.get(item.__valueKey as TItem["__valueKey"]) ??
+      []
+    );
   };
 
   onUndefinedClick(): void {

package/src/data/sheet/injectSheetColumnResizing.ts

@@ -31,6 +31,8 @@ export function injectSheetColumnResizing(options: {
   }
 
   function onMousedown(event: MouseEvent, colDef: SdSheetColumnDef): void {
+    resizingCleanup?.();
+
     event.preventDefault();
     event.stopPropagation();
 

package/src/data/state-preset/sd-state-preset.ts

@@ -130,6 +130,12 @@ export class SdStatePreset {
     if (name == null) return;
 
     const currentPresets = this._presets();
+
+    if (currentPresets.some((p) => p.name === name)) {
+      this._sdToast.warning("이미 존재하는 프리셋 이름입니다.");
+      return;
+    }
+
     const newPreset: SdStatePresetDef = {
       name,
       state: obj.clone(this.state()),

package/src/features/address/sd-address-search.modal.ts

@@ -11,17 +11,19 @@ import type { OnInit } from "@angular/core";
 import { SdBusyContainer } from "../../core/busy/sd-busy-container";
 import type { SdModalContentDef } from "../../core/modal/sd-modal.provider";
 
-declare const daum: {
-  postcode: {
-    load(callback: () => void): void;
-  };
-  Postcode: new (options: {
-    oncomplete: (data: DaumPostcodeData) => void;
-    onresize: (size: { height: number }) => void;
-    width: string;
-    height: string;
-  }) => { embed(el: HTMLElement, options: { autoClose: boolean }): void };
-};
+declare const daum:
+  | {
+      postcode: {
+        load(callback: () => void): void;
+      };
+      Postcode: new (options: {
+        oncomplete: (data: DaumPostcodeData) => void;
+        onresize: (size: { height: number }) => void;
+        width: string;
+        height: string;
+      }) => { embed(el: HTMLElement, options: { autoClose: boolean }): void };
+    }
+  | undefined;
 
 interface DaumPostcodeData {
   zonecode: string;
@@ -39,6 +41,51 @@ export interface Address {
   buildingName: string | undefined;
 }
 
+function loadDaumPostcodeScript(): Promise<void> {
+  const existing = document.getElementById("daum_address");
+  if (existing != null) {
+    if (typeof daum !== "undefined") {
+      return Promise.resolve();
+    }
+    return new Promise<void>((resolve, reject) => {
+      existing.addEventListener(
+        "load",
+        () => {
+          daum!.postcode.load(() => {
+            resolve();
+          });
+        },
+        { once: true },
+      );
+      existing.addEventListener(
+        "error",
+        () => {
+          existing.remove();
+          reject(new Error("주소 검색 스크립트를 불러올 수 없습니다."));
+        },
+        { once: true },
+      );
+    });
+  }
+
+  return new Promise<void>((resolve, reject) => {
+    const scriptEl = document.createElement("script");
+    scriptEl.src = "//t1.daumcdn.net/mapjsapi/bundle/postcode/prod/postcode.v2.js";
+    scriptEl.setAttribute("id", "daum_address");
+
+    scriptEl.onload = (): void => {
+      daum!.postcode.load(() => {
+        resolve();
+      });
+    };
+    scriptEl.onerror = (): void => {
+      scriptEl.remove();
+      reject(new Error("주소 검색 스크립트를 불러올 수 없습니다."));
+    };
+    document.head.appendChild(scriptEl);
+  });
+}
+
 @Component({
   selector: "sd-address-search-modal",
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -47,45 +94,42 @@ export interface Address {
   imports: [SdBusyContainer],
   template: `
     <sd-busy-container [busy]="!initialized()">
-      <div #content style="min-height: 100px;"></div>
+      @if (errorMessage() !== null) {
+        <div class="_error">{{ errorMessage() }}</div>
+      } @else {
+        <div #content style="min-height: 100px;"></div>
+      }
     </sd-busy-container>
   `,
 })
 export class SdAddressSearchModal implements SdModalContentDef<Address>, OnInit {
-  contentElRef = viewChild.required<"content", ElementRef<HTMLElement>>("content", {
+  contentElRef = viewChild<"content", ElementRef<HTMLElement>>("content", {
     read: ElementRef,
   });
 
   close = output<Address>();
 
   initialized = signal(false);
+  errorMessage = signal<string | null>(null);
 
   ngOnInit() {
     void this._initAsync();
   }
 
   private async _initAsync() {
-    if (!document.getElementById("daum_address")) {
-      await new Promise<void>((resolve, reject) => {
-        const scriptEl = document.createElement("script");
-        scriptEl.src = "//t1.daumcdn.net/mapjsapi/bundle/postcode/prod/postcode.v2.js";
-        scriptEl.setAttribute("id", "daum_address");
-
-        scriptEl.onload = (): void => {
-          daum.postcode.load(() => {
-            resolve();
-          });
-        };
-        scriptEl.onerror = (): void => {
-          reject(new Error("주소 검색 스크립트를 불러올 수 없습니다."));
-        };
-        document.head.appendChild(scriptEl);
-      });
+    try {
+      await loadDaumPostcodeScript();
+    } catch (err) {
+      this.errorMessage.set(err instanceof Error ? err.message : String(err));
+      this.initialized.set(true);
+      return;
     }
 
-    const contentEl = this.contentElRef().nativeElement;
+    const contentElRef = this.contentElRef();
+    if (contentElRef == null) return;
+    const contentEl = contentElRef.nativeElement;
 
-    new daum.Postcode({
+    new daum!.Postcode({
       oncomplete: (data: DaumPostcodeData): void => {
         const addr = data.userSelectedType === "R" ? data.roadAddress : data.jibunAddress;
 

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/features/visual/sd-barcode.ts

@@ -32,11 +32,15 @@ export class SdBarcode {
     if (text == null || text === "") {
       return "";
     }
-    const svg = bwipjs.toSVG({
-      bcid: this.type(),
-      text,
-    });
-    return this._sanitizer.bypassSecurityTrustHtml(svg);
+    try {
+      const svg = bwipjs.toSVG({
+        bcid: this.type(),
+        text,
+      });
+      return this._sanitizer.bypassSecurityTrustHtml(svg);
+    } catch {
+      return "";
+    }
   });
 }
 

package/src/index.ts

@@ -159,7 +159,7 @@ export { type SdTextfieldTypes, sdTextfieldTypes } from "./controls/input/sd-tex
 export { SdTextarea } from "./controls/input/sd-textarea";
 export { SdNumpad } from "./controls/input/sd-numpad";
 export { SdRange } from "./controls/input/sd-range";
-export { SdDateRangePicker } from "./controls/input/sd-date-range.picker";
+export { SdDateRangePicker } from "./controls/input/sd-date-range-picker";
 
 // controls/checkbox
 export { SdCheckbox } from "./controls/checkbox/sd-checkbox";
@@ -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 "";
     }
   });

package/src/layout/dock/sd-dock.ts

@@ -132,6 +132,8 @@ export class SdDock {
   }
 
   onResizeBarMousedown(event: MouseEvent) {
+    this._dragCleanup?.();
+
     const thisEl = this._elRef.nativeElement;
 
     const startX = event.clientX;