chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: start to refactor.

Browse Source
This commit is contained in:
rabbitism
2023-12-27 00:58:50 +08:00
parent 5ac95a9965
commit 0c4b6edfc2
6 changed files with 111 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Ursa.Demo/Pages/IntroductionDemo.axaml
View File

@@ -144,6 +144,7 @@
IPAddress="{Binding Address}" />
<u:IPv4Box HorizontalAlignment="Stretch" IsEnabled="False" />
</StackPanel>
<!--
<u:Timeline Grid.Column="1">
<u:TimelineItem
Content="ToDo"
@@ -166,6 +167,7 @@
ItemType="Error"
Time="2022-01-05" />
</u:Timeline>
-->
<StackPanel Grid.Column="2" Spacing="20">
<u:ButtonGroup Classes="Primary Solid" ItemsSource="{Binding ButtonGroupItems}" />
<u:ButtonGroup Classes="Primary" ItemsSource="{Binding ButtonGroupItems}" />

50
demo/Ursa.Demo/Pages/TimelineDemo.axaml
View File

@@ -8,51 +8,19 @@
xmlns:viewModels="clr-namespace:Ursa.Demo.ViewModels"
d:DesignHeight="450"
d:DesignWidth="800"
x:CompileBindings="False"
x:DataType="viewModels:TimelineDemoViewModel"
x:CompileBindings="True"
mc:Ignorable="d">
<UserControl.Resources>
<u:TimelineFormatConverter x:Key="FormatConverter" />
</UserControl.Resources>
<StackPanel>
<u:Timeline>
<u:TimelineItem
Content="Start"
ItemType="Warning"
Time="2022-01-01" />
<u:TimelineItem
Content="In between"
ItemType="Ongoing"
Time="2022-01-02" />
<u:TimelineItem
Content="Finished"
ItemType="Error"
Time="2022-01-03" />
<u:TimelineItem
Content="Finished"
IconForeground="Yellow"
ItemType="Default"
Time="2022-01-03" />
<u:Timeline ItemsSource="{Binding Items}"
HeaderMemberBinding="{ReflectionBinding Header}"
DescriptionMemberBinding="{ReflectionBinding Description}"
>
</u:Timeline>
<u:Timeline HorizontalAlignment="Left" ItemsSource="{Binding Items}">
<u:Timeline.ItemTemplate>
<DataTemplate x:DataType="viewModels:TimelineItemViewModel">
<u:TimelineItem
Content="{Binding Content}"
ItemType="{Binding ItemType}"
Time="{Binding Time}"
TimeFormat="{Binding TimeFormat}">
<u:TimelineItem.ContentTemplate>
<DataTemplate>
<TextBlock
MaxWidth="100"
Text="{Binding}"
TextWrapping="Wrap" />
</DataTemplate>
</u:TimelineItem.ContentTemplate>
</u:TimelineItem>
</DataTemplate>
</u:Timeline.ItemTemplate>
<u:Timeline>
<u:TimelineItem Header="第一步" Content="Step 1"></u:TimelineItem>
<u:TimelineItem Header="第二步" Content="Step 2"></u:TimelineItem>
<u:TimelineItem Header="第三步" Content="Step 3"></u:TimelineItem>
</u:Timeline>
</StackPanel>
</UserControl>

24
demo/Ursa.Demo/ViewModels/TimelineDemoViewModel.cs
View File

@@ -13,7 +13,7 @@ public class TimelineDemoViewModel: ViewModelBase
Time = DateTime.Now,
TimeFormat = "yyyy-MM-dd HH:mm:ss",
Description = "Item 1",
Content = "First",
Header = "审核中",
ItemType = TimelineItemType.Success,
},
new()
@@ -21,7 +21,7 @@ public class TimelineDemoViewModel: ViewModelBase
Time = DateTime.Now,
TimeFormat = "HH:mm:ss",
Description = "Item 2",
Content = "Content 2",
Header = "发布成功",
ItemType = TimelineItemType.Success,
},
new()
@@ -29,23 +29,9 @@ public class TimelineDemoViewModel: ViewModelBase
Time = DateTime.Now,
TimeFormat = "HH:mm:ss",
Description = "Item 3",
Content = "Content 3",
Header = "审核失败",
ItemType = TimelineItemType.Ongoing,
},
new()
{
Time = DateTime.Now,
TimeFormat = "HH:mm:ss",
Description = "Item 4",
Content = "Content 4"
},
new()
{
Time = DateTime.Now,
TimeFormat = "HH:mm:ss",
Description = "Item 5",
Content = "Content 5"
},
}
};
}
@@ -54,6 +40,6 @@ public class TimelineItemViewModel: ObservableObject
public DateTime Time { get; set; }
public string? TimeFormat { get; set; }
public string? Description { get; set; }
public string? Content { get; set; }
public string? Header { get; set; }
public TimelineItemType ItemType { get; set; }
}