From cf8c3cb608bceb47bc4ea83fb7a9bfe22cb80d2e Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 02 十一月 2024 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | 79 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
index 4794cd4..da4edb5 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -29,6 +29,11 @@
/// </summary>
private void InitializeComponent()
{
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -39,6 +44,8 @@
this.status = new DevExpress.XtraGrid.Columns.GridColumn();
this.roleCreateBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
@@ -52,18 +59,16 @@
this.lbGuid = new System.Windows.Forms.Label();
this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.trv = new System.Windows.Forms.TreeView();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_roleRemark.Properties)).BeginInit();
- this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// toolBarMenu1
@@ -74,19 +79,19 @@
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
-
+ this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1237, 80);
this.toolBarMenu1.TabIndex = 5;
this.toolBarMenu1.xlsInService = null;
-
+ this.toolBarMenu1.xlsOutParameter = null;
//
// xtraTabControl1
//
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
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(935, 661);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1237, 661);
this.xtraTabControl1.TabIndex = 7;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -97,7 +102,7 @@
this.xtraTabPage1.Controls.Add(this.gcMain);
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(933, 629);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1235, 629);
this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
//
// gcMain
@@ -107,7 +112,9 @@
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(933, 589);
+ this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
+ this.gcMain.Size = new System.Drawing.Size(1235, 589);
this.gcMain.TabIndex = 5;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -121,7 +128,8 @@
this.rolRemark,
this.status,
this.roleCreateBy,
- this.createDate});
+ this.createDate,
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsView.ShowButtonMode = DevExpress.XtraGrid.Views.Base.ShowButtonModeEnum.ShowAlways;
@@ -186,6 +194,27 @@
this.createDate.VisibleIndex = 4;
this.createDate.Width = 94;
//
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "閰嶇疆鏉冮檺";
+ this.gridColumn1.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 5;
+ this.gridColumn1.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.bouser_16x162;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ 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);
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 0;
@@ -195,7 +224,7 @@
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
this.pageBar1.RowsCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(933, 40);
+ this.pageBar1.Size = new System.Drawing.Size(1235, 40);
this.pageBar1.TabIndex = 6;
this.pageBar1.TotalPages = 0;
//
@@ -330,33 +359,11 @@
this.labelControl5.TabIndex = 101;
this.labelControl5.Text = "鍚敤鐘舵�侊細";
//
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.trv);
- this.groupBox1.Dock = System.Windows.Forms.DockStyle.Left;
- this.groupBox1.Location = new System.Drawing.Point(935, 80);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(291, 661);
- this.groupBox1.TabIndex = 8;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "璇烽�夋嫨璇ヨ鑹茬殑鏉冮檺";
- //
- // trv
- //
- this.trv.CheckBoxes = true;
- this.trv.Dock = System.Windows.Forms.DockStyle.Fill;
- this.trv.Font = new System.Drawing.Font("Tahoma", 10F);
- this.trv.Location = new System.Drawing.Point(3, 22);
- this.trv.Name = "trv";
- this.trv.Size = new System.Drawing.Size(285, 636);
- this.trv.TabIndex = 2;
- //
// Role
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1237, 741);
- this.Controls.Add(this.groupBox1);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Role";
@@ -366,12 +373,12 @@
this.xtraTabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_roleRemark.Properties)).EndInit();
- this.groupBox1.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -386,8 +393,6 @@
private DevExpress.XtraGrid.Columns.GridColumn roleName;
private DevExpress.XtraGrid.Columns.GridColumn rolRemark;
private DevExpress.XtraGrid.Columns.GridColumn status;
- private System.Windows.Forms.GroupBox groupBox1;
- private System.Windows.Forms.TreeView trv;
private UserControls.Data.UcPageBar pageBar1;
private System.Windows.Forms.Panel panel1;
private DevExpress.XtraEditors.LabelControl labelControl10;
@@ -402,5 +407,7 @@
private DevExpress.XtraGrid.Columns.GridColumn createDate;
private DevExpress.XtraGrid.Columns.GridColumn roleCreateBy;
private System.Windows.Forms.CheckBox txt_isStatus;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3