From d5ad57eb9376705a9ab02224b14de1cfdd95bdfa Mon Sep 17 00:00:00 2001 From: Dino Chan Date: Sun, 26 Jan 2020 23:21:12 +0800 Subject: [PATCH 1/9] Update index.md --- .../extend_controls/clock/index.md | 73 ++++++++++++++++++- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/doc/source/handycontrol/extend_controls/clock/index.md b/doc/source/handycontrol/extend_controls/clock/index.md index ca12ad62..e797191e 100644 --- a/doc/source/handycontrol/extend_controls/clock/index.md +++ b/doc/source/handycontrol/extend_controls/clock/index.md @@ -1,5 +1,74 @@ --- -title: 建设中 +title: Clock --- -建设中 \ No newline at end of file +Clock 控件允许用户通过在文本框中键入日期或使用下拉的日历控件来选择日期。 + +``` CS +[TemplatePart(Name = ElementTextBox, Type = typeof(DatePickerTextBox))] +public class DatePicker : System.Windows.Controls.DatePicker, IDataInput +``` + +# 创建DatePicker + +``` XML + +``` + +``` CS +var datePicker = new DatePicker(); +``` + +生成的DatePicker如下图所示： + +![DatePicker](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/DatePicker_1.png) + + + +# 选择日期 + +可以通过文本框输入日期，或者点击文本框右边的按钮打开下拉的日历控件选择日期。 + +![DatePicker](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/DatePicker_2.png) + +也可以在XAML钟或代码中这样设置日期。 + +``` XML + +``` + +``` CS +datePicker.SelectedDate = DateTime.Now; +``` + +# 设置标题和占位符文本 + +你可以将 Header（标题）和 Placeholder（占位符）添加到DatePicker，以向用户指示其用途。 + +``` XML + +``` + + + + +# 属性 + +| 属性 | 描述 | +| ---------------- | ------------------ | +| SelectedDate | 获取或设置当前选中的日期 | +| VerifyFunc | 获取或设置数据验证委托 | +| IsError | 获取或设置数据是否错误 | +| ErrorStr | 获取或设置错误提示 | +| TextType | 获取或设置文本类型 | +| ShowClearButton | 获取或设置是否显示清除按钮 | + +# 方法 + +| 方法 | 描述 | +| ---------------- | ------------------ | +| VerifyData() | 验证数据 | + From 02e0dfd07ce297b633a99fecfeaa92189ab7948b Mon Sep 17 00:00:00 2001 From: DinoChan Date: Tue, 31 Mar 2020 16:18:16 +0800 Subject: [PATCH 2/9] add clock doc --- .../extend_controls/clock/index.md | 60 ++++++++----------- 1 file changed, 25 insertions(+), 35 deletions(-) diff --git a/doc/source/handycontrol/extend_controls/clock/index.md b/doc/source/handycontrol/extend_controls/clock/index.md index e797191e..e27b7d54 100644 --- a/doc/source/handycontrol/extend_controls/clock/index.md +++ b/doc/source/handycontrol/extend_controls/clock/index.md @@ -2,55 +2,48 @@ title: Clock --- -Clock 控件允许用户通过在文本框中键入日期或使用下拉的日历控件来选择日期。 +Clock 控件展示一个虚拟的时钟，允许用户在这个时钟上选择时间。 ``` CS -[TemplatePart(Name = ElementTextBox, Type = typeof(DatePickerTextBox))] -public class DatePicker : System.Windows.Controls.DatePicker, IDataInput +[TemplatePart(Name = ElementButtonAm, Type = typeof(RadioButton))] +[TemplatePart(Name = ElementButtonPm, Type = typeof(RadioButton))] +[TemplatePart(Name = ElementCanvas, Type = typeof(Canvas))] +[TemplatePart(Name = ElementBorderTitle, Type = typeof(Border))] +[TemplatePart(Name = ElementBorderClock, Type = typeof(Border))] +[TemplatePart(Name = ElementPanelNum, Type = typeof(CirclePanel))] +[TemplatePart(Name = ElementTimeStr, Type = typeof(TextBlock))] +public class Clock : ClockBase ``` -# 创建DatePicker +# 创建Clock ``` XML - + ``` ``` CS -var datePicker = new DatePicker(); +var clock = new Clock(); ``` -生成的DatePicker如下图所示： +生成的Clock如下图所示： -![DatePicker](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/DatePicker_1.png) +![Clock](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/Clock_1.png) -# 选择日期 +# 选择s时间 -可以通过文本框输入日期，或者点击文本框右边的按钮打开下拉的日历控件选择日期。 - -![DatePicker](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/DatePicker_2.png) - -也可以在XAML钟或代码中这样设置日期。 +可以通过点击左边的时钟，或者点击右边的时分秒列表选择时间。也可以在XAML钟或代码中这样设置日期。 ``` XML - + ``` ``` CS -datePicker.SelectedDate = DateTime.Now; +clock.SelectedTime = DateTime.Now; ``` -# 设置标题和占位符文本 -你可以将 Header（标题）和 Placeholder（占位符）添加到DatePicker，以向用户指示其用途。 - -``` XML - -``` @@ -59,16 +52,13 @@ datePicker.SelectedDate = DateTime.Now; | 属性 | 描述 | | ---------------- | ------------------ | -| SelectedDate | 获取或设置当前选中的日期 | -| VerifyFunc | 获取或设置数据验证委托 | -| IsError | 获取或设置数据是否错误 | -| ErrorStr | 获取或设置错误提示 | -| TextType | 获取或设置文本类型 | -| ShowClearButton | 获取或设置是否显示清除按钮 | +| SelectedTime | 获取或设置当前选中的时间。 | +| DisplayTime | 获取或设置当前的显示时间。 | +| TimeFormat | 获取或设置用于显示选定的时间的格式 | +| ClockRadioButtonStyle | 获取或设置Clock控件中RadioButton的样式 | -# 方法 +# 事件 -| 方法 | 描述 | +| 事件 | 描述 | | ---------------- | ------------------ | -| VerifyData() | 验证数据 | - +| DisplayTimeChanged | 当显示的时间改变时发生。 | From da5c94bf1a092146a4b9875e8911b70b7807650c Mon Sep 17 00:00:00 2001 From: DinoChan Date: Wed, 1 Apr 2020 09:15:04 +0800 Subject: [PATCH 3/9] add passwordbox document --- .../extend_controls/passwordBox/index.md | 85 ++++++++++++++++++- 1 file changed, 83 insertions(+), 2 deletions(-) diff --git a/doc/source/handycontrol/extend_controls/passwordBox/index.md b/doc/source/handycontrol/extend_controls/passwordBox/index.md index ca12ad62..c48a7ee1 100644 --- a/doc/source/handycontrol/extend_controls/passwordBox/index.md +++ b/doc/source/handycontrol/extend_controls/passwordBox/index.md @@ -1,5 +1,86 @@ --- -title: 建设中 +title: PasswordBox --- -建设中 \ No newline at end of file +表示用于输入和处理密码的控件。 + +``` CS +[TemplatePart(Name = ElementPasswordBox, Type = typeof(System.Windows.Controls.PasswordBox))] +[TemplatePart(Name = ElementTextBox, Type = typeof(System.Windows.Controls.TextBox))] +public class PasswordBox : Control, IDataInput + +``` + +# PasswordBox + +``` XML + +``` + +``` CS +var passwordBox = new PasswordBox(); +``` + +生成的PasswordBox如下图所示： + +![PasswordBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/PasswordBox_1.png) + + + +# 输入密码 + +可以通过文本框输入密码，也可以在XAML钟或代码中这样设置日期。 + +``` XML + +``` + +``` CS +passwordBox.Password = "123456"; +``` + +# 显示密码 + +PasswordBox控件可以主动显示已输入的密码。将`ShowEyeButton`设置为`true`，PasswordBox将显示一个“眼睛”的按钮，点击这个按钮即可显示已输入的密码。 + + + +![PasswordBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/PasswordBox_2.gif) + + +# 设置标题和占位符文本 + +你可以将 Header（标题）和 Placeholder（占位符）添加到PasswordBox，以向用户指示其用途。要使用这两个属性，首先需要应用 **TimePickerExtend** 或 **TimePickerPlus** 样式。 + +``` XML + Date: Wed, 1 Apr 2020 14:13:03 +0800 Subject: [PATCH 4/9] add textbox doc --- .../extend_controls/passwordBox/index.md | 3 +- .../extend_controls/textBox/index.md | 78 ++++++++++++++++++- 2 files changed, 77 insertions(+), 4 deletions(-) diff --git a/doc/source/handycontrol/extend_controls/passwordBox/index.md b/doc/source/handycontrol/extend_controls/passwordBox/index.md index c48a7ee1..4d15c5cf 100644 --- a/doc/source/handycontrol/extend_controls/passwordBox/index.md +++ b/doc/source/handycontrol/extend_controls/passwordBox/index.md @@ -8,7 +8,6 @@ title: PasswordBox [TemplatePart(Name = ElementPasswordBox, Type = typeof(System.Windows.Controls.PasswordBox))] [TemplatePart(Name = ElementTextBox, Type = typeof(System.Windows.Controls.TextBox))] public class PasswordBox : Control, IDataInput - ``` # PasswordBox @@ -50,7 +49,7 @@ PasswordBox控件可以主动显示已输入的密码。将`ShowEyeButton`设置 # 设置标题和占位符文本 -你可以将 Header（标题）和 Placeholder（占位符）添加到PasswordBox，以向用户指示其用途。要使用这两个属性，首先需要应用 **TimePickerExtend** 或 **TimePickerPlus** 样式。 +你可以将 Header（标题）和 Placeholder（占位符）添加到PasswordBox，以向用户指示其用途。 ``` XML +``` + +``` CS +var textBox = new TextBox(); +``` + + + + +# 输入文本 + +此示例演示如何使用 Text 属性设置 TextBox 控件的初始文本内容： + +``` XML + +``` + +``` CS +textBox.Text = "这是内容"; +``` + +生成的TextBox如下图所示： + +![TextBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/TextBox_1.png) + + +有关TextBox的更多示例，可以参考它的基类的[文档](https://docs.microsoft.com/zh-cn/dotnet/api/system.windows.controls.textbox?view=netframework-4.8)。 + + +# 设置标题和占位符文本 + +你可以将 Header（标题）和 Placeholder（占位符）添加到TextBox，以向用户指示其用途。要使用这两个属性， + +``` XML + Date: Wed, 1 Apr 2020 14:22:16 +0800 Subject: [PATCH 5/9] update textbox doc --- .../extend_controls/textBox/index.md | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/doc/source/handycontrol/extend_controls/textBox/index.md b/doc/source/handycontrol/extend_controls/textBox/index.md index 4329ee94..1f59acdb 100644 --- a/doc/source/handycontrol/extend_controls/textBox/index.md +++ b/doc/source/handycontrol/extend_controls/textBox/index.md @@ -57,23 +57,16 @@ textBox.Text = "这是内容"; | 属性 | 描述 | | ---------------- | ------------------ | -| Password | 获取或设置 PasswordBox 当前保留的密码。 | -| PasswordChar | 获取或设置 PasswordBox 的掩码字符。 | -| ShowEyeButton | 获取或设置是否显示一个“眼睛”的按钮，点击可以显示密码。 | -| ShowPassword | 获取或设置是否显示密码。 | -| Text | 获取由 **TimePicker** 显示的文本，或设置选定的时间 | -| VerifyFunc | 获取或设置数据验证委托 | -| IsError | 获取或设置数据是否错误 | -| ErrorStr | 获取或设置错误提示 | -| TextType | 获取或设置文本类型 | -| ShowClearButton | 获取或设置是否显示清除按钮 | +| Text | 获取或设置文本框的文本内容。 | +| VerifyFunc | 获取或设置数据验证委托。 | +| IsError | 获取或设置数据是否错误。 | +| ErrorStr | 获取或设置错误提示。 | +| TextType | 获取或设置文本类型。 | +| ShowClearButton | 获取或设置是否显示清除按钮。 | # 方法 | 方法 | 描述 | | ---------------- | ------------------ | -| Clear() | 清除 Password 属性的值。 | -| Paste() | 用剪贴板中的内容替换 PasswordBox 中的当前选定内容。 | -| SelectAll() | 选择 PasswordBox 中的全部内容。 | | VerifyData() | 验证数据。 | From a8ecf3f79f8ef74b15d21a6bf276086bec5d0d5a Mon Sep 17 00:00:00 2001 From: DinoChan Date: Wed, 1 Apr 2020 14:53:28 +0800 Subject: [PATCH 6/9] update doc --- doc/source/handycontrol/extend_controls/passwordBox/index.md | 2 +- doc/source/handycontrol/extend_controls/textBox/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/handycontrol/extend_controls/passwordBox/index.md b/doc/source/handycontrol/extend_controls/passwordBox/index.md index 4d15c5cf..ea751e04 100644 --- a/doc/source/handycontrol/extend_controls/passwordBox/index.md +++ b/doc/source/handycontrol/extend_controls/passwordBox/index.md @@ -10,7 +10,7 @@ title: PasswordBox public class PasswordBox : Control, IDataInput ``` -# PasswordBox +# 创建PasswordBox ``` XML diff --git a/doc/source/handycontrol/extend_controls/textBox/index.md b/doc/source/handycontrol/extend_controls/textBox/index.md index 1f59acdb..ff30f18d 100644 --- a/doc/source/handycontrol/extend_controls/textBox/index.md +++ b/doc/source/handycontrol/extend_controls/textBox/index.md @@ -8,7 +8,7 @@ title: TextBox public class TextBox : System.Windows.Controls.TextBox, IDataInput ``` -# TextBox +# 创建TextBox ``` XML From 110ac1d36d68414fa0526f776dae2a3be6e25df2 Mon Sep 17 00:00:00 2001 From: DinoChan Date: Wed, 1 Apr 2020 15:54:53 +0800 Subject: [PATCH 7/9] fix #345 --- src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs b/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs index 7e15f681..a8acf741 100644 --- a/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs +++ b/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs @@ -40,7 +40,11 @@ namespace HandyControl.Controls Info = (double)e.NewValue }); - protected virtual void OnValueChanged(FunctionEventArgs e) => RaiseEvent(e); + protected virtual void OnValueChanged(FunctionEventArgs e) + { + RaiseEvent(e); + UpdateItems(); + } public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof(string), typeof(Rate), new PropertyMetadata(default(string))); From aead17d5b78fe1ef6b7bc7ff15f9dced55c8cf8a Mon Sep 17 00:00:00 2001 From: DinoChan Date: Fri, 3 Apr 2020 15:55:21 +0800 Subject: [PATCH 8/9] update passwordbox document --- doc/source/handycontrol/extend_controls/passwordBox/index.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/source/handycontrol/extend_controls/passwordBox/index.md b/doc/source/handycontrol/extend_controls/passwordBox/index.md index ea751e04..90231b22 100644 --- a/doc/source/handycontrol/extend_controls/passwordBox/index.md +++ b/doc/source/handycontrol/extend_controls/passwordBox/index.md @@ -20,11 +20,6 @@ public class PasswordBox : Control, IDataInput var passwordBox = new PasswordBox(); ``` -生成的PasswordBox如下图所示： - -![PasswordBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/PasswordBox_1.png) - - # 输入密码 From 501a6376893fa8c6cf78ab011d82fe5d3e543bc3 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Sat, 4 Apr 2020 15:06:47 +0800 Subject: [PATCH 9/9] merged pr/347 --- .../handycontrol/extend_controls/blurWindow/index.md | 5 ----- .../handycontrol/extend_controls/clock/index.md | 11 ++--------- doc/source/handycontrol/extend_controls/index.md | 4 ++-- .../handycontrol/extend_controls/passwordBox/index.md | 9 +++------ .../handycontrol/extend_controls/radioGroup/index.md | 5 ----- .../handycontrol/extend_controls/textBox/index.md | 8 +------- doc/themes/next/_config.yml | 4 +--- 7 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 doc/source/handycontrol/extend_controls/blurWindow/index.md delete mode 100644 doc/source/handycontrol/extend_controls/radioGroup/index.md diff --git a/doc/source/handycontrol/extend_controls/blurWindow/index.md b/doc/source/handycontrol/extend_controls/blurWindow/index.md deleted file mode 100644 index ca12ad62..00000000 --- a/doc/source/handycontrol/extend_controls/blurWindow/index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 建设中 ---- - -建设中 \ No newline at end of file diff --git a/doc/source/handycontrol/extend_controls/clock/index.md b/doc/source/handycontrol/extend_controls/clock/index.md index e27b7d54..89fc1253 100644 --- a/doc/source/handycontrol/extend_controls/clock/index.md +++ b/doc/source/handycontrol/extend_controls/clock/index.md @@ -1,5 +1,5 @@ --- -title: Clock +title: Clock 时钟 --- Clock 控件展示一个虚拟的时钟，允许用户在这个时钟上选择时间。 @@ -29,9 +29,7 @@ var clock = new Clock(); ![Clock](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/Clock_1.png) - - -# 选择s时间 +# 选择时间 可以通过点击左边的时钟，或者点击右边的时分秒列表选择时间。也可以在XAML钟或代码中这样设置日期。 @@ -43,11 +41,6 @@ var clock = new Clock(); clock.SelectedTime = DateTime.Now; ``` - - - - - # 属性 | 属性 | 描述 | diff --git a/doc/source/handycontrol/extend_controls/index.md b/doc/source/handycontrol/extend_controls/index.md index ca12ad62..772e7310 100644 --- a/doc/source/handycontrol/extend_controls/index.md +++ b/doc/source/handycontrol/extend_controls/index.md @@ -1,5 +1,5 @@ --- -title: 建设中 +title: 扩展控件 --- -建设中 \ No newline at end of file +HandyControl目前包含70余款扩展控件，正逐步增加。 \ No newline at end of file diff --git a/doc/source/handycontrol/extend_controls/passwordBox/index.md b/doc/source/handycontrol/extend_controls/passwordBox/index.md index 90231b22..3eeb5705 100644 --- a/doc/source/handycontrol/extend_controls/passwordBox/index.md +++ b/doc/source/handycontrol/extend_controls/passwordBox/index.md @@ -1,5 +1,5 @@ --- -title: PasswordBox +title: PasswordBox 密码框 --- 表示用于输入和处理密码的控件。 @@ -20,7 +20,6 @@ public class PasswordBox : Control, IDataInput var passwordBox = new PasswordBox(); ``` - # 输入密码 可以通过文本框输入密码，也可以在XAML钟或代码中这样设置日期。 @@ -37,7 +36,9 @@ passwordBox.Password = "123456"; PasswordBox控件可以主动显示已输入的密码。将`ShowEyeButton`设置为`true`，PasswordBox将显示一个“眼睛”的按钮，点击这个按钮即可显示已输入的密码。 +``` XML +``` ![PasswordBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/PasswordBox_2.gif) @@ -51,9 +52,6 @@ PasswordBox控件可以主动显示已输入的密码。将`ShowEyeButton`设置 hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" ``` - - - # 属性 | 属性 | 描述 | @@ -77,4 +75,3 @@ PasswordBox控件可以主动显示已输入的密码。将`ShowEyeButton`设置 | Paste() | 用剪贴板中的内容替换 PasswordBox 中的当前选定内容。 | | SelectAll() | 选择 PasswordBox 中的全部内容。 | | VerifyData() | 验证数据。 | - diff --git a/doc/source/handycontrol/extend_controls/radioGroup/index.md b/doc/source/handycontrol/extend_controls/radioGroup/index.md deleted file mode 100644 index ca12ad62..00000000 --- a/doc/source/handycontrol/extend_controls/radioGroup/index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 建设中 ---- - -建设中 \ No newline at end of file diff --git a/doc/source/handycontrol/extend_controls/textBox/index.md b/doc/source/handycontrol/extend_controls/textBox/index.md index ff30f18d..2e98b20c 100644 --- a/doc/source/handycontrol/extend_controls/textBox/index.md +++ b/doc/source/handycontrol/extend_controls/textBox/index.md @@ -1,5 +1,5 @@ --- -title: TextBox +title: TextBox 文本框 --- 表示一个控件，该控件可用于显示或编辑无格式文本。 @@ -18,9 +18,6 @@ public class TextBox : System.Windows.Controls.TextBox, IDataInput var textBox = new TextBox(); ``` - - - # 输入文本 此示例演示如何使用 Text 属性设置 TextBox 控件的初始文本内容： @@ -50,9 +47,6 @@ textBox.Text = "这是内容"; hc:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr2}" ``` - - - # 属性 | 属性 | 描述 | diff --git a/doc/themes/next/_config.yml b/doc/themes/next/_config.yml index 6e310349..c29078e3 100644 --- a/doc/themes/next/_config.yml +++ b/doc/themes/next/_config.yml @@ -231,8 +231,7 @@ menu: default: /extend_controls/ || AnimationPath 动画路径: /animationPath/ || Badge 标记: /badge/ || - ButtonGroup : /buttonGroup/ || - BlurWindow 背景模糊窗口: /blurWindow/ || + ButtonGroup 按钮组: /buttonGroup/ || CalendarWithClock 带有时钟的日历: /calendarWithClock/ || Card 卡片: /card/ || Carousel 轮播: /carousel/ || @@ -276,7 +275,6 @@ menu: PreviewSlider 预览滑块: /previewSlider/ || ProgressButton 进度按钮: /progressButton/ || RangeSlider 范围滑块: /rangeSlider/ || - RadioGroup 单选按钮组: /radioGroup/ || Rate 评分: /rate/ || RelativePanel 相对布局: /relativePanel/ || RunningBlock 滚动块: /runningBlock/ ||