github/lowcode-engine
1
0
Fork 0
mirror of https://github.com/alibaba/lowcode-engine.git synced 2026-01-12 17:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/designer/src/document/document-model.ts
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) {

27
packages/designer/src/document/history.ts
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 });
}