Skip to content

Commit b731c7d

Browse files
committed
增加TreeSelect控件
1 parent 3603f87 commit b731c7d

File tree

19 files changed

+718
-475
lines changed

19 files changed

+718
-475
lines changed

src/Yuandl.ThemeUI.Sample/Views/Pages/IconsPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
ToolTipService.InitialShowDelay="240">
103103
<ui:SymbolIcon
104104
Grid.Row="0"
105-
FontSize="28"
105+
FontSize="35"
106106
Symbol="{Binding Icon, Mode=OneTime}" Foreground="{DynamicResource ControlTextColorBrush}"/>
107107
</Button>
108108
</DataTemplate>

src/Yuandl.ThemeUI.Sample/Views/Pages/TreePage.xaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@
3737
</TreeViewItem>
3838
</TreeView>
3939
</smtx:XamlDisplay>
40-
<smtx:XamlDisplay UniqueKey="TreeSample2" Margin="20" Tag="Simple TreeView.">
40+
<smtx:XamlDisplay UniqueKey="TreeSample2" Margin="20" Tag="treeSelect example.">
4141
<ui:TreeSelect ItemsSource="{Binding ItemsSource}"
42-
ScrollViewer.CanContentScroll="False"
4342
PlaceholderText="请选择"
44-
SelectedIndex="3">
43+
SelectedIndex="1">
4544
<ui:TreeSelect.ItemTemplate>
4645
<HierarchicalDataTemplate ItemsSource="{Binding Children}">
4746
<TextBlock Text="{Binding Name}" />

src/Yuandl.ThemeUI/Controls/CardAction/CardAction.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:controls="clr-namespace:Yuandl.ThemeUI.Controls"
1010
xmlns:converters="clr-namespace:Yuandl.ThemeUI.Converters"
1111
xmlns:assist="clr-namespace:Yuandl.ThemeUI.ElementAssist"
12-
xmlns:system="clr-namespace:System;assembly=System.Runtime">
12+
xmlns:system="clr-namespace:System;assembly=mscorlib">
1313

1414
<converters:ShadowConverter x:Key="ShadowConverter" />
1515
<converters:BorderClipConverter x:Key="BorderClipConverter" />

src/Yuandl.ThemeUI/Controls/CardControl/CardControl.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:controls="clr-namespace:Yuandl.ThemeUI.Controls"
1010
xmlns:converters="clr-namespace:Yuandl.ThemeUI.Converters"
1111
xmlns:assist="clr-namespace:Yuandl.ThemeUI.ElementAssist"
12-
xmlns:system="clr-namespace:System;assembly=System.Runtime">
12+
xmlns:system="clr-namespace:System;assembly=mscorlib">
1313

1414
<converters:ShadowConverter x:Key="ShadowConverter" />
1515

src/Yuandl.ThemeUI/Controls/Carousel/Carousel.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:controls="clr-namespace:Yuandl.ThemeUI.Controls"
1010
xmlns:converters="clr-namespace:Yuandl.ThemeUI.Converters"
1111
xmlns:assist="clr-namespace:Yuandl.ThemeUI.ElementAssist"
12-
xmlns:system="clr-namespace:System;assembly=System.Runtime">
12+
xmlns:system="clr-namespace:System;assembly=mscorlib">
1313

1414
<Style x:Key="CarouselItemBaseStyle" TargetType="controls:CarouselItem">
1515
<Setter Property="Focusable" Value="False"/>

src/Yuandl.ThemeUI/Controls/ComboBox/ComboBox.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
99
xmlns:controls="clr-namespace:Yuandl.ThemeUI.Controls"
1010
xmlns:assist="clr-namespace:Yuandl.ThemeUI.ElementAssist"
11-
xmlns:system="clr-namespace:System;assembly=System.Runtime">
11+
xmlns:system="clr-namespace:System;assembly=mscorlib">
1212

1313
<Thickness x:Key="ComboBoxPadding">10,8,10,8</Thickness>
1414
<Thickness x:Key="ComboBoxBorderThemeThickness">1,1,1,1</Thickness>

src/Yuandl.ThemeUI/Controls/DataGrid/DataGrid.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
99
xmlns:controls="clr-namespace:Yuandl.ThemeUI.Controls"
1010
xmlns:converters="clr-namespace:Yuandl.ThemeUI.Converters"
11-
xmlns:system="clr-namespace:System;assembly=System.Runtime">
11+
xmlns:system="clr-namespace:System;assembly=mscorlib">
1212
<ResourceDictionary.MergedDictionaries>
1313
<ResourceDictionary Source="pack://application:,,,/Yuandl.ThemeUI;component/Controls/TextBox/TextBox.xaml"/>
1414
<ResourceDictionary Source="pack://application:,,,/Yuandl.ThemeUI;component/Controls/CheckBox/CheckBox.xaml"/>

src/Yuandl.ThemeUI/Controls/Divider/Divider.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:controls="clr-namespace:Yuandl.ThemeUI.Controls"
1010
xmlns:converters="clr-namespace:Yuandl.ThemeUI.Converters"
1111
xmlns:assist="clr-namespace:Yuandl.ThemeUI.ElementAssist"
12-
xmlns:system="clr-namespace:System;assembly=System.Runtime">
12+
xmlns:system="clr-namespace:System;assembly=mscorlib">
1313

1414
<converters:LineDashStrokeArrayConverter x:Key="LineDashStrokeArrayConverter" />
1515

src/Yuandl.ThemeUI/Controls/Expander/Expander.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
99
xmlns:controls="clr-namespace:Yuandl.ThemeUI.Controls"
1010
xmlns:converters="clr-namespace:Yuandl.ThemeUI.Converters"
11-
xmlns:system="clr-namespace:System;assembly=System.Runtime">
11+
xmlns:system="clr-namespace:System;assembly=mscorlib">
1212

1313
<Thickness x:Key="ExpanderPadding">11,11,11,11</Thickness>
1414
<Thickness x:Key="ExpanderBorderThemeThickness">1</Thickness>

src/Yuandl.ThemeUI/Controls/RadioButton/RadioButton.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ResourceDictionary
77
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
88
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
9-
xmlns:system="clr-namespace:System;assembly=System.Runtime">
9+
xmlns:system="clr-namespace:System;assembly=mscorlib">
1010

1111
<system:Double x:Key="RadioButtonCheckGlyphSize">12</system:Double>
1212
<system:Double x:Key="RadioButtonOuterEllipseSize">20</system:Double>

0 commit comments

Comments
 (0)