From e4fea42e72dda4461e85135c07b299b6dd69bb55 Mon Sep 17 00:00:00 2001
From: afunc233 <afunc@sina.com>
Date: Sun, 24 Nov 2019 21:26:11 +0800
Subject: [PATCH 1/2] doc for GroupBox

---
 .../native_controls/expander/index.md         |  2 +-
 .../native_controls/groupBox/index.md         | 88 ++++++++++++++++++-
 2 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/doc/source/handycontrol/native_controls/expander/index.md b/doc/source/handycontrol/native_controls/expander/index.md
index e3877e56..094e9c99 100644
--- a/doc/source/handycontrol/native_controls/expander/index.md
+++ b/doc/source/handycontrol/native_controls/expander/index.md
@@ -7,7 +7,7 @@ title: Expander 展开框
 Expander 展开框 默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
 
 {% note info no-icon %}
-
+用例：
 {% code %}
 <StackPanel Margin="32" VerticalAlignment="Center" Width="240">
     <Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}">
diff --git a/doc/source/handycontrol/native_controls/groupBox/index.md b/doc/source/handycontrol/native_controls/groupBox/index.md
index ca12ad62..f9a26ef8 100644
--- a/doc/source/handycontrol/native_controls/groupBox/index.md
+++ b/doc/source/handycontrol/native_controls/groupBox/index.md
@@ -1,5 +1,89 @@
 ---
-title: 建设中
+title: GroupBox 分组框
 ---
 
-建设中
\ No newline at end of file
+# GroupBoxBaseStyle 
+
+GroupBox 分组框 默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+{% note info no-icon %}
+用例：
+{% code %}
+    <GroupBox Grid.Row="0" Grid.Column="0" Width="300" Height="200" Header="{x:Static langs:Lang.TitleDemoStr1}" 
+        Padding="10" Margin="16">
+        <Border Background="{DynamicResource PrimaryBrush}" CornerRadius="4">
+            <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" 
+            Foreground="White"/>
+        </Border>
+    </GroupBox>
+{% endcode %}
+![GroupBoxBaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/GroupBox_Base.png)
+{% endnote %}
+
+这里提供另外一种样式,供开发者选择
+
+{% note info no-icon %}
+只需要添加扩展属性即可
+{% code %}
+hc:TitleElement.TitleAlignment="Left"
+{% endcode %}
+用例：
+{% code %}
+    <GroupBox Grid.Row="0" Grid.Column="1" Width="300" Height="200" Header="{x:Static langs:Lang.TitleDemoStr1}" Padding="10" 
+        Margin="16"  hc:TitleElement.TitleAlignment="Left">
+        <Border Background="{DynamicResource PrimaryBrush}" CornerRadius="4">
+            <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" 
+            Foreground="White"/>
+        </Border>
+    </GroupBox>
+{% endcode %}
+
+![GroupBox_Base_left](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/GroupBox_Base_left.png)
+{% endnote %}
+
+---
+
+# GroupBoxTab : GroupBoxTabBaseStyle : GroupBoxBaseStyle
+
+GroupBox 分组框 的另一种样式  GroupBoxTabBaseStyle 不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+{% note info no-icon %}
+用例：
+{% code %}
+    <GroupBox Grid.Row="1" Grid.Column="0" Width="300" Height="200" Header="{x:Static langs:Lang.TitleDemoStr1}" Padding="10" 
+        Margin="16" Style="{StaticResource GroupBoxTab}">
+        <Border Background="{DynamicResource PrimaryBrush}" CornerRadius="4">
+            <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" 
+            Foreground="White"/>
+        </Border>
+    </GroupBox>
+{% endcode %}
+
+- 同样可以 使用扩展属性  {% code %} hc:TitleElement.TitleAlignment="Left" {% endcode %}
+
+![GroupBox_Tab](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/GroupBox_Tab.png) ![GroupBox_Tab_left](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/GroupBox_Tab_left.png)
+{% endnote %}
+
+
+---
+
+# GroupBoxOriginal : GroupBoxOriginalBaseStyle : GroupBoxBaseStyle
+
+GroupBox 分组框 的另一种样式 GroupBoxOriginalBaseStyle 不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
+
+{% note info no-icon %}
+用例：
+{% code %}
+    <GroupBox Grid.Row="2" Grid.Column="0" Width="300" Header="{x:Static langs:Lang.TitleDemoStr1}" Margin="16" 
+        Style="{StaticResource GroupBoxOriginal}" HorizontalContentAlignment="Left">
+        <TextBox/>
+    </GroupBox>
+    <GroupBox Grid.Row="2" VerticalAlignment="Bottom" Grid.Column="1" Width="300" hc:TitleElement.TitleWidth="100"
+        Header="{x:Static langs:Lang.TitleDemoStr1}" Margin="16" Style="{StaticResource GroupBoxOriginal}"
+        HorizontalContentAlignment="Left" hc:TitleElement.TitleAlignment="Left">
+        <ComboBox DataContext="{Binding ComboBoxDemo,Source={StaticResource Locator}}" ItemsSource="{Binding DataList}"/>
+    </GroupBox>
+{% endcode %}
+
+![GroupBox_Origin](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/GroupBox_Origin.png) ![GroupBox_Origin_left](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/GroupBox_Origin_left.png)
+{% endnote %}
\ No newline at end of file

From daa406e7d1cd48e4871bd98f42baf61c5ac25c10 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 28 Nov 2019 22:18:41 +0800
Subject: [PATCH 2/2] Update index.md

---
 doc/source/handycontrol/native_controls/groupBox/index.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/doc/source/handycontrol/native_controls/groupBox/index.md b/doc/source/handycontrol/native_controls/groupBox/index.md
index f9a26ef8..4a83ce35 100644
--- a/doc/source/handycontrol/native_controls/groupBox/index.md
+++ b/doc/source/handycontrol/native_controls/groupBox/index.md
@@ -41,8 +41,6 @@ hc:TitleElement.TitleAlignment="Left"
 ![GroupBox_Base_left](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/GroupBox_Base_left.png)
 {% endnote %}
 
----
-
 # GroupBoxTab : GroupBoxTabBaseStyle : GroupBoxBaseStyle
 
 GroupBox 分组框 的另一种样式  GroupBoxTabBaseStyle 不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。
@@ -64,9 +62,6 @@ GroupBox 分组框 的另一种样式  GroupBoxTabBaseStyle 不推荐直接使
 ![GroupBox_Tab](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/GroupBox_Tab.png) ![GroupBox_Tab_left](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/GroupBox_Tab_left.png)
 {% endnote %}
 
-
----
-
 # GroupBoxOriginal : GroupBoxOriginalBaseStyle : GroupBoxBaseStyle
 
 GroupBox 分组框 的另一种样式 GroupBoxOriginalBaseStyle 不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。