From 15588d275bb5e10b8c6e437f81ff0193b5e726a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E7=94=9F=E7=9F=B3=E4=B8=8A?= Date: Tue, 5 Sep 2017 10:49:48 +0800 Subject: [PATCH] v4.2.4.1 --- FineUI.Examples/Code/PageBase.cs | 16 + FineUI.Examples/FineUI.Examples.csproj | 81 + FineUI.Examples/accordion/accordion.aspx | 1 - .../accordion/accordion_autopostback.aspx | 5 +- .../accordion/accordion_autopostback.aspx.cs | 11 + .../accordion_autopostback.aspx.designer.cs | 79 +- FineUI.Examples/accordion/accordion_fill.aspx | 2 - FineUI.Examples/accordion/accordion_tree.aspx | 1 - FineUI.Examples/aspnet/aspnet.aspx | 1 - FineUI.Examples/aspnet/aspnet_literal.aspx | 1 - FineUI.Examples/basic/hello.aspx | 1 - FineUI.Examples/basic/hello_aspnet.aspx | 1 - FineUI.Examples/basic/login.aspx | 1 - FineUI.Examples/basic/login_captcha.aspx | 1 - FineUI.Examples/basic/login_enterkey.aspx | 1 - FineUI.Examples/button/button.aspx | 1 - FineUI.Examples/button/button_click.aspx | 1 - FineUI.Examples/button/button_custom.aspx | 1 - FineUI.Examples/button/button_icon.aspx | 1 - FineUI.Examples/button/button_linkbutton.aspx | 1 - FineUI.Examples/button/button_menu.aspx | 1 - .../button/button_menu_menuid.aspx | 1 - FineUI.Examples/common/menu.xml | 44 +- FineUI.Examples/config/ajax.aspx | 1 - FineUI.Examples/config/icons.aspx | 1 - FineUI.Examples/default.aspx | 12 +- FineUI.Examples/default.aspx.cs | 8 +- FineUI.Examples/default.aspx.designer.cs | 247 +- .../databind/dropdownlist_compositelist.aspx | 1 - .../databind/dropdownlist_datatable.aspx | 1 - .../databind/dropdownlist_simplelist.aspx | 1 - .../dropdownlist/dropdownlist.aspx | 6 +- .../dropdownlist.aspx.designer.cs | 52 +- .../dropdownlist_autopostback.aspx | 2 - .../dropdownlist_autopostback_enableedit.aspx | 2 - ...opostback_enableedit_noforceselection.aspx | 2 - .../dropdownlist/dropdownlist_emptytext.aspx | 2 - .../dropdownlist_emptytext_enableedit.aspx | 2 - .../dropdownlist/dropdownlist_emptyvalue.aspx | 1 - .../dropdownlist/dropdownlist_enableedit.aspx | 1 - .../dropdownlist/dropdownlist_focus.aspx | 42 + .../dropdownlist/dropdownlist_focus.aspx.cs | 40 + .../dropdownlist_focus.aspx.designer.cs | 78 + .../dropdownlist_forceselection.aspx | 1 - .../dropdownlist_matchfieldwidth.aspx | 2 - .../dropdownlist_matchfieldwidth_right.aspx | 53 + ...dropdownlist_matchfieldwidth_right.aspx.cs | 40 + ...ist_matchfieldwidth_right.aspx.designer.cs | 87 + .../dropdownlist_multiselect_scroll.aspx | 52 + .../dropdownlist_multiselect_scroll.aspx.cs | 51 + ...wnlist_multiselect_scroll.aspx.designer.cs | 78 + .../dropdownlist_no_autopostback.aspx | 2 - .../dropdownlist/dropdownlist_scroll.aspx | 51 + .../dropdownlist/dropdownlist_scroll.aspx.cs | 40 + .../dropdownlist_scroll.aspx.designer.cs | 78 + .../dropdownlist_simulate_tree.aspx | 1 - FineUI.Examples/dropdownlist/multiselect.aspx | 1 - .../multiselect_autopostback.aspx | 1 - .../multiselect_autopostback_enableedit.aspx | 1 - .../dropdownlist/multiselect_enableedit.aspx | 1 - .../dropdownlist/shengshixian.aspx | 1 - FineUI.Examples/extjs_builder/js/F/F.ajax.js | 67 +- FineUI.Examples/extjs_builder/js/F/F.util.js | 5 +- FineUI.Examples/extjs_builder/js/F/F.wnd.js | 4 + .../extjs_builder/js/F/extender.js | 51 +- .../extjs_builder/js/lang/f-lang-zh_CN.js | 8 + .../extjs_builder/js/lang/f-lang-zh_TW.js | 7 + .../js/ux/SimplePagingToolbar.js | 12 + FineUI.Examples/extjs_builder/res/FineUI.css | 1 - FineUI.Examples/extjs_builder/version.txt | 2 +- FineUI.Examples/form/calendar.aspx | 23 +- FineUI.Examples/form/calendar.aspx.cs | 4 +- .../form/calendar.aspx.designer.cs | 49 +- FineUI.Examples/form/calendar_mindate.aspx | 24 + FineUI.Examples/form/calendar_mindate.aspx.cs | 40 + .../form/calendar_mindate.aspx.designer.cs | 60 + FineUI.Examples/form/checkbox.aspx | 1 - FineUI.Examples/form/checkboxlist.aspx | 1 - FineUI.Examples/form/checkboxlist_update.aspx | 1 - FineUI.Examples/form/datepicker.aspx | 1 - .../form/datepicker_autopostback.aspx | 1 - FineUI.Examples/form/datepicker_range.aspx | 1 - FineUI.Examples/form/fileupload.aspx | 1 - .../form/fileupload_autopostback.aspx | 1 - FineUI.Examples/form/fileupload_toolbar.aspx | 1 - FineUI.Examples/form/form.aspx | 1 - FineUI.Examples/form/form_center_button.aspx | 1 - FineUI.Examples/form/form_columnwidths.aspx | 2 - FineUI.Examples/form/form_compare.aspx | 1 - FineUI.Examples/form/form_disabled.aspx | 2 - FineUI.Examples/form/form_dynamic.aspx | 1 - FineUI.Examples/form/form_hide_field.aspx | 2 - FineUI.Examples/form/form_labelwidth.aspx | 2 - FineUI.Examples/form/form_longlabel.aspx | 2 - FineUI.Examples/form/form_reset.aspx | 1 - FineUI.Examples/form/form_textalign.aspx | 34 + FineUI.Examples/form/form_textalign.aspx.cs | 26 + .../form/form_textalign.aspx.designer.cs | 78 + FineUI.Examples/form/form_validate.aspx | 1 - FineUI.Examples/form/htmleditor.aspx | 1 - FineUI.Examples/form/hyperlink.aspx | 1 - FineUI.Examples/form/image.aspx | 1 - FineUI.Examples/form/label.aspx | 1 - FineUI.Examples/form/layout_center_label.aspx | 2 - FineUI.Examples/form/layout_checkout.aspx | 1 - FineUI.Examples/form/layout_contactus.aspx | 1 - .../form/layout_multiline_buttons.aspx | 2 - FineUI.Examples/form/layout_panel.aspx | 1 - FineUI.Examples/form/layout_panel_column.aspx | 1 - FineUI.Examples/form/numberbox.aspx | 5 +- .../form/numberbox.aspx.designer.cs | 58 +- FineUI.Examples/form/radiobutton.aspx | 1 - FineUI.Examples/form/radiobuttonlist.aspx | 1 - .../form/radiobuttonlist_update.aspx | 1 - FineUI.Examples/form/textarea_autogrow.aspx | 1 - FineUI.Examples/form/textbox.aspx | 1 - .../form/textbox_autopostback.aspx | 1 - FineUI.Examples/form/timepicker.aspx | 1 - FineUI.Examples/form/tooltip.aspx | 1 - FineUI.Examples/form/triggerbox.aspx | 1 - .../form/triggerbox.aspx.designer.cs | 46 +- .../form/triggerbox_triggerboxurl.aspx | 35 + .../form/triggerbox_triggerboxurl.aspx.cs | 59 + .../triggerbox_triggerboxurl.aspx.designer.cs | 78 + FineUI.Examples/form/twintriggerbox.aspx | 1 - FineUI.Examples/grid/grid.aspx | 1 - FineUI.Examples/grid/grid_aspnet.aspx | 1 - .../grid/grid_aspnet_rowdatabound.aspx | 1 - FineUI.Examples/grid/grid_backup.aspx | 38 + FineUI.Examples/grid/grid_backup.aspx.cs | 40 + .../grid/grid_backup.aspx.designer.cs | 51 + FineUI.Examples/grid/grid_centercolumn.aspx | 1 - FineUI.Examples/grid/grid_checkall.aspx | 1 - .../grid_checkall_keepcurrentselection.aspx | 1 - FineUI.Examples/grid/grid_checkall_only.aspx | 1 - .../grid/grid_checkall_singleselect.aspx | 2 - ...rid_checkall_singleselect.aspx.designer.cs | 58 +- FineUI.Examples/grid/grid_checkboxfield.aspx | 1 - .../grid/grid_checkboxfield_autopostback.aspx | 1 - .../grid/grid_checkboxfield_checkall.aspx | 1 - .../grid/grid_checkboxfield_rowcheckall.aspx | 1 - ..._checkboxfield_rowcheckall_clientside.aspx | 1 - ...checkboxfield_rowcheckall_contextmenu.aspx | 1 - FineUI.Examples/grid/grid_column_lines.aspx | 1 - .../grid/grid_complex_property.aspx | 1 - .../grid/grid_dynamic_columns.aspx | 1 - .../grid/grid_dynamic_columns2.aspx | 1 - FineUI.Examples/grid/grid_edit.aspx | 1 - FineUI.Examples/grid/grid_edit_cart.aspx | 1 - .../grid/grid_edit_checkboxlist.aspx | 1 - FineUI.Examples/grid/grid_edit_compare.aspx | 1 - .../grid/grid_edit_dropdownlist.aspx | 1 - .../grid/grid_edit_dropdownlist2.aspx | 1 - .../grid/grid_edit_dropdownlist_textbox.aspx | 1 - .../grid/grid_edit_dropdownlist_update.aspx | 1 - .../grid/grid_edit_enterkey_h.aspx | 1 - .../grid/grid_edit_enterkey_v.aspx | 1 - .../grid/grid_edit_radiobuttonlist.aspx | 1 - FineUI.Examples/grid/grid_edit_save_auto.aspx | 1 - FineUI.Examples/grid/grid_editor_cell.aspx | 1 - .../grid/grid_editor_cell_afteredit.aspx | 1 - ...rid_editor_cell_afteredit_rowexpander.aspx | 1 - ...grid_editor_cell_afteredit_selectcell.aspx | 2 - .../grid_editor_cell_client_validate.aspx | 2 - .../grid/grid_editor_cell_databind.aspx | 1 - .../grid/grid_editor_cell_delete.aspx | 1 - .../grid/grid_editor_cell_new.aspx | 1 - .../grid_editor_cell_new.aspx.designer.cs | 88 +- .../grid_editor_cell_new_editcolumnid.aspx | 2 - .../grid/grid_editor_cell_newdelete.aspx | 1 - ...rid_editor_cell_newdelete.aspx.designer.cs | 94 +- ...d_editor_cell_newdelete_getmergeddata.aspx | 2 - ...rid_editor_cell_newdelete_rowexpander.aspx | 1 - .../grid/grid_editor_cell_paging.aspx | 1 - .../grid/grid_editor_cell_paging.aspx.cs | 2 +- .../grid/grid_editor_cell_renderfunction.aspx | 1 - ...id_editor_cell_renderfunction_complex.aspx | 2 - .../grid/grid_editor_cell_textarea.aspx | 1 - .../grid_editor_cell_updatecellvalue.aspx | 2 - ...tor_cell_updatecellvalue_hiddencolumn.aspx | 2 - ...id_editor_cell_updatecellvalue_noedit.aspx | 2 - .../grid/grid_editor_cell_updatesummary.aspx | 2 - FineUI.Examples/grid/grid_empty_text.aspx | 1 - FineUI.Examples/grid/grid_excel.aspx | 1 - FineUI.Examples/grid/grid_excel_aspnet.aspx | 1 - .../grid/grid_excel_dblclick_download.aspx | 1 - .../grid/grid_excel_dynamic_columns.aspx | 1 - .../grid/grid_excel_findcontrol.aspx | 2 - .../grid/grid_excel_groupfield.aspx | 2 - .../grid/grid_excel_selectcolumns.aspx | 1 - ...rid_excel_selectcolumns_iframe_window.aspx | 1 - FineUI.Examples/grid/grid_groupheader.aspx | 1 - .../grid/grid_groupheader_hidden.aspx | 3 +- .../grid/grid_groupheader_hidden.aspx.cs | 5 +- .../grid/grid_groupheader_sort.aspx | 1 - .../grid/grid_groupheader_sort.aspx.cs | 4 +- .../grid/grid_groupheader_sort_hdmenu.aspx | 1 - .../grid/grid_groupheader_sort_hdmenu.aspx.cs | 5 +- .../grid/grid_hdmenu_hidecolumn.aspx | 1 - FineUI.Examples/grid/grid_hdmenu_sorting.aspx | 1 - .../grid/grid_hdmenu_sorting.aspx.cs | 4 +- .../grid/grid_header_disablemenu.aspx | 2 - FineUI.Examples/grid/grid_header_hide.aspx | 2 - FineUI.Examples/grid/grid_header_wrap.aspx | 2 - .../grid/grid_hide_gridheader.aspx | 2 - FineUI.Examples/grid/grid_hidecolumn.aspx | 2 - .../grid/grid_hidecolumn.aspx.designer.cs | 52 +- FineUI.Examples/grid/grid_iframe.aspx | 1 - FineUI.Examples/grid/grid_iframe_window.aspx | 1 - FineUI.Examples/grid/grid_line_wrap.aspx | 1 - FineUI.Examples/grid/grid_lockcolumn.aspx | 1 - .../grid/grid_lockcolumn_editor_cell_new.aspx | 1 - .../grid_lockcolumn_groupheader_sort.aspx | 1 - .../grid_lockcolumn_groupheader_sort.aspx.cs | 4 +- .../grid/grid_lockcolumn_line_wrap.aspx | 1 - .../grid/grid_lockcolumn_many_columns.aspx | 1 - .../grid/grid_lockcolumn_rowexpander.aspx | 1 - .../grid_lockcolumn_summary_scrollbar.aspx | 2 - .../grid_lockcolumn_summary_scrollbar.aspx.cs | 2 +- FineUI.Examples/grid/grid_many_columns.aspx | 1 - FineUI.Examples/grid/grid_pageitems.aspx | 1 - FineUI.Examples/grid/grid_pageitems.aspx.cs | 2 +- .../grid/grid_pageitems_pagesize.aspx | 1 - .../grid/grid_pageitems_pagesize.aspx.cs | 2 +- .../grid_pageitems_pagesize_database.aspx | 1 - .../grid_pageitems_pagesize_database.aspx.cs | 2 +- .../grid/grid_pageitems_rowexpander.aspx | 1 - .../grid/grid_pageitems_rowexpander.aspx.cs | 2 +- FineUI.Examples/grid/grid_paging.aspx | 1 - FineUI.Examples/grid/grid_paging.aspx.cs | 2 +- FineUI.Examples/grid/grid_paging_aspnet.aspx | 2 - .../grid/grid_paging_aspnet.aspx.cs | 2 +- .../grid/grid_paging_database.aspx | 1 - .../grid/grid_paging_database.aspx.cs | 2 +- .../grid/grid_paging_database_bbar.aspx | 2 - .../grid/grid_paging_database_bbar.aspx.cs | 2 +- .../grid/grid_paging_database_selection.aspx | 62 +- .../grid_paging_database_selection.aspx.cs | 55 +- ...paging_database_selection.aspx.designer.cs | 52 +- .../grid/grid_paging_database_sorting.aspx | 1 - .../grid/grid_paging_database_sorting.aspx.cs | 6 +- FineUI.Examples/grid/grid_paging_fineui.aspx | 2 - .../grid/grid_paging_fineui.aspx.cs | 2 +- .../grid/grid_paging_selection.aspx | 17 +- .../grid/grid_paging_selection.aspx.cs | 72 +- .../grid_paging_selection.aspx.designer.cs | 52 +- FineUI.Examples/grid/grid_paging_sorting.aspx | 1 - .../grid/grid_paging_sorting.aspx.cs | 6 +- .../grid/grid_prerowdatabound.aspx | 1 - .../grid/grid_prerowdatabound_cancelled.aspx | 2 - FineUI.Examples/grid/grid_rowcheckall.aspx | 1 - FineUI.Examples/grid/grid_rowclick.aspx | 1 - FineUI.Examples/grid/grid_rowcommand.aspx | 1 - .../grid/grid_rowcommand_download.aspx | 1 - .../grid/grid_rowcommand_paging.aspx | 1 - .../grid/grid_rowcommand_paging.aspx.cs | 2 +- .../grid/grid_rowcommand_paging_database.aspx | 1 - .../grid_rowcommand_paging_database.aspx.cs | 2 +- FineUI.Examples/grid/grid_rowdatabound.aspx | 1 - FineUI.Examples/grid/grid_rowdoubleclick.aspx | 1 - FineUI.Examples/grid/grid_rowexpander.aspx | 1 - .../grid/grid_rowexpander_expandall.aspx | 1 - .../grid/grid_rowexpander_expandall_js.aspx | 1 - .../grid/grid_rowexpander_grid.aspx | 2 - .../grid/grid_rownumber_align.aspx | 1 - .../grid/grid_rownumber_align.aspx.cs | 2 +- .../grid/grid_rownumber_paging.aspx | 1 - .../grid/grid_rownumber_paging.aspx.cs | 2 +- .../grid/grid_rownumber_paging_database.aspx | 1 - .../grid_rownumber_paging_database.aspx.cs | 2 +- .../grid/grid_rownumber_width.aspx | 1 - .../grid/grid_rownumber_width.aspx.cs | 2 +- FineUI.Examples/grid/grid_rowselect.aspx | 1 - FineUI.Examples/grid/grid_simulate_tree.aspx | 1 - .../grid_simulate_tree_database_paging.aspx | 1 - ...grid_simulate_tree_database_paging.aspx.cs | 2 +- ...ate_tree_database_paging_dropdownlist.aspx | 1 - ..._tree_database_paging_dropdownlist.aspx.cs | 2 +- .../grid/grid_simulate_tree_paging.aspx | 1 - .../grid/grid_simulate_tree_paging.aspx.cs | 2 +- FineUI.Examples/grid/grid_sorting.aspx | 1 - FineUI.Examples/grid/grid_sorting.aspx.cs | 4 +- .../grid/grid_sorting_nosortfield.aspx | 42 + .../grid/grid_sorting_nosortfield.aspx.cs | 61 + .../grid_sorting_nosortfield.aspx.designer.cs | 69 + .../grid/grid_style_columnclass.aspx | 1 - FineUI.Examples/grid/grid_style_rowcolor.aspx | 1 - .../grid/grid_style_rowcolor_paging.aspx | 1 - .../grid/grid_style_rowcolor_paging.aspx.cs | 2 +- .../grid_style_rowcolor_paging_database.aspx | 1 - ...rid_style_rowcolor_paging_database.aspx.cs | 2 +- FineUI.Examples/grid/grid_summary.aspx | 2 - FineUI.Examples/grid/grid_summary.aspx.cs | 2 +- .../grid/grid_summary_currentpage.aspx | 2 - .../grid/grid_summary_currentpage.aspx.cs | 2 +- .../grid/grid_summary_scrollbar.aspx | 1 - .../grid/grid_summary_scrollbar_bottom.aspx | 2 - .../grid_summary_scrollbar_bottom.aspx.cs | 2 +- .../grid/grid_summary_scrollbar_flow.aspx | 2 - .../grid/grid_summary_scrollbar_flow.aspx.cs | 2 +- .../grid/grid_summary_scrollbar_top.aspx | 2 - .../grid/grid_summary_scrollbar_top.aspx.cs | 2 +- FineUI.Examples/grid/grid_text_middle.aspx | 1 - FineUI.Examples/grid/grid_text_top.aspx | 1 - FineUI.Examples/grid/grid_textselection.aspx | 1 - FineUI.Examples/grid/grid_twogrid.aspx | 1 - FineUI.Examples/grid/grid_width.aspx | 1 - FineUI.Examples/grid/grid_width_boxflex.aspx | 2 - .../grid/grid_width_expandunusedspace.aspx | 2 - FineUI.Examples/grid/grid_width_forcefit.aspx | 2 - .../grid/grid_width_forcefit_minwidth.aspx | 2 - FineUI.Examples/iframe/button_iframe.aspx | 1 - FineUI.Examples/iframe/grid_iframe.aspx | 1 - FineUI.Examples/iframe/iframe_iframe.aspx | 1 - .../iframe/iframe_iframe.aspx.designer.cs | 52 +- .../iframe/iframe_iframe_window1.aspx | 1 - .../iframe/iframe_iframe_window2.aspx | 1 - FineUI.Examples/iframe/parent_postback.aspx | 1 - FineUI.Examples/iframe/parent_postback2.aspx | 1 - FineUI.Examples/iframe/parent_postback3.aspx | 1 - .../iframe/parent_postback_top.aspx | 1 - .../iframe/parent_postback_top2.aspx | 1 - .../iframe/parent_postback_top3.aspx | 1 - .../iframe/parent_simplepostback.aspx | 1 - .../iframe/parent_simplepostback2.aspx | 1 - FineUI.Examples/iframe/passvalue_iframe.aspx | 1 - .../iframe/passvalue_iframe_iframe.aspx | 1 - FineUI.Examples/iframe/selectprovince1.aspx | 1 - .../iframe/selectprovince1_child.aspx | 1 - FineUI.Examples/iframe/selectprovince2.aspx | 1 - .../iframe/selectprovince2_child.aspx | 1 - FineUI.Examples/iframe/selectprovince3.aspx | 1 - .../iframe/selectprovince3_child.aspx | 1 - .../iframe/selectprovince_executescript.aspx | 2 - ...ectprovince_executescript.aspx.designer.cs | 52 +- .../selectprovince_executescript_child.aspx | 2 - ...vince_executescript_child.aspx.designer.cs | 46 +- FineUI.Examples/iframe/triggerbox_iframe.aspx | 1 - .../iframe/triggerbox_iframe_iframe.aspx | 1 - FineUI.Examples/iframe/window.aspx | 1 - FineUI.Examples/iframe/window.aspx.cs | 1 - .../iframe/window.aspx.designer.cs | 40 +- FineUI.Examples/iframe/window2.aspx | 1 - FineUI.Examples/iframe/window2_iframe.aspx | 1 - FineUI.Examples/iframe/window_iframe.aspx | 1 - FineUI.Examples/layout/absolute.aspx | 1 - FineUI.Examples/layout/anchor.aspx | 1 - FineUI.Examples/layout/card.aspx | 1 - FineUI.Examples/layout/column.aspx | 1 - FineUI.Examples/layout/column_autoheight.aspx | 2 - FineUI.Examples/layout/column_scrollbar.aspx | 2 - FineUI.Examples/layout/fit.aspx | 1 - FineUI.Examples/layout/hbox.aspx | 1 - FineUI.Examples/layout/hbox_autoheight.aspx | 2 - .../layout/hbox_autoheight_multilevels.aspx | 2 - FineUI.Examples/layout/hbox_form.aspx | 10 +- .../layout/hbox_form.aspx.designer.cs | 106 +- FineUI.Examples/layout/hbox_scrollbar.aspx | 2 - FineUI.Examples/layout/region.aspx | 2 - FineUI.Examples/layout/table.aspx | 1 - FineUI.Examples/layout/table_form.aspx | 2 - FineUI.Examples/layout/vbox.aspx | 1 - FineUI.Examples/layout/vbox_autoheight.aspx | 2 - FineUI.Examples/layout/vbox_collapse.aspx | 2 - FineUI.Examples/layout/vbox_form.aspx | 2 - FineUI.Examples/layout/vbox_formgrid.aspx | 2 - FineUI.Examples/layout/vbox_hbox.aspx | 2 - FineUI.Examples/layout/vbox_scrollbar.aspx | 2 - FineUI.Examples/master/Simple.Master | 1 - .../master/Simple.Master.designer.cs | 52 +- FineUI.Examples/master/SingleGrid.Master | 2 - FineUI.Examples/master/SingleGrid.Master.cs | 6 +- .../master/SingleGrid.Master.designer.cs | 46 +- FineUI.Examples/message/alert.aspx | 1 - FineUI.Examples/message/alert_download.aspx | 2 - .../message/alert_download.aspx.designer.cs | 28 +- .../message/alert_download_hide.aspx | 2 - .../message/alert_download_hideiframe.aspx | 2 - .../alert_download_hideiframe_window.aspx | 2 - FineUI.Examples/message/confirm_buttons.aspx | 2 - FineUI.Examples/message/confirm_cancel.aspx | 1 - .../message/confirm_cancel_customevent.aspx | 1 - FineUI.Examples/other/addtab.aspx | 1 - FineUI.Examples/other/ajax_loading.aspx | 1 - .../other/authentication_timeout.aspx | 2 - .../other/authentication_timeout_async.aspx | 2 - FineUI.Examples/other/cssclass.aspx | 1 - FineUI.Examples/other/cssstyle.aspx | 1 - FineUI.Examples/other/custom_postback.aspx | 1 - FineUI.Examples/other/custom_postback2.aspx | 1 - FineUI.Examples/other/global_error.aspx | 2 - FineUI.Examples/other/keydown.aspx | 1 - FineUI.Examples/other/pageloading.aspx | 2 - FineUI.Examples/other/timer.aspx | 1 - FineUI.Examples/other/toolbar.aspx | 1 - FineUI.Examples/res/css/default.css | 4 +- FineUI.Examples/tabstrip/tabstrip.aspx | 1 - FineUI.Examples/tabstrip/tabstrip_addtab.aspx | 1 - .../tabstrip/tabstrip_autopostback.aspx | 1 - .../tabstrip/tabstrip_enableclose.aspx | 1 - FineUI.Examples/tabstrip/tabstrip_iframe.aspx | 1 - .../tabstrip/tabstrip_iframe_disabled.aspx | 1 - .../tabstrip_iframe_disabled_tab1.aspx | 1 - .../tabstrip/tabstrip_position.aspx | 1 - FineUI.Examples/test/WebForm1.aspx | 31 + FineUI.Examples/test/WebForm1.aspx.cs | 52 + .../test/WebForm1.aspx.designer.cs | 60 + FineUI.Examples/test/activex.aspx | 1 - FineUI.Examples/test/empty.aspx | 103 + FineUI.Examples/test/empty.aspx.cs | 39 + FineUI.Examples/test/empty.aspx.designer.cs | 321 ++ FineUI.Examples/test/form2.aspx | 108 + FineUI.Examples/test/form2.aspx.cs | 36 + FineUI.Examples/test/form2.aspx.designer.cs | 195 ++ FineUI.Examples/test/grid_editor_cell2.aspx | 79 + .../test/grid_editor_cell2.aspx.cs | 121 + .../test/grid_editor_cell2.aspx.designer.cs | 114 + FineUI.Examples/test/grid_sorting2.aspx | 41 + FineUI.Examples/test/grid_sorting2.aspx.cs | 62 + .../test/grid_sorting2.aspx.designer.cs | 69 + FineUI.Examples/test/hello.aspx | 21 + FineUI.Examples/test/hello.aspx.cs | 54 + FineUI.Examples/test/hello.aspx.designer.cs | 51 + FineUI.Examples/test/test.aspx | 2 - FineUI.Examples/test/triggerbox2.aspx | 29 + FineUI.Examples/test/triggerbox2.aspx.cs | 31 + .../test/triggerbox2.aspx.designer.cs | 69 + .../autocomplete/custom_display.aspx | 1 - .../third-party/autocomplete/email.aspx | 1 - .../third-party/autocomplete/inline.aspx | 1 - .../autocomplete/inline_window.aspx | 2 - .../autocomplete/multi_values.aspx | 1 - .../autocomplete/multi_values_remote.aspx | 1 - .../autocomplete/remote_with_cache.aspx | 1 - .../third-party/ckeditor/ckeditor.aspx | 1 - FineUI.Examples/third-party/my97/my97.aspx | 7 +- .../third-party/my97/my97.aspx.designer.cs | 52 +- .../res/jqueryuiautocomplete/jquery-ui.css | 146 + .../res/jqueryuiautocomplete/jquery-ui.js | 2583 +++++++++++++++++ .../jqueryuiautocomplete/jquery-ui.min.css | 6 + .../res/jqueryuiautocomplete/jquery-ui.min.js | 7 + .../theme-start/images/animated-overlay.gif | Bin 0 -> 1738 bytes .../images/ui-bg_flat_55_999999_40x100.png | Bin 0 -> 259 bytes .../images/ui-bg_flat_75_aaaaaa_40x100.png | Bin 0 -> 251 bytes .../images/ui-bg_glass_45_0078ae_1x400.png | Bin 0 -> 385 bytes .../images/ui-bg_glass_55_f8da4e_1x400.png | Bin 0 -> 384 bytes .../images/ui-bg_glass_75_79c9ec_1x400.png | Bin 0 -> 387 bytes .../ui-bg_gloss-wave_45_e14f1c_500x100.png | Bin 0 -> 5903 bytes .../ui-bg_gloss-wave_50_6eac2c_500x100.png | Bin 0 -> 5945 bytes .../ui-bg_gloss-wave_75_2191c0_500x100.png | Bin 0 -> 6016 bytes .../ui-bg_inset-hard_100_fcfdfd_1x100.png | Bin 0 -> 331 bytes .../images/ui-icons_0078ae_256x240.png | Bin 0 -> 4599 bytes .../images/ui-icons_056b93_256x240.png | Bin 0 -> 4599 bytes .../images/ui-icons_d8e7f3_256x240.png | Bin 0 -> 4599 bytes .../images/ui-icons_e0fdff_256x240.png | Bin 0 -> 4599 bytes .../images/ui-icons_f5e175_256x240.png | Bin 0 -> 4599 bytes .../images/ui-icons_f7a50d_256x240.png | Bin 0 -> 4599 bytes .../images/ui-icons_fcd113_256x240.png | Bin 0 -> 4599 bytes .../theme-start/theme.css | 410 +++ .../third-party/tinymce/tinymce.aspx | 1 - .../third-party/ueditor/ueditor.aspx | 2 - .../third-party/ueditor/ueditor_two.aspx | 1 - .../third-party/umeditor/umeditor.aspx | 1 - FineUI.Examples/toolbar/form.aspx | 2 - FineUI.Examples/toolbar/formfields.aspx | 2 - FineUI.Examples/toolbar/menu.aspx | 1 - FineUI.Examples/toolbar/menu_dynamic.aspx | 1 - FineUI.Examples/toolbar/menu_dynamic2.aspx | 1 - FineUI.Examples/toolbar/menu_hideonclick.aspx | 1 - FineUI.Examples/toolbar/menucheckbox.aspx | 1 - FineUI.Examples/toolbar/multi_toolbars.aspx | 2 - FineUI.Examples/toolbar/toolbar_fill.aspx | 2 - FineUI.Examples/toolbar/toolbar_iframe.aspx | 1 - FineUI.Examples/toolbar/toolbar_images.aspx | 1 - .../toolbar/toolbar_images_fixedwidth.aspx | 2 - .../tree/checkbox/tree_checkall.aspx | 1 - .../tree/checkbox/tree_checked.aspx | 1 - .../tree/databind/tree_datasource.aspx | 1 - .../tree/databind/tree_datatable.aspx | 1 - .../tree/databind/tree_document.aspx | 1 - .../tree/databind/tree_sitemap.aspx | 1 - .../tree/select/tree_multi_select.aspx | 1 - .../select/tree_multi_select_selectable.aspx | 2 - .../tree/select/tree_nodecommand.aspx | 1 - FineUI.Examples/tree/select/tree_select.aspx | 1 - FineUI.Examples/tree/tree.aspx | 1 - FineUI.Examples/tree/tree_ajax.aspx | 1 - FineUI.Examples/tree/tree_contextmenu.aspx | 2 - FineUI.Examples/tree/tree_expand.aspx | 1 - FineUI.Examples/tree/tree_icon.aspx | 1 - FineUI.Examples/tree/tree_node_cssclass.aspx | 2 - FineUI.Examples/tree/tree_nodedatabound.aspx | 2 - FineUI.Examples/tree/tree_singleexpand.aspx | 2 - FineUI.Examples/tree/tree_textselection.aspx | 2 - FineUI.Examples/usercontrol/userinfo.aspx | 1 - FineUI.Examples/usercontrol/userinfo2.aspx | 1 - .../usercontrol/userinfo_dynamic.aspx | 1 - FineUI.Examples/window/group_panel.aspx | 1 - FineUI.Examples/window/panel.aspx | 1 - FineUI.Examples/window/panel_collapse.aspx | 1 - FineUI.Examples/window/panel_disabled.aspx | 2 - FineUI.Examples/window/window.aspx | 1 - FineUI.Examples/window/window_form.aspx | 1 - FineUI.Examples/window/window_maximized.aspx | 1 - .../window/window_maximized_fixed.aspx | 1 - FineUI.Examples/window/window_minwidth.aspx | 2 - FineUI.Examples/window/window_multi.aspx | 2 - FineUI.Examples/window/window_toolbar.aspx | 1 - FineUI.sln | 2 +- .../FormBase.cs | 2 +- .../BoxComponent.Field/Field.cs | 10 +- FineUI/Business/Enums/LabelAlign.cs | 9 +- FineUI/Business/Enums/TextAlign.cs | 9 +- FineUI/Business/Util/StyleUtil.cs | 5 + FineUI/Properties/AssemblyInfo.cs | 2 +- .../TriggerBox.cs | 4 +- .../TwinTriggerBox.cs | 11 +- .../EventArgs/GridPageEventArgs.cs | 23 +- FineUI/WebControls/PanelBase.Grid/Grid.cs | 293 +- .../PanelBase.Grid/GridColumn/BoundField.cs | 32 +- .../GridColumn/GridColumn/GridColumn.cs | 13 +- .../GridColumn/HyperLinkField.cs | 43 +- .../GridColumn/LinkButtonField.cs | 43 +- .../PanelBase.Grid/GridColumn/WindowField.cs | 44 +- FineUI/release_history.txt | 29 +- 525 files changed, 7790 insertions(+), 1590 deletions(-) create mode 100644 FineUI.Examples/dropdownlist/dropdownlist_focus.aspx create mode 100644 FineUI.Examples/dropdownlist/dropdownlist_focus.aspx.cs create mode 100644 FineUI.Examples/dropdownlist/dropdownlist_focus.aspx.designer.cs create mode 100644 FineUI.Examples/dropdownlist/dropdownlist_matchfieldwidth_right.aspx create mode 100644 FineUI.Examples/dropdownlist/dropdownlist_matchfieldwidth_right.aspx.cs create mode 100644 FineUI.Examples/dropdownlist/dropdownlist_matchfieldwidth_right.aspx.designer.cs create mode 100644 FineUI.Examples/dropdownlist/dropdownlist_multiselect_scroll.aspx create mode 100644 FineUI.Examples/dropdownlist/dropdownlist_multiselect_scroll.aspx.cs create mode 100644 FineUI.Examples/dropdownlist/dropdownlist_multiselect_scroll.aspx.designer.cs create mode 100644 FineUI.Examples/dropdownlist/dropdownlist_scroll.aspx create mode 100644 FineUI.Examples/dropdownlist/dropdownlist_scroll.aspx.cs create mode 100644 FineUI.Examples/dropdownlist/dropdownlist_scroll.aspx.designer.cs create mode 100644 FineUI.Examples/form/calendar_mindate.aspx create mode 100644 FineUI.Examples/form/calendar_mindate.aspx.cs create mode 100644 FineUI.Examples/form/calendar_mindate.aspx.designer.cs create mode 100644 FineUI.Examples/form/form_textalign.aspx create mode 100644 FineUI.Examples/form/form_textalign.aspx.cs create mode 100644 FineUI.Examples/form/form_textalign.aspx.designer.cs create mode 100644 FineUI.Examples/form/triggerbox_triggerboxurl.aspx create mode 100644 FineUI.Examples/form/triggerbox_triggerboxurl.aspx.cs create mode 100644 FineUI.Examples/form/triggerbox_triggerboxurl.aspx.designer.cs create mode 100644 FineUI.Examples/grid/grid_backup.aspx create mode 100644 FineUI.Examples/grid/grid_backup.aspx.cs create mode 100644 FineUI.Examples/grid/grid_backup.aspx.designer.cs create mode 100644 FineUI.Examples/grid/grid_sorting_nosortfield.aspx create mode 100644 FineUI.Examples/grid/grid_sorting_nosortfield.aspx.cs create mode 100644 FineUI.Examples/grid/grid_sorting_nosortfield.aspx.designer.cs create mode 100644 FineUI.Examples/test/WebForm1.aspx create mode 100644 FineUI.Examples/test/WebForm1.aspx.cs create mode 100644 FineUI.Examples/test/WebForm1.aspx.designer.cs create mode 100644 FineUI.Examples/test/empty.aspx create mode 100644 FineUI.Examples/test/empty.aspx.cs create mode 100644 FineUI.Examples/test/empty.aspx.designer.cs create mode 100644 FineUI.Examples/test/form2.aspx create mode 100644 FineUI.Examples/test/form2.aspx.cs create mode 100644 FineUI.Examples/test/form2.aspx.designer.cs create mode 100644 FineUI.Examples/test/grid_editor_cell2.aspx create mode 100644 FineUI.Examples/test/grid_editor_cell2.aspx.cs create mode 100644 FineUI.Examples/test/grid_editor_cell2.aspx.designer.cs create mode 100644 FineUI.Examples/test/grid_sorting2.aspx create mode 100644 FineUI.Examples/test/grid_sorting2.aspx.cs create mode 100644 FineUI.Examples/test/grid_sorting2.aspx.designer.cs create mode 100644 FineUI.Examples/test/hello.aspx create mode 100644 FineUI.Examples/test/hello.aspx.cs create mode 100644 FineUI.Examples/test/hello.aspx.designer.cs create mode 100644 FineUI.Examples/test/triggerbox2.aspx create mode 100644 FineUI.Examples/test/triggerbox2.aspx.cs create mode 100644 FineUI.Examples/test/triggerbox2.aspx.designer.cs create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/jquery-ui.css create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/jquery-ui.js create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/jquery-ui.min.css create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/jquery-ui.min.js create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/animated-overlay.gif create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-bg_flat_55_999999_40x100.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-bg_flat_75_aaaaaa_40x100.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-bg_glass_45_0078ae_1x400.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-bg_glass_55_f8da4e_1x400.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-bg_glass_75_79c9ec_1x400.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-bg_gloss-wave_45_e14f1c_500x100.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-bg_gloss-wave_50_6eac2c_500x100.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-bg_gloss-wave_75_2191c0_500x100.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-bg_inset-hard_100_fcfdfd_1x100.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-icons_0078ae_256x240.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-icons_056b93_256x240.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-icons_d8e7f3_256x240.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-icons_e0fdff_256x240.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-icons_f5e175_256x240.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-icons_f7a50d_256x240.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/images/ui-icons_fcd113_256x240.png create mode 100644 FineUI.Examples/third-party/res/jqueryuiautocomplete/theme-start/theme.css 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 b/FineUI.Examples/accordion/accordion_autopostback.aspx index 6a1f4fc..48a0524 100644 --- a/FineUI.Examples/accordion/accordion_autopostback.aspx +++ b/FineUI.Examples/accordion/accordion_autopostback.aspx @@ -4,7 +4,6 @@ - @@ -39,6 +38,10 @@
+
+
+ +
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/accordion/accordion_tree.aspx b/FineUI.Examples/accordion/accordion_tree.aspx index d932724..6adbb93 100644 --- a/FineUI.Examples/accordion/accordion_tree.aspx +++ b/FineUI.Examples/accordion/accordion_tree.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/aspnet/aspnet.aspx b/FineUI.Examples/aspnet/aspnet.aspx index 01e072c..fbf1545 100644 --- a/FineUI.Examples/aspnet/aspnet.aspx +++ b/FineUI.Examples/aspnet/aspnet.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/aspnet/aspnet_literal.aspx b/FineUI.Examples/aspnet/aspnet_literal.aspx index 33417db..c0babf8 100644 --- a/FineUI.Examples/aspnet/aspnet_literal.aspx +++ b/FineUI.Examples/aspnet/aspnet_literal.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/basic/hello.aspx b/FineUI.Examples/basic/hello.aspx index d3f6645..628f23e 100644 --- a/FineUI.Examples/basic/hello.aspx +++ b/FineUI.Examples/basic/hello.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/basic/hello_aspnet.aspx b/FineUI.Examples/basic/hello_aspnet.aspx index 8418650..b4beba6 100644 --- a/FineUI.Examples/basic/hello_aspnet.aspx +++ b/FineUI.Examples/basic/hello_aspnet.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/basic/login.aspx b/FineUI.Examples/basic/login.aspx index 0195f2f..93d238c 100644 --- a/FineUI.Examples/basic/login.aspx +++ b/FineUI.Examples/basic/login.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/basic/login_captcha.aspx b/FineUI.Examples/basic/login_captcha.aspx index 84a56a4..0daed1e 100644 --- a/FineUI.Examples/basic/login_captcha.aspx +++ b/FineUI.Examples/basic/login_captcha.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/basic/login_enterkey.aspx b/FineUI.Examples/basic/login_enterkey.aspx index 0fceeb0..aaca7cb 100644 --- a/FineUI.Examples/basic/login_enterkey.aspx +++ b/FineUI.Examples/basic/login_enterkey.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/button/button.aspx b/FineUI.Examples/button/button.aspx index 4f7c7ae..8e64cb4 100644 --- a/FineUI.Examples/button/button.aspx +++ b/FineUI.Examples/button/button.aspx @@ -4,7 +4,6 @@ - + + + + + + + + + + + + + + + + + + + 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/form/htmleditor.aspx b/FineUI.Examples/form/htmleditor.aspx index d363a63..9f8b94e 100644 --- a/FineUI.Examples/form/htmleditor.aspx +++ b/FineUI.Examples/form/htmleditor.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/form/hyperlink.aspx b/FineUI.Examples/form/hyperlink.aspx index b646859..0c4e710 100644 --- a/FineUI.Examples/form/hyperlink.aspx +++ b/FineUI.Examples/form/hyperlink.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/form/image.aspx b/FineUI.Examples/form/image.aspx index 5ebca17..2f12838 100644 --- a/FineUI.Examples/form/image.aspx +++ b/FineUI.Examples/form/image.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/form/label.aspx b/FineUI.Examples/form/label.aspx index 3e24fab..aabb007 100644 --- a/FineUI.Examples/form/label.aspx +++ b/FineUI.Examples/form/label.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/grid/grid_pageitems_rowexpander.aspx.cs b/FineUI.Examples/grid/grid_pageitems_rowexpander.aspx.cs index 1e9c0a2..65ca937 100644 --- a/FineUI.Examples/grid/grid_pageitems_rowexpander.aspx.cs +++ b/FineUI.Examples/grid/grid_pageitems_rowexpander.aspx.cs @@ -40,7 +40,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; } protected void btnShowRowExpanders_Click(object sender, EventArgs e) diff --git a/FineUI.Examples/grid/grid_paging.aspx b/FineUI.Examples/grid/grid_paging.aspx index c3da415..071cf67 100644 --- a/FineUI.Examples/grid/grid_paging.aspx +++ b/FineUI.Examples/grid/grid_paging.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/grid/grid_paging.aspx.cs b/FineUI.Examples/grid/grid_paging.aspx.cs index 753973a..0ae9ae9 100644 --- a/FineUI.Examples/grid/grid_paging.aspx.cs +++ b/FineUI.Examples/grid/grid_paging.aspx.cs @@ -39,7 +39,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; } #endregion diff --git a/FineUI.Examples/grid/grid_paging_aspnet.aspx b/FineUI.Examples/grid/grid_paging_aspnet.aspx index 8e5589c..2f3e029 100644 --- a/FineUI.Examples/grid/grid_paging_aspnet.aspx +++ b/FineUI.Examples/grid/grid_paging_aspnet.aspx @@ -3,9 +3,7 @@ - - diff --git a/FineUI.Examples/grid/grid_paging_aspnet.aspx.cs b/FineUI.Examples/grid/grid_paging_aspnet.aspx.cs index 8135375..9f84363 100644 --- a/FineUI.Examples/grid/grid_paging_aspnet.aspx.cs +++ b/FineUI.Examples/grid/grid_paging_aspnet.aspx.cs @@ -36,7 +36,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChanging(object sender, GridViewPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; BindGrid(); } diff --git a/FineUI.Examples/grid/grid_paging_database.aspx b/FineUI.Examples/grid/grid_paging_database.aspx index 721eb19..f594886 100644 --- a/FineUI.Examples/grid/grid_paging_database.aspx +++ b/FineUI.Examples/grid/grid_paging_database.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_paging_database.aspx.cs b/FineUI.Examples/grid/grid_paging_database.aspx.cs index 9ccea51..2638ad3 100644 --- a/FineUI.Examples/grid/grid_paging_database.aspx.cs +++ b/FineUI.Examples/grid/grid_paging_database.aspx.cs @@ -79,7 +79,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; BindGrid(); } diff --git a/FineUI.Examples/grid/grid_paging_database_bbar.aspx b/FineUI.Examples/grid/grid_paging_database_bbar.aspx index 19b543f..036f542 100644 --- a/FineUI.Examples/grid/grid_paging_database_bbar.aspx +++ b/FineUI.Examples/grid/grid_paging_database_bbar.aspx @@ -4,9 +4,7 @@ - - diff --git a/FineUI.Examples/grid/grid_paging_database_bbar.aspx.cs b/FineUI.Examples/grid/grid_paging_database_bbar.aspx.cs index d3891e3..11b92ed 100644 --- a/FineUI.Examples/grid/grid_paging_database_bbar.aspx.cs +++ b/FineUI.Examples/grid/grid_paging_database_bbar.aspx.cs @@ -79,7 +79,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; BindGrid(); } diff --git a/FineUI.Examples/grid/grid_paging_database_selection.aspx b/FineUI.Examples/grid/grid_paging_database_selection.aspx index c53fbca..b6754b1 100644 --- a/FineUI.Examples/grid/grid_paging_database_selection.aspx +++ b/FineUI.Examples/grid/grid_paging_database_selection.aspx @@ -5,40 +5,40 @@ - - - - - - - - - - - - - - - - - - - -
- - -
- - + + + + + + + + + + + + + + + + + + + +
+ + +
+ + 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 @@ -
diff --git a/FineUI.Examples/grid/grid_paging_database_sorting.aspx.cs b/FineUI.Examples/grid/grid_paging_database_sorting.aspx.cs index 1397988..90d0d90 100644 --- a/FineUI.Examples/grid/grid_paging_database_sorting.aspx.cs +++ b/FineUI.Examples/grid/grid_paging_database_sorting.aspx.cs @@ -90,15 +90,15 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; BindGrid(); } protected void Grid1_Sort(object sender, GridSortEventArgs e) { - Grid1.SortDirection = e.SortDirection; - Grid1.SortField = e.SortField; + //Grid1.SortDirection = e.SortDirection; + //Grid1.SortField = e.SortField; BindGrid(); } diff --git a/FineUI.Examples/grid/grid_paging_fineui.aspx b/FineUI.Examples/grid/grid_paging_fineui.aspx index 61d3a68..2dbc643 100644 --- a/FineUI.Examples/grid/grid_paging_fineui.aspx +++ b/FineUI.Examples/grid/grid_paging_fineui.aspx @@ -3,9 +3,7 @@ - - diff --git a/FineUI.Examples/grid/grid_paging_fineui.aspx.cs b/FineUI.Examples/grid/grid_paging_fineui.aspx.cs index 981d826..f86df8f 100644 --- a/FineUI.Examples/grid/grid_paging_fineui.aspx.cs +++ b/FineUI.Examples/grid/grid_paging_fineui.aspx.cs @@ -36,7 +36,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; } #endregion diff --git a/FineUI.Examples/grid/grid_paging_selection.aspx b/FineUI.Examples/grid/grid_paging_selection.aspx index e0e878d..2b433e6 100644 --- a/FineUI.Examples/grid/grid_paging_selection.aspx +++ b/FineUI.Examples/grid/grid_paging_selection.aspx @@ -5,29 +5,30 @@ - - + - + - - + + + HeaderText="分组"> + diff --git a/FineUI.Examples/grid/grid_paging_selection.aspx.cs b/FineUI.Examples/grid/grid_paging_selection.aspx.cs index ca9b240..e14c3d8 100644 --- a/FineUI.Examples/grid/grid_paging_selection.aspx.cs +++ b/FineUI.Examples/grid/grid_paging_selection.aspx.cs @@ -36,22 +36,20 @@ 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(); - - Grid1.PageIndex = e.NewPageIndex; - - UpdateSelectedRowIndexArray(); + SyncSelectedRowIDArrayToHiddenField(e.OldPageIndex); + UpdateSelectedRowIDArray(e.NewPageIndex); } - private List GetSelectedRowIndexArrayFromHiddenField() + private List GetSelectedRowIDArrayFromHiddenField() { JArray idsArray = new JArray(); @@ -64,62 +62,64 @@ namespace FineUI.Examples.grid { idsArray = new JArray(); } - return new List(idsArray.ToObject()); } - private void SyncSelectedRowIndexArrayToHiddenField() + private void SyncSelectedRowIDArrayToHiddenField() { - List ids = GetSelectedRowIndexArrayFromHiddenField(); + SyncSelectedRowIDArrayToHiddenField(Grid1.PageIndex); + } - List selectedRows = new List(); - if (Grid1.SelectedRowIndexArray != null && Grid1.SelectedRowIndexArray.Length > 0) - { - selectedRows = new List(Grid1.SelectedRowIndexArray); - } + private void SyncSelectedRowIDArrayToHiddenField(int pageIndex) + { + List ids = GetSelectedRowIDArrayFromHiddenField(); - int startPageIndex = Grid1.PageIndex * Grid1.PageSize; - for (int i = startPageIndex, count = Math.Min(startPageIndex + Grid1.PageSize, Grid1.RecordCount); i < count; i++) + List selectedRowIDs = new List(Grid1.SelectedRowIDArray); + + // 当前页的开始序号和结束序号 + int startPageIndex = pageIndex * Grid1.PageSize; + int endPageIndex = Math.Min(startPageIndex + Grid1.PageSize, Grid1.RecordCount) - 1; + for (int i = startPageIndex; i <= endPageIndex; i++) { - string id = Grid1.DataKeys[i][0].ToString(); - if (selectedRows.Contains(i - startPageIndex)) + string rowID = Grid1.Rows[i].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(int pageIndex) { - List ids = GetSelectedRowIndexArrayFromHiddenField(); + List ids = GetSelectedRowIDArrayFromHiddenField(); - List nextSelectedRowIndexArray = new List(); - int nextStartPageIndex = Grid1.PageIndex * Grid1.PageSize; - for (int i = nextStartPageIndex, count = Math.Min(nextStartPageIndex + Grid1.PageSize, Grid1.RecordCount); i < count; i++) + List selectedRowIDs = new List(); + // 当前页的开始序号和结束序号 + int startPageIndex = pageIndex * Grid1.PageSize; + int endPageIndex = Math.Min(startPageIndex + Grid1.PageSize, Grid1.RecordCount) - 1; + for (int i = startPageIndex; i <= endPageIndex; i++) { - string id = Grid1.DataKeys[i][0].ToString(); - if (ids.Contains(id)) + string rowID = Grid1.Rows[i].RowID; + if (ids.Contains(rowID)) { - nextSelectedRowIndexArray.Add(i - nextStartPageIndex); + selectedRowIDs.Add(rowID); } } - Grid1.SelectedRowIndexArray = nextSelectedRowIndexArray.ToArray(); - } + Grid1.SelectedRowIDArray = selectedRowIDs.ToArray(); + } #endregion } } diff --git a/FineUI.Examples/grid/grid_paging_selection.aspx.designer.cs b/FineUI.Examples/grid/grid_paging_selection.aspx.designer.cs index 932578e..016c5fe 100644 --- a/FineUI.Examples/grid/grid_paging_selection.aspx.designer.cs +++ b/FineUI.Examples/grid/grid_paging_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_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_sorting.aspx b/FineUI.Examples/grid/grid_paging_sorting.aspx index 8d594e1..26582d4 100644 --- a/FineUI.Examples/grid/grid_paging_sorting.aspx +++ b/FineUI.Examples/grid/grid_paging_sorting.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_paging_sorting.aspx.cs b/FineUI.Examples/grid/grid_paging_sorting.aspx.cs index 81b99a3..79b9468 100644 --- a/FineUI.Examples/grid/grid_paging_sorting.aspx.cs +++ b/FineUI.Examples/grid/grid_paging_sorting.aspx.cs @@ -45,15 +45,15 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; } protected void Grid1_Sort(object sender, GridSortEventArgs e) { - Grid1.SortDirection = e.SortDirection; - Grid1.SortField = e.SortField; + //Grid1.SortDirection = e.SortDirection; + //Grid1.SortField = e.SortField; BindGrid(); } diff --git a/FineUI.Examples/grid/grid_prerowdatabound.aspx b/FineUI.Examples/grid/grid_prerowdatabound.aspx index 13cd37b..0ed4208 100644 --- a/FineUI.Examples/grid/grid_prerowdatabound.aspx +++ b/FineUI.Examples/grid/grid_prerowdatabound.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_prerowdatabound_cancelled.aspx b/FineUI.Examples/grid/grid_prerowdatabound_cancelled.aspx index 8b90a8f..e348066 100644 --- a/FineUI.Examples/grid/grid_prerowdatabound_cancelled.aspx +++ b/FineUI.Examples/grid/grid_prerowdatabound_cancelled.aspx @@ -4,9 +4,7 @@ - - diff --git a/FineUI.Examples/grid/grid_rowcheckall.aspx b/FineUI.Examples/grid/grid_rowcheckall.aspx index 06b05a0..6c87e64 100644 --- a/FineUI.Examples/grid/grid_rowcheckall.aspx +++ b/FineUI.Examples/grid/grid_rowcheckall.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rowclick.aspx b/FineUI.Examples/grid/grid_rowclick.aspx index 6d6094e..70ff985 100644 --- a/FineUI.Examples/grid/grid_rowclick.aspx +++ b/FineUI.Examples/grid/grid_rowclick.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rowcommand.aspx b/FineUI.Examples/grid/grid_rowcommand.aspx index 3010fba..cc14caf 100644 --- a/FineUI.Examples/grid/grid_rowcommand.aspx +++ b/FineUI.Examples/grid/grid_rowcommand.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rowcommand_download.aspx b/FineUI.Examples/grid/grid_rowcommand_download.aspx index 9384b86..2b62ce7 100644 --- a/FineUI.Examples/grid/grid_rowcommand_download.aspx +++ b/FineUI.Examples/grid/grid_rowcommand_download.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rowcommand_paging.aspx b/FineUI.Examples/grid/grid_rowcommand_paging.aspx index 01fd2c2..5692f8a 100644 --- a/FineUI.Examples/grid/grid_rowcommand_paging.aspx +++ b/FineUI.Examples/grid/grid_rowcommand_paging.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rowcommand_paging.aspx.cs b/FineUI.Examples/grid/grid_rowcommand_paging.aspx.cs index 14aea8c..48545a6 100644 --- a/FineUI.Examples/grid/grid_rowcommand_paging.aspx.cs +++ b/FineUI.Examples/grid/grid_rowcommand_paging.aspx.cs @@ -56,7 +56,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; } #endregion diff --git a/FineUI.Examples/grid/grid_rowcommand_paging_database.aspx b/FineUI.Examples/grid/grid_rowcommand_paging_database.aspx index 2dfa993..330bd6f 100644 --- a/FineUI.Examples/grid/grid_rowcommand_paging_database.aspx +++ b/FineUI.Examples/grid/grid_rowcommand_paging_database.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rowcommand_paging_database.aspx.cs b/FineUI.Examples/grid/grid_rowcommand_paging_database.aspx.cs index 3c10586..0be4972 100644 --- a/FineUI.Examples/grid/grid_rowcommand_paging_database.aspx.cs +++ b/FineUI.Examples/grid/grid_rowcommand_paging_database.aspx.cs @@ -89,7 +89,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; BindGrid(); } diff --git a/FineUI.Examples/grid/grid_rowdatabound.aspx b/FineUI.Examples/grid/grid_rowdatabound.aspx index 0912ef7..2bfe925 100644 --- a/FineUI.Examples/grid/grid_rowdatabound.aspx +++ b/FineUI.Examples/grid/grid_rowdatabound.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rowdoubleclick.aspx b/FineUI.Examples/grid/grid_rowdoubleclick.aspx index 3dcaaab..a39ba3f 100644 --- a/FineUI.Examples/grid/grid_rowdoubleclick.aspx +++ b/FineUI.Examples/grid/grid_rowdoubleclick.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rowexpander.aspx b/FineUI.Examples/grid/grid_rowexpander.aspx index ca33aa3..80e80e9 100644 --- a/FineUI.Examples/grid/grid_rowexpander.aspx +++ b/FineUI.Examples/grid/grid_rowexpander.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rowexpander_expandall.aspx b/FineUI.Examples/grid/grid_rowexpander_expandall.aspx index 072181f..7ca3c7d 100644 --- a/FineUI.Examples/grid/grid_rowexpander_expandall.aspx +++ b/FineUI.Examples/grid/grid_rowexpander_expandall.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rowexpander_expandall_js.aspx b/FineUI.Examples/grid/grid_rowexpander_expandall_js.aspx index ea6f8b0..25073ac 100644 --- a/FineUI.Examples/grid/grid_rowexpander_expandall_js.aspx +++ b/FineUI.Examples/grid/grid_rowexpander_expandall_js.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rowexpander_grid.aspx b/FineUI.Examples/grid/grid_rowexpander_grid.aspx index 759349c..b33beb2 100644 --- a/FineUI.Examples/grid/grid_rowexpander_grid.aspx +++ b/FineUI.Examples/grid/grid_rowexpander_grid.aspx @@ -4,10 +4,8 @@ - - diff --git a/FineUI.Examples/grid/grid_rownumber_align.aspx b/FineUI.Examples/grid/grid_rownumber_align.aspx index b752854..ca06459 100644 --- a/FineUI.Examples/grid/grid_rownumber_align.aspx +++ b/FineUI.Examples/grid/grid_rownumber_align.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rownumber_align.aspx.cs b/FineUI.Examples/grid/grid_rownumber_align.aspx.cs index c9522fe..41cf9b5 100644 --- a/FineUI.Examples/grid/grid_rownumber_align.aspx.cs +++ b/FineUI.Examples/grid/grid_rownumber_align.aspx.cs @@ -70,7 +70,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; BindGrid(); } diff --git a/FineUI.Examples/grid/grid_rownumber_paging.aspx b/FineUI.Examples/grid/grid_rownumber_paging.aspx index 55fa4bf..f34ddf7 100644 --- a/FineUI.Examples/grid/grid_rownumber_paging.aspx +++ b/FineUI.Examples/grid/grid_rownumber_paging.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rownumber_paging.aspx.cs b/FineUI.Examples/grid/grid_rownumber_paging.aspx.cs index 6f62523..be00b33 100644 --- a/FineUI.Examples/grid/grid_rownumber_paging.aspx.cs +++ b/FineUI.Examples/grid/grid_rownumber_paging.aspx.cs @@ -40,7 +40,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; } #endregion diff --git a/FineUI.Examples/grid/grid_rownumber_paging_database.aspx b/FineUI.Examples/grid/grid_rownumber_paging_database.aspx index c8130e0..15de57d 100644 --- a/FineUI.Examples/grid/grid_rownumber_paging_database.aspx +++ b/FineUI.Examples/grid/grid_rownumber_paging_database.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rownumber_paging_database.aspx.cs b/FineUI.Examples/grid/grid_rownumber_paging_database.aspx.cs index a65a9ac..a9c8ee5 100644 --- a/FineUI.Examples/grid/grid_rownumber_paging_database.aspx.cs +++ b/FineUI.Examples/grid/grid_rownumber_paging_database.aspx.cs @@ -79,7 +79,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; BindGrid(); } diff --git a/FineUI.Examples/grid/grid_rownumber_width.aspx b/FineUI.Examples/grid/grid_rownumber_width.aspx index fd32d17..6dd906e 100644 --- a/FineUI.Examples/grid/grid_rownumber_width.aspx +++ b/FineUI.Examples/grid/grid_rownumber_width.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_rownumber_width.aspx.cs b/FineUI.Examples/grid/grid_rownumber_width.aspx.cs index ff72965..0232a37 100644 --- a/FineUI.Examples/grid/grid_rownumber_width.aspx.cs +++ b/FineUI.Examples/grid/grid_rownumber_width.aspx.cs @@ -70,7 +70,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; BindGrid(); } diff --git a/FineUI.Examples/grid/grid_rowselect.aspx b/FineUI.Examples/grid/grid_rowselect.aspx index b7608f6..d6f8b74 100644 --- a/FineUI.Examples/grid/grid_rowselect.aspx +++ b/FineUI.Examples/grid/grid_rowselect.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_simulate_tree.aspx b/FineUI.Examples/grid/grid_simulate_tree.aspx index b1cfbdb..7417592 100644 --- a/FineUI.Examples/grid/grid_simulate_tree.aspx +++ b/FineUI.Examples/grid/grid_simulate_tree.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_simulate_tree_database_paging.aspx b/FineUI.Examples/grid/grid_simulate_tree_database_paging.aspx index 06cfa1c..e66c5bb 100644 --- a/FineUI.Examples/grid/grid_simulate_tree_database_paging.aspx +++ b/FineUI.Examples/grid/grid_simulate_tree_database_paging.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_simulate_tree_database_paging.aspx.cs b/FineUI.Examples/grid/grid_simulate_tree_database_paging.aspx.cs index 87029c2..2b41005 100644 --- a/FineUI.Examples/grid/grid_simulate_tree_database_paging.aspx.cs +++ b/FineUI.Examples/grid/grid_simulate_tree_database_paging.aspx.cs @@ -134,7 +134,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; BindGrid(); } diff --git a/FineUI.Examples/grid/grid_simulate_tree_database_paging_dropdownlist.aspx b/FineUI.Examples/grid/grid_simulate_tree_database_paging_dropdownlist.aspx index 7cbc9bf..0f8b62b 100644 --- a/FineUI.Examples/grid/grid_simulate_tree_database_paging_dropdownlist.aspx +++ b/FineUI.Examples/grid/grid_simulate_tree_database_paging_dropdownlist.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_simulate_tree_database_paging_dropdownlist.aspx.cs b/FineUI.Examples/grid/grid_simulate_tree_database_paging_dropdownlist.aspx.cs index 0ff8d29..6505b4a 100644 --- a/FineUI.Examples/grid/grid_simulate_tree_database_paging_dropdownlist.aspx.cs +++ b/FineUI.Examples/grid/grid_simulate_tree_database_paging_dropdownlist.aspx.cs @@ -174,7 +174,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; BindGrid(); } diff --git a/FineUI.Examples/grid/grid_simulate_tree_paging.aspx b/FineUI.Examples/grid/grid_simulate_tree_paging.aspx index 18ad457..51ee1ab 100644 --- a/FineUI.Examples/grid/grid_simulate_tree_paging.aspx +++ b/FineUI.Examples/grid/grid_simulate_tree_paging.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/grid/grid_simulate_tree_paging.aspx.cs b/FineUI.Examples/grid/grid_simulate_tree_paging.aspx.cs index 4fcf3c5..9882271 100644 --- a/FineUI.Examples/grid/grid_simulate_tree_paging.aspx.cs +++ b/FineUI.Examples/grid/grid_simulate_tree_paging.aspx.cs @@ -108,7 +108,7 @@ namespace FineUI.Examples.grid protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { - Grid1.PageIndex = e.NewPageIndex; + //Grid1.PageIndex = e.NewPageIndex; } #endregion diff --git a/FineUI.Examples/grid/grid_sorting.aspx b/FineUI.Examples/grid/grid_sorting.aspx index 870b3c4..05e3837 100644 --- a/FineUI.Examples/grid/grid_sorting.aspx +++ b/FineUI.Examples/grid/grid_sorting.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/grid/grid_sorting.aspx.cs b/FineUI.Examples/grid/grid_sorting.aspx.cs index dd94834..fb37c86 100644 --- a/FineUI.Examples/grid/grid_sorting.aspx.cs +++ b/FineUI.Examples/grid/grid_sorting.aspx.cs @@ -45,8 +45,8 @@ namespace FineUI.Examples.grid protected void Grid1_Sort(object sender, GridSortEventArgs e) { - Grid1.SortDirection = e.SortDirection; - Grid1.SortField = e.SortField; + //Grid1.SortDirection = e.SortDirection; + //Grid1.SortField = e.SortField; BindGrid(); } diff --git a/FineUI.Examples/grid/grid_sorting_nosortfield.aspx b/FineUI.Examples/grid/grid_sorting_nosortfield.aspx new file mode 100644 index 0000000..2c0acee --- /dev/null +++ b/FineUI.Examples/grid/grid_sorting_nosortfield.aspx @@ -0,0 +1,42 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="grid_sorting_nosortfield.aspx.cs" Inherits="FineUI.Examples.grid.grid_sorting_nosortfield" %> + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + diff --git a/FineUI.Examples/grid/grid_sorting_nosortfield.aspx.cs b/FineUI.Examples/grid/grid_sorting_nosortfield.aspx.cs new file mode 100644 index 0000000..0007998 --- /dev/null +++ b/FineUI.Examples/grid/grid_sorting_nosortfield.aspx.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Data; +using System.Text; + +namespace FineUI.Examples.grid +{ + public partial class grid_sorting_nosortfield : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + BindGrid(); + } + } + + #region BindGrid + + private void BindGrid() + { + string sortField = Grid1.SortField; + string sortDirection = Grid1.SortDirection; + + DataTable table = DataSourceUtil.GetDataTable(); + + DataView view1 = table.DefaultView; + if (!String.IsNullOrEmpty(sortField)) + { + view1.Sort = String.Format("{0} {1}", sortField, sortDirection); + } + + + Grid1.DataSource = view1; + Grid1.DataBind(); + } + + #endregion + + #region Events + + protected void Button1_Click(object sender, EventArgs e) + { + labResult.Text = HowManyRowsAreSelected(Grid1); + } + + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + //Grid1.SortDirection = e.SortDirection; + //Grid1.SortField = e.SortField; + + BindGrid(); + } + + #endregion + + } +} diff --git a/FineUI.Examples/grid/grid_sorting_nosortfield.aspx.designer.cs b/FineUI.Examples/grid/grid_sorting_nosortfield.aspx.designer.cs new file mode 100644 index 0000000..f7b1b4e --- /dev/null +++ b/FineUI.Examples/grid/grid_sorting_nosortfield.aspx.designer.cs @@ -0,0 +1,69 @@ +//------------------------------------------------------------------------------ +// +// 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 { + + + public partial class grid_sorting_nosortfield { + + /// + /// 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; + + /// + /// Grid1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::FineUI.Grid Grid1; + + /// + /// 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; + + /// + /// Button1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::FineUI.Button Button1; + + /// + /// 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_style_columnclass.aspx b/FineUI.Examples/grid/grid_style_columnclass.aspx index 8e3bf8b..e223ed4 100644 --- a/FineUI.Examples/grid/grid_style_columnclass.aspx +++ b/FineUI.Examples/grid/grid_style_columnclass.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/toolbar/menu_dynamic.aspx b/FineUI.Examples/toolbar/menu_dynamic.aspx index fccdb2f..404b4ee 100644 --- a/FineUI.Examples/toolbar/menu_dynamic.aspx +++ b/FineUI.Examples/toolbar/menu_dynamic.aspx @@ -4,7 +4,6 @@ -
diff --git a/FineUI.Examples/toolbar/menu_dynamic2.aspx b/FineUI.Examples/toolbar/menu_dynamic2.aspx index bec6a24..1678b16 100644 --- a/FineUI.Examples/toolbar/menu_dynamic2.aspx +++ b/FineUI.Examples/toolbar/menu_dynamic2.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/toolbar/menu_hideonclick.aspx b/FineUI.Examples/toolbar/menu_hideonclick.aspx index 5979437..0b4c075 100644 --- a/FineUI.Examples/toolbar/menu_hideonclick.aspx +++ b/FineUI.Examples/toolbar/menu_hideonclick.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/toolbar/toolbar_fill.aspx b/FineUI.Examples/toolbar/toolbar_fill.aspx index 6c01db3..1f00437 100644 --- a/FineUI.Examples/toolbar/toolbar_fill.aspx +++ b/FineUI.Examples/toolbar/toolbar_fill.aspx @@ -3,9 +3,7 @@ - - diff --git a/FineUI.Examples/toolbar/toolbar_iframe.aspx b/FineUI.Examples/toolbar/toolbar_iframe.aspx index 3186c29..55ee5b7 100644 --- a/FineUI.Examples/toolbar/toolbar_iframe.aspx +++ b/FineUI.Examples/toolbar/toolbar_iframe.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/toolbar/toolbar_images.aspx b/FineUI.Examples/toolbar/toolbar_images.aspx index 2b0fb61..6e158b8 100644 --- a/FineUI.Examples/toolbar/toolbar_images.aspx +++ b/FineUI.Examples/toolbar/toolbar_images.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/toolbar/toolbar_images_fixedwidth.aspx b/FineUI.Examples/toolbar/toolbar_images_fixedwidth.aspx index 74d84fa..ec94ccc 100644 --- a/FineUI.Examples/toolbar/toolbar_images_fixedwidth.aspx +++ b/FineUI.Examples/toolbar/toolbar_images_fixedwidth.aspx @@ -4,9 +4,7 @@ - - diff --git a/FineUI.Examples/tree/checkbox/tree_checkall.aspx b/FineUI.Examples/tree/checkbox/tree_checkall.aspx index 7801adf..a0ebaae 100644 --- a/FineUI.Examples/tree/checkbox/tree_checkall.aspx +++ b/FineUI.Examples/tree/checkbox/tree_checkall.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/tree/checkbox/tree_checked.aspx b/FineUI.Examples/tree/checkbox/tree_checked.aspx index 57e8998..85601c3 100644 --- a/FineUI.Examples/tree/checkbox/tree_checked.aspx +++ b/FineUI.Examples/tree/checkbox/tree_checked.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/tree/databind/tree_datasource.aspx b/FineUI.Examples/tree/databind/tree_datasource.aspx index 6f974ad..d00035c 100644 --- a/FineUI.Examples/tree/databind/tree_datasource.aspx +++ b/FineUI.Examples/tree/databind/tree_datasource.aspx @@ -6,7 +6,6 @@ - diff --git a/FineUI.Examples/tree/databind/tree_datatable.aspx b/FineUI.Examples/tree/databind/tree_datatable.aspx index c632a13..c52a5e0 100644 --- a/FineUI.Examples/tree/databind/tree_datatable.aspx +++ b/FineUI.Examples/tree/databind/tree_datatable.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/tree/databind/tree_document.aspx b/FineUI.Examples/tree/databind/tree_document.aspx index bd1eb44..121431b 100644 --- a/FineUI.Examples/tree/databind/tree_document.aspx +++ b/FineUI.Examples/tree/databind/tree_document.aspx @@ -6,7 +6,6 @@ - diff --git a/FineUI.Examples/tree/databind/tree_sitemap.aspx b/FineUI.Examples/tree/databind/tree_sitemap.aspx index 037ef2a..2b22f15 100644 --- a/FineUI.Examples/tree/databind/tree_sitemap.aspx +++ b/FineUI.Examples/tree/databind/tree_sitemap.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/tree/select/tree_multi_select.aspx b/FineUI.Examples/tree/select/tree_multi_select.aspx index 70cf61e..aa72f63 100644 --- a/FineUI.Examples/tree/select/tree_multi_select.aspx +++ b/FineUI.Examples/tree/select/tree_multi_select.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/tree/select/tree_multi_select_selectable.aspx b/FineUI.Examples/tree/select/tree_multi_select_selectable.aspx index df49c82..894a703 100644 --- a/FineUI.Examples/tree/select/tree_multi_select_selectable.aspx +++ b/FineUI.Examples/tree/select/tree_multi_select_selectable.aspx @@ -4,9 +4,7 @@ - - diff --git a/FineUI.Examples/tree/select/tree_nodecommand.aspx b/FineUI.Examples/tree/select/tree_nodecommand.aspx index 8696db2..0d7e4d2 100644 --- a/FineUI.Examples/tree/select/tree_nodecommand.aspx +++ b/FineUI.Examples/tree/select/tree_nodecommand.aspx @@ -5,7 +5,6 @@ - diff --git a/FineUI.Examples/tree/select/tree_select.aspx b/FineUI.Examples/tree/select/tree_select.aspx index eee06d7..b5c8b84 100644 --- a/FineUI.Examples/tree/select/tree_select.aspx +++ b/FineUI.Examples/tree/select/tree_select.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/tree/tree.aspx b/FineUI.Examples/tree/tree.aspx index aab31f0..aa72f96 100644 --- a/FineUI.Examples/tree/tree.aspx +++ b/FineUI.Examples/tree/tree.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/tree/tree_ajax.aspx b/FineUI.Examples/tree/tree_ajax.aspx index 70bee79..f86c9f5 100644 --- a/FineUI.Examples/tree/tree_ajax.aspx +++ b/FineUI.Examples/tree/tree_ajax.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/tree/tree_contextmenu.aspx b/FineUI.Examples/tree/tree_contextmenu.aspx index 0a0659c..0a479cd 100644 --- a/FineUI.Examples/tree/tree_contextmenu.aspx +++ b/FineUI.Examples/tree/tree_contextmenu.aspx @@ -3,9 +3,7 @@ - - diff --git a/FineUI.Examples/tree/tree_expand.aspx b/FineUI.Examples/tree/tree_expand.aspx index 5954347..8dffe16 100644 --- a/FineUI.Examples/tree/tree_expand.aspx +++ b/FineUI.Examples/tree/tree_expand.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/tree/tree_icon.aspx b/FineUI.Examples/tree/tree_icon.aspx index d37f78d..f77d14b 100644 --- a/FineUI.Examples/tree/tree_icon.aspx +++ b/FineUI.Examples/tree/tree_icon.aspx @@ -4,7 +4,6 @@ - diff --git a/FineUI.Examples/tree/tree_node_cssclass.aspx b/FineUI.Examples/tree/tree_node_cssclass.aspx index 5a5de80..51aa27f 100644 --- a/FineUI.Examples/tree/tree_node_cssclass.aspx +++ b/FineUI.Examples/tree/tree_node_cssclass.aspx @@ -3,9 +3,7 @@ - -