Merge remote-tracking branch 'origin/dev' into sub_laptop_1
This commit is contained in:
@@ -50,6 +50,7 @@ import {
|
||||
swapBadge,
|
||||
} from "./formula_doc_copy";
|
||||
import { docFoot } from "./formula_doc_foot";
|
||||
import { askRenew } from "./formula_doc_renew";
|
||||
import { buildOptions } from "./formula_doc_options";
|
||||
import { ft } from "./formula_doc_text";
|
||||
import { addTaken, type Taken } from "../common_util/common_util_line_stack_copy";
|
||||
@@ -316,7 +317,7 @@ export function createStackScreen(opt: StackScreenOptions) {
|
||||
const busy = dirty();
|
||||
const tools = [
|
||||
...(mark?.단가기준 && opt.page ? [basisPick(mark.단가기준)] : []), // 모달 = 머리 판 단추(793-3b)
|
||||
...(cp && edit() && key ? copyTools(true, (job) => void runJob(job)) : []),
|
||||
...(cp && edit() && key && !mark?.자동 ? copyTools(true, (job) => void runJob(job)) : []), // 836-2 자동 = 없음
|
||||
...(edit() && key && !opt.page
|
||||
? [
|
||||
createButton({
|
||||
@@ -548,6 +549,9 @@ export function createStackScreen(opt: StackScreenOptions) {
|
||||
recalc();
|
||||
draw();
|
||||
opt.page?.(); // 캐시에서 이어 받은 고침 — 페이지 [저장] · [되돌림] 켬
|
||||
const notes = (mark as CopyMark | undefined)?.갱신; // 836-2 M01 자동 따라옴 알림(take 가 채움)
|
||||
if (cp && edit() && !dirty() && notes?.length)
|
||||
void askRenew(notes).then((ok) => ok && save({ 할일: "갱신확인", 판: version }, ""));
|
||||
} catch (e) {
|
||||
if (mine === seq)
|
||||
head.replaceChildren(
|
||||
|
||||
Reference in New Issue
Block a user