Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion Common/BlazorServerCommon_NET10.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
<None Include="wwwroot\interop.js" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Syncfusion.Blazor" Version="33.1.44" />
<PackageReference Include="Syncfusion.Blazor.Diagram" Version="34.1.29" />
<PackageReference Include="Syncfusion.Blazor.Themes" Version="34.1.29" />
<PackageReference Include="Syncfusion.PdfExport.Net.Core" Version="34.1.29" />
</ItemGroup>


Expand Down
4 changes: 3 additions & 1 deletion Common/BlazorWasmCommon_NET10.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.1" PrivateAssets="all" />
<PackageReference Include="Syncfusion.Blazor" Version="33.1.44" />
<PackageReference Include="Syncfusion.Blazor.Diagram" Version="34.1.29" />
<PackageReference Include="Syncfusion.Blazor.Themes" Version="34.1.29" />
<PackageReference Include="Syncfusion.PdfExport.Net.Core" Version="34.1.29" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion Common/Pages/DiagramExportDialog.razor
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@using Syncfusion.Blazor.Popups
@using Syncfusion.Blazor.DropDowns
@using Syncfusion.Blazor.Diagram
@using Syncfusion.Blazor.Inputs
@using Syncfusion.Blazor.Buttons
@inject IJSRuntime jsRuntime
@namespace MindMap
Expand Down
11 changes: 1 addition & 10 deletions Common/Pages/DiagramMainContent.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using System;
using System.Threading.Tasks;
using System.Collections.ObjectModel;
using System.Globalization;
using Syncfusion.Blazor.Diagram;
using System.Runtime.CompilerServices;
using System.Security.Cryptography.X509Certificates;

using Syncfusion.Blazor.Diagram;

