gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-22 08:08:51 +02:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

fix(views/table): column width or visibility lost after adding new column

Browse Source
This commit is contained in:
Elian Doran 2025-07-04 21:11:50 +03:00
parent fbda049c32
commit 461e085eff
No known key found for this signature in database
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/client/src/widgets/view_widgets/table_view/data.ts
View File

@ -64,7 +64,7 @@ export async function buildData(parentNote: FNote, info: PromotedAttributeInform
} }
} }
export function buildColumnDefinitions(info: PromotedAttributeInformation[]) { export function buildColumnDefinitions(info: PromotedAttributeInformation[], existingColumnData?: ColumnDefinition[]) {
const columnDefs: ColumnDefinition[] = [ const columnDefs: ColumnDefinition[] = [
{ {
title: "#", title: "#",
@ -100,10 +100,30 @@ export function buildColumnDefinitions(info: PromotedAttributeInformation[]) {
} }
applyHeaderMenu(columnDefs); applyHeaderMenu(columnDefs);
if (existingColumnData) {
restoreExistingData(columnDefs, existingColumnData);
}
return columnDefs; return columnDefs;
} }
function restoreExistingData(newDefs: ColumnDefinition[], oldDefs: ColumnDefinition[]) {
const byField = new Map<string, ColumnDefinition>;
for (const def of oldDefs) {
byField.set(def.field, def);
}
for (const newDef of newDefs) {
const oldDef = byField.get(newDef.field);
if (!oldDef) {
continue;
}
newDef.width = oldDef.width;
newDef.visible = oldDef.visible;
}
}
export async function buildRowDefinitions(parentNote: FNote, notes: FNote[], infos: PromotedAttributeInformation[]) { export async function buildRowDefinitions(parentNote: FNote, notes: FNote[], infos: PromotedAttributeInformation[]) {
const definitions: TableData[] = []; const definitions: TableData[] = [];
for (const branch of parentNote.getChildBranches()) { for (const branch of parentNote.getChildBranches()) {

17
apps/client/src/widgets/view_widgets/table_view/index.ts
View File

@ -7,7 +7,7 @@ import SpacedUpdate from "../../../services/spaced_update.js";
import type { CommandListenerData, EventData } from "../../../components/app_context.js"; import type { CommandListenerData, EventData } from "../../../components/app_context.js";
import type { Attribute } from "../../../services/attribute_parser.js"; import type { Attribute } from "../../../services/attribute_parser.js";
import note_create from "../../../services/note_create.js"; import note_create from "../../../services/note_create.js";
import {Tabulator, SortModule, FormatModule, InteractionModule, EditModule, ResizeColumnsModule, FrozenColumnsModule, PersistenceModule, MoveColumnsModule, MenuModule, MoveRowsModule} from 'tabulator-tables'; import {Tabulator, SortModule, FormatModule, InteractionModule, EditModule, ResizeColumnsModule, FrozenColumnsModule, PersistenceModule, MoveColumnsModule, MenuModule, MoveRowsModule, ColumnDefinition} from 'tabulator-tables';
import "tabulator-tables/dist/css/tabulator_bootstrap5.min.css"; import "tabulator-tables/dist/css/tabulator_bootstrap5.min.css";
import { canReorderRows, configureReorderingRows } from "./dragging.js"; import { canReorderRows, configureReorderingRows } from "./dragging.js";
import buildFooter from "./footer.js"; import buildFooter from "./footer.js";
@ -68,7 +68,9 @@ const TPL = /*html*/`
`; `;
export interface StateInfo { export interface StateInfo {
tableData: Record<string, object>; tableData?: {
columns?: ColumnDefinition[];
};
} }
export default class TableView extends ViewMode<StateInfo> { export default class TableView extends ViewMode<StateInfo> {
@ -79,7 +81,7 @@ export default class TableView extends ViewMode<StateInfo> {
private spacedUpdate: SpacedUpdate; private spacedUpdate: SpacedUpdate;
private api?: Tabulator; private api?: Tabulator;
private newAttribute?: Attribute; private newAttribute?: Attribute;
private persistentData: Record<string, object>; private persistentData: StateInfo["tableData"];
/** If set to a note ID, whenever the rows will be updated, the title of the note will be automatically focused for editing. */ /** If set to a note ID, whenever the rows will be updated, the title of the note will be automatically focused for editing. */
private noteIdToEdit?: string; private noteIdToEdit?: string;
@ -117,11 +119,10 @@ export default class TableView extends ViewMode<StateInfo> {
const notes = await froca.getNotes(this.args.noteIds); const notes = await froca.getNotes(this.args.noteIds);
const info = getPromotedAttributeInformation(this.parentNote); const info = getPromotedAttributeInformation(this.parentNote);
const columnDefs = buildColumnDefinitions(info);
const viewStorage = await this.viewStorage.restore(); const viewStorage = await this.viewStorage.restore();
this.persistentData = viewStorage?.tableData || {}; this.persistentData = viewStorage?.tableData || {};
const columnDefs = buildColumnDefinitions(info);
const movableRows = canReorderRows(this.parentNote); const movableRows = canReorderRows(this.parentNote);
this.api = new Tabulator(el, { this.api = new Tabulator(el, {
@ -134,10 +135,10 @@ export default class TableView extends ViewMode<StateInfo> {
movableRows, movableRows,
footerElement: buildFooter(this.parentNote), footerElement: buildFooter(this.parentNote),
persistenceWriterFunc: (_id, type: string, data: object) => { persistenceWriterFunc: (_id, type: string, data: object) => {
this.persistentData[type] = data; (this.persistentData as Record<string, {}>)[type] = data;
this.spacedUpdate.scheduleUpdate(); this.spacedUpdate.scheduleUpdate();
}, },
persistenceReaderFunc: (_id, type: string) => this.persistentData[type], persistenceReaderFunc: (_id, type: string) => this.persistentData?.[type],
}); });
configureReorderingRows(this.api); configureReorderingRows(this.api);
this.setupEditing(); this.setupEditing();
@ -244,7 +245,7 @@ export default class TableView extends ViewMode<StateInfo> {
} }
const info = getPromotedAttributeInformation(this.parentNote); const info = getPromotedAttributeInformation(this.parentNote);
const columnDefs = buildColumnDefinitions(info); const columnDefs = buildColumnDefinitions(info, this.persistentData?.columns);
this.api.setColumns(columnDefs); this.api.setColumns(columnDefs);
} }