Merge remote-tracking branches 'origin/sub_laptop_2' and 'origin/sub_laptop_3' into main_laptop_1
This commit is contained in:
@@ -46,7 +46,7 @@ function toFragments(pieces: TextPiece[], ctx: DetailContext): Fragment[] {
|
||||
const open = (): void => {
|
||||
if (!ref) return openNoteModal(piece.글, tl("Pill_NoPick"));
|
||||
if (piece.kind === "표")
|
||||
openTableModal({ title: piece.글, table: ref.키, row: ref.행, col: ref.열 });
|
||||
openTableModal({ title: piece.글, table: ref.키, row: ref.줄 ?? ref.행, col: ref.열 });
|
||||
else if (piece.kind === "요소")
|
||||
openRefModal({ title: piece.글, ref: ref.키, prices: ctx.prices });
|
||||
else openLogic(ref.키);
|
||||
|
||||
@@ -103,7 +103,13 @@ export type CalcAnswer =
|
||||
export interface TextPiece {
|
||||
kind: "요소" | "표" | "로직" | "값" | "기호" | "글";
|
||||
글: string;
|
||||
참조?: { 테이블?: string; 키: string; 행?: string | number | null; 열?: string | null };
|
||||
참조?: {
|
||||
테이블?: string;
|
||||
키: string;
|
||||
행?: string | number | null;
|
||||
줄?: number;
|
||||
열?: string | null;
|
||||
};
|
||||
깊이?: number;
|
||||
}
|
||||
export interface TextLine {
|
||||
|
||||
Reference in New Issue
Block a user