From 50ba7e73d1d38294538b7a4b6e3b4343a79a7123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E7=94=9F=E7=9F=B3=E4=B8=8A?= Date: Sat, 14 May 2016 23:43:12 -0400 Subject: [PATCH] no commit message --- FineUI.Examples/FineUI.Examples.csproj | 19 +++++++- FineUI.Examples/grid/grid.aspx | 37 +++++++------- FineUI.Examples/grid/grid.aspx.cs | 1 - FineUI.Examples/grid/grid.aspx.designer.cs | 9 ---- FineUI.Examples/grid/grid_aspnet.aspx | 48 +++++++++---------- FineUI.Examples/grid/grid_aspnet.aspx.cs | 4 +- .../grid/grid_aspnet.aspx.designer.cs | 4 +- ...id_editor_cell_renderfunction_complex.aspx | 3 ++ .../grid/grid_lockcolumn_many_columns.aspx | 19 ++++---- .../grid/grid_lockcolumn_many_columns.aspx.cs | 2 +- FineUI.Examples/grid/grid_many_columns.aspx | 18 +++---- .../grid/grid_many_columns.aspx.cs | 5 ++ 12 files changed, 91 insertions(+), 78 deletions(-) diff --git a/FineUI.Examples/FineUI.Examples.csproj b/FineUI.Examples/FineUI.Examples.csproj index e2b02a9..7e6fc7e 100644 --- a/FineUI.Examples/FineUI.Examples.csproj +++ b/FineUI.Examples/FineUI.Examples.csproj @@ -23,7 +23,7 @@ - + true true @@ -125,6 +125,7 @@ + @@ -162,6 +163,7 @@ + @@ -963,6 +965,13 @@ grid_checkall_keepcurrentselection.aspx + + grid_backup.aspx + ASPXCodeBehind + + + grid_backup.aspx + selectprovince_executescript.aspx ASPXCodeBehind @@ -1218,10 +1227,18 @@ hello.aspx + ASPXCodeBehind hello.aspx + + WebForm1.aspx + ASPXCodeBehind + + + WebForm1.aspx + inline_window.aspx ASPXCodeBehind diff --git a/FineUI.Examples/grid/grid.aspx b/FineUI.Examples/grid/grid.aspx index 460fdf7..ab2b767 100644 --- a/FineUI.Examples/grid/grid.aspx +++ b/FineUI.Examples/grid/grid.aspx @@ -9,31 +9,30 @@
- + - - - + - <%-- Container.DataItem 的类型是 System.Data.DataRowView 或者用户自定义类型 --%> - <%----%> - + <%# Container.DataItemIndex + 1 %> - - - - - + + + + <%# GetGender(Eval("Gender")) %> + + + + + + + -
-
- <%--注：如果你尝试扩大“所学专业”列的宽度，你会发现右侧的列看不到了，而横向滚动条却没有出来，这是 ExtJS 的BUG。查看专业版示例。--%> diff --git a/FineUI.Examples/grid/grid.aspx.cs b/FineUI.Examples/grid/grid.aspx.cs index 540cb38..fb0bc41 100644 --- a/FineUI.Examples/grid/grid.aspx.cs +++ b/FineUI.Examples/grid/grid.aspx.cs @@ -27,7 +27,6 @@ namespace FineUI.Examples.grid Grid1.DataSource = table; Grid1.DataBind(); - } diff --git a/FineUI.Examples/grid/grid.aspx.designer.cs b/FineUI.Examples/grid/grid.aspx.designer.cs index 7130ca6..3bd5bdf 100644 --- a/FineUI.Examples/grid/grid.aspx.designer.cs +++ b/FineUI.Examples/grid/grid.aspx.designer.cs @@ -38,14 +38,5 @@ namespace FineUI.Examples.grid { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUI.Grid Grid1; - - /// - /// Label3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label3; } } diff --git a/FineUI.Examples/grid/grid_aspnet.aspx b/FineUI.Examples/grid/grid_aspnet.aspx index 0ace80c..81c7707 100644 --- a/FineUI.Examples/grid/grid_aspnet.aspx +++ b/FineUI.Examples/grid/grid_aspnet.aspx @@ -8,30 +8,30 @@
- - - - - - - - - - - - - - - - - - - - + + + + + <%# Container.DataItemIndex + 1 %> + + + + + + <%# GetGender(Eval("Gender")) %> + + + + + + + + +
diff --git a/FineUI.Examples/grid/grid_aspnet.aspx.cs b/FineUI.Examples/grid/grid_aspnet.aspx.cs index 7c3d3b2..e9ff68e 100644 --- a/FineUI.Examples/grid/grid_aspnet.aspx.cs +++ b/FineUI.Examples/grid/grid_aspnet.aspx.cs @@ -25,8 +25,8 @@ namespace FineUI.Examples.grid { DataTable table = DataSourceUtil.GetDataTable(); - GridView1.DataSource = table; - GridView1.DataBind(); + Grid1.DataSource = table; + Grid1.DataBind(); } diff --git a/FineUI.Examples/grid/grid_aspnet.aspx.designer.cs b/FineUI.Examples/grid/grid_aspnet.aspx.designer.cs index cc1d9e7..8eb0716 100644 --- a/FineUI.Examples/grid/grid_aspnet.aspx.designer.cs +++ b/FineUI.Examples/grid/grid_aspnet.aspx.designer.cs @@ -22,12 +22,12 @@ namespace FineUI.Examples.grid { protected global::System.Web.UI.HtmlControls.HtmlForm form1; /// - /// GridView1 控件。 + /// Grid1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::System.Web.UI.WebControls.GridView GridView1; + protected global::System.Web.UI.WebControls.GridView Grid1; } } diff --git a/FineUI.Examples/grid/grid_editor_cell_renderfunction_complex.aspx b/FineUI.Examples/grid/grid_editor_cell_renderfunction_complex.aspx index de59e00..76b5956 100644 --- a/FineUI.Examples/grid/grid_editor_cell_renderfunction_complex.aspx +++ b/FineUI.Examples/grid/grid_editor_cell_renderfunction_complex.aspx @@ -83,7 +83,10 @@ function renderName(value, params) { if (params.record.data["EntranceYear"] >= 2003) { params.tdCls = 'highlight'; + } else { + params.tdCls = ''; } + return value; } diff --git a/FineUI.Examples/grid/grid_lockcolumn_many_columns.aspx b/FineUI.Examples/grid/grid_lockcolumn_many_columns.aspx index e7cebc5..96cb4ca 100644 --- a/FineUI.Examples/grid/grid_lockcolumn_many_columns.aspx +++ b/FineUI.Examples/grid/grid_lockcolumn_many_columns.aspx @@ -9,17 +9,18 @@
- - + + + @@ -34,6 +35,10 @@ DataTextFormatString="{0}" DataNavigateUrlFields="Major" DataNavigateUrlFormatString="http://gsa.ustc.edu.cn/search?q={0}" UrlEncode="true" Target="_blank" /> + + + <%# GetHobby(Eval("Hobby")) %> @@ -49,10 +54,8 @@ - - - - + +
diff --git a/FineUI.Examples/grid/grid_lockcolumn_many_columns.aspx.cs b/FineUI.Examples/grid/grid_lockcolumn_many_columns.aspx.cs index 39b0257..bd3faec 100644 --- a/FineUI.Examples/grid/grid_lockcolumn_many_columns.aspx.cs +++ b/FineUI.Examples/grid/grid_lockcolumn_many_columns.aspx.cs @@ -25,7 +25,7 @@ namespace FineUI.Examples.grid { DataTable table = DataSourceUtil.GetDataTable(); - for (int i = 0; i < 3; i++) + for (int i = 0; i < 2; i++) { table.Merge(DataSourceUtil.GetDataTable(), true); } diff --git a/FineUI.Examples/grid/grid_many_columns.aspx b/FineUI.Examples/grid/grid_many_columns.aspx index 1114288..8d242b6 100644 --- a/FineUI.Examples/grid/grid_many_columns.aspx +++ b/FineUI.Examples/grid/grid_many_columns.aspx @@ -7,7 +7,7 @@