namespace MindMap
{
Expand Down
4 changes: 0 additions & 4 deletions Common/Pages/DiagramMainContent.razor
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
@using Syncfusion.Blazor.Diagram
@using Syncfusion.Blazor.Buttons
@using System.Collections.ObjectModel
@using System.Text.Json;
@inherits SampleBaseComponent;
@using Syncfusion.Blazor.Navigations
@using Syncfusion.Blazor.Popups
@namespace MindMap


<div class="db-diagram-container">
<div id="palette-space" class="sb-mobile-palette" style="display:@DisplayTreeViewNodes">
<div id="treeview">
Expand Down Expand Up @@ -284,12 +280,12 @@
{
Node node= new Node();
if(obj!=null)
node= obj as Node;

Check warning on line 283 in Common/Pages/DiagramMainContent.razor

View workflow job for this annotation

GitHub Actions / build

Converting null literal or possible null value to non-nullable type.
if(node!=null && Parent.MindMapPropertyPanel.IsMindMap)
{
node.Constraints |= NodeConstraints.AllowDrop;
}
if (node != null && node.AdditionalInfo["Orientation"].ToString() == "Root")

Check warning on line 288 in Common/Pages/DiagramMainContent.razor

View workflow job for this annotation

GitHub Actions / build

Dereference of a possibly null reference.
{
node.ExpandIcon = new DiagramExpandIcon()
{
Expand All @@ -303,7 +299,7 @@
};

}
else if (node != null && node.AdditionalInfo["Orientation"].ToString() == "Left")

Check warning on line 302 in Common/Pages/DiagramMainContent.razor

View workflow job for this annotation

GitHub Actions / build

Dereference of a possibly null reference.
{
node.ExpandIcon = new DiagramExpandIcon()
{
Expand All @@ -321,7 +317,7 @@
};

}
else if (node != null && node.AdditionalInfo["Orientation"].ToString() == "Right")

Check warning on line 320 in Common/Pages/DiagramMainContent.razor

View workflow job for this annotation

GitHub Actions / build

Dereference of a possibly null reference.
{
node.ExpandIcon = new DiagramExpandIcon()
{
Expand Down Expand Up @@ -368,7 +364,7 @@
Visibility = PortVisibility.Hidden,
Style = new ShapeStyle() { Fill = "green" }
};
node.Ports = new DiagramObjectCollection<PointPort> { port1, port2, port3, port4 };

Check warning on line 367 in Common/Pages/DiagramMainContent.razor

View workflow job for this annotation

GitHub Actions / build

Dereference of a possibly null reference.
}
/// <summary>
/// This method is helped to assign the default properties of the connector.
Expand All @@ -377,7 +373,7 @@
{
Connector connector = new Connector();
if(obj !=null)
connector = obj as Connector;

Check warning on line 376 in Common/Pages/DiagramMainContent.razor

View workflow job for this annotation

GitHub Actions / build

Converting null literal or possible null value to non-nullable type.
if (connector != null && Parent.MindMapPropertyPanel.IsMindMap)
{
connector.Constraints = ConnectorConstraints.Default & ~ConnectorConstraints.Select;
Expand Down Expand Up @@ -957,7 +953,7 @@
{
deleteObject = (diagram.SelectionSettings.Nodes[0]) as Node;
}
public override void OnMouseUp(DiagramMouseEventArgs args)

Check warning on line 956 in Common/Pages/DiagramMainContent.razor

View workflow job for this annotation

GitHub Actions / build

Nullability of type of parameter 'args' doesn't match overridden member (possibly because of nullability attributes).

Check warning on line 956 in Common/Pages/DiagramMainContent.razor

View workflow job for this annotation

GitHub Actions / build

Nullability of type of parameter 'args' doesn't match overridden member (possibly because of nullability attributes).
{
if (deleteObject != null)
{
Expand Down
4 changes: 0 additions & 4 deletions Common/Pages/DiagramMenuBar.razor
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@
@using Syncfusion.Blazor.Navigations;
@using Syncfusion.Blazor.Diagram
@using Syncfusion.PdfExport;
@using System.Text.Json.Serialization;
@using System.Text.Json;
@using System.Collections.ObjectModel;
@using Syncfusion.Blazor.SplitButtons;
@using Microsoft.JSInterop
@using Microsoft.AspNetCore.Components.Web
@using System;
@inject IJSRuntime jsRuntime
@namespace MindMap
Expand Down
3 changes: 1 addition & 2 deletions Common/Pages/DiagramToolBar.razor
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@using Syncfusion.Blazor.Navigations
@using Syncfusion.Blazor.Buttons
@using Syncfusion.Blazor.SplitButtons
@using Syncfusion.Blazor.DropDowns
@using Syncfusion.Blazor.Inputs

@namespace MindMap
Expand Down Expand Up @@ -65,7 +64,7 @@
</SfDropDownButton>

<div class=@HideButtonCss style="background-color: @HideButtonBackground;margin-left:12px;margin-top:-2px;min-width:30px;min-height:20px;border-color:transparent">
<SfButton ID="btnHideProperty" IconCss="sf-icon-properties tb-hide-button tb-icons" OnClick="@HidePropertyContainer"></SfButton>
<SfButton ID="btnHideProperty" IconCss="sf-icon-properties tb-hide-button tb-icons" OnClick="@HidePropertyContainer" style="border-color: transparent;"></SfButton>
</div>
</Template>
</ToolbarItem>
Expand Down
1 change: 0 additions & 1 deletion Common/Pages/DiagramToolBar.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Microsoft.JSInterop;
using System;
using System.Threading.Tasks;
using Newtonsoft.Json;
using System.Collections.ObjectModel;
using System.Globalization;
using Syncfusion.Blazor.Diagram;
Expand Down
2 changes: 0 additions & 2 deletions Common/Pages/FileUtil.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using Microsoft.JSInterop;
using System;
using System.Threading.Tasks;

namespace MindMap
{
Expand Down
19 changes: 8 additions & 11 deletions Common/Pages/MindMapPropertyContainer.razor
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
@using System.Collections.Generic
@using Syncfusion.Blazor.DropDowns
@using Syncfusion.Blazor.Inputs
@using Syncfusion.Blazor.Popups;
@using Syncfusion.Blazor.Navigations
@using Syncfusion.Blazor.Diagram
@using System.Collections.ObjectModel
@using Newtonsoft.Json.Linq;
@using Syncfusion.Blazor.SplitButtons
@using System.Drawing
@inject IJSRuntime js

Expand Down Expand Up @@ -78,15 +75,15 @@
<div class="col-xs-6 db-col-right">
<span class="db-prop-text-style">Type</span>
</div>
<div class="col-xs-2 db-col-center" style="margin-left: -30px; ">
<div class="col-xs-2 db-col-center" style="margin-left: -50px; ">
<span class="db-prop-text-style">Stroke</span>
</div>
<div class="col-xs-2 db-col-left" style="margin-left: 25px">
<div class="col-xs-2 db-col-left" style="margin-left: 15px;">
<span class="db-prop-text-style">Thickness</span>
</div>
</div>
<div class="row">
<div class="col-xs-6 db-col-left" style="width:90px;margin-top:3px">
<div class="col-xs-5 db-col-left" style="width:70px;margin-top:3px">
<SfDropDownList ID="strokeStyle" TValue="string" TItem="BorderStylesFields" PopupWidth="160px" Index="@strokeStyleValue" DataSource="@BorderStyles">
<DropDownListTemplates TItem="BorderStylesFields">
<ItemTemplate>
Expand All @@ -109,7 +106,7 @@
<SfColorPicker ID="mindmapStroke" ValueChange="OnStrokeColorChange" Mode="ColorPickerMode.Palette" @bind-Value="@strokeColorValue"></SfColorPicker>
</div>
</div>
<div class="col-xs-4 db-col-center" style="width:87px;margin-left: 34px;margin-top:4px;">
<div class="col-xs-7 db-col-center" style="width:110px;margin-left: 34px;margin-top:4px;">
<SfNumericTextBox ID="mindmapStrokeWidth" Format="###.##" Min="0" Step="0.5" @bind-Value="@mindMapStrokeWidth">
<NumericTextBoxEvents TValue="double" ValueChange="@OnStrokeWidthChange"></NumericTextBoxEvents>
</SfNumericTextBox>
Expand Down Expand Up @@ -192,20 +189,20 @@
<div class="db-prop-separator">
</div>
<div class="row db-prop-row">
<div class="col-xs-8 db-col-right db-prop-text-style" style="padding-top: 12px;">
<div class="col-xs-7 db-col-right db-prop-text-style" style="padding-top: 12px;">
<span class="db-prop-text-style">Horizontal Spacing</span>
</div>
<div class="col-xs-4 db-col-left" style="padding-top: 8px">
<div class="col-xs-5 db-col-left" style="padding-top: 8px">
<SfNumericTextBox TValue="int?" Width="100%" @bind-Value="@horizontalValue" Min="20" Step="2" Format="###.##">
<NumericTextBoxEvents TValue="int?" ValueChange="OnHorizontalSpaceChange"></NumericTextBoxEvents>
</SfNumericTextBox>
</div>
</div>
<div class="row db-prop-row">
<div class="col-xs-8 db-col-right db-prop-text-style" style="padding-top: 12px;">
<div class="col-xs-7 db-col-right db-prop-text-style" style="padding-top: 12px;">
<span class="db-prop-text-style">Vertical Spacing</span>
</div>
<div class="col-xs-4 db-col-left" style="padding-top: 8px;">
<div class="col-xs-5 db-col-left" style="padding-top: 8px;">
<SfNumericTextBox TValue="int?" Width="100%" @bind-Value="@verticalValue" Min="20" Step="2" Format="###.##">
<NumericTextBoxEvents TValue="int?" ValueChange="OnVerticalSpaceChange"></NumericTextBoxEvents>
</SfNumericTextBox>
Expand Down Expand Up @@ -505,7 +502,7 @@
SfDiagramComponent Diagram = Parent.DiagramContent.Diagram;
mindMapLevelValue = "Root";
mindMapShapeValue = "Ellipse";
fillColorValue = Diagram.Nodes[0].Style.Fill.ToString();

Check warning on line 505 in Common/Pages/MindMapPropertyContainer.razor

View workflow job for this annotation

GitHub Actions / build

Dereference of a possibly null reference.

Check warning on line 505 in Common/Pages/MindMapPropertyContainer.razor

View workflow job for this annotation

GitHub Actions / build

Dereference of a possibly null reference.

Check warning on line 505 in Common/Pages/MindMapPropertyContainer.razor

View workflow job for this annotation

GitHub Actions / build

Dereference of a possibly null reference.
strokeColorValue = "#80BFEA";
TextColor = "#008000";
StateHasChanged();
Expand Down
1 change: 0 additions & 1 deletion Common/Shared/MainLayout.razor
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
@inject SyncfusionBlazorService SyncfusionBlazorService;
@using Syncfusion.Blazor;
@using MindMap;
@using MindMap.Shared
@inject Microsoft.AspNetCore.Components.NavigationManager UriHelper;
@namespace MindMap.Shared
<Syncfusion.Blazor.Popups.SfDialogProvider />
Expand All @@ -12,9 +11,9 @@

@code{
[Inject]
SyncfusionBlazorService SyncfusionService { get; set; }

Check warning on line 14 in Common/Shared/MainLayout.razor

View workflow job for this annotation

GitHub Actions / build

Non-nullable property 'SyncfusionService' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the property as nullable.

public DiagramMain DiagramMain { get; set; }

Check warning on line 16 in Common/Shared/MainLayout.razor

View workflow job for this annotation

GitHub Actions / build

Non-nullable property 'DiagramMain' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the property as nullable.


protected override async Task OnInitializedAsync()
Expand Down
6 changes: 1 addition & 5 deletions Common/Shared/SampleComponentBase.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;

namespace MindMap.Shared
Expand Down
5 changes: 1 addition & 4 deletions Common/Shared/SampleService.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using System.Threading.Tasks;

namespace MindMap.Shared
namespace MindMap.Shared
{
public class SampleService
{
Expand All @@ -20,7 +17,7 @@
get; set;
} = new NotifyProperties();

public event Func<NotifyProperties, Task> Notify;

Check warning on line 20 in Common/Shared/SampleService.cs

View workflow job for this annotation

GitHub Actions / build

Non-nullable event 'Notify' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the event as nullable.
}

public class NotifyProperties
Expand Down
12 changes: 10 additions & 2 deletions Server/Components/App.razor
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<ResourcePreloader />
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" />
<link href="_content/Syncfusion.Blazor/styles/fluent2.css" rel="stylesheet">
<link href="_content/Syncfusion.Blazor.Themes/fluent2.css" rel="stylesheet">

<link href="@Assets["assets/db-icons1/style.css"]" rel="stylesheet" />
<link href="@Assets["assets/dbstyle/diagrambuilder.css"]" rel="stylesheet" />
Expand Down Expand Up @@ -75,7 +75,15 @@
</environment>
</div>
<ReconnectModal />
<script src="@Assets["_content/Syncfusion.Blazor/scripts/syncfusion-blazor.min.js"]" type="text/javascript"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Diagram/scripts/sf-diagramcomponent.min.js"]" type="text/javascript"></script>
<script src="@Assets["_content/Syncfusion.Blazor.DropDowns/scripts/sf-dropdownlist.min.js"]" type="text/javascript"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Inputs/scripts/sf-colorpicker.min.js"]" type="text/javascript"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Popups/scripts/sf-tooltip.min.js"]" type="text/javascript"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Navigations/scripts/sf-toolbar.min.js"]"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Navigations/scripts/sf-treeview.min.js"]"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Buttons/scripts/sf-checkbox.min.js"]"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Popups/scripts/sf-dialog.min.js"]"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Inputs/scripts/sf-uploader.min.js"]"></script>
<script src="@Assets["_framework/blazor.web.js"]"></script>
</body>

Expand Down
1 change: 0 additions & 1 deletion Server/Controllers/CultureController.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Localization;

namespace MindMap.Controllers
Expand Down
4 changes: 1 addition & 3 deletions Server/wwwroot/assets/dbstyle/diagrambuilder.css
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,8 @@ fill: black;

.e-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn.tb-item-selected .e-btn-icon,
.tb-property-open #btnHideProperty .tb-hide-button {
padding-left:2px;
margin-left:-6px;
margin-bottom:4px;
color:white;
padding-bottom: 8px;
}
.e-toolbar-left .e-toolbar-item.tb-item-selected .e-tbar-btn .e-icons.e-btn-icon {
color: white;
Expand Down
12 changes: 10 additions & 2 deletions WASM/MindMap/Components/App.razor
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" />
<link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet'>
<link href=@Urihelper.Uri rel="canonical" />
<link href="_content/Syncfusion.Blazor/styles/fluent2.css" rel="stylesheet">
<link href="_content/Syncfusion.Blazor.Themes/fluent2.css" rel="stylesheet">
<link href="@Assets["assets/db-icons1/style.css"]" rel="stylesheet" />
<link href="@Assets["assets/dbstyle/diagrambuilder.css"]" rel="stylesheet" />
<script src="@Assets["_content/BlazorWasmCommon_NET10/interop.js"]"></script>
Expand Down Expand Up @@ -86,7 +86,15 @@
}
}, 3000);
</script>
<script src="@Assets["_content/Syncfusion.Blazor/scripts/syncfusion-blazor.min.js"]" type="text/javascript"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Diagram/scripts/sf-diagramcomponent.min.js"]" type="text/javascript"></script>
<script src="@Assets["_content/Syncfusion.Blazor.DropDowns/scripts/sf-dropdownlist.min.js"]" type="text/javascript"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Inputs/scripts/sf-colorpicker.min.js"]" type="text/javascript"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Popups/scripts/sf-tooltip.min.js"]" type="text/javascript"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Navigations/scripts/sf-toolbar.min.js"]"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Navigations/scripts/sf-treeview.min.js"]"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Buttons/scripts/sf-checkbox.min.js"]"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Popups/scripts/sf-dialog.min.js"]"></script>
<script src="@Assets["_content/Syncfusion.Blazor.Inputs/scripts/sf-uploader.min.js"]"></script>
<script src="@Assets["_framework/blazor.web.js"]"></script>
</body>

Expand Down
4 changes: 1 addition & 3 deletions WASM/MindMap/wwwroot/assets/dbstyle/diagrambuilder.css
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,7 @@ fill: black;

.e-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn.tb-item-selected .e-btn-icon,
.tb-property-open #btnHideProperty .tb-hide-button {
padding-left:2px;
margin-left:-6px;
margin-bottom:4px;
padding-bottom:8px;
color:white;
}
.e-toolbar-left .e-toolbar-item.tb-item-selected .e-tbar-btn .e-icons.e-btn-icon {
Expand Down
Loading