Skip to content

feat(MindMap): redesign MindMap component #5006

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

Merged
merged 3 commits into from
Dec 31, 2024
Merged

feat(MindMap): redesign MindMap component #5006

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
e5058ab
doc: 更新示例
ArgoZhang Dec 31, 2024
859a499
refactor: 更新本地化
ArgoZhang Dec 31, 2024
f5ff6fe
chore: bump version 9.1.0
ArgoZhang Dec 31, 2024
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
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<PackageReference Include="BootstrapBlazor.MaterialDesign.Extensions" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.1.4" />
<PackageReference Include="BootstrapBlazor.Mermaid" Version="9.0.3" />
<PackageReference Include="BootstrapBlazor.MindMap" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MindMap" Version="9.1.0" />
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.0" />
Expand Down
45 changes: 25 additions & 20 deletions src/BootstrapBlazor.Server/Components/Samples/MindMaps.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,37 @@
<PackageTips Name="BootstrapBlazor.MindMap" />

<DemoBlock Title="@Localizer["MindMapNormalTitle"]" Introduction="@Localizer["MindMapDescription"]" Name="MindMapNormal">
<MindMap @ref="_mindMap" Options="_options" Data="@Data" OnReceive="@OnReceive" OnError="@OnError" StyleCss="height: 55vh;" />
<section ignore>
<div class="row g-3 form-inline">
<div class="col-12 col-sm-6">
<Select @bind-Value="_options.Layout" ShowLabel="true" DisplayText="@Localizer["MindMapLayout"]"></Select>
</div>
<div class="col-12 col-sm-6">
<Select @bind-Value="_options.Theme" ShowLabel="true" DisplayText="@Localizer["MindMapTheme"]"></Select>
</div>
</div>
</section>
<MindMap Options="_options" Data="@Data" OnReceive="@OnReceive" @ref="MindMap"></MindMap>
<div class="row g-3 mt-3">
<div class="col-12">
<Button Text="@Localizer["Sample1ButtonText"]" OnClick="Sample" />
<Button Text="@Localizer["Sample2ButtonText"]" OnClick="Sample2" />
<Button Text="@Localizer["ExportButtonText"]" OnClick="Export" />
<Button Text="@Localizer["ExportJsonButtonText"]" OnClick="ExportJson" />
<Button Text="@Localizer["GetFullDataButtonText"]" OnClick="GetFullData" />
<Button Text="@Localizer["GetDataButtonText"]" OnClick="GetData" />
<Button Text="@Localizer["SetDataButtonText"]" OnClick="SetData" />
<Button Text="@Localizer["ResetButtonText"]" OnClick="Reset" />
</div>
<div class="col-12 col-sm-3 mt-3">
<Select @bind-Value="_options.Layout" ShowLabel="true" />
</div>
<div class="col-12 col-sm-3 mt-3">
<Select @bind-Value="_options.Theme" ShowLabel="true" />
<Button Text="@Localizer["Sample1ButtonText"]" OnClick="Sample"></Button>
<Button Text="@Localizer["Sample2ButtonText"]" OnClick="Sample2"></Button>
<Button Text="@Localizer["ExportButtonText"]" OnClick="ExportImage"></Button>
<Button Text="@Localizer["ExportJsonButtonText"]" OnClick="ExportJson"></Button>
<Button Text="@Localizer["GetFullDataButtonText"]" OnClick="GetFullData"></Button>
<Button Text="@Localizer["GetDataButtonText"]" OnClick="GetData"></Button>
<Button Text="@Localizer["SetDataButtonText"]" OnClick="SetData"></Button>
<Button Text="@Localizer["ResetButtonText"]" OnClick="Reset"></Button>
<Button Text="@Localizer["FitButtonText"]" OnClick="Fit"></Button>
</div>
<div class="col-12">
<Textarea @bind-Value="_result" rows="10" />
<Textarea @bind-Value="@_result" rows="10"></Textarea>
</div>
</div>
</div>
</DemoBlock>

<AttributeTable Items="@GetAttributes()" />
<AttributeTable Items="@GetAttributes()"></AttributeTable>

<AttributeTable Title="@Localizer["OptionsText"]" Items="@GetOptionsAttributes()" />
<AttributeTable Title="@Localizer["OptionsText"]" Items="@GetOptionsAttributes()"></AttributeTable>

<AttributeTable Title="@Localizer["NodeDataText"]" Items="@GetNodeDataAttributes()" />
<AttributeTable Title="@Localizer["NodeDataText"]" Items="@GetNodeDataAttributes()"></AttributeTable>
50 changes: 23 additions & 27 deletions src/BootstrapBlazor.Server/Components/Samples/MindMaps.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ public partial class MindMaps
[NotNull]
private MessageService? MessageService { get; set; }

private MindMap _mindMap = default!;

private readonly MindMapOption _options = new();

private string _result = "";
private string? _result;

[NotNull]
private MindMap? MindMap { get; set; }

/// <summary>
/// 初始化数据
Expand Down Expand Up @@ -95,21 +96,21 @@ private Task OnError(string message)
return Task.CompletedTask;
}

async Task Export()
async Task ExportImage()
{
await _mindMap.Export();
await MindMap.Export();
await ShowBottomMessage("下载Png");
}

async Task ExportJson()
{
await _mindMap.Export("json", WithConfig: false);
await MindMap.Export("json", withConfig: false);
await ShowBottomMessage("下载Json");
}

async Task ExportPng()
{
await _mindMap.Export(IsDownload: false, WithConfig: false);
await MindMap.Export(download: false, withConfig: false);
await ShowBottomMessage("已导出Png");
}

Expand All @@ -119,16 +120,27 @@ private Task ShowBottomMessage(string message) => MessageService.Show(new Messag
Icon = "fa-solid fa-circle-info",
});

Task GetFullData() => _mindMap.GetData();
async Task GetFullData()
{
_result = await MindMap.GetData(true);
}

Task GetData() => _mindMap.GetData(false);
async Task GetData()
{
_result = await MindMap.GetData(false);
}

async Task SetData()
{
if (_result != null) await _mindMap.SetData(_result);
if (!string.IsNullOrEmpty(_result))
{
await MindMap.SetData(_result);
}
}

Task Reset() => _mindMap.Reset();
Task Reset() => MindMap.Reset();

Task Fit() => MindMap.Fit();

async Task Sample()
{
Expand Down Expand Up @@ -221,22 +233,6 @@ private AttributeItem[] GetAttributes() =>
DefaultValue = " — "
},
new()
{
Name = nameof(MindMap.SetTheme),
Description = Localizer[nameof(MindMap.SetTheme)],
Type = "Task",
ValueList = " — ",
DefaultValue = " — "
},
new()
{
Name = nameof(MindMap.SetLayout),
Description = Localizer[nameof(MindMap.SetTheme)],
Type = "Task",
ValueList = " — ",
DefaultValue = " — "
},
new()
{
Name = nameof(MindMap.Options),
Description = Localizer[nameof(MindMap.Options)],
Expand Down
13 changes: 8 additions & 5 deletions src/BootstrapBlazor.Server/Locales/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6308,14 +6308,17 @@
"MindMapTitle": "Mind Map",
"MindMapDescription": "The shortcut key tab adds a new node, the mouse can drag node arrangement",
"MindMapNormalTitle": "Basic usage",
"MindMapLayout": "Layout",
"MindMapTheme": "Theme",
"Sample1ButtonText": "Example 1",
"Sample2ButtonText": "Example 2: week arrangement",
"ExportButtonText": "Download as PNG",
"ExportJsonButtonText": "Download as JSON",
"GetFullDataButtonText": "Export object",
"GetDataButtonText": "Export the JSON object",
"SetDataButtonText": "Import data (JSON)",
"ExportButtonText": "ExportPng",
"ExportJsonButtonText": "ExportJSON",
"GetFullDataButtonText": "GetFullData",
"GetDataButtonText": "GetData",
"SetDataButtonText": "SetData",
"ResetButtonText": "Reset",
"FitButtonText": "Fit",
"NodeDataText": "NodeData",
"Data": "Data",
"ShowUI": "Show default UI",
Expand Down
13 changes: 8 additions & 5 deletions src/BootstrapBlazor.Server/Locales/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6308,14 +6308,17 @@
"MindMapTitle": "Mind Map 思维导图",
"MindMapDescription": "快捷键Tab添加新节点,鼠标可拖动节点排列",
"MindMapNormalTitle": "基本用法",
"MindMapLayout": "布局",
"MindMapTheme": "主题",
"Sample1ButtonText": "例子1",
"Sample2ButtonText": "一周安排",
"ExportButtonText": "下载为PNG",
"ExportJsonButtonText": "下载为json",
"GetFullDataButtonText": "导出对象",
"GetDataButtonText": "导出json对象",
"SetDataButtonText": "导入数据(json)",
"ExportButtonText": "导出 PNG",
"ExportJsonButtonText": "导出 Json",
"GetFullDataButtonText": "GetFullData",
"GetDataButtonText": "GetData",
"SetDataButtonText": "SetData",
"ResetButtonText": "复位",
"FitButtonText": "自适应",
"NodeDataText": "节点数据",
"Data": "初始数据",
"ShowUI": "显示内置UI",
Expand Down
Loading