From 004c751fc4795263660c589c7e6b2fc03cb91ac6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 16 一月 2025 13:04:29 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 7 +
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | 15 ++-
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 2
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs | 128 ++++++++++++++------------------
DevApp/Gs.DevApp/DevFrm/User/User.cs | 8 +
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs | 9 --
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 20 +++-
8 files changed, 91 insertions(+), 101 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index db17d67..0589453 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -433,9 +433,12 @@
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "checkStatus", "", "", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
index 57e4c74..f16ba10 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
@@ -52,7 +52,8 @@
this.gv_msg.AppearanceCell.Options.UseFont = true;
this.gv_msg.Caption = "鎿嶄綔璇︽儏";
this.gv_msg.FieldName = "msg";
- this.gv_msg.MinWidth = 200;
+ this.gv_msg.MaxWidth = 500;
+ this.gv_msg.MinWidth = 100;
this.gv_msg.Name = "gv_msg";
this.gv_msg.OptionsColumn.AllowEdit = false;
this.gv_msg.Tag = "query_MSG";
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
index e975ff0..ba6ae3c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -72,14 +72,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- _filterList.Clear();
- if (gridView1.ActiveFilter.Count > 0)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- }
- getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
index 4dd5368..dadd91c 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -152,13 +152,14 @@
//
this.rolRemark.Caption = "鍔熻兘澶囨敞";
this.rolRemark.FieldName = "roleRemark";
+ this.rolRemark.MaxWidth = 400;
this.rolRemark.MinWidth = 10;
this.rolRemark.Name = "rolRemark";
this.rolRemark.OptionsColumn.AllowEdit = false;
this.rolRemark.Tag = "query_role_Remark";
this.rolRemark.Visible = true;
this.rolRemark.VisibleIndex = 1;
- this.rolRemark.Width = 362;
+ this.rolRemark.Width = 300;
//
// status
//
@@ -258,7 +259,7 @@
// txt_isStatus
//
this.txt_isStatus.AutoSize = true;
- this.txt_isStatus.Location = new System.Drawing.Point(123, 158);
+ this.txt_isStatus.Location = new System.Drawing.Point(123, 151);
this.txt_isStatus.Name = "txt_isStatus";
this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
this.txt_isStatus.TabIndex = 132;
@@ -308,20 +309,20 @@
//
// txt_roleRemark
//
- this.txt_roleRemark.Location = new System.Drawing.Point(123, 67);
+ this.txt_roleRemark.Location = new System.Drawing.Point(123, 56);
this.txt_roleRemark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_roleRemark.Name = "txt_roleRemark";
this.txt_roleRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_roleRemark.Properties.Appearance.Options.UseFont = true;
this.txt_roleRemark.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.txt_roleRemark.Size = new System.Drawing.Size(297, 68);
+ this.txt_roleRemark.Size = new System.Drawing.Size(297, 84);
this.txt_roleRemark.TabIndex = 126;
//
// labelControl7
//
this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl7.Appearance.Options.UseFont = true;
- this.labelControl7.Location = new System.Drawing.Point(31, 67);
+ this.labelControl7.Location = new System.Drawing.Point(31, 56);
this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl7.Name = "labelControl7";
this.labelControl7.Size = new System.Drawing.Size(85, 21);
@@ -341,7 +342,7 @@
//
this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl9.Appearance.Options.UseForeColor = true;
- this.labelControl9.Location = new System.Drawing.Point(426, 73);
+ this.labelControl9.Location = new System.Drawing.Point(426, 62);
this.labelControl9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl9.Name = "labelControl9";
this.labelControl9.Size = new System.Drawing.Size(8, 18);
@@ -352,7 +353,7 @@
//
this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl5.Appearance.Options.UseFont = true;
- this.labelControl5.Location = new System.Drawing.Point(31, 156);
+ this.labelControl5.Location = new System.Drawing.Point(31, 149);
this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl5.Name = "labelControl5";
this.labelControl5.Size = new System.Drawing.Size(85, 21);
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 2bfbc50..42b8d51 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -242,7 +242,7 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "CREATE_TIME",
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "ROLE_NAME asc,CREATE_TIME ",
"desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index 5fcf758..237b5ac 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -48,8 +48,6 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.account = new DevExpress.XtraGrid.Columns.GridColumn();
this.userName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.tel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.email = new DevExpress.XtraGrid.Columns.GridColumn();
this.colCreateBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.createTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.lastLoginTime = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -63,6 +61,7 @@
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_isStatus = new System.Windows.Forms.CheckBox();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.txt_account = new DevExpress.XtraEditors.TextEdit();
@@ -78,12 +77,12 @@
this.tipPwd = new DevExpress.XtraEditors.LabelControl();
this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
this.txt_password = new DevExpress.XtraEditors.TextEdit();
this.lbPwd = new DevExpress.XtraEditors.LabelControl();
this.txt_userName = new DevExpress.XtraEditors.TextEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
- this.txt_isStatus = new System.Windows.Forms.CheckBox();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -106,16 +105,17 @@
//
this.isLocked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.isLocked.AppearanceCell.Options.UseFont = true;
- this.isLocked.Caption = "鐘舵��";
+ this.isLocked.Caption = "浣跨敤鐘舵��";
this.isLocked.FieldName = "isStatus";
- this.isLocked.MinWidth = 25;
+ this.isLocked.MaxWidth = 50;
+ this.isLocked.MinWidth = 50;
this.isLocked.Name = "isLocked";
this.isLocked.OptionsColumn.AllowEdit = false;
this.isLocked.Tag = "query_IS_STATUS";
this.isLocked.UnboundDataType = typeof(bool);
this.isLocked.Visible = true;
- this.isLocked.VisibleIndex = 7;
- this.isLocked.Width = 94;
+ this.isLocked.VisibleIndex = 0;
+ this.isLocked.Width = 50;
//
// toolBarMenu1
//
@@ -127,7 +127,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = "rpt_User{}";
- this.toolBarMenu1.Size = new System.Drawing.Size(738, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1004, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -142,24 +142,26 @@
this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit2});
- this.gcMain.Size = new System.Drawing.Size(736, 531);
+ this.gcMain.Size = new System.Drawing.Size(1002, 531);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
// gridView1
//
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.isLocked,
+ this.gridColumn2,
this.account,
this.userName,
- this.tel,
- this.email,
this.colCreateBy,
this.createTime,
this.lastLoginTime,
- this.isLocked,
this.loginCounter,
this.colRole,
this.gridColumn1});
@@ -188,7 +190,7 @@
this.account.OptionsColumn.AllowEdit = false;
this.account.Tag = "query_ACCOUNT";
this.account.Visible = true;
- this.account.VisibleIndex = 0;
+ this.account.VisibleIndex = 2;
this.account.Width = 94;
//
// userName
@@ -202,36 +204,8 @@
this.userName.OptionsColumn.AllowEdit = false;
this.userName.Tag = "query_USER_NAME";
this.userName.Visible = true;
- this.userName.VisibleIndex = 1;
+ this.userName.VisibleIndex = 3;
this.userName.Width = 94;
- //
- // tel
- //
- this.tel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.tel.AppearanceCell.Options.UseFont = true;
- this.tel.Caption = "鑱旂郴鐢佃瘽";
- this.tel.FieldName = "tel";
- this.tel.MinWidth = 50;
- this.tel.Name = "tel";
- this.tel.OptionsColumn.AllowEdit = false;
- this.tel.Tag = "query_tel";
- this.tel.Visible = true;
- this.tel.VisibleIndex = 2;
- this.tel.Width = 94;
- //
- // email
- //
- this.email.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.email.AppearanceCell.Options.UseFont = true;
- this.email.Caption = "閭";
- this.email.FieldName = "email";
- this.email.MinWidth = 50;
- this.email.Name = "email";
- this.email.OptionsColumn.AllowEdit = false;
- this.email.Tag = "query_email";
- this.email.Visible = true;
- this.email.VisibleIndex = 3;
- this.email.Width = 94;
//
// colCreateBy
//
@@ -251,7 +225,7 @@
this.createTime.AppearanceCell.Options.UseFont = true;
this.createTime.Caption = "寤虹珛鏃堕棿";
this.createTime.FieldName = "createTime";
- this.createTime.MinWidth = 180;
+ this.createTime.MinWidth = 50;
this.createTime.Name = "createTime";
this.createTime.OptionsColumn.AllowEdit = false;
this.createTime.Tag = "query_CREATE_TIME";
@@ -265,7 +239,7 @@
this.lastLoginTime.AppearanceCell.Options.UseFont = true;
this.lastLoginTime.Caption = "鏈�杩戠櫥褰曟椂闂�";
this.lastLoginTime.FieldName = "lastloginTime";
- this.lastLoginTime.MinWidth = 180;
+ this.lastLoginTime.MinWidth = 50;
this.lastLoginTime.Name = "lastLoginTime";
this.lastLoginTime.OptionsColumn.AllowEdit = false;
this.lastLoginTime.Tag = "query_LASTLOGIN_TIME";
@@ -284,7 +258,7 @@
this.loginCounter.OptionsColumn.AllowEdit = false;
this.loginCounter.Tag = "query_LOGIN_COUNTER";
this.loginCounter.Visible = true;
- this.loginCounter.VisibleIndex = 8;
+ this.loginCounter.VisibleIndex = 7;
this.loginCounter.Width = 94;
//
// colRole
@@ -298,7 +272,7 @@
this.colRole.ShowButtonMode = DevExpress.XtraGrid.Views.Base.ShowButtonModeEnum.ShowAlways;
this.colRole.Tag = "";
this.colRole.Visible = true;
- this.colRole.VisibleIndex = 9;
+ this.colRole.VisibleIndex = 8;
this.colRole.Width = 94;
//
// repositoryItemButtonEdit1
@@ -324,7 +298,7 @@
this.gridColumn1.OptionsFilter.AllowFilter = false;
this.gridColumn1.ShowButtonMode = DevExpress.XtraGrid.Views.Base.ShowButtonModeEnum.ShowAlways;
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 10;
+ this.gridColumn1.VisibleIndex = 9;
this.gridColumn1.Width = 94;
//
// repositoryItemButtonEdit2
@@ -344,7 +318,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(738, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1004, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -355,7 +329,7 @@
this.xtraTabPage1.Controls.Add(this.gcMain);
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(736, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1002, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
@@ -366,7 +340,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(736, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1002, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
@@ -406,6 +380,15 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(585, 426);
this.panel1.TabIndex = 1;
+ //
+ // txt_isStatus
+ //
+ this.txt_isStatus.AutoSize = true;
+ this.txt_isStatus.Location = new System.Drawing.Point(125, 342);
+ this.txt_isStatus.Name = "txt_isStatus";
+ this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
+ this.txt_isStatus.TabIndex = 133;
+ this.txt_isStatus.UseVisualStyleBackColor = true;
//
// labelControl11
//
@@ -565,6 +548,17 @@
this.labelControl6.TabIndex = 103;
this.labelControl6.Text = "閭锛�";
//
+ // labelControl5
+ //
+ this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl5.Appearance.Options.UseFont = true;
+ this.labelControl5.Location = new System.Drawing.Point(31, 340);
+ this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(85, 21);
+ this.labelControl5.TabIndex = 101;
+ this.labelControl5.Text = "鍚敤鐘舵�侊細";
+ //
// txt_password
//
this.txt_password.Location = new System.Drawing.Point(125, 56);
@@ -607,31 +601,22 @@
this.labelControl2.TabIndex = 94;
this.labelControl2.Text = "濮撳悕锛�";
//
- // labelControl5
+ // gridColumn2
//
- this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl5.Appearance.Options.UseFont = true;
- this.labelControl5.Location = new System.Drawing.Point(31, 340);
- this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl5.Name = "labelControl5";
- this.labelControl5.Size = new System.Drawing.Size(85, 21);
- this.labelControl5.TabIndex = 101;
- this.labelControl5.Text = "鍚敤鐘舵�侊細";
- //
- // txt_isStatus
- //
- this.txt_isStatus.AutoSize = true;
- this.txt_isStatus.Location = new System.Drawing.Point(125, 342);
- this.txt_isStatus.Name = "txt_isStatus";
- this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
- this.txt_isStatus.TabIndex = 133;
- this.txt_isStatus.UseVisualStyleBackColor = true;
+ this.gridColumn2.Caption = "鍦ㄧ嚎鐘舵��";
+ this.gridColumn2.FieldName = "flagOnline";
+ this.gridColumn2.MaxWidth = 50;
+ this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 50;
//
// User
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(738, 682);
+ this.ClientSize = new System.Drawing.Size(1004, 682);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "User";
@@ -663,8 +648,6 @@
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn userName;
- private DevExpress.XtraGrid.Columns.GridColumn tel;
- private DevExpress.XtraGrid.Columns.GridColumn email;
private DevExpress.XtraGrid.Columns.GridColumn createTime;
private DevExpress.XtraGrid.Columns.GridColumn lastLoginTime;
private DevExpress.XtraGrid.Columns.GridColumn isLocked;
@@ -701,5 +684,6 @@
private DevExpress.XtraGrid.Columns.GridColumn colCreateBy;
private System.Windows.Forms.CheckBox txt_isStatus;
private DevExpress.XtraEditors.LabelControl labelControl5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index ec78126..e2e4119 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -121,9 +121,10 @@
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 0)
- getPageList(this.pageBar1.CurrentPage);
+ { }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ getPageList(this.pageBar1.CurrentPage);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -257,8 +258,8 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "CREATE_TIME",
- "asc", "", _sbSqlWhere.ToString());
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "ACCOUNT asc ,CREATE_TIME",
+ "desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -274,6 +275,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index dc4be61..0794fe4 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1597,23 +1597,29 @@
/// <param name="fm">褰撳墠绐椾綋</param>
/// <param name="fileName">1涓哄鏍革紝0涓哄弽瀹℃牳</param>
/// <param name="icoName"></param>
- public static void SetCheckIco(GridView gridView1,string zdChk,string zdChkUser,string zdCkDate, PictureBox btnChkIco, Form fm, string fileName, string icoName = "")
+ public static void SetCheckIco(GridView gridView1, string zdChk, string zdChkUser, string zdCkDate, PictureBox btnChkIco, Form fm, string fileName, string icoName = "")
{
if (fileName == "1" || fileName.ToUpper() == true.ToString().ToUpper())
{
btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check;
btnChkIco.Tag = "宸插鏍�";
- gridView1.SetFocusedRowCellValue(zdChkUser, "宸插鏍�");
- gridView1.SetFocusedRowCellValue(zdCkDate, DateTime.Now.ToString());
- gridView1.SetFocusedRowCellValue(zdChk, true);
+ if (!string.IsNullOrEmpty(zdChkUser))
+ gridView1.SetFocusedRowCellValue(zdChkUser, "宸插鏍�");
+ if (!string.IsNullOrEmpty(zdCkDate))
+ gridView1.SetFocusedRowCellValue(zdCkDate, DateTime.Now.ToString());
+ if (!string.IsNullOrEmpty(zdChk))
+ gridView1.SetFocusedRowCellValue(zdChk, true);
}
else
{
btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
btnChkIco.Tag = "鏈鏍�";
- gridView1.SetFocusedRowCellValue(zdChkUser, "");
- gridView1.SetFocusedRowCellValue(zdCkDate, "");
- gridView1.SetFocusedRowCellValue(zdChk, false);
+ if (!string.IsNullOrEmpty(zdChkUser))
+ gridView1.SetFocusedRowCellValue(zdChkUser, "");
+ if (!string.IsNullOrEmpty(zdCkDate))
+ gridView1.SetFocusedRowCellValue(zdCkDate, "");
+ if (!string.IsNullOrEmpty(zdChk))
+ gridView1.SetFocusedRowCellValue(zdChk, false);
}
btnChkIco.Anchor = AnchorStyles.Top | AnchorStyles.Right; // 闈犲彸
btnChkIco.Location = new Point(fm.ClientSize.Width - btnChkIco.Width - 20, 80); // 璺濈椤堕儴10鍍忕礌
--
Gitblit v1.9.3