diff --git a/demo/Ursa.Demo/Pages/MultiAutoCompleteBoxDemo.axaml b/demo/Ursa.Demo/Pages/MultiAutoCompleteBoxDemo.axaml index 698e016..3907993 100644 --- a/demo/Ursa.Demo/Pages/MultiAutoCompleteBoxDemo.axaml +++ b/demo/Ursa.Demo/Pages/MultiAutoCompleteBoxDemo.axaml @@ -3,10 +3,25 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:u="https://irihi.tech/ursa" + xmlns:vm="clr-namespace:Ursa.Demo.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" + x:DataType="vm:MultiAutoCompleteBoxDemoViewModel" x:Class="Ursa.Demo.Pages.MultiAutoCompleteBoxDemo"> - + - + + + + + + + + + + + + diff --git a/demo/Ursa.Demo/ViewModels/MultiAutoCompleteBoxDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/MultiAutoCompleteBoxDemoViewModel.cs index 87ac094..3b1f0a3 100644 --- a/demo/Ursa.Demo/ViewModels/MultiAutoCompleteBoxDemoViewModel.cs +++ b/demo/Ursa.Demo/ViewModels/MultiAutoCompleteBoxDemoViewModel.cs @@ -1,8 +1,91 @@ -using CommunityToolkit.Mvvm.ComponentModel; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using Avalonia.Controls; +using CommunityToolkit.Mvvm.ComponentModel; namespace Ursa.Demo.ViewModels; public class MultiAutoCompleteBoxDemoViewModel: ObservableObject { - + public ObservableCollection Items { get; set; } + public AutoCompleteFilterPredicate FilterPredicate { get; set; } + + public MultiAutoCompleteBoxDemoViewModel() + { + Items = new ObservableCollection + { + new() { MenuHeader = "Button Group", Chinese = "按钮组" }, + new() { MenuHeader = "Icon Button", Chinese = "图标按钮" }, + new() { MenuHeader = "AutoCompleteBox", Chinese = "自动完成框" }, + new() { MenuHeader = "Class Input", Chinese = "类输入框" }, + new() { MenuHeader = "Enum Selector", Chinese = "枚举选择器" }, + new() { MenuHeader = "Form", Chinese = "表单" }, + new() { MenuHeader = "KeyGestureInput", Chinese = "快捷键输入" }, + new() { MenuHeader = "IPv4Box", Chinese = "IPv4输入框" }, + new() { MenuHeader = "MultiComboBox", Chinese = "多选组合框" }, + new() { MenuHeader = "Multi AutoCompleteBox", Chinese = "多项自动完成框" }, + new() { MenuHeader = "Numeric UpDown", Chinese = "数字上下调节" }, + new() { MenuHeader = "NumPad", Chinese = "数字键盘" }, + new() { MenuHeader = "PathPicker", Chinese = "路径选择器" }, + new() { MenuHeader = "PinCode", Chinese = "密码输入" }, + new() { MenuHeader = "RangeSlider", Chinese = "范围滑块" }, + new() { MenuHeader = "Rating", Chinese = "评分" }, + new() { MenuHeader = "Selection List", Chinese = "选择列表" }, + new() { MenuHeader = "TagInput", Chinese = "标签输入" }, + new() { MenuHeader = "Theme Toggler", Chinese = "主题切换" }, + new() { MenuHeader = "TreeComboBox", Chinese = "树形组合框" }, + + new() { MenuHeader = "Dialog", Chinese = "对话框" }, + new() { MenuHeader = "Drawer", Chinese = "抽屉" }, + new() { MenuHeader = "Loading", Chinese = "加载" }, + new() { MenuHeader = "Message Box", Chinese = "消息框" }, + new() { MenuHeader = "Notification", Chinese = "通知" }, + new() { MenuHeader = "PopConfirm", Chinese = "气泡确认" }, + new() { MenuHeader = "Toast", Chinese = "吐司" }, + new() { MenuHeader = "Skeleton", Chinese = "骨架屏" }, + + new() { MenuHeader = "Date Picker", Chinese = "日期选择器" }, + new() { MenuHeader = "Date Range Picker", Chinese = "日期范围选择器" }, + new() { MenuHeader = "Date Time Picker", Chinese = "日期时间选择器" }, + new() { MenuHeader = "Time Box", Chinese = "时间输入框" }, + new() { MenuHeader = "Time Picker", Chinese = "时间选择器" }, + new() { MenuHeader = "Time Range Picker", Chinese = "时间范围选择器" }, + new() { MenuHeader = "Clock", Chinese = "时钟" }, + + new() { MenuHeader = "Anchor", Chinese = "锚点" }, + new() { MenuHeader = "Breadcrumb", Chinese = "面包屑" }, + new() { MenuHeader = "Nav Menu", Chinese = "导航菜单" }, + new() { MenuHeader = "Pagination", Chinese = "分页" }, + new() { MenuHeader = "ToolBar", Chinese = "工具栏" }, + + new() { MenuHeader = "AspectRatioLayout", Chinese = "宽高比布局" }, + new() { MenuHeader = "Avatar", Chinese = "头像" }, + new() { MenuHeader = "Badge", Chinese = "徽章" }, + new() { MenuHeader = "Banner", Chinese = "横幅" }, + new() { MenuHeader = "Disable Container", Chinese = "禁用容器" }, + new() { MenuHeader = "Divider", Chinese = "分割线" }, + new() { MenuHeader = "DualBadge", Chinese = "双徽章" }, + new() { MenuHeader = "ImageViewer", Chinese = "图片查看器" }, + new() { MenuHeader = "ElasticWrapPanel", Chinese = "弹性换行面板" }, + new() { MenuHeader = "Marquee", Chinese = "跑马灯" }, + new() { MenuHeader = "Number Displayer", Chinese = "数字显示器" }, + new() { MenuHeader = "Scroll To", Chinese = "滚动到按钮" }, + new() { MenuHeader = "Timeline", Chinese = "时间轴" }, + new() { MenuHeader = "TwoTonePathIcon", Chinese = "双色路径图标" } + }; + FilterPredicate = Search; + } + + private static bool Search(string? text, object? data) + { + if (text is null) return true; + if (data is not ControlData control) return false; + return control.MenuHeader.Contains(text )|| control.Chinese.Contains(text); + } +} + +public class ControlData +{ + public string MenuHeader { get; set; } + public string Chinese { get; set; } } \ No newline at end of file diff --git a/src/Ursa.Themes.Semi/Controls/MultiAutoCompleteBox.axaml b/src/Ursa.Themes.Semi/Controls/MultiAutoCompleteBox.axaml index ad833db..a8a2e74 100644 --- a/src/Ursa.Themes.Semi/Controls/MultiAutoCompleteBox.axaml +++ b/src/Ursa.Themes.Semi/Controls/MultiAutoCompleteBox.axaml @@ -3,6 +3,8 @@ xmlns:u="https://irihi.tech/ursa"> + + diff --git a/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.Properties.cs b/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.Properties.cs index 37475d9..f302bae 100644 --- a/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.Properties.cs +++ b/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.Properties.cs @@ -32,7 +32,7 @@ public partial class MultiAutoCompleteBox /// The identifier for the property. public static readonly StyledProperty MinimumPrefixLengthProperty = AvaloniaProperty.Register( - nameof(MinimumPrefixLength), 1, + nameof(MinimumPrefixLength), 0, validate: IsValidMinimumPrefixLength); /// diff --git a/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.cs b/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.cs index e613244..ded97bf 100644 --- a/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.cs +++ b/src/Ursa/Controls/AutoCompleteBox/MultiAutoCompleteBox.cs @@ -585,7 +585,7 @@ public partial class MultiAutoCompleteBox : TemplatedControl, IInnerContentContr protected override void OnLoaded(RoutedEventArgs e) { base.OnLoaded(e); - var textbox = (_selectedItemsControl?.ItemsPanelRoot as WrapPanelWithTrailingItem)?.TrailingItem as TextBox; + TextBox = (_selectedItemsControl?.ItemsPanelRoot as WrapPanelWithTrailingItem)?.TrailingItem as TextBox; } ///