Skip to content

ES-827094-Issue fix #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

ES-827094-Issue fix #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a9f508
ES-827094-Issue fix
SumathiSumi Jul 19, 2023
7bbc6c6
ES-827094-Issue resolved
SumathiSumi Jul 21, 2023
624bdaf
ES-827094-Issue resolved
SumathiSumi Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions Common/Pages/DiagramMainContent.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,16 +209,18 @@
var nodeID = keyValuePair.Key;
if (!orgChartPropertyContainer.OriginalTextBoxValuesDictionary.ContainsKey(node.ID) && !orgChartPropertyContainer.OriginalCheckBoxValuesDictionary.ContainsKey(node.ID) && !orgChartPropertyContainer.TextBoxDictionary.ContainsKey(node.ID) && !orgChartPropertyContainer.CheckBoxDictionary.ContainsKey(node.ID))
{
var textBox = orgChartPropertyContainer.OriginalTextBoxValuesDictionary[nodeID];
var textBox = orgChartPropertyContainer.TextBoxDictionary[nodeID];
var originalTextBox = orgChartPropertyContainer.OriginalTextBoxValuesDictionary[nodeID];
List<string> deleteInformations = new List<string>();
foreach (KeyValuePair<string, string> propertyNames in textBox)
{
deleteInformations.Add(propertyNames.Key);
}
orgChartPropertyContainer.DeleteDictionary.Add(node.ID, deleteInformations);
var checkBox = orgChartPropertyContainer.OriginalCheckBoxValuesDictionary[nodeID];
orgChartPropertyContainer.OriginalTextBoxValuesDictionary[node.ID] = (textBox);
orgChartPropertyContainer.OriginalCheckBoxValuesDictionary[node.ID] = checkBox;
var checkBox = orgChartPropertyContainer.CheckBoxDictionary[nodeID];
var originalCheckBox = orgChartPropertyContainer.OriginalCheckBoxValuesDictionary[nodeID];
orgChartPropertyContainer.OriginalTextBoxValuesDictionary[node.ID] = (originalTextBox);
orgChartPropertyContainer.OriginalCheckBoxValuesDictionary[node.ID] = originalCheckBox;
orgChartPropertyContainer.TextBoxDictionary[node.ID] = textBox;
orgChartPropertyContainer.CheckBoxDictionary[node.ID] = checkBox;
}
Expand Down Expand Up @@ -547,14 +549,15 @@
annotationDetails.Add(data.Department);
break;


}
}
private void ConnectorDefaults(IDiagramObject obj)
{
Connector connector = obj as Connector;
if (Parent.MindMapPropertyPanel.IsMindMap)
connector.Constraints = ConnectorConstraints.Default & ~ConnectorConstraints.Select;
connector.BezierConnectorSettings = new BezierConnectorSettings { AllowSegmentsReset = false };
}

public async Task CreditProcessDiagram()
Expand Down Expand Up @@ -652,12 +655,14 @@
{
if (Diagram.SelectionSettings.Nodes.Count == 1)
{
Diagram.SelectionSettings.UserHandles[0].Visible = true;
Diagram.SelectionSettings.UserHandles[1].Visible = true;
Diagram.SelectionSettings.UserHandles[2].Visible = true;
Parent.DiagramPropertyPanel.PanelVisibility();
Parent.DiagramPropertyPanel.slider();

if (this.Parent.OrgChartPropertyPanel.IsOrgChart)
{
Diagram.SelectionSettings.UserHandles[0].Visible = true;
Diagram.SelectionSettings.UserHandles[1].Visible = true;
Diagram.SelectionSettings.UserHandles[2].Visible = true;
}
}
else if (Diagram.SelectionSettings.Connectors.Count == 1)
{
Expand Down Expand Up @@ -704,7 +709,7 @@

private void MultipleSelectionSettings(ObservableCollection<IDiagramObject> SelectedItems)
{
if(!Parent.MindMapPropertyPanel.MindMapProperty)
if (!Parent.MindMapPropertyPanel.MindMapProperty&&!Parent.OrgChartPropertyPanel.IsOrgChart)
{
Parent.DiagramPropertyPanel.PropertyPanelVisibility();
bool showConnectorPanel = false; bool showNodePanel = false;
Expand Down Expand Up @@ -823,9 +828,9 @@
{
StateHasChanged();
}
public void LoadNewDiagram(string Json)
public async Task LoadNewDiagram(string Json)
{
_= Diagram.LoadDiagram(Json);
await Diagram.LoadDiagram(Json);
}

public class PageOptionElement
Expand Down Expand Up @@ -1355,6 +1360,10 @@
{
Diagram.Select(new ObservableCollection<IDiagramObject>() { Diagram.Nodes[0] });
}
if (Parent.MindMapPropertyPanel.IsMindMap || Parent.OrgChartPropertyPanel.IsOrgChart)
{
await Parent.DiagramContent.Diagram.DoLayout();
}
}
private async void TextChanged(TextChangeEventArgs args)
{
Expand Down
Loading