Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-visual-modeling",
"version": "1.0.23",
"version": "1.0.24",
"description": "一个基于React的数据可视化建模的DAG图,适用于UML,数据库建模,数据仓库建设等业务",
"main": "dist/index.js",
"pack": "pack/index.js",
Expand Down
15 changes: 15 additions & 0 deletions src/adaptor.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,20 @@ export const diffPropsData = (newData, oldData, options) => {
let addEdges = _.differenceWith(newData.edges, oldData.edges, isSameEdge);
let rmEdges = _.differenceWith(oldData.edges, newData.edges, isSameEdge);

// 线段的label有变化
let updateLabel = [];
newData.edges.forEach((a) => {
let edge = _.find(oldData.edges, (b) => {
return isSameEdge(a, b);
});
if (edge && a.label !== edge.label) {
updateLabel.push({
edge,
label: a.label
});
}
});

let updateTitle = [];
let addFields = [];
let rmFields = [];
Expand Down Expand Up @@ -138,6 +152,7 @@ export const diffPropsData = (newData, oldData, options) => {
rmNodes,
addEdges,
rmEdges,
updateLabel,
updateTitle,
addFields,
rmFields,
Expand Down
7 changes: 7 additions & 0 deletions src/canvas/canvas.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@ export default class TableCanvas extends Canvas {
});
}

updateLabel(infos) {
infos.forEach((info) => {
let edge = this.getEdge(info.edge.id);
edge.updateLabel(info.label);
})
}

expand(nodeId) {
let node = this.getNode(nodeId);

Expand Down
1 change: 1 addition & 0 deletions src/canvas/edge.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export default class BaseEdge extends Edge {
}

drawLabel(label) {

let sourceNode = this.sourceNode;
let targetNode = this.targetNode;
let labelRender = _.get(this, 'options._config.labelRender');
Expand Down
4 changes: 4 additions & 0 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,10 @@ export default class TableBuilding extends React.Component<ComProps, any> {
this.canvas.removeEdges(diffInfo.rmEdges.map(edge => edge.id));
}

if (diffInfo.updateLabel.length > 0) {
this.canvas.updateLabel(diffInfo.updateLabel);
}

this.canvasData = result;
return true;
}
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"module": "commonjs",
"target": "es5",
"jsx": "react",
"allowJs": true
"allowJs": true,
"esModuleInterop": true
}
}