Merge commit 'f77b1dc0fadab6605fb10303f696c879c28b4378' into def_releases_2022022114463131_ali-lowcode_ali-lowcode-engine/1.0.78

This commit is contained in:
tbfed 2022-02-23 15:29:28 +08:00
commit 59d5d7c241
2 changed files with 14 additions and 15 deletions

View File

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

View File

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