Commit 39e13d81 authored by frank.xa.zhang's avatar frank.xa.zhang

fixed shareholder structure -- frank

parent 6afe093c
...@@ -150,10 +150,11 @@ infrastructureModule.controller('organizationFullChartController', ['$scope', '$ ...@@ -150,10 +150,11 @@ infrastructureModule.controller('organizationFullChartController', ['$scope', '$
for (var i = 0; i < linkGs.length; i++) { for (var i = 0; i < linkGs.length; i++) {
var linkG = linkGs[i]; var linkG = linkGs[i];
var link_id = linkG.attributes[0].value; var link_id = linkG.attributes[0].value;
if (link_id.substring(0, 3) === "[" + nodeId + "]") {
var linkGSelector = "svg>g[link-id='" + link_id + "']"; var linkGSelector = "svg>g[link-id='" + link_id + "']";
linkG = $(linkGSelector); linkG = $(linkGSelector);
var inResut = _.find(gArray, function (item) { var inResut = _.find(gArray, function (item) {
return item.attr("link-id") === link_id || item.attr("second-link-id") === link_id; return item.attr("link-id") === link_id;
}); });
if (inResut) { if (inResut) {
continue; continue;
...@@ -167,15 +168,17 @@ infrastructureModule.controller('organizationFullChartController', ['$scope', '$ ...@@ -167,15 +168,17 @@ infrastructureModule.controller('organizationFullChartController', ['$scope', '$
} }
} }
} }
}
if (secondLinkGs.length > 0) { if (secondLinkGs.length > 0) {
for (var i = 0; i < secondLinkGs.length; i++) { for (var i = 0; i < secondLinkGs.length; i++) {
var secondLinkG = secondLinkGs[i]; var secondLinkG = secondLinkGs[i];
var secondLink_id = secondLinkG.attributes[0].value; var secondLink_id = secondLinkG.attributes[0].value;
if (secondLink_id.substring(3) === "[" + nodeId + "]") {
var secondLinkGSelector = "svg>g[second-link-id='" + secondLink_id + "']"; var secondLinkGSelector = "svg>g[second-link-id='" + secondLink_id + "']";
secondLinkG = $(secondLinkGSelector); secondLinkG = $(secondLinkGSelector);
var inResut = _.find(gArray, function (item) { var inResut = _.find(gArray, function (item) {
return item.attr("link-id") === secondLink_id || item.attr("second-link-id") === secondLink_id; return item.attr("second-link-id") === secondLink_id;
}); });
if (inResut) { if (inResut) {
continue; continue;
...@@ -189,16 +192,19 @@ infrastructureModule.controller('organizationFullChartController', ['$scope', '$ ...@@ -189,16 +192,19 @@ infrastructureModule.controller('organizationFullChartController', ['$scope', '$
} }
} }
} }
}
}; };
var exportStart = function (sender, options, svg) { var exportStart = function (sender, options, svg) {
var nodeId = options.options.nodeId; var nodeId = options.options.nodeId;
if(nodeId) {
var gArray = []; var gArray = [];
getGArray(nodeId, gArray); getGArray(nodeId, gArray);
$("svg>g").remove(); $("svg>g").remove();
for (var i = 0; i < gArray.length; i++) { for (var i = 0; i < gArray.length; i++) {
$("svg").append(gArray[i]); $("svg").append(gArray[i]);
} }
}
var svg = $('svg')[0].outerHTML; var svg = $('svg')[0].outerHTML;
console.log("svg", svg); console.log("svg", svg);
canvg(document.getElementById('canvas'), svg); canvg(document.getElementById('canvas'), svg);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment