From 39b82ed3bcb5487f5162c5ffb7bf6c268a7b600f Mon Sep 17 00:00:00 2001
From: MeysamMoghaddam <65253484+MeysamMoghaddam@users.noreply.github.com>
Date: Mon, 13 Oct 2025 21:36:05 +0330
Subject: [PATCH] u
---
.../Shared/OrganizationChart.razor | 4 +++-
.../Shared/OrganizationChart.razor.cs | 16 ++++++++++++++++
.../Shared/OrganizationChart.razor.css | 5 -----
.../Shared/OrganizationChartLevel.razor.cs | 15 +++++++++++++--
.../Shared/OrganizationChartLevel.razor.css | 2 +-
5 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/src/FrontOffice.Main/Shared/OrganizationChart.razor b/src/FrontOffice.Main/Shared/OrganizationChart.razor
index b489eac..bfdd5e1 100644
--- a/src/FrontOffice.Main/Shared/OrganizationChart.razor
+++ b/src/FrontOffice.Main/Shared/OrganizationChart.razor
@@ -35,7 +35,9 @@
@if (_isExpanded && _currentUser?.Children?.Any() == true)
{
-
+
+
+
}
diff --git a/src/FrontOffice.Main/Shared/OrganizationChart.razor.cs b/src/FrontOffice.Main/Shared/OrganizationChart.razor.cs
index cc671df..e9ca1ed 100644
--- a/src/FrontOffice.Main/Shared/OrganizationChart.razor.cs
+++ b/src/FrontOffice.Main/Shared/OrganizationChart.razor.cs
@@ -50,6 +50,14 @@ public partial class OrganizationChart
LastName = "رضایی",
PersonalPurchase = 950000,
TeamPurchase = 2100000
+ },
+ new UserNode
+ {
+ Id = 8,
+ FirstName = "فرزاد",
+ LastName = "رضایی",
+ PersonalPurchase = 950000,
+ TeamPurchase = 2100000
}
}
},
@@ -80,6 +88,14 @@ public partial class OrganizationChart
LastName = "رضایی",
PersonalPurchase = 1350000,
TeamPurchase = 4100000
+ },
+ new UserNode
+ {
+ Id = 7,
+ FirstName = "آرش",
+ LastName = "رضایی",
+ PersonalPurchase = 1350000,
+ TeamPurchase = 4100000
}
}
},
diff --git a/src/FrontOffice.Main/Shared/OrganizationChart.razor.css b/src/FrontOffice.Main/Shared/OrganizationChart.razor.css
index 7ebb732..cd9b7e3 100644
--- a/src/FrontOffice.Main/Shared/OrganizationChart.razor.css
+++ b/src/FrontOffice.Main/Shared/OrganizationChart.razor.css
@@ -13,11 +13,6 @@
.org-node {
position: relative;
- margin: 20px 0;
-}
-
-.root-node {
- margin-bottom: 40px;
}
.child-node {
diff --git a/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.cs b/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.cs
index 557c53b..21b12ac 100644
--- a/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.cs
+++ b/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.cs
@@ -7,7 +7,7 @@ public partial class OrganizationChartLevel
[Parameter] public List? Nodes { get; set; }
[Parameter] public int Level { get; set; } = 1;
- [CascadingParameter] private OrganizationChart ParentChart { get; set; } = default!;
+ [CascadingParameter] private OrganizationChart? ParentChart { get; set; }
private Size GetAvatarSize(int level)
{
@@ -21,7 +21,18 @@ public partial class OrganizationChartLevel
private void ToggleNodeExpand(long userId)
{
- ParentChart?.ToggleNodeExpand(userId);
+ if (ParentChart != null)
+ {
+ ParentChart.ToggleNodeExpand(userId);
+ }
+ }
+
+ private void SafeToggleNodeExpand(long userId)
+ {
+ if (ParentChart != null)
+ {
+ ParentChart.ToggleNodeExpand(userId);
+ }
}
public class UserNode
diff --git a/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.css b/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.css
index f7bf760..2777f74 100644
--- a/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.css
+++ b/src/FrontOffice.Main/Shared/OrganizationChartLevel.razor.css
@@ -4,7 +4,7 @@
justify-content: center;
flex-wrap: wrap;
position: relative;
- margin-top: 40px;
+ margin-top: 80px;
}
.org-level::before {