Spring/spring-flo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New error marker support via model only

Browse Source
This commit is contained in:
BoykoAlex
2019-11-22 14:00:48 -05:00
parent c1348124a9
commit 60b042a5ff
3 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/editor/editor.component.ts
View File

@@ -875,8 +875,10 @@ export class EditorComponent implements OnInit, OnDestroy {
}
markElement(cell: dia.Cell, markers: Array<Flo.Marker>) {
let errorMessages = markers.map(m => m.message);
cell.set('markers', markers);
// Old legacy code below consider removing
let errorMessages = markers.map(m => m.message);
let errorCell = cell.getEmbeddedCells().find((e: dia.Cell) => e.attr('./kind') === Constants.ERROR_DECORATION_KIND);
if (errorCell) {
if (errorMessages.length === 0) {
@@ -893,14 +895,12 @@ export class EditorComponent implements OnInit, OnDestroy {
kind: Constants.ERROR_DECORATION_KIND,
messages: errorMessages
});
const view = this.paper.findViewByModel(error);
view.setInteractivity(false);
if (error) {
const view = this.paper.findViewByModel(error);
view.setInteractivity(false);
}
}
const cellView = this.paper.findViewByModel(cell);
if (cellView) {
joint.V(cellView.el).toggleClass('marker-error', errorMessages.length);
}
}
doLayout(): Promise<void> {
@@ -1018,6 +1018,13 @@ export class EditorComponent implements OnInit, OnDestroy {
}
});
}
node.on('change:markers', () => {
if (this.renderer && this.renderer.markersChanged) {
this.renderer.markersChanged(node, this.paper);
}
});
}
/**