From 38aa8e6e5b6a60704336304265282a023e5e7ff0 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Wed, 26 Jul 2023 01:23:05 +0800 Subject: [PATCH] feat: WIP. --- .../Semi.Avalonia.TreeDataGrid.Demo/App.axaml | 1 + .../MainWindow.axaml | 10 +- .../MainWindow.axaml.cs | 2 + .../Semi.Avalonia.TreeDataGrid.Demo.csproj | 2 + .../ViewModels/FilesPageViewModel.cs | 26 +++ .../ViewModels/MainViewModel.cs | 8 + .../ViewModels/SongsPageViewModel.cs | 152 ++++++++++++++++++ src/Semi.Avalonia.TreeDataGrid/Dark.axaml | 12 +- src/Semi.Avalonia.TreeDataGrid/Light.axaml | 13 +- src/Semi.Avalonia.TreeDataGrid/Shared.axaml | 10 +- .../TreeDataGrid.axaml | 40 +++-- 11 files changed, 243 insertions(+), 33 deletions(-) create mode 100644 demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/FilesPageViewModel.cs create mode 100644 demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/MainViewModel.cs create mode 100644 demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/SongsPageViewModel.cs diff --git a/demo/Semi.Avalonia.TreeDataGrid.Demo/App.axaml b/demo/Semi.Avalonia.TreeDataGrid.Demo/App.axaml index 6ba2484..3cd62a8 100644 --- a/demo/Semi.Avalonia.TreeDataGrid.Demo/App.axaml +++ b/demo/Semi.Avalonia.TreeDataGrid.Demo/App.axaml @@ -6,6 +6,7 @@ + \ No newline at end of file diff --git a/demo/Semi.Avalonia.TreeDataGrid.Demo/MainWindow.axaml b/demo/Semi.Avalonia.TreeDataGrid.Demo/MainWindow.axaml index 1c957f9..f6abc32 100644 --- a/demo/Semi.Avalonia.TreeDataGrid.Demo/MainWindow.axaml +++ b/demo/Semi.Avalonia.TreeDataGrid.Demo/MainWindow.axaml @@ -4,11 +4,15 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:vm="clr-namespace:Semi.Avalonia.TreeDataGrid.Demo.ViewModels;assembly=Semi.Avalonia.TreeDataGrid.Demo" Title="Semi.Avalonia.TreeDataGrid.Demo" d:DesignHeight="450" d:DesignWidth="800" + x:DataType="vm:SongsPageViewModel" mc:Ignorable="d"> - - - + + + + + diff --git a/demo/Semi.Avalonia.TreeDataGrid.Demo/MainWindow.axaml.cs b/demo/Semi.Avalonia.TreeDataGrid.Demo/MainWindow.axaml.cs index 0694e68..8bb425e 100644 --- a/demo/Semi.Avalonia.TreeDataGrid.Demo/MainWindow.axaml.cs +++ b/demo/Semi.Avalonia.TreeDataGrid.Demo/MainWindow.axaml.cs @@ -1,4 +1,5 @@ using Avalonia.Controls; +using Semi.Avalonia.TreeDataGrid.Demo.ViewModels; namespace Semi.Avalonia.TreeDataGrid.Demo; @@ -7,5 +8,6 @@ public partial class MainWindow : Window public MainWindow() { InitializeComponent(); + this.DataContext = new SongsPageViewModel(); } } \ No newline at end of file diff --git a/demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj b/demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj index ffa8068..3dda989 100644 --- a/demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj +++ b/demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj @@ -16,10 +16,12 @@ + + diff --git a/demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/FilesPageViewModel.cs b/demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/FilesPageViewModel.cs new file mode 100644 index 0000000..933da57 --- /dev/null +++ b/demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/FilesPageViewModel.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; +using CommunityToolkit.Mvvm.ComponentModel; + +namespace Semi.Avalonia.TreeDataGrid.Demo.ViewModels; + +public class FilesPageViewModel: ObservableObject +{ + public IList Drives { get; } + private string _selectedDrive; + + public FilesPageViewModel() + { + Drives= DriveInfo.GetDrives().Select(x => x.Name).ToList(); + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + _selectedDrive = "C:\\"; + } + else + { + _selectedDrive = Drives.FirstOrDefault() ?? "/"; + } + } +} \ No newline at end of file diff --git a/demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/MainViewModel.cs b/demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/MainViewModel.cs new file mode 100644 index 0000000..9d68af8 --- /dev/null +++ b/demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/MainViewModel.cs @@ -0,0 +1,8 @@ +using CommunityToolkit.Mvvm.ComponentModel; + +namespace Semi.Avalonia.TreeDataGrid.Demo.ViewModels; + +public class MainViewModel: ObservableObject +{ + +} \ No newline at end of file diff --git a/demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/SongsPageViewModel.cs b/demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/SongsPageViewModel.cs new file mode 100644 index 0000000..fc5fbd7 --- /dev/null +++ b/demo/Semi.Avalonia.TreeDataGrid.Demo/ViewModels/SongsPageViewModel.cs @@ -0,0 +1,152 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using Avalonia.Controls; +using Avalonia.Controls.Models.TreeDataGrid; +using CommunityToolkit.Mvvm.ComponentModel; + +namespace Semi.Avalonia.TreeDataGrid.Demo.ViewModels; + +public class SongsPageViewModel: ObservableObject +{ + private readonly ObservableCollection _songs; + + public FlatTreeDataGridSource Songs { get; } + + public SongsPageViewModel() + { + _songs = new ObservableCollection(Song.Songs); + + Songs = new FlatTreeDataGridSource(_songs) + { + Columns = + { + new TextColumn("Title", a=>a.Title, (o, a) => o.Title = a, new GridLength(6, GridUnitType.Star)), + new TextColumn("Artist", a=>a.Artist, (o, a) => o.Artist = a, new GridLength(6, GridUnitType.Star)), + } + }; + } + +} + + +public class Song +{ + public string? Title { get; set; } + public string? Artist { get; set; } + public TimeSpan? Duration { get; set; } + public string? Album { get; set; } + public int CountOfComment { get; set; } + public string Url { get; set; } + + public Song(string title, string artist, int m, int s, string album, int countOfComment, int netEaseId) + { + Title = title; + Artist = artist; + Duration = new TimeSpan(0, m, s); + Album = album; + CountOfComment = countOfComment; + Url = $"https://music.163.com/song?id={netEaseId}"; + + } + + public static List Songs { get; set; } = new List() + { + new("好肚有肚(feat.李玲玉)", "熊猫堂ProducePandas", 2, 50, "A.S.I.A", 730, 1487039339), + new("荒诞秀", "熊猫堂ProducePandas", 3, 15, "A.S.I.A", 639, 1487037601), + new("长大", "熊猫堂ProducePandas", 4, 6, "A.S.I.A", 1114, 1487037690), + new("招财猫(feat.纪粹希(G-Tracy))", "熊猫堂ProducePandas", 3, 37, "A.S.I.A", 361, 1487039632), + new("千转", "熊猫堂ProducePandas", 4, 0, "A.S.I.A", 1115, 1477312398), + new("辣辣辣", "熊猫堂ProducePandas", 3, 24, "A.S.I.A", 1873, 1465043716), + new("碎碎念", "熊猫堂ProducePandas", 3, 25, "A.S.I.A", 676, 1474142064), + new("盘他", "熊猫堂ProducePandas", 2, 16, "A.S.I.A", 365, 1481652786), + new("Na Na Na", "熊猫堂ProducePandas", 3, 26, "A.S.I.A", 312, 1469022662), + new("Indigo", "熊猫堂ProducePandas", 3, 15, "A.S.I.A", 137, 1487039517), + new("饕餮人间", "熊猫堂ProducePandas", 3, 20, "饕餮人间", 1295, 1499584605), + new("七步咙咚呛", "熊猫堂ProducePandas", 3, 10, "七步咙咚呛", 175, 1809095152), + new("大惊小怪", "熊猫堂ProducePandas", 3, 32, "大惊小怪", 10420, 1847477425), + new("工具人", "熊猫堂ProducePandas", 2, 46, "大惊小怪", 1135, 1847476499), + new("以梦为马", "熊猫堂ProducePandas", 4, 19, "大惊小怪", 18361, 1836034373), + new("以梦为马(Piano Version)", "熊猫堂ProducePandas", 3, 4, "大惊小怪", 570, 1847477423), + new("The ONE", "熊猫堂ProducePandas", 2, 58, "The ONE", 1508, 1864329424), + new("The ONE(日文版)", "熊猫堂ProducePandas", 2, 57, "The ONE", 385, 1864329429), + new("以梦为马 (壮志骄阳版)", "熊猫堂ProducePandas", 4, 19, "以梦为马 (壮志骄阳版)", 161, 1865138896), + new("New Horse", "熊猫堂ProducePandas", 2, 30, "emo了", 643, 1887021307), + new("不例外", "熊猫堂ProducePandas", 3, 31, "emo了", 1818, 1887022665), + new("满意", "熊猫堂ProducePandas", 4, 32, "emo了", 1081, 1882433472), + new("就算与全世界为敌也要跟你在一起", "熊猫堂ProducePandas", 3, 32, "emo了", 2119, 1881759960), + new("The ONE", "熊猫堂ProducePandas", 2, 58, "emo了", 67, 1887022648), + new("口香糖", "熊猫堂ProducePandas", 3, 10, "emo了", 2181, 1885502254), + new("Suuuuuuper Mario", "熊猫堂ProducePandas", 3, 32, "emo了", 1010, 1887021318), + new("饕餮人间", "熊猫堂ProducePandas", 3, 22, "emo了", 109, 1887021320), + new("以梦为马 (壮志骄阳版)", "熊猫堂ProducePandas", 4, 21, "emo了", 34, 1887022666), + new("The ONE(日文版)", "熊猫堂ProducePandas", 2, 57, "emo了", 27, 1887022646), + new("满意(DJheap九天版)", "熊猫堂ProducePandas", 4, 31, "emo了", 31, 1901605941), + new("一眼万年", "熊猫堂ProducePandas", 3, 54, "一眼万年", 20, 1922599361), + new("冲刺", "熊猫堂ProducePandas", 3, 49, "冲刺吧", 1006, 1932878194), + new("滴答滴", "熊猫堂ProducePandas", 2, 30, "爱的赏味期限", 86, 1957515790), + new("热带季风", "熊猫堂ProducePandas", 2, 45, "爱的赏味期限", 212, 1957514964), + new("渣", "熊猫堂ProducePandas", 3, 28, "爱的赏味期限", 22, 1957514965), + new("独特", "熊猫堂ProducePandas", 3, 33, "爱的赏味期限", 62, 1957514966), + new("雨后", "熊猫堂ProducePandas", 4, 15, "爱的赏味期限", 23, 1957514967), + new("然后然后", "熊猫堂ProducePandas", 3, 50, "爱的赏味期限", 108, 1957514968), + new("丢", "熊猫堂ProducePandas", 3, 26, "爱的赏味期限", 30, 1957515792), + new("热带疾风(FACEVOID桃心连哥 Remix)", "熊猫堂ProducePandas", 3, 23, "爱的赏味期限", 55, 1957515793), + new("COSMIC ANTHEM -Japanese Ver.-", "熊猫堂ProducePandas", 3, 11, "COSMIC ANTHEM / 手紙", 0, 1977171493), + new("手紙 (「長大-You Raise Me Up-」-Japanese Ver.-)", "熊猫堂ProducePandas", 4, 11, "COSMIC ANTHEM / 手紙", 0, + 1977171494), + new("COSMIC ANTHEM -Chinese Ver.-", "熊猫堂ProducePandas", 3, 31, "COSMIC ANTHEM / 手紙", 0, 1977172202), + new("世界晚安", "熊猫堂ProducePandas", 2, 59, "世界晚安", 652, 1985063377), + new("世界晚安(泰文版)", "熊猫堂ProducePandas", 2, 59, "世界晚安", 134, 1987842504), + new("世界晚安(钢琴版)", "熊猫堂ProducePandas", 3, 2, "世界晚安", 76, 1990475933), + new("世界晚安(泰文钢琴版)", "熊猫堂ProducePandas", 3, 2, "世界晚安", 29, 1990475934), + new("世界晚安(DJ沈念版)", "熊猫堂ProducePandas", 3, 9, "世界晚安", 34, 2014263184), + new("世界晚安(钢琴配乐)", "熊猫堂ProducePandas", 2, 59, "世界晚安", 11, 2014263185), + new("明年也要好好长大", "熊猫堂ProducePandas", 3, 12, "明年也要好好长大", 0, 2010515162), + new("320万年前（DJ沈念版）", "熊猫堂ProducePandas", 3, 21, "320万年前", 8, 2055888636), + new("320万年前", "熊猫堂ProducePandas", 3, 7, "W.O.R.L.D.", 329, 2049770469), + new("隐德来希", "熊猫堂ProducePandas", 3, 3, "W.O.R.L.D.", 594, 2061317924), + new("孔明", "熊猫堂ProducePandas", 3, 59, "W.O.R.L.D.", 91, 2063175274), + new("锦鲤卟噜噜", "熊猫堂ProducePandas", 3, 5, "W.O.R.L.D.", 67, 2059208262), + new("指鹿为马", "熊猫堂ProducePandas", 3, 12, "W.O.R.L.D.", 74, 2063175272), + new("热带季风Remix", "熊猫堂ProducePandas", 3, 22, "W.O.R.L.D.", 23, 2063173319), + new("加州梦境", "熊猫堂ProducePandas", 2, 56, "W.O.R.L.D.", 1662, 2063173324), + new("渐进自由", "熊猫堂ProducePandas", 4, 19, "W.O.R.L.D.", 124, 2063173321), + new("世界所有的烂漫", "熊猫堂ProducePandas", 3, 30, "W.O.R.L.D.", 335, 2053388775), + }; +} + +public class SongViewModel: ObservableObject +{ + private string? _title; + private string? _artist; + private string? _album; + private int _countOfComment; + private bool? _isSelected; + public string? Title + { + get => _title; + set => SetProperty(ref _title, value); + } + public string? Artist + { + get => _artist; + set => SetProperty(ref _artist, value); + } + public string? Album + { + get => _album; + set => SetProperty(ref _album, value); + } + public int CountOfComment + { + get => _countOfComment; + set => SetProperty(ref _countOfComment, value); + } + public bool? IsSelected + { + get => _isSelected; + set => SetProperty(ref _isSelected, value); + } + +} \ No newline at end of file diff --git a/src/Semi.Avalonia.TreeDataGrid/Dark.axaml b/src/Semi.Avalonia.TreeDataGrid/Dark.axaml index bd82d78..15d6fb6 100644 --- a/src/Semi.Avalonia.TreeDataGrid/Dark.axaml +++ b/src/Semi.Avalonia.TreeDataGrid/Dark.axaml @@ -1,11 +1,11 @@ - - - + + + - - - + + + diff --git a/src/Semi.Avalonia.TreeDataGrid/Light.axaml b/src/Semi.Avalonia.TreeDataGrid/Light.axaml index bd82d78..6083873 100644 --- a/src/Semi.Avalonia.TreeDataGrid/Light.axaml +++ b/src/Semi.Avalonia.TreeDataGrid/Light.axaml @@ -1,11 +1,12 @@ - - - + + + - - - + + + + diff --git a/src/Semi.Avalonia.TreeDataGrid/Shared.axaml b/src/Semi.Avalonia.TreeDataGrid/Shared.axaml index cd04974..a053c3f 100644 --- a/src/Semi.Avalonia.TreeDataGrid/Shared.axaml +++ b/src/Semi.Avalonia.TreeDataGrid/Shared.axaml @@ -1,7 +1,11 @@ - M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z - M1965 947l-941 -941l-941 941l90 90l787 -787v1798h128v-1798l787 787z + + M17.549 15.659L12.753 21.139C12.6591 21.2464 12.5434 21.3325 12.4135 21.3915C12.2836 21.4505 12.1427 21.481 12 21.481C11.8574 21.481 11.7164 21.4505 11.5865 21.3915C11.4566 21.3325 11.3409 21.2464 11.247 21.139L6.45101 15.659C5.88501 15.011 6.34501 14 7.20401 14H16.796C17.656 14 18.115 15.012 17.549 15.659Z + + M6.45096 8.34102L11.247 2.86102C11.3408 2.75361 11.4566 2.66753 11.5865 2.60854C11.7163 2.54956 11.8573 2.51904 12 2.51904C12.1426 2.51904 12.2836 2.54956 12.4135 2.60854C12.5433 2.66753 12.6591 2.75361 12.753 2.86102L17.549 8.34102C18.115 8.98802 17.655 10 16.796 10H7.20396C6.34396 10 5.88496 8.98802 6.45096 8.34102Z M 1,0 10,10 l -9,10 -1,-1 L 8,10 -0,1 Z - M0,1 L10,10 20,1 19,0 10,8 1,0 Z + + M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z + diff --git a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml index c7f2555..95778ac 100644 --- a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml +++ b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml @@ -3,6 +3,11 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls.TreeDataGrid"> + + + + + @@ -47,17 +52,21 @@ - - + + + + - + + - - + @@ -118,12 +128,12 @@ - -