Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: sider

Browse Source
This commit is contained in:
Rucha Mahabal 2021-07-02 18:15:18 +05:30
parent 77b0b8a877
commit 2fcd05aa82
3 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js
View File

@ -40,7 +40,7 @@ erpnext.HierarchyChart = class {
me.setup_node_click_action(this);
me.setup_edit_node_action(this);
}
}
};
}
make_node_element(node) {
@ -76,7 +76,7 @@ erpnext.HierarchyChart = class {
me.company = company.get_value();
// svg for connectors
me.make_svg_markers()
me.make_svg_markers();
if (me.$hierarchy)
me.$hierarchy.remove();
@ -149,7 +149,7 @@ erpnext.HierarchyChart = class {
me.expand_node(root_node);
}
}
})
});
}
expand_node(node) {
@ -166,7 +166,7 @@ erpnext.HierarchyChart = class {
// rebuild incoming connections
let grandparent = $(`#${node.parent_id}`).attr('data-parent');
this.refresh_connectors(grandparent)
this.refresh_connectors(grandparent);
}
if (node.expandable && !node.expanded) {
@ -176,8 +176,8 @@ erpnext.HierarchyChart = class {
collapse_node() {
if (this.selected_node.expandable) {
this.selected_node.$children.hide();
$(`path[data-parent="${this.selected_node.id}"]`).hide();
this.selected_node.$children.hide('fast');
$(`path[data-parent="${this.selected_node.id}"]`).hide('fast');
this.selected_node.expanded = false;
}
}
@ -222,15 +222,14 @@ erpnext.HierarchyChart = class {
if (!node.$children) {
node.$children = $('<ul class="node-children"></ul>')
.hide()
.appendTo(this.$hierarchy.find('.level:last'));
.hide()
.appendTo(this.$hierarchy.find('.level:last'));
node.$children.empty();
if (child_nodes) {
$.each(child_nodes, (_i, data) => {
this.add_node(node, data);
setTimeout(() => {
this.add_connector(node.id, data.id);
}, 250);
@ -238,8 +237,8 @@ erpnext.HierarchyChart = class {
}
}
node.$children.show();
$(`path[data-parent="${node.id}"]`).show();
node.$children.show('fast');
$(`path[data-parent="${node.id}"]`).show('fast');
node.expanded = true;
}
@ -443,6 +442,6 @@ erpnext.HierarchyChart = class {
return;
$(path).remove();
})
});
}
}
};

18
erpnext/public/js/hierarchy_chart/hierarchy_chart_mobile.js
View File

@ -10,7 +10,7 @@ erpnext.HierarchyChartMobile = class {
this.wrapper = $(wrapper);
this.page = wrapper.page;
this.method = method;
this.doctype = doctype
this.doctype = doctype;
this.page.main.css({
'min-height': '300px',
@ -40,7 +40,7 @@ erpnext.HierarchyChartMobile = class {
me.setup_node_click_action(this);
me.setup_edit_node_action(this);
}
}
};
}
make_node_element(node) {
@ -78,7 +78,7 @@ erpnext.HierarchyChartMobile = class {
me.company = company.get_value();
// svg for connectors
me.make_svg_markers()
me.make_svg_markers();
if (me.$sibling_group)
me.$sibling_group.remove();
@ -158,7 +158,7 @@ erpnext.HierarchyChartMobile = class {
me.expand_node(root_node);
}
}
})
});
}
expand_node(node) {
@ -248,8 +248,8 @@ erpnext.HierarchyChartMobile = class {
render_child_nodes(node, child_nodes) {
if (!node.$children) {
node.$children = $('<ul class="node-children"></ul>')
.hide()
.appendTo(node.$link.parent());
.hide()
.appendTo(node.$link.parent());
node.$children.empty();
@ -462,7 +462,7 @@ erpnext.HierarchyChartMobile = class {
get_avatar(node) {
return `<span class="avatar avatar-small" title="${node.name}">
<span class="avatar-frame" src=${node.image} style="background-image: url(${node.image})"></span>
</span>`
</span>`;
}
expand_sibling_group_node(parent) {
@ -518,7 +518,7 @@ erpnext.HierarchyChartMobile = class {
return;
$(path).remove();
})
});
}
refresh_connectors(node_parent, node_id) {
@ -527,4 +527,4 @@ erpnext.HierarchyChartMobile = class {
$(`path[data-parent="${node_parent}"]`).remove();
this.add_connector(node_parent, node_id);
}
}
};

5
erpnext/public/scss/hierarchy_chart.scss
View File

@ -62,16 +62,13 @@
.edit-chart-node {
display: block;
margin-right: 0.25rem;
}
.node-edit-icon {
display: block;
}
.edit-chart-node {
margin-right: 0.25rem;
}
.node-edit-icon > .icon{
stroke: var(--blue-500);
}