diff --git a/FineUI.Examples/Code/PageBase.cs b/FineUI.Examples/Code/PageBase.cs
index 166fdd1..6af0ce0 100644
--- a/FineUI.Examples/Code/PageBase.cs
+++ b/FineUI.Examples/Code/PageBase.cs
@@ -53,6 +53,22 @@ namespace FineUI.Examples
}
+ // 为所有页面添加公共的：
+ System.Web.UI.HtmlControls.HtmlGenericControl metaCtrl = new System.Web.UI.HtmlControls.HtmlGenericControl("meta");
+ metaCtrl.Attributes["http-equiv"] = "Content-Type";
+ metaCtrl.Attributes["content"] = "text/html; charset=utf-8";
+ Header.Controls.AddAt(0, metaCtrl);
+
+
+ // 为所有页面添加公共的：
+ System.Web.UI.HtmlControls.HtmlGenericControl linkCtrl = new System.Web.UI.HtmlControls.HtmlGenericControl("link");
+ linkCtrl.Attributes["rel"] = "stylesheet";
+ linkCtrl.Attributes["type"] = "text/css";
+ linkCtrl.Attributes["href"] = ResolveClientUrl("~/res/css/common.css");
+ Header.Controls.Add(linkCtrl);
+
+
+
base.OnInit(e);
}
diff --git a/FineUI.Examples/FineUI.Examples.csproj b/FineUI.Examples/FineUI.Examples.csproj
index 7e6fc7e..8880383 100644
--- a/FineUI.Examples/FineUI.Examples.csproj
+++ b/FineUI.Examples/FineUI.Examples.csproj
@@ -67,19 +67,27 @@
+
+
+
+
+
+
+
+
@@ -113,6 +121,7 @@
+
@@ -162,7 +171,9 @@
+
+
@@ -567,6 +578,13 @@
dropdownlist_emptytext_enableedit.aspx
+
+ dropdownlist_focus.aspx
+ ASPXCodeBehind
+
+
+ dropdownlist_focus.aspx
+
dropdownlist_matchfieldwidth.aspx
ASPXCodeBehind
@@ -574,6 +592,20 @@
dropdownlist_matchfieldwidth.aspx
+
+ dropdownlist_matchfieldwidth_right.aspx
+ ASPXCodeBehind
+
+
+ dropdownlist_matchfieldwidth_right.aspx
+
+
+ dropdownlist_multiselect_scroll.aspx
+ ASPXCodeBehind
+
+
+ dropdownlist_multiselect_scroll.aspx
+
dropdownlist_no_autopostback.aspx
ASPXCodeBehind
@@ -581,6 +613,13 @@
dropdownlist_no_autopostback.aspx
+
+ dropdownlist_scroll.aspx
+ ASPXCodeBehind
+
+
+ dropdownlist_scroll.aspx
+
multiselect.aspx
ASPXCodeBehind
@@ -616,6 +655,13 @@
dropdownlist_autopostback_enableedit_noforceselection.aspx
+
+ calendar_mindate.aspx
+ ASPXCodeBehind
+
+
+ calendar_mindate.aspx
+
form_columnwidths.aspx
ASPXCodeBehind
@@ -637,6 +683,13 @@
form_longlabel.aspx
+
+ form_textalign.aspx
+ ASPXCodeBehind
+
+
+ form_textalign.aspx
+
layout_center_label.aspx
ASPXCodeBehind
@@ -651,6 +704,13 @@
layout_multiline_buttons.aspx
+
+ triggerbox_triggerboxurl.aspx
+ ASPXCodeBehind
+
+
+ triggerbox_triggerboxurl.aspx
+
Global.asax
@@ -881,6 +941,13 @@
grid_rowexpander_grid_data.ashx
+
+ grid_sorting_nosortfield.aspx
+ ASPXCodeBehind
+
+
+ grid_sorting_nosortfield.aspx
+
grid_style_columnclass.aspx
ASPXCodeBehind
@@ -1225,6 +1292,13 @@
grid_editor_cell2.aspx
+
+ grid_sorting2.aspx
+ ASPXCodeBehind
+
+
+ grid_sorting2.aspx
+
hello.aspx
ASPXCodeBehind
@@ -1232,6 +1306,13 @@
hello.aspx
+
+ triggerbox2.aspx
+ ASPXCodeBehind
+
+
+ triggerbox2.aspx
+
WebForm1.aspx
ASPXCodeBehind
diff --git a/FineUI.Examples/accordion/accordion.aspx b/FineUI.Examples/accordion/accordion.aspx
index 8ee82ed..cc79b8b 100644
--- a/FineUI.Examples/accordion/accordion.aspx
+++ b/FineUI.Examples/accordion/accordion.aspx
@@ -4,7 +4,6 @@
-
diff --git a/FineUI.Examples/accordion/accordion_autopostback.aspx.cs b/FineUI.Examples/accordion/accordion_autopostback.aspx.cs
index 63423b9..18fbabf 100644
--- a/FineUI.Examples/accordion/accordion_autopostback.aspx.cs
+++ b/FineUI.Examples/accordion/accordion_autopostback.aspx.cs
@@ -24,5 +24,16 @@ namespace FineUI.Examples.accordion
{
Alert.ShowInTop(String.Format("当前展开的是第 {0} 个面板", Accordion1.ActivePaneIndex + 1));
}
+
+ protected void Button2_Click(object sender, EventArgs e)
+ {
+ var nextIndex = Accordion1.ActivePaneIndex + 1;
+ if (nextIndex >= Accordion1.Panes.Count)
+ {
+ nextIndex = 0;
+ }
+
+ Accordion1.ActivePaneIndex = nextIndex;
+ }
}
}
diff --git a/FineUI.Examples/accordion/accordion_autopostback.aspx.designer.cs b/FineUI.Examples/accordion/accordion_autopostback.aspx.designer.cs
index 9e5af00..439e54a 100644
--- a/FineUI.Examples/accordion/accordion_autopostback.aspx.designer.cs
+++ b/FineUI.Examples/accordion/accordion_autopostback.aspx.designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
-// <自动生成>
-// 此代码由工具生成。
+//
+// This code was generated by a tool.
//
-// 对此文件的更改可能会导致不正确的行为，并且如果
-// 重新生成代码，这些更改将会丢失。
-//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
//------------------------------------------------------------------------------
namespace FineUI.Examples.accordion {
@@ -13,93 +13,102 @@ namespace FineUI.Examples.accordion {
public partial class accordion_autopostback {
///
- /// form1 控件。
+ /// form1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
///
- /// PageManager1 控件。
+ /// PageManager1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.PageManager PageManager1;
///
- /// Accordion1 控件。
+ /// Accordion1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.Accordion Accordion1;
///
- /// AccordionPane1 控件。
+ /// AccordionPane1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.AccordionPane AccordionPane1;
///
- /// Label1 控件。
+ /// Label1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.Label Label1;
///
- /// AccordionPane2 控件。
+ /// AccordionPane2 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.AccordionPane AccordionPane2;
///
- /// Label2 控件。
+ /// Label2 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.Label Label2;
///
- /// AccordionPane3 控件。
+ /// AccordionPane3 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.AccordionPane AccordionPane3;
///
- /// Label3 控件。
+ /// Label3 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.Label Label3;
///
- /// Button1 控件。
+ /// Button1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.Button Button1;
+
+ ///
+ /// Button2 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUI.Button Button2;
}
}
diff --git a/FineUI.Examples/accordion/accordion_fill.aspx b/FineUI.Examples/accordion/accordion_fill.aspx
index b19fafc..cb00f39 100644
--- a/FineUI.Examples/accordion/accordion_fill.aspx
+++ b/FineUI.Examples/accordion/accordion_fill.aspx
@@ -3,9 +3,7 @@
-
-
+
+
diff --git a/FineUI.Examples/form/form_textalign.aspx.cs b/FineUI.Examples/form/form_textalign.aspx.cs
new file mode 100644
index 0000000..ae3258f
--- /dev/null
+++ b/FineUI.Examples/form/form_textalign.aspx.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUI.Examples.form
+{
+ public partial class form_textalign : PageBase
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+
+ }
+
+ }
+
+ protected void btnSubmit_Click(object sender, EventArgs e)
+ {
+ ShowNotify("表单验证成功");
+ }
+
+ }
+}
diff --git a/FineUI.Examples/form/form_textalign.aspx.designer.cs b/FineUI.Examples/form/form_textalign.aspx.designer.cs
new file mode 100644
index 0000000..7527493
--- /dev/null
+++ b/FineUI.Examples/form/form_textalign.aspx.designer.cs
@@ -0,0 +1,78 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace FineUI.Examples.form {
+
+
+ public partial class form_textalign {
+
+ ///
+ /// form1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUI.PageManager PageManager1;
+
+ ///
+ /// SimpleForm1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUI.SimpleForm SimpleForm1;
+
+ ///
+ /// TextBox1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUI.TextBox TextBox1;
+
+ ///
+ /// TextBox2 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUI.TextBox TextBox2;
+
+ ///
+ /// TextBox3 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUI.TextBox TextBox3;
+
+ ///
+ /// btnSubmit control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUI.Button btnSubmit;
+ }
+}
diff --git a/FineUI.Examples/form/form_validate.aspx b/FineUI.Examples/form/form_validate.aspx
index 4a2adbb..909d6d7 100644
--- a/FineUI.Examples/form/form_validate.aspx
+++ b/FineUI.Examples/form/form_validate.aspx
@@ -5,7 +5,6 @@
-
diff --git a/FineUI.Examples/grid/grid_paging_database_selection.aspx.cs b/FineUI.Examples/grid/grid_paging_database_selection.aspx.cs
index 28cf9d8..a9aab86 100644
--- a/FineUI.Examples/grid/grid_paging_database_selection.aspx.cs
+++ b/FineUI.Examples/grid/grid_paging_database_selection.aspx.cs
@@ -75,24 +75,22 @@ namespace FineUI.Examples.grid
protected void Button1_Click(object sender, EventArgs e)
{
- SyncSelectedRowIndexArrayToHiddenField();
+ SyncSelectedRowIDArrayToHiddenField();
labResult.Text = "选中行的ID列表为：" + hfSelectedIDS.Text.Trim();
-
}
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
- SyncSelectedRowIndexArrayToHiddenField();
+ SyncSelectedRowIDArrayToHiddenField();
- Grid1.PageIndex = e.NewPageIndex;
BindGrid();
- UpdateSelectedRowIndexArray();
+ UpdateSelectedRowIDArray();
}
- private List GetSelectedRowIndexArrayFromHiddenField()
+ private List GetSelectedRowIDArrayFromHiddenField()
{
JArray idsArray = new JArray();
@@ -108,55 +106,48 @@ namespace FineUI.Examples.grid
return new List(idsArray.ToObject());
}
- private void SyncSelectedRowIndexArrayToHiddenField()
+ private void SyncSelectedRowIDArrayToHiddenField()
{
- List ids = GetSelectedRowIndexArrayFromHiddenField();
+ List ids = GetSelectedRowIDArrayFromHiddenField();
- List selectedRows = new List();
- if (Grid1.SelectedRowIndexArray != null && Grid1.SelectedRowIndexArray.Length > 0)
+ List selectedRowIDs = new List(Grid1.SelectedRowIDArray);
+ foreach (GridRow row in Grid1.Rows)
{
- selectedRows = new List(Grid1.SelectedRowIndexArray);
- }
-
- for (int i = 0, count = Math.Min(Grid1.PageSize, (Grid1.RecordCount - Grid1.PageIndex * Grid1.PageSize)); i < count; i++)
- {
- string id = Grid1.DataKeys[i][0].ToString();
- if (selectedRows.Contains(i))
+ string rowID = row.RowID;
+ if (selectedRowIDs.Contains(rowID))
{
- if (!ids.Contains(id))
+ if (!ids.Contains(rowID))
{
- ids.Add(id);
+ ids.Add(rowID);
}
}
else
{
- if (ids.Contains(id))
+ if (ids.Contains(rowID))
{
- ids.Remove(id);
+ ids.Remove(rowID);
}
}
-
}
+
hfSelectedIDS.Text = new JArray(ids).ToString(Formatting.None);
-
-
}
- private void UpdateSelectedRowIndexArray()
+ private void UpdateSelectedRowIDArray()
{
- List ids = GetSelectedRowIndexArrayFromHiddenField();
+ List ids = GetSelectedRowIDArrayFromHiddenField();
- List nextSelectedRowIndexArray = new List();
- for (int i = 0, count = Math.Min(Grid1.PageSize, (Grid1.RecordCount - Grid1.PageIndex * Grid1.PageSize)); i < count; i++)
+ List selectedRowIDs = new List();
+ foreach (GridRow row in Grid1.Rows)
{
- string id = Grid1.DataKeys[i][0].ToString();
- if (ids.Contains(id))
+ if (ids.Contains(row.RowID))
{
- nextSelectedRowIndexArray.Add(i);
+ selectedRowIDs.Add(row.RowID);
}
}
- Grid1.SelectedRowIndexArray = nextSelectedRowIndexArray.ToArray();
+
+ Grid1.SelectedRowIDArray = selectedRowIDs.ToArray();
}
#endregion
diff --git a/FineUI.Examples/grid/grid_paging_database_selection.aspx.designer.cs b/FineUI.Examples/grid/grid_paging_database_selection.aspx.designer.cs
index 26741c4..c876551 100644
--- a/FineUI.Examples/grid/grid_paging_database_selection.aspx.designer.cs
+++ b/FineUI.Examples/grid/grid_paging_database_selection.aspx.designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
-// <自动生成>
-// 此代码由工具生成。
+//
+// This code was generated by a tool.
//
-// 对此文件的更改可能会导致不正确的行为，并且如果
-// 重新生成代码，这些更改将会丢失。
-//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
//------------------------------------------------------------------------------
namespace FineUI.Examples.grid {
@@ -13,65 +13,65 @@ namespace FineUI.Examples.grid {
public partial class grid_paging_database_selection {
///
- /// form1 控件。
+ /// form1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
///
- /// PageManager1 控件。
+ /// PageManager1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.PageManager PageManager1;
///
- /// Grid1 控件。
+ /// Grid1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.Grid Grid1;
///
- /// Label2 控件。
+ /// Label2 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.Label Label2;
///
- /// hfSelectedIDS 控件。
+ /// hfSelectedIDS control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.HiddenField hfSelectedIDS;
///
- /// Button1 控件。
+ /// Button1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.Button Button1;
///
- /// labResult 控件。
+ /// labResult control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUI.Label labResult;
}
diff --git a/FineUI.Examples/grid/grid_paging_database_sorting.aspx b/FineUI.Examples/grid/grid_paging_database_sorting.aspx
index 74e873f..ddf5c79 100644
--- a/FineUI.Examples/grid/grid_paging_database_sorting.aspx
+++ b/FineUI.Examples/grid/grid_paging_database_sorting.aspx
@@ -5,7 +5,6 @@
-