Merge branch 'fix/history-records' into 'develop'

fix: 修复初始页面就有两条历史记录



See merge request !1581812
This commit is contained in:
林熠 2022-02-23 15:25:36 +08:00
commit f77b1dc0fa
2 changed files with 14 additions and 15 deletions

View File

@ -86,7 +86,7 @@ export class DocumentModel {
} }
get fileName(): string { get fileName(): string {
return this.rootNode?.getExtraProp('fileName')?.getAsString() || this.id; return this.rootNode?.getExtraProp('fileName', false)?.getAsString() || this.id;
} }
set fileName(fileName: string) { set fileName(fileName: string) {

View File

@ -43,21 +43,20 @@ export class History {
if (this.asleep) return; if (this.asleep) return;
untracked(() => { untracked(() => {
const log = currentSerialization.serialize(data); const log = currentSerialization.serialize(data);
if (this.session.isActive()) { if (this.session.isActive()) {
this.session.log(log); this.session.log(log);
} else { } else {
this.session.end(); this.session.end();
const lastState = this.getState(); const lastState = this.getState();
const cursor = this.session.cursor + 1; const cursor = this.session.cursor + 1;
const session = new Session(cursor, log, this.timeGap); const session = new Session(cursor, log, this.timeGap);
this.session = session; this.session = session;
this.records.splice(cursor, this.records.length - cursor, session); this.records.splice(cursor, this.records.length - cursor, session);
const currentState = this.getState(); const currentState = this.getState();
if (currentState !== lastState) { if (currentState !== lastState) {
this.emitter.emit('statechange', currentState); this.emitter.emit('statechange', currentState);
}
} }
// } }
}); });
}, { fireImmediately: true }); }, { fireImmediately: true });
} }