eomsangdon/Aislo
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

refactor(M02): 흐린 글 span · div · p 26 곳을 보조 글 부품으로 (PLAN 553-8 ①)

Browse Source 
- DataFlow 입력 · 출력 · 검증 패널의 옛 __muted 셋(dfip 21 · dfout 2 · dfver 3) = ui-text ui-text--muted (입력 쪽은 글 14)
- 죽은 CSS 셋 걷음 · 지킴 시험 test_553_5 에 한 건 더함

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
eomsangdon
2026-10-27 00:06:50 +09:00
co-authored by Claude Sonnet 5.5
parent e9ff94a0d4
commit ffa0821f2d
11 changed files with 84 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
M02_MasterTemplete/DataFlow/M02_DF_InputPanel.css
-5
View File
@@ -15,11 +15,6 @@
font-size: 1.15em; font-size: 1.15em;
color: var(--color-text); color: var(--color-text);
} }
.m02-dfip__muted {
margin: 0;
color: var(--color-text-muted);
font-size: var(--text-body-sm);
}
.m02-dfip__unit { .m02-dfip__unit {
margin: 0; margin: 0;
font-weight: 600; font-weight: 600;
M02_MasterTemplete/DataFlow/M02_DF_InputPanel.ts
+15 -5
View File
@@ -263,7 +263,8 @@ function drawChosen(
...(rule && e.rule ...(rule && e.rule
? [ ? [
el("div", { el("div", {
className: "m02-dfip__muted", className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: t("RuleLine", { f: e.rule.field, n: e.rule.from.name }), text: t("RuleLine", { f: e.rule.field, n: e.rule.from.name }),
}), }),
] ]
@@ -271,7 +272,11 @@ function drawChosen(
], ],
}), }),
val, val,
el("span", { className: "m02-dfip__muted", text: e.unit || "-" }), el("span", {
className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: e.unit || "-",
}),
createButton({ createButton({
label: t("Remove"), label: t("Remove"),
variant: "ghost", variant: "ghost",
@@ -313,7 +318,7 @@ async function drawFind(
): Promise<void> { ): Promise<void> {
const q = createInputField({ type: "search", placeholder: t("Search"), compact: true }); const q = createInputField({ type: "search", placeholder: t("Search"), compact: true });
const list = el("div", { className: "m02-dfip__list" }); const list = el("div", { className: "m02-dfip__list" });
const count = el("span", { className: "m02-dfip__muted" }); const count = el("span", { className: "ui-text ui-text--muted", attrs: { "data-text": "14" } });
const bar: HTMLElement[] = []; const bar: HTMLElement[] = [];
let file = ""; let file = "";
let sub = ""; let sub = "";
@@ -380,11 +385,16 @@ async function drawFind(
className: "m02-dfip__name", className: "m02-dfip__name",
children: [ children: [
el("strong", { text: String(r["이름"] ?? "") }), el("strong", { text: String(r["이름"] ?? "") }),
el("span", { className: "m02-dfip__muted", text: ` ${r["규격"] ?? ""}` }), el("span", {
className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: ` ${r["규격"] ?? ""}`,
}),
], ],
}), }),
el("span", { el("span", {
className: "m02-dfip__muted", className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: `${v === null ? "" : fmt(v)} ${unitText}`.trim(), text: `${v === null ? "" : fmt(v)} ${unitText}`.trim(),
}), }),
], ],
M02_MasterTemplete/DataFlow/M02_DF_InputPanel_Logic.ts
+25 -6
View File
@@ -152,7 +152,7 @@ export function renderLogicInput(
chapter, chapter,
); );
const list = el("div", { className: "m02-dfip__list" }); const list = el("div", { className: "m02-dfip__list" });
const info = el("span", { className: "m02-dfip__muted" }); const info = el("span", { className: "ui-text ui-text--muted", attrs: { "data-text": "14" } });
const prev = createButton({ const prev = createButton({
label: t("Prev"), label: t("Prev"),
variant: "ghost", variant: "ghost",
@@ -197,10 +197,15 @@ export function renderLogicInput(
className: "m02-dfip__name", className: "m02-dfip__name",
children: [ children: [
el("strong", { text: i.이름 }), el("strong", { text: i.이름 }),
el("span", { className: "m02-dfip__muted", text: ` ${i.원문번호}` }), el("span", {
className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: ` ${i.원문번호}`,
}),
// 별칭으로 맞았으면 그 별칭을 작게(208-1) // 별칭으로 맞았으면 그 별칭을 작게(208-1)
el("span", { el("span", {
className: "m02-dfip__muted", className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: ` ${aliasNote(matchLogic(q.input.value, i).alias)}`, text: ` ${aliasNote(matchLogic(q.input.value, i).alias)}`,
}), }),
el("span", { el("span", {
@@ -210,7 +215,11 @@ export function renderLogicInput(
}), }),
], ],
}), }),
el("span", { className: "m02-dfip__muted", text: i.결과단위 }), el("span", {
className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: i.결과단위,
}),
], ],
}); });
b.addEventListener("click", () => void pick(i)); b.addEventListener("click", () => void pick(i));
@@ -299,9 +308,19 @@ function showChosen(
...(valueNode ...(valueNode
? [valueNode] ? [valueNode]
: extra : extra
? [el("span", { className: "m02-dfip__muted", text: extra })] ? [
el("span", {
className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: extra,
}),
]
: []), : []),
el("span", { className: "m02-dfip__muted", text: unit || "-" }), el("span", {
className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: unit || "-",
}),
], ],
}); });
host.replaceChildren( host.replaceChildren(
M02_MasterTemplete/DataFlow/M02_DF_InputPanel_Material.ts
+19 -6
View File
@@ -178,7 +178,7 @@ function itemList(
): HTMLElement { ): HTMLElement {
const q = createInputField({ type: "search", placeholder: t("Search"), compact: true }); const q = createInputField({ type: "search", placeholder: t("Search"), compact: true });
const list = el("div", { className: "m02-dfip__list" }); const list = el("div", { className: "m02-dfip__list" });
const info = el("span", { className: "m02-dfip__muted" }); const info = el("span", { className: "ui-text ui-text--muted", attrs: { "data-text": "14" } });
let page = 1; let page = 1;
let seq = 0; let seq = 0;
const own = base ? null : scopeBoxes({ sub: "", detail: "" }, () => ((page = 1), void load())); const own = base ? null : scopeBoxes({ sub: "", detail: "" }, () => ((page = 1), void load()));
@@ -222,11 +222,16 @@ function itemList(
className: "m02-dfip__name", className: "m02-dfip__name",
children: [ children: [
el("strong", { text: it.name }), el("strong", { text: it.name }),
el("span", { className: "m02-dfip__muted", text: ` ${it.spec}` }), el("span", {
className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: ` ${it.spec}`,
}),
], ],
}), }),
el("span", { el("span", {
className: "m02-dfip__muted", className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: `${it.price === null ? "" : fmt(it.price)} ${it.unit}`.trim(), text: `${it.price === null ? "" : fmt(it.price)} ${it.unit}`.trim(),
}), }),
], ],
@@ -396,7 +401,10 @@ export function renderMaterial(
...(els.length ...(els.length
? els.map((e) => { ? els.map((e) => {
const val = el("strong", { className: "m02-dfip__value", text: "—" }); const val = el("strong", { className: "m02-dfip__value", text: "—" });
const note = el("span", { className: "m02-dfip__muted" }); const note = el("span", {
className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
});
const kind = const kind =
e.mode === "choice" ? t("Choice") : e.mode === "rule" ? t("Rule") : t("Fixed"); e.mode === "choice" ? t("Choice") : e.mode === "rule" ? t("Rule") : t("Fixed");
const row = el("div", { const row = el("div", {
@@ -416,7 +424,11 @@ export function renderMaterial(
], ],
}), }),
val, val,
el("span", { className: "m02-dfip__muted", text: e.unit || "-" }), el("span", {
className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: e.unit || "-",
}),
createButton({ createButton({
label: t("Remove"), label: t("Remove"),
variant: "ghost", variant: "ghost",
@@ -600,7 +612,8 @@ export function renderMaterial(
}); });
body.replaceChildren( body.replaceChildren(
el("p", { el("p", {
className: "m02-dfip__muted", className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: mode === "choice" ? t("ChoiceHelp") : t("RuleHelp"), text: mode === "choice" ? t("ChoiceHelp") : t("RuleHelp"),
}), }),
name.root, name.root,
M02_MasterTemplete/DataFlow/M02_DF_InputPanel_Table.ts
+6 -3
View File
@@ -195,7 +195,8 @@ export function renderTablePick(
children: [ children: [
el("strong", { text: `${s.section} ${s.title}` }), el("strong", { text: `${s.section} ${s.title}` }),
el("span", { el("span", {
className: "m02-dfip__muted", className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: `${s.chapter} · ${t("SecLine", { t: s.tables })}`, text: `${s.chapter} · ${t("SecLine", { t: s.tables })}`,
}), }),
], ],
@@ -229,7 +230,8 @@ export function renderTablePick(
children: [ children: [
el("strong", { text: h.이름 }), el("strong", { text: h.이름 }),
el("span", { el("span", {
className: "m02-dfip__muted", className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: t("TableLine", { text: t("TableLine", {
b: h.기준 || "—", b: h.기준 || "—",
c: Object.keys(h.조건).length, c: Object.keys(h.조건).length,
@@ -321,7 +323,8 @@ function showChosen(
(e) => (e) =>
body.replaceChildren( body.replaceChildren(
el("p", { el("p", {
className: "m02-dfip__muted", className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: e instanceof Error ? e.message : t("Failed"), text: e instanceof Error ? e.message : t("Failed"),
}), }),
), ),
M02_MasterTemplete/DataFlow/M02_DF_InputPanel_Vars.ts
+5 -1
View File
@@ -94,7 +94,11 @@ export function renderVariables(
const unit = el("div", { className: "m02-dfip__unitfield" }); const unit = el("div", { className: "m02-dfip__unitfield" });
const drawUnit = (): void => const drawUnit = (): void =>
unit.replaceChildren( unit.replaceChildren(
el("span", { className: "m02-dfip__muted", text: t("Unit") }), el("span", {
className: "ui-text ui-text--muted",
attrs: { "data-text": "14" },
text: t("Unit"),
}),
createUnitPick({ createUnitPick({
value: unitValue || NO_UNIT, value: unitValue || NO_UNIT,
ariaLabel: t("Unit"), ariaLabel: t("Unit"),
M02_MasterTemplete/DataFlow/M02_DF_OutputPanel.css
-6
View File
@@ -57,12 +57,6 @@
max-width: 100%; max-width: 100%;
} }
.m02-dfout__muted {
margin: 0;
color: var(--color-text-muted);
font-size: var(--text-caption);
}
.m02-dfout__round { .m02-dfout__round {
margin: var(--spacing-8) 0; margin: var(--spacing-8) 0;
color: var(--color-text-body); color: var(--color-text-body);
M02_MasterTemplete/DataFlow/M02_DF_OutputPanel.ts
+2 -2
View File
@@ -180,7 +180,7 @@ export function renderOutputPanel(
onPick: setUnit, onPick: setUnit,
}); });
/** 단위 표준의 소수자리 제안(주 ① 반올림) — 값(비용 아님)이고 끝수를 안 정했을 때 */ /** 단위 표준의 소수자리 제안(주 ① 반올림) — 값(비용 아님)이고 끝수를 안 정했을 때 */
const suggestNote = el("span", { className: "m02-dfout__muted" }); const suggestNote = el("span", { className: "ui-text ui-text--muted" });
if (cost === "값" && !box.output?.round) if (cost === "값" && !box.output?.round)
void suggestPlaces(box.output?.unit ?? box.unit).then((p) => { void suggestPlaces(box.output?.unit ?? box.unit).then((p) => {
if (p === null) return; if (p === null) return;
@@ -204,7 +204,7 @@ export function renderOutputPanel(
const round = box.output?.round; const round = box.output?.round;
const stepName = (n: number): string => (n === 0 ? "1" : String(Number((10 ** -n).toFixed(n)))); const stepName = (n: number): string => (n === 0 ? "1" : String(Number((10 ** -n).toFixed(n))));
let fallback: CfRound = { places: 1, method: "버림" }; let fallback: CfRound = { places: 1, method: "버림" };
const roundNote = el("span", { className: "m02-dfout__muted" }); const roundNote = el("span", { className: "ui-text ui-text--muted" });
const noteOf = (r: CfRound | undefined): string => const noteOf = (r: CfRound | undefined): string =>
r r
? `${to("RoundUser")}: ${roundText(r)}` ? `${to("RoundUser")}: ${roundText(r)}`
M02_MasterTemplete/DataFlow/M02_DF_Verify.css
-6
View File
@@ -95,12 +95,6 @@
white-space: normal; white-space: normal;
} }
.m02-dfver__muted {
margin: 0;
color: var(--color-text-muted);
font-size: var(--text-caption);
}
/* 쉬는 갈래 — 문제가 아니라 회색으로 */ /* 쉬는 갈래 — 문제가 아니라 회색으로 */
.m02-dfver__rest { .m02-dfver__rest {
padding: var(--spacing-8) var(--spacing-12); padding: var(--spacing-8) var(--spacing-12);
M02_MasterTemplete/DataFlow/M02_DF_Verify.ts
+3 -3
View File
@@ -222,7 +222,7 @@ function slotRow(box: CfBox, e: CfElementRef, on: CfVerifyOn, lg: CfLogic): HTML
}, },
}), }),
el("span", { el("span", {
className: "m02-dfver__muted", className: "ui-text ui-text--muted",
text: tv("Page", { p: got.page, n: pages, t: got.total }), text: tv("Page", { p: got.page, n: pages, t: got.total }),
}), }),
createButton({ createButton({
@@ -293,7 +293,7 @@ function ruleRow(e: CfElementRef, lg: CfLogic, result: CfEvalResult): HTMLElemen
className: "m02-dfver__now", className: "m02-dfver__now",
text: value ? tv("Loading") : tv("NeedValue"), text: value ? tv("Loading") : tv("NeedValue"),
}); });
const note = el("span", { className: "m02-dfver__muted" }); const note = el("span", { className: "ui-text ui-text--muted" });
if (value) { if (value) {
void findMaterials({ void findMaterials({
q: e.scope?.찾는말, q: e.scope?.찾는말,
@@ -320,7 +320,7 @@ function ruleRow(e: CfElementRef, lg: CfLogic, result: CfEvalResult): HTMLElemen
children: [el("strong", { text: elementPort(e) }), state, note], children: [el("strong", { text: elementPort(e) }), state, note],
}), }),
el("span", { el("span", {
className: "m02-dfver__muted", className: "ui-text ui-text--muted",
text: `${from ? `${from} · ` : ""}${tv("Cond", { field: rule.field, v: value || rule.from.name, op: rule.op })}`, text: `${from ? `${from} · ` : ""}${tv("Cond", { field: rule.field, v: value || rule.from.name, op: rule.op })}`,
}), }),
], ],
resources/tester/test_553_5_m01_m02.py
+9
View File
@@ -95,3 +95,12 @@ def test_m02_parts_in_place():
def test_m02_css_no_old_alias(): def test_m02_css_no_old_alias():
for name, css in _m02_src(".css").items(): for name, css in _m02_src(".css").items():
assert not OLD_ALIAS.search(css), f"{name}: 옛 보라 별칭" assert not OLD_ALIAS.search(css), f"{name}: 옛 보라 별칭"
def test_m02_dataflow_muted_spans_use_ui_text():
"""553-8 ① — 흐린 글 span · div · p 는 보조 글 부품 꼴 · 옛 __muted 걷음."""
ts = "".join(_m02_src(".ts").values())
css = "".join(_m02_src(".css").values())
for gone in ("m02-dfip__muted", "m02-dfout__muted", "m02-dfver__muted"):
assert gone not in ts and gone not in css, f"옛 변종 {gone} 남음"
assert len(re.findall(r'"ui-text ui-text--muted",\s*attrs: \{ "data-text": "14" \}', ts)) >= 21