From b0cebba8ea5393c5de74f4b09078f7a4d3d3e8cf Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 13 十二月 2024 10:38:09 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index e534ed2..9c29774 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -31,17 +31,17 @@
{
DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(User));
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.isLocked = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
@@ -111,7 +111,7 @@
this.isLocked.MinWidth = 25;
this.isLocked.Name = "isLocked";
this.isLocked.OptionsColumn.AllowEdit = false;
- this.isLocked.Tag = "query_a.IS_STATUS";
+ this.isLocked.Tag = "query_IS_STATUS";
this.isLocked.Visible = true;
this.isLocked.VisibleIndex = 7;
this.isLocked.Width = 94;
@@ -184,7 +184,7 @@
this.account.MinWidth = 25;
this.account.Name = "account";
this.account.OptionsColumn.AllowEdit = false;
- this.account.Tag = "query_a.ACCOUNT";
+ this.account.Tag = "query_ACCOUNT";
this.account.Visible = true;
this.account.VisibleIndex = 0;
this.account.Width = 94;
@@ -198,7 +198,7 @@
this.userName.MinWidth = 25;
this.userName.Name = "userName";
this.userName.OptionsColumn.AllowEdit = false;
- this.userName.Tag = "query_a.USER_NAME";
+ this.userName.Tag = "query_USER_NAME";
this.userName.Visible = true;
this.userName.VisibleIndex = 1;
this.userName.Width = 94;
@@ -212,7 +212,7 @@
this.tel.MinWidth = 25;
this.tel.Name = "tel";
this.tel.OptionsColumn.AllowEdit = false;
- this.tel.Tag = "query_a.tel";
+ this.tel.Tag = "query_tel";
this.tel.Visible = true;
this.tel.VisibleIndex = 2;
this.tel.Width = 94;
@@ -226,7 +226,7 @@
this.email.MinWidth = 25;
this.email.Name = "email";
this.email.OptionsColumn.AllowEdit = false;
- this.email.Tag = "query_a.email";
+ this.email.Tag = "query_email";
this.email.Visible = true;
this.email.VisibleIndex = 3;
this.email.Width = 94;
@@ -238,6 +238,7 @@
this.colCreateBy.MinWidth = 25;
this.colCreateBy.Name = "colCreateBy";
this.colCreateBy.OptionsColumn.AllowEdit = false;
+ this.colCreateBy.Tag = "query_CREATE_BY";
this.colCreateBy.Visible = true;
this.colCreateBy.VisibleIndex = 4;
this.colCreateBy.Width = 94;
@@ -251,7 +252,7 @@
this.createTime.MinWidth = 25;
this.createTime.Name = "createTime";
this.createTime.OptionsColumn.AllowEdit = false;
- this.createTime.Tag = "query_a.CREATE_TIME";
+ this.createTime.Tag = "query_CREATE_TIME";
this.createTime.Visible = true;
this.createTime.VisibleIndex = 5;
this.createTime.Width = 94;
@@ -265,7 +266,7 @@
this.lastLoginTime.MinWidth = 25;
this.lastLoginTime.Name = "lastLoginTime";
this.lastLoginTime.OptionsColumn.AllowEdit = false;
- this.lastLoginTime.Tag = "query_a.LASTLOGIN_TIME";
+ this.lastLoginTime.Tag = "query_LASTLOGIN_TIME";
this.lastLoginTime.Visible = true;
this.lastLoginTime.VisibleIndex = 6;
this.lastLoginTime.Width = 94;
@@ -279,7 +280,7 @@
this.loginCounter.MinWidth = 25;
this.loginCounter.Name = "loginCounter";
this.loginCounter.OptionsColumn.AllowEdit = false;
- this.loginCounter.Tag = "query_a.LOGIN_COUNTER";
+ this.loginCounter.Tag = "query_LOGIN_COUNTER";
this.loginCounter.Visible = true;
this.loginCounter.VisibleIndex = 8;
this.loginCounter.Width = 94;
@@ -301,12 +302,12 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.user_16x16;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- serializableAppearanceObject17.Font = new System.Drawing.Font("Tahoma", 10F);
- serializableAppearanceObject17.Options.UseFont = true;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.user_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ serializableAppearanceObject1.Font = new System.Drawing.Font("Tahoma", 10F);
+ serializableAppearanceObject1.Options.UseFont = true;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁剧疆瑙掕壊", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁剧疆瑙掕壊", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -327,10 +328,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions6.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions6.Image")));
- editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions2.Image")));
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶇疆瀵嗙爜", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶇疆瀵嗙爜", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -353,7 +354,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(736, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -363,7 +364,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(736, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
@@ -374,7 +374,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(736, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
--
Gitblit v1.9.3