zhaoyushun1999/FineUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-更新示例：表单控件->表单布局->按钮和表单。

Browse Source
This commit is contained in:
三生石上 2018-06-06 11:12:02 +08:00
parent dae78daac3
commit 0cc5f6d907
7 changed files with 231 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
FineUI_v6/FineUI.Examples/FineUI.Examples.csproj
View File

@ -191,6 +191,7 @@
<Content Include="test\test2.aspx" /> <Content Include="test\test2.aspx" />
<Content Include="test\test.aspx" /> <Content Include="test\test.aspx" />
<Content Include="test\tree2.aspx" /> <Content Include="test\tree2.aspx" />
<Content Include="test\WebForm1.aspx" />
<Content Include="third-party\autocomplete\inline_window.aspx" /> <Content Include="third-party\autocomplete\inline_window.aspx" />
<Content Include="third-party\ckeditor\ckeditor_setvalue.aspx" /> <Content Include="third-party\ckeditor\ckeditor_setvalue.aspx" />
<Content Include="third-party\ckeditor\ckeditor.aspx" /> <Content Include="third-party\ckeditor\ckeditor.aspx" />
@ -1433,6 +1434,13 @@
<Compile Include="test\tree2.aspx.designer.cs"> <Compile Include="test\tree2.aspx.designer.cs">
<DependentUpon>tree2.aspx</DependentUpon> <DependentUpon>tree2.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="test\WebForm1.aspx.cs">
<DependentUpon>WebForm1.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="test\WebForm1.aspx.designer.cs">
<DependentUpon>WebForm1.aspx</DependentUpon>
</Compile>
<Compile Include="third-party\autocomplete\inline_window.aspx.cs"> <Compile Include="third-party\autocomplete\inline_window.aspx.cs">
<DependentUpon>inline_window.aspx</DependentUpon> <DependentUpon>inline_window.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>ASPXCodeBehind</SubType>

8
FineUI_v6/FineUI.Examples/default.aspx
View File

@ -28,10 +28,10 @@
</a> </a>
</td> </td>
<td style="text-align: right;"> <td style="text-align: right;">
<f:Button runat="server" CssClass="" Text="企业版(MVC)" IconAlign="Top" Icon="Lightning" <f:Button runat="server" CssClass="" Text="FineUIMvc" IconAlign="Top" Icon="Lightning"
EnablePostBack="false" OnClientClick="window.location.href='http://mvc.fineui.com/';"> EnablePostBack="false" OnClientClick="window.location.href='http://mvc.fineui.com/';">
</f:Button> </f:Button>
<f:Button runat="server" CssClass="" Text="专业版(WebForms)" IconAlign="Top" Icon="Star" <f:Button runat="server" CssClass="" Text="FineUIPro" IconAlign="Top" Icon="Star"
EnablePostBack="false" OnClientClick="window.location.href='http://pro.fineui.com/';"> EnablePostBack="false" OnClientClick="window.location.href='http://pro.fineui.com/';">
</f:Button> </f:Button>
<f:Button runat="server" CssClass="" Text="加载动画" IconAlign="Top" Icon="Hourglass" <f:Button runat="server" CssClass="" Text="加载动画" IconAlign="Top" Icon="Hourglass"
@ -179,10 +179,10 @@
<div style="position:absolute;top:5px;right:5px;border:solid 1px #eee;background-color:#F5F6F8;"> <div style="position:absolute;top:5px;right:5px;border:solid 1px #eee;background-color:#F5F6F8;">
<img src="http://fineui.com/bbs/data/attachment/forum/201712/18/161926s44uks2ks7i2n624.jpg" style="width:260px;" alert="使用微信扫描二维码加入【FineUI铁杆粉丝】知识星球" /> <img src="http://fineui.com/bbs/data/attachment/forum/201801/14/223302z9888a91x99f8jzx.jpg" style="width:260px;" alert="使用微信扫描二维码加入【三石和他的朋友们】知识星球" />
<br/> <br/>
<div style="text-align:center;margin:2px 0 10px;"> <div style="text-align:center;margin:2px 0 10px;">
<a style="text-decoration:none;" target="_blank" title="连接一千位 FineUI 铁杆粉丝，实现知识分享和沉淀" href="http://fineui.com/bbs/forum.php?mod=viewthread&tid=21482">查看详情</a> <a style="text-decoration:none;" target="_blank" title="连接三石和他的一千位朋友，实现知识沉淀和分享" href="http://fineui.com/bbs/forum.php?mod=viewthread&tid=21482">查看详情</a>
</div> </div>
</div> </div>

15
FineUI_v6/FineUI.Examples/form/layout_checkout.aspx
View File

@ -9,11 +9,11 @@
<body> <body>
<form id="_form1" runat="server"> <form id="_form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" /> <f:PageManager ID="PageManager1" runat="server" />
<f:Window ID="Window1" runat="server" Title="账单信息" IsModal="true" EnableClose="false" EnableResize="true" <f:Window ID="Window1" runat="server" Title="账单信息" IsModal="false" EnableClose="false" EnableResize="true"
Width="650px" MinHeight="350px" Layout="Fit"> Width="650px" AutoScroll="true">
<Items> <Items>
<f:Form ID="Form1" Width="650px" LabelAlign="Right" MessageTarget="Qtip" <f:Form ID="Form1" LabelAlign="Right" MessageTarget="Qtip"
BodyPadding="5px" ShowBorder="false" ShowHeader="false" runat="server" AutoScroll="true"> BodyPadding="5px" ShowBorder="false" ShowHeader="false" runat="server">
<Items> <Items>
<f:GroupPanel Layout="Anchor" Title="联系人信息" runat="server"> <f:GroupPanel Layout="Anchor" Title="联系人信息" runat="server">
<Items> <Items>
@ -104,6 +104,8 @@
</Items> </Items>
</f:GroupPanel> </f:GroupPanel>
</Items> </Items>
</f:Form>
</Items>
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar1" runat="server" ToolbarAlign="Right" Position="Bottom"> <f:Toolbar ID="Toolbar1" runat="server" ToolbarAlign="Right" Position="Bottom">
<Items> <Items>
@ -112,12 +114,7 @@
</Items> </Items>
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
</f:Form>
</Items>
</f:Window> </f:Window>
<br />
<br />
注：已经设置了Form1的AutoScroll="true"，尝试缩小窗体的高度，使其出现纵向滚动条。
</form> </form>
</body> </body>
</html> </html>

202
FineUI_v6/FineUI.Examples/form/layout_checkout.aspx.designer.cs generated
View File

@ -1,10 +1,10 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <自动生成> // <auto-generated>
// 此代码由工具生成。 // This code was generated by a tool.
// //
// 对此文件的更改可能会导致不正确的行为，并且如果 // Changes to this file may cause incorrect behavior and will be lost if
// 重新生成代码，这些更改将会丢失。 // the code is regenerated.
// </自动生成> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUI.Examples.form { namespace FineUI.Examples.form {
@ -13,290 +13,290 @@ namespace FineUI.Examples.form {
public partial class layout_checkout { public partial class layout_checkout {
/// <summary> /// <summary>
/// Head1 控件。 /// Head1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1; protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary> /// <summary>
/// _form1 控件。 /// _form1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm _form1; protected global::System.Web.UI.HtmlControls.HtmlForm _form1;
/// <summary> /// <summary>
/// PageManager1 控件。 /// PageManager1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.PageManager PageManager1; protected global::FineUI.PageManager PageManager1;
/// <summary> /// <summary>
/// Window1 控件。 /// Window1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Window Window1; protected global::FineUI.Window Window1;
/// <summary> /// <summary>
/// Form1 控件。 /// Form1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Form Form1; protected global::FineUI.Form Form1;
/// <summary> /// <summary>
/// Panel2 控件。 /// Panel2 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Panel Panel2; protected global::FineUI.Panel Panel2;
/// <summary> /// <summary>
/// TextBox2 控件。 /// TextBox2 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox2; protected global::FineUI.TextBox TextBox2;
/// <summary> /// <summary>
/// TextBox4 控件。 /// TextBox4 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox4; protected global::FineUI.TextBox TextBox4;
/// <summary> /// <summary>
/// Panel1 控件。 /// Panel1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Panel Panel1; protected global::FineUI.Panel Panel1;
/// <summary> /// <summary>
/// TextBox1 控件。 /// TextBox1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox1; protected global::FineUI.TextBox TextBox1;
/// <summary> /// <summary>
/// TextBox6 控件。 /// TextBox6 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox6; protected global::FineUI.TextBox TextBox6;
/// <summary> /// <summary>
/// GroupPanel1 控件。 /// GroupPanel1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.GroupPanel GroupPanel1; protected global::FineUI.GroupPanel GroupPanel1;
/// <summary> /// <summary>
/// TextBox7 控件。 /// TextBox7 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox7; protected global::FineUI.TextBox TextBox7;
/// <summary> /// <summary>
/// Panel4 控件。 /// Panel4 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Panel Panel4; protected global::FineUI.Panel Panel4;
/// <summary> /// <summary>
/// TextBox9 控件。 /// TextBox9 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox9; protected global::FineUI.TextBox TextBox9;
/// <summary> /// <summary>
/// TextBox5 控件。 /// TextBox5 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox5; protected global::FineUI.TextBox TextBox5;
/// <summary> /// <summary>
/// TextBox8 控件。 /// TextBox8 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox8; protected global::FineUI.TextBox TextBox8;
/// <summary> /// <summary>
/// GroupPanel2 控件。 /// GroupPanel2 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.GroupPanel GroupPanel2; protected global::FineUI.GroupPanel GroupPanel2;
/// <summary> /// <summary>
/// cbxSameAsContactAddress 控件。 /// cbxSameAsContactAddress control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.CheckBox cbxSameAsContactAddress; protected global::FineUI.CheckBox cbxSameAsContactAddress;
/// <summary> /// <summary>
/// tbxBillingAddress 控件。 /// tbxBillingAddress control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox tbxBillingAddress; protected global::FineUI.TextBox tbxBillingAddress;
/// <summary> /// <summary>
/// Panel3 控件。 /// Panel3 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Panel Panel3; protected global::FineUI.Panel Panel3;
/// <summary> /// <summary>
/// tbxBillingProvince 控件。 /// tbxBillingProvince control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox tbxBillingProvince; protected global::FineUI.TextBox tbxBillingProvince;
/// <summary> /// <summary>
/// tbxBillingCity 控件。 /// tbxBillingCity control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox tbxBillingCity; protected global::FineUI.TextBox tbxBillingCity;
/// <summary> /// <summary>
/// tbxBillingPostCode 控件。 /// tbxBillingPostCode control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox tbxBillingPostCode; protected global::FineUI.TextBox tbxBillingPostCode;
/// <summary> /// <summary>
/// GroupPanel3 控件。 /// GroupPanel3 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.GroupPanel GroupPanel3; protected global::FineUI.GroupPanel GroupPanel3;
/// <summary> /// <summary>
/// RadioButtonList1 控件。 /// RadioButtonList1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.RadioButtonList RadioButtonList1; protected global::FineUI.RadioButtonList RadioButtonList1;
/// <summary> /// <summary>
/// TextBox3 控件。 /// TextBox3 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox3; protected global::FineUI.TextBox TextBox3;
/// <summary> /// <summary>
/// Panel5 控件。 /// Panel5 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Panel Panel5; protected global::FineUI.Panel Panel5;
/// <summary> /// <summary>
/// TextBox14 控件。 /// TextBox14 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox14; protected global::FineUI.TextBox TextBox14;
/// <summary> /// <summary>
/// TextBox16 控件。 /// TextBox16 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.NumberBox TextBox16; protected global::FineUI.NumberBox TextBox16;
/// <summary> /// <summary>
/// Toolbar1 控件。 /// Toolbar1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Toolbar Toolbar1; protected global::FineUI.Toolbar Toolbar1;
/// <summary> /// <summary>
/// Button1 控件。 /// Button1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Button Button1; protected global::FineUI.Button Button1;
} }

32
FineUI_v6/FineUI.Examples/form/layout_panel.aspx
View File

@ -5,10 +5,12 @@
<head runat="server"> <head runat="server">
<title></title> <title></title>
<style> <style>
.btn-in-form .panel-in-formrow {
{
margin-bottom: 5px; margin-bottom: 5px;
display: table; display: table;
table-layout: fixed;
border-spacing: 0;
border-collapse: separate;
} }
</style> </style>
</head> </head>
@ -18,37 +20,53 @@
<f:Form ID="SimpleForm1" BodyPadding="5px" Width="550px" LabelAlign="Left" LabelWidth="80px" <f:Form ID="SimpleForm1" BodyPadding="5px" Width="550px" LabelAlign="Left" LabelWidth="80px"
Title="表单" runat="server"> Title="表单" runat="server">
<Rows> <Rows>
<f:FormRow ID="FormRow5"> <f:FormRow>
<Items> <Items>
<f:TextBox ID="TextBox1" runat="server" Label="文本一"> <f:TextBox ID="TextBox1" runat="server" Label="文本一">
</f:TextBox> </f:TextBox>
<f:Button ID="Button4" CssClass="btn-in-form" runat="server" Text="按钮一"> <f:Panel CssClass="panel-in-formrow" ShowBorder="false" runat="server">
<Items>
<f:Button ID="Button4" runat="server" Text="按钮一">
</f:Button> </f:Button>
</Items> </Items>
</f:Panel>
</Items>
</f:FormRow> </f:FormRow>
<f:FormRow ID="FormRow6" runat="server"> <f:FormRow ID="FormRow6" runat="server">
<Items> <Items>
<f:TextBox ID="TextBox2" runat="server" Label="文本二"> <f:TextBox ID="TextBox2" runat="server" Label="文本二">
</f:TextBox> </f:TextBox>
<f:Button ID="Button3" CssClass="btn-in-form" runat="server" Text="按钮二"> <f:Panel CssClass="panel-in-formrow" ShowBorder="false" runat="server">
<Items>
<f:Button ID="Button3" runat="server" Text="按钮二">
</f:Button> </f:Button>
</Items> </Items>
</f:Panel>
</Items>
</f:FormRow> </f:FormRow>
<f:FormRow ID="FormRow7" runat="server"> <f:FormRow ID="FormRow7" runat="server">
<Items> <Items>
<f:TextBox ID="TextBox3" runat="server" Label="文本三"> <f:TextBox ID="TextBox3" runat="server" Label="文本三">
</f:TextBox> </f:TextBox>
<f:Button ID="Button1" CssClass="btn-in-form" runat="server" Text="按钮三"> <f:Panel CssClass="panel-in-formrow" ShowBorder="false" runat="server">
<Items>
<f:Button ID="Button1" runat="server" Text="按钮三">
</f:Button> </f:Button>
</Items> </Items>
</f:Panel>
</Items>
</f:FormRow> </f:FormRow>
<f:FormRow ID="FormRow8" runat="server"> <f:FormRow ID="FormRow8" runat="server">
<Items> <Items>
<f:TextBox ID="TextBox4" runat="server" Label="文本四"> <f:TextBox ID="TextBox4" runat="server" Label="文本四">
</f:TextBox> </f:TextBox>
<f:Button ID="Button2" CssClass="btn-in-form" runat="server" Text="按钮四"> <f:Panel CssClass="panel-in-formrow" ShowBorder="false" runat="server">
<Items>
<f:Button ID="Button2" runat="server" Text="按钮四">
</f:Button> </f:Button>
</Items> </Items>
</f:Panel>
</Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
</f:Form> </f:Form>

103
FineUI_v6/FineUI.Examples/form/layout_panel.aspx.designer.cs generated
View File

@ -1,10 +1,10 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <自动生成> // <auto-generated>
// 此代码由工具生成。 // This code was generated by a tool.
// //
// 对此文件的更改可能会导致不正确的行为，并且如果 // Changes to this file may cause incorrect behavior and will be lost if
// 重新生成代码，这些更改将会丢失。 // the code is regenerated.
// </自动生成> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUI.Examples.form { namespace FineUI.Examples.form {
@ -13,137 +13,128 @@ namespace FineUI.Examples.form {
public partial class layout_panel { public partial class layout_panel {
/// <summary> /// <summary>
/// form1 控件。 /// form1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1; protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary> /// <summary>
/// PageManager1 控件。 /// PageManager1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.PageManager PageManager1; protected global::FineUI.PageManager PageManager1;
/// <summary> /// <summary>
/// SimpleForm1 控件。 /// SimpleForm1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Form SimpleForm1; protected global::FineUI.Form SimpleForm1;
/// <summary> /// <summary>
/// FormRow5 控件。 /// TextBox1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUI.FormRow FormRow5;
/// <summary>
/// TextBox1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox1; protected global::FineUI.TextBox TextBox1;
/// <summary> /// <summary>
/// Button4 控件。 /// Button4 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Button Button4; protected global::FineUI.Button Button4;
/// <summary> /// <summary>
/// FormRow6 控件。 /// FormRow6 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.FormRow FormRow6; protected global::FineUI.FormRow FormRow6;
/// <summary> /// <summary>
/// TextBox2 控件。 /// TextBox2 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox2; protected global::FineUI.TextBox TextBox2;
/// <summary> /// <summary>
/// Button3 控件。 /// Button3 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Button Button3; protected global::FineUI.Button Button3;
/// <summary> /// <summary>
/// FormRow7 控件。 /// FormRow7 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.FormRow FormRow7; protected global::FineUI.FormRow FormRow7;
/// <summary> /// <summary>
/// TextBox3 控件。 /// TextBox3 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox3; protected global::FineUI.TextBox TextBox3;
/// <summary> /// <summary>
/// Button1 控件。 /// Button1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Button Button1; protected global::FineUI.Button Button1;
/// <summary> /// <summary>
/// FormRow8 控件。 /// FormRow8 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.FormRow FormRow8; protected global::FineUI.FormRow FormRow8;
/// <summary> /// <summary>
/// TextBox4 控件。 /// TextBox4 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextBox4; protected global::FineUI.TextBox TextBox4;
/// <summary> /// <summary>
/// Button2 控件。 /// Button2 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// Auto-generated field.
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::FineUI.Button Button2; protected global::FineUI.Button Button2;
} }

1
FineUI_v6/FineUI/release_history.txt
View File

@ -31,6 +31,7 @@ FineUI 严格遵守 ExtJS 对开源软件的规定，不再内置 ExtJS 库，
-增加示例：表格控件->行与列样式->行样式（列锁定）（vt4u-21458）。 -增加示例：表格控件->行与列样式->行样式（列锁定）（vt4u-21458）。
-增加示例：表格控件->排序->排序（服务器端改变排序列）（PLEaglefly-21456）。 -增加示例：表格控件->排序->排序（服务器端改变排序列）（PLEaglefly-21456）。
-更新示例：表单控件->表单布局->按钮和表单。