test/g6
1
0
Fork 0
mirror of https://gitee.com/antv/g6.git synced 2024-12-02 19:58:46 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

feat: svg version.

Browse Source
This commit is contained in:
Yanyan-Wang 2020-02-27 14:20:14 +08:00 committed by Yanyan Wang
parent 1a3d38ef0a
commit 8433826dfc
3 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/graph/graph.ts
View File

@ -522,6 +522,7 @@ export default class Graph extends EventEmitter implements IGraph {
const group: Group = this.get('group');
translate(group, { x: dx, y: dy });
this.emit('viewportchange', { action: 'translate', matrix: group.getMatrix() });
this.autoPaint();
}
/**
@ -545,13 +546,10 @@ export default class Graph extends EventEmitter implements IGraph {
if (padding) {
this.set('fitViewPadding', padding);
}
const autoPaint = this.get('autoPaint');
this.setAutoPaint(false);
const viewController: ViewController = this.get('viewController');
viewController.fitView();
this.setAutoPaint(autoPaint);
this.autoPaint();
}
@ -596,8 +594,6 @@ export default class Graph extends EventEmitter implements IGraph {
const minZoom: number = this.get('minZoom');
const maxZoom: number = this.get('maxZoom');
const autoPaint = this.get('autoPaint');
this.setAutoPaint(false);
if (!matrix) {
matrix = mat3.create();
}
@ -611,13 +607,11 @@ export default class Graph extends EventEmitter implements IGraph {
}
if ((minZoom && matrix[0] < minZoom) || (maxZoom && matrix[0] > maxZoom)) {
this.setAutoPaint(autoPaint);
return;
}
group.setMatrix(matrix);
this.emit('viewportchange', { action: 'zoom', matrix });
this.setAutoPaint(autoPaint);
this.autoPaint();
}
@ -798,7 +792,9 @@ export default class Graph extends EventEmitter implements IGraph {
);
}
const itemController: ItemController = this.get('itemController');
return itemController.addItem(type, model);
const item = itemController.addItem(type, model);
this.autoPaint();
return item;
}
public add(type: ITEM_TYPE, model: ModelConfig): Item {
@ -979,7 +975,6 @@ export default class Graph extends EventEmitter implements IGraph {
self.render();
}
const autoPaint: boolean = this.get('autoPaint');
const itemMap: NodeMap = this.get('itemMap');
const items: {
@ -990,8 +985,6 @@ export default class Graph extends EventEmitter implements IGraph {
edges: [],
};
this.setAutoPaint(false);
this.diffItems('node', items, (data as GraphData).nodes!);
this.diffItems('edge', items, (data as GraphData).edges!);
@ -1008,11 +1001,9 @@ export default class Graph extends EventEmitter implements IGraph {
layoutController.changeData();
self.setAutoPaint(autoPaint);
if (self.get('animate') && !layoutController.getLayoutType()) {
// 如果没有指定布局
self.positionsAnimate();
self.setAutoPaint(autoPaint);
} else {
self.autoPaint();
}
@ -1109,8 +1100,6 @@ export default class Graph extends EventEmitter implements IGraph {
*/
public refresh(): void {
const self = this;
const autoPaint: boolean = self.get('autoPaint');
self.setAutoPaint(false);
self.emit('beforegraphrefresh');
@ -1129,7 +1118,6 @@ export default class Graph extends EventEmitter implements IGraph {
});
}
self.setAutoPaint(autoPaint);
self.emit('aftergraphrefresh');
self.autoPaint();
@ -1246,8 +1234,6 @@ export default class Graph extends EventEmitter implements IGraph {
let model: NodeConfig;
const updatedNodes: { [key: string]: boolean } = {};
const autoPaint = this.get('autoPaint');
this.setAutoPaint(false);
each(nodes, (node: INode) => {
model = node.getModel() as NodeConfig;
const originAttrs = node.get('originAttrs');
@ -1267,7 +1253,6 @@ export default class Graph extends EventEmitter implements IGraph {
});
self.emit('aftergraphrefreshposition');
this.setAutoPaint(autoPaint);
self.autoPaint();
}

10
tests/unit/graph/svg-spec.ts
View File

@ -1992,8 +1992,8 @@ describe('plugins', () => {
const viewport = minimap.get('viewport');
expect(viewport.style.width).toBe('60px');
expect(viewport.style.height).toBe('60px');
expect(viewport.style.left).toBe('72.52px');
expect(viewport.style.top).toBe('32.52px');
expect(viewport.style.left).toBe('70px');
expect(viewport.style.top).toBe('30px');
graph.destroy();
});
it('minimap delegate', () => {
@ -2023,7 +2023,7 @@ describe('plugins', () => {
expect(viewport.style.height).toBe('60px');
expect(viewport.style.left).toBe('70px');
expect(viewport.style.top).toBe('30px');
// graph.destroy();
graph2.destroy();
});
it('minimap keyShape', () => {
const minimap = new G6.Minimap({
@ -2053,8 +2053,8 @@ describe('plugins', () => {
const viewport = minimap.get('viewport');
expect(viewport.style.width).toBe('60px');
expect(viewport.style.height).toBe('60px');
expect(viewport.style.left).toBe('72.52px');
expect(viewport.style.top).toBe('32.52px');
expect(viewport.style.left).toBe('70px');
expect(viewport.style.top).toBe('30px');
graph.destroy();
});
// TODO: the edges before bundling are not removed

4
tests/unit/plugins/grid-spec.ts
View File

@ -31,8 +31,8 @@ describe('grid', () => {
const gridContainer: HTMLDivElement = container.childNodes[0] as HTMLDivElement;
expect(gridContainer.style.width).toEqual('4000px');
expect(gridContainer.style.height).toEqual('3000px');
expect(gridContainer.style.width).toEqual('800px');
expect(gridContainer.style.height).toEqual('600px');
expect(gridContainer.style.left).toEqual('0px');
expect(gridContainer.style.top).toEqual('0px');
expect(gridContainer.style.backgroundImage).not.toEqual('');