Merge remote-tracking branch 'origin/sub_laptop_1' into main_laptop_1

This commit is contained in:
2026-09-17 11:58:45 +09:00
3 changed files with 21 additions and 14 deletions
+7 -3
View File
@@ -88,18 +88,22 @@ export function outdatedBanner(sources?: TableSource[]): string[] {
/** 서버가 주는 표 한 벌 — 갈래·kind·한글 이름·줄 수. 화면은 제 목록을 안 가짐(늘면 저절로 섬). */
export interface ServedKind {
group: string;
/** 갈래 한글 이름(이름표 `base_price_groups`) — 안 오면 group 키가 그대로 떠 빠진 것이 드러남 */
group_label?: string;
kind: string;
label: string;
rows: number;
}
type KindBox = { group: string; label: string; items: ServedKind[] };
/** 받은 차례 그대로 갈래별로 묶음 — 갈래 차례도 서버가 낸 순서를 따름. */
export function groupKinds(kinds: ServedKind[]): { group: string; items: ServedKind[] }[] {
const boxes: { group: string; items: ServedKind[] }[] = [];
export function groupKinds(kinds: ServedKind[]): KindBox[] {
const boxes: KindBox[] = [];
for (const kind of kinds) {
const box = boxes.find((each) => each.group === kind.group);
if (box) box.items.push(kind);
else boxes.push({ group: kind.group, items: [kind] });
else boxes.push({ group: kind.group, label: kind.group_label ?? kind.group, items: [kind] });
}
return boxes;
}
+3 -3
View File
@@ -56,7 +56,7 @@ export function buildSidePanel(
button.addEventListener("click", () => {
activate(button);
view.show({
title: `${box.group} ${served.label}`,
title: `${box.label} ${served.label}`,
key: `base-prices/${served.kind}`,
load: (query) => fetchBasePrices(served.kind, query),
save: (rowId, values) => saveBasePrice(served.kind, rowId, values),
@@ -64,7 +64,7 @@ export function buildSidePanel(
});
grid.append(button);
}
return { group: box.group, grid };
return { label: box.label, grid };
});
const overridesButton = el("button", {
className: "z01-master__base z01-master__base--wide",
@@ -131,7 +131,7 @@ export function buildSidePanel(
}
panel.append(
...boxes.map((box) => section(box.group, box.grid)),
...boxes.map((box) => section(box.label, box.grid)),
section(L("Z01_MasterData_Tree"), tree),
);
attachCollapsible(panel);