From 8d36c9cf06313786dbf5ee2cdf7cdd06d1857f01 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期五, 30 八月 2024 11:04:27 +0800
Subject: [PATCH] 用户管理
---
DevApp/Gs.DevApp/DevFrm/User/RoleAdd.resx | 120 +++++
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | 201 ++++++++
DevApp/Gs.DevApp/DevFrm/User/RoleAdd.cs | 77 +++
DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs | 396 ++++++++--------
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 118 +++++
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs | 24
DevApp/Gs.DevApp/DevFrm/User/Organization.cs | 4
DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs | 2
DevApp/Gs.DevApp/DevFrm/User/RoleAdd.Designer.cs | 251 ++++++++++
DevApp/Gs.DevApp/DevFrm/User/Role.resx | 120 +++++
DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs | 60 +-
11 files changed, 1,138 insertions(+), 235 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs
index fb9c6c6..6ff5c34 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs
@@ -29,36 +29,46 @@
/// </summary>
private void InitializeComponent()
{
- this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
- this.tabPage1 = new System.Windows.Forms.TabPage();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.panel1 = new System.Windows.Forms.Panel();
- this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
- this.comUp = new System.Windows.Forms.ComboBox();
- this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
- this.txtStatus = new DevExpress.XtraEditors.ComboBoxEdit();
- this.lbGuid = new System.Windows.Forms.Label();
- this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
- this.txtConTel = new DevExpress.XtraEditors.TextEdit();
- this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
- this.txtConPeople = new DevExpress.XtraEditors.TextEdit();
- this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
- this.txtName = new DevExpress.XtraEditors.TextEdit();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.trv = new System.Windows.Forms.TreeView();
this.tabControl1 = new System.Windows.Forms.TabControl();
- this.tabPage1.SuspendLayout();
- this.groupBox1.SuspendLayout();
- this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txtStatus.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtConTel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtConPeople.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtName.Properties)).BeginInit();
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
+ this.trv = new System.Windows.Forms.TreeView();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.txtName = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+ this.txtConPeople = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+ this.txtConTel = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.txtStatus = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
+ this.comUp = new System.Windows.Forms.ComboBox();
+ this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+ this.panel1 = new System.Windows.Forms.Panel();
this.tabControl1.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.tabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txtName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtConPeople.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtConTel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtStatus.Properties)).BeginInit();
+ this.panel1.SuspendLayout();
this.SuspendLayout();
+ //
+ // tabControl1
+ //
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControl1.Location = new System.Drawing.Point(0, 80);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(917, 564);
+ this.tabControl1.TabIndex = 2;
//
// toolBarMenu1
//
@@ -67,6 +77,26 @@
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.Size = new System.Drawing.Size(917, 80);
this.toolBarMenu1.TabIndex = 0;
+ //
+ // trv
+ //
+ this.trv.Dock = System.Windows.Forms.DockStyle.Left;
+ this.trv.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.trv.Location = new System.Drawing.Point(3, 3);
+ this.trv.Name = "trv";
+ this.trv.Size = new System.Drawing.Size(207, 527);
+ this.trv.TabIndex = 1;
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.panel1);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox1.Location = new System.Drawing.Point(210, 3);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(696, 527);
+ this.groupBox1.TabIndex = 2;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "鍩烘湰淇℃伅";
//
// tabPage1
//
@@ -80,16 +110,140 @@
this.tabPage1.Text = "鏁版嵁鍒楄〃";
this.tabPage1.UseVisualStyleBackColor = true;
//
- // groupBox1
+ // labelControl2
//
- this.groupBox1.Controls.Add(this.panel1);
- this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.groupBox1.Location = new System.Drawing.Point(210, 3);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(696, 527);
- this.groupBox1.TabIndex = 2;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "鍩烘湰淇℃伅";
+ this.labelControl2.Location = new System.Drawing.Point(41, 80);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(75, 18);
+ this.labelControl2.TabIndex = 2;
+ this.labelControl2.Text = "缁勭粐鍚嶇О锛�";
+ //
+ // txtName
+ //
+ this.txtName.Location = new System.Drawing.Point(133, 74);
+ this.txtName.Name = "txtName";
+ this.txtName.Size = new System.Drawing.Size(156, 24);
+ this.txtName.TabIndex = 3;
+ //
+ // labelControl3
+ //
+ this.labelControl3.Location = new System.Drawing.Point(26, 125);
+ this.labelControl3.Name = "labelControl3";
+ this.labelControl3.Size = new System.Drawing.Size(90, 18);
+ this.labelControl3.TabIndex = 4;
+ this.labelControl3.Text = "缁勭粐璐熻矗浜猴細";
+ //
+ // txtConPeople
+ //
+ this.txtConPeople.Location = new System.Drawing.Point(133, 119);
+ this.txtConPeople.Name = "txtConPeople";
+ this.txtConPeople.Size = new System.Drawing.Size(156, 24);
+ this.txtConPeople.TabIndex = 5;
+ //
+ // labelControl4
+ //
+ this.labelControl4.Location = new System.Drawing.Point(26, 174);
+ this.labelControl4.Name = "labelControl4";
+ this.labelControl4.Size = new System.Drawing.Size(90, 18);
+ this.labelControl4.TabIndex = 6;
+ this.labelControl4.Text = "璐熻矗浜虹數璇濓細";
+ //
+ // txtConTel
+ //
+ this.txtConTel.Location = new System.Drawing.Point(133, 168);
+ this.txtConTel.Name = "txtConTel";
+ this.txtConTel.Size = new System.Drawing.Size(156, 24);
+ this.txtConTel.TabIndex = 7;
+ //
+ // labelControl12
+ //
+ this.labelControl12.Appearance.ForeColor = System.Drawing.Color.Red;
+ this.labelControl12.Appearance.Options.UseForeColor = true;
+ this.labelControl12.Location = new System.Drawing.Point(296, 77);
+ this.labelControl12.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl12.Name = "labelControl12";
+ this.labelControl12.Size = new System.Drawing.Size(8, 18);
+ this.labelControl12.TabIndex = 108;
+ this.labelControl12.Text = "*";
+ //
+ // labelControl1
+ //
+ this.labelControl1.Appearance.ForeColor = System.Drawing.Color.Red;
+ this.labelControl1.Appearance.Options.UseForeColor = true;
+ this.labelControl1.Location = new System.Drawing.Point(296, 125);
+ this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl1.Name = "labelControl1";
+ this.labelControl1.Size = new System.Drawing.Size(8, 18);
+ this.labelControl1.TabIndex = 109;
+ this.labelControl1.Text = "*";
+ //
+ // labelControl5
+ //
+ this.labelControl5.Appearance.ForeColor = System.Drawing.Color.Red;
+ this.labelControl5.Appearance.Options.UseForeColor = true;
+ this.labelControl5.Location = new System.Drawing.Point(296, 174);
+ this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(8, 18);
+ this.labelControl5.TabIndex = 110;
+ this.labelControl5.Text = "*";
+ //
+ // lbGuid
+ //
+ this.lbGuid.AutoSize = true;
+ this.lbGuid.Location = new System.Drawing.Point(41, 250);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(0, 18);
+ this.lbGuid.TabIndex = 111;
+ //
+ // txtStatus
+ //
+ this.txtStatus.Location = new System.Drawing.Point(133, 213);
+ this.txtStatus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txtStatus.Name = "txtStatus";
+ this.txtStatus.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txtStatus.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
+ "姝ｅ父",
+ "绂佺敤"});
+ this.txtStatus.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txtStatus.Size = new System.Drawing.Size(156, 24);
+ this.txtStatus.TabIndex = 116;
+ //
+ // labelControl7
+ //
+ this.labelControl7.Location = new System.Drawing.Point(41, 216);
+ this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl7.Name = "labelControl7";
+ this.labelControl7.Size = new System.Drawing.Size(75, 18);
+ this.labelControl7.TabIndex = 117;
+ this.labelControl7.Text = "缁勭粐鐘舵�侊細";
+ //
+ // labelControl6
+ //
+ this.labelControl6.Location = new System.Drawing.Point(41, 38);
+ this.labelControl6.Name = "labelControl6";
+ this.labelControl6.Size = new System.Drawing.Size(75, 18);
+ this.labelControl6.TabIndex = 118;
+ this.labelControl6.Text = "涓婄骇缁勭粐锛�";
+ //
+ // comUp
+ //
+ this.comUp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comUp.FormattingEnabled = true;
+ this.comUp.Location = new System.Drawing.Point(133, 32);
+ this.comUp.Name = "comUp";
+ this.comUp.Size = new System.Drawing.Size(156, 26);
+ this.comUp.TabIndex = 119;
+ //
+ // labelControl8
+ //
+ this.labelControl8.Location = new System.Drawing.Point(295, 35);
+ this.labelControl8.Name = "labelControl8";
+ this.labelControl8.Size = new System.Drawing.Size(120, 18);
+ this.labelControl8.TabIndex = 120;
+ this.labelControl8.Text = "锛堢┖灏嗕负鏍圭粍缁囷級";
//
// panel1
//
@@ -113,160 +267,6 @@
this.panel1.Size = new System.Drawing.Size(462, 307);
this.panel1.TabIndex = 0;
//
- // labelControl8
- //
- this.labelControl8.Location = new System.Drawing.Point(295, 35);
- this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(120, 18);
- this.labelControl8.TabIndex = 120;
- this.labelControl8.Text = "锛堢┖灏嗕负鏍圭粍缁囷級";
- //
- // comUp
- //
- this.comUp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comUp.FormattingEnabled = true;
- this.comUp.Location = new System.Drawing.Point(133, 32);
- this.comUp.Name = "comUp";
- this.comUp.Size = new System.Drawing.Size(156, 26);
- this.comUp.TabIndex = 119;
- //
- // labelControl6
- //
- this.labelControl6.Location = new System.Drawing.Point(41, 38);
- this.labelControl6.Name = "labelControl6";
- this.labelControl6.Size = new System.Drawing.Size(75, 18);
- this.labelControl6.TabIndex = 118;
- this.labelControl6.Text = "涓婄骇缁勭粐锛�";
- //
- // labelControl7
- //
- this.labelControl7.Location = new System.Drawing.Point(41, 216);
- this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(75, 18);
- this.labelControl7.TabIndex = 117;
- this.labelControl7.Text = "缁勭粐鐘舵�侊細";
- //
- // txtStatus
- //
- this.txtStatus.Location = new System.Drawing.Point(133, 213);
- this.txtStatus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.txtStatus.Name = "txtStatus";
- this.txtStatus.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txtStatus.Properties.Items.AddRange(new object[] {
- "-璇烽�夋嫨-",
- "姝ｅ父",
- "绂佺敤"});
- this.txtStatus.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txtStatus.Size = new System.Drawing.Size(156, 24);
- this.txtStatus.TabIndex = 116;
- //
- // lbGuid
- //
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(41, 250);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 18);
- this.lbGuid.TabIndex = 111;
- //
- // labelControl5
- //
- this.labelControl5.Appearance.ForeColor = System.Drawing.Color.Red;
- this.labelControl5.Appearance.Options.UseForeColor = true;
- this.labelControl5.Location = new System.Drawing.Point(296, 174);
- this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl5.Name = "labelControl5";
- this.labelControl5.Size = new System.Drawing.Size(8, 18);
- this.labelControl5.TabIndex = 110;
- this.labelControl5.Text = "*";
- //
- // labelControl1
- //
- this.labelControl1.Appearance.ForeColor = System.Drawing.Color.Red;
- this.labelControl1.Appearance.Options.UseForeColor = true;
- this.labelControl1.Location = new System.Drawing.Point(296, 125);
- this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(8, 18);
- this.labelControl1.TabIndex = 109;
- this.labelControl1.Text = "*";
- //
- // labelControl12
- //
- this.labelControl12.Appearance.ForeColor = System.Drawing.Color.Red;
- this.labelControl12.Appearance.Options.UseForeColor = true;
- this.labelControl12.Location = new System.Drawing.Point(296, 77);
- this.labelControl12.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl12.Name = "labelControl12";
- this.labelControl12.Size = new System.Drawing.Size(8, 18);
- this.labelControl12.TabIndex = 108;
- this.labelControl12.Text = "*";
- //
- // txtConTel
- //
- this.txtConTel.Location = new System.Drawing.Point(133, 168);
- this.txtConTel.Name = "txtConTel";
- this.txtConTel.Size = new System.Drawing.Size(156, 24);
- this.txtConTel.TabIndex = 7;
- //
- // labelControl4
- //
- this.labelControl4.Location = new System.Drawing.Point(26, 174);
- this.labelControl4.Name = "labelControl4";
- this.labelControl4.Size = new System.Drawing.Size(90, 18);
- this.labelControl4.TabIndex = 6;
- this.labelControl4.Text = "璐熻矗浜虹數璇濓細";
- //
- // txtConPeople
- //
- this.txtConPeople.Location = new System.Drawing.Point(133, 119);
- this.txtConPeople.Name = "txtConPeople";
- this.txtConPeople.Size = new System.Drawing.Size(156, 24);
- this.txtConPeople.TabIndex = 5;
- //
- // labelControl3
- //
- this.labelControl3.Location = new System.Drawing.Point(26, 125);
- this.labelControl3.Name = "labelControl3";
- this.labelControl3.Size = new System.Drawing.Size(90, 18);
- this.labelControl3.TabIndex = 4;
- this.labelControl3.Text = "缁勭粐璐熻矗浜猴細";
- //
- // txtName
- //
- this.txtName.Location = new System.Drawing.Point(133, 74);
- this.txtName.Name = "txtName";
- this.txtName.Size = new System.Drawing.Size(156, 24);
- this.txtName.TabIndex = 3;
- //
- // labelControl2
- //
- this.labelControl2.Location = new System.Drawing.Point(41, 80);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(75, 18);
- this.labelControl2.TabIndex = 2;
- this.labelControl2.Text = "缁勭粐鍚嶇О锛�";
- //
- // trv
- //
- this.trv.Dock = System.Windows.Forms.DockStyle.Left;
- this.trv.Font = new System.Drawing.Font("Tahoma", 10F);
- this.trv.Location = new System.Drawing.Point(3, 3);
- this.trv.Name = "trv";
- this.trv.Size = new System.Drawing.Size(207, 527);
- this.trv.TabIndex = 1;
- //
- // tabControl1
- //
- this.tabControl1.Controls.Add(this.tabPage1);
- this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(0, 80);
- this.tabControl1.Name = "tabControl1";
- this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(917, 564);
- this.tabControl1.TabIndex = 2;
- //
// Organization
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -276,22 +276,22 @@
this.Controls.Add(this.toolBarMenu1);
this.Name = "Organization";
this.Text = "Organization";
- this.tabPage1.ResumeLayout(false);
+ this.tabControl1.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
+ this.tabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txtName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtConPeople.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtConTel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtStatus.Properties)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txtStatus.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtConTel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtConPeople.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtName.Properties)).EndInit();
- this.tabControl1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
- private UserControl.ToolBarMenu toolBarMenu1;
+ private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Panel panel1;
@@ -311,6 +311,6 @@
private DevExpress.XtraEditors.TextEdit txtName;
private DevExpress.XtraEditors.LabelControl labelControl2;
private System.Windows.Forms.TreeView trv;
- private System.Windows.Forms.TabControl tabControl1;
+ private UserControl.ToolBarMenu toolBarMenu1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Organization.cs b/DevApp/Gs.DevApp/DevFrm/User/Organization.cs
index cd71832..28336c2 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Organization.cs
@@ -46,7 +46,7 @@
txtConTel.Focus();
return;
}
- string _upGuid = comUp.SelectedValue.ToString();
+ string _upGuid = comUp.Text.Trim().Length > 0 ? comUp.SelectedValue.ToString() : "";
var _obj = new
{
guid = lbGuid.Text.Trim(),//涓诲缓
@@ -95,7 +95,7 @@
TreeNode node = new TreeNode();//瀹氫箟缁撶偣
node.Text = _dy["name"].ToString();//涓虹粨鐐硅祴鍊�
node.Name = _dy["guid"].ToString();
- node.ImageIndex =0;
+ node.ImageIndex = 0;
DataRow[] drItem = dt.Select("upGuid='" + _dy["guid"].ToString() + "'");
foreach (DataRow _dy2 in drItem)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
new file mode 100644
index 0000000..46571fc
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -0,0 +1,201 @@
+锘�
+namespace Gs.DevApp.DevFrm.User
+{
+ partial class Role
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </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.tabControl1 = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.trv = new System.Windows.Forms.TreeView();
+ this.gc_Main = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.roleName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rolRemark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.status = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
+ this.tabControl1.SuspendLayout();
+ this.tabPage1.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gc_Main)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // tabControl1
+ //
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControl1.Location = new System.Drawing.Point(0, 80);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(1036, 460);
+ this.tabControl1.TabIndex = 6;
+ //
+ // tabPage1
+ //
+ this.tabPage1.Controls.Add(this.groupBox1);
+ this.tabPage1.Controls.Add(this.gc_Main);
+ this.tabPage1.Location = new System.Drawing.Point(4, 27);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(1028, 429);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "鏁版嵁鍒楄〃";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.trv);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox1.Location = new System.Drawing.Point(547, 3);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(478, 423);
+ this.groupBox1.TabIndex = 3;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "璇烽�夋嫨璇ヨ鑹茬殑鏉冮檺";
+ //
+ // trv
+ //
+ this.trv.CheckBoxes = true;
+ this.trv.Dock = System.Windows.Forms.DockStyle.Left;
+ 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(337, 398);
+ this.trv.TabIndex = 2;
+ //
+ // gc_Main
+ //
+ this.gc_Main.Dock = System.Windows.Forms.DockStyle.Left;
+ this.gc_Main.Location = new System.Drawing.Point(3, 3);
+ this.gc_Main.MainView = this.gridView1;
+ this.gc_Main.Name = "gc_Main";
+ this.gc_Main.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
+ this.gc_Main.Size = new System.Drawing.Size(544, 423);
+ this.gc_Main.TabIndex = 4;
+ this.gc_Main.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.roleName,
+ this.rolRemark,
+ this.status});
+ this.gridView1.GridControl = this.gc_Main;
+ this.gridView1.Name = "gridView1";
+ //
+ // roleName
+ //
+ this.roleName.Caption = "瑙掕壊鍚嶇О";
+ this.roleName.FieldName = "roleName";
+ this.roleName.MinWidth = 25;
+ this.roleName.Name = "roleName";
+ this.roleName.Visible = true;
+ this.roleName.VisibleIndex = 0;
+ this.roleName.Width = 94;
+ //
+ // rolRemark
+ //
+ this.rolRemark.Caption = "鍔熻兘澶囨敞";
+ this.rolRemark.FieldName = "rolRemark";
+ this.rolRemark.MinWidth = 25;
+ this.rolRemark.Name = "rolRemark";
+ this.rolRemark.Visible = true;
+ this.rolRemark.VisibleIndex = 1;
+ this.rolRemark.Width = 94;
+ //
+ // status
+ //
+ this.status.Caption = "鐘舵��";
+ this.status.FieldName = "status";
+ this.status.MinWidth = 25;
+ this.status.Name = "status";
+ this.status.Visible = true;
+ this.status.VisibleIndex = 2;
+ this.status.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.meeting_32x32;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Ellipsis, "", -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;
+ //
+ // toolBarMenu1
+ //
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.Size = new System.Drawing.Size(1036, 80);
+ this.toolBarMenu1.TabIndex = 5;
+ //
+ // Role
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1036, 540);
+ this.Controls.Add(this.tabControl1);
+ this.Controls.Add(this.toolBarMenu1);
+ this.Name = "Role";
+ this.Text = "Role";
+ this.tabControl1.ResumeLayout(false);
+ this.tabPage1.ResumeLayout(false);
+ this.groupBox1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gc_Main)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.TabPage tabPage1;
+ private UserControl.ToolBarMenu toolBarMenu1;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private DevExpress.XtraGrid.GridControl gc_Main;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn roleName;
+ private DevExpress.XtraGrid.Columns.GridColumn rolRemark;
+ private DevExpress.XtraGrid.Columns.GridColumn status;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private System.Windows.Forms.TreeView trv;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
new file mode 100644
index 0000000..a16d1f0
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -0,0 +1,118 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Models;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.User
+{
+ public partial class Role : DevExpress.XtraEditors.XtraForm
+ {
+ public Role()
+ {
+ InitializeComponent();
+ this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+ GetPageList(1, 999999);
+ getTree();
+
+ }
+ private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+ {
+ RoleAdd frm = new RoleAdd("");
+ frm.ShowDialog();
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void GetPageList(int curPage, int pageSize)
+ {
+ Models.PageQueryModel pgq = new Models.PageQueryModel(curPage, pageSize, "createDate", "asc", "", "");
+ string json = JsonConvert.SerializeObject(pgq);
+ string strReturn = "";
+ try
+ {
+ strReturn = UtilityHelper.HttpPost("", "Role/GetListPage", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
+ DataTable dt = dd.rtnData.list;
+ gc_Main.BindingContext = new BindingContext();
+ gc_Main.DataSource = dt;
+ gc_Main.ForceInitialize();
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ private void getTree()
+ {
+ trv.Nodes.Clear();
+ ImageList imageList = new ImageList();
+ imageList.Images.Add("icon0", Properties.Resources.publicfix_32x32);
+ imageList.Images.Add("icon1", Properties.Resources.addfooter_32x32);
+ imageList.Images.Add("icon2", Properties.Resources.listmultilevel_16x16);
+ imageList.Images.Add("icon3", Properties.Resources.addcalculatedfield_16x16);
+ trv.ImageList = imageList;
+ Models.PageQueryModel pgq = new Models.PageQueryModel(1, 999999, "idx", "desc", "", "");
+ string json = JsonConvert.SerializeObject(pgq);
+ string strReturn = "";
+ try
+ {
+ strReturn = UtilityHelper.HttpPost("", "MenuAction/GetListPageByOrg", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
+ DataTable dt = dd.rtnData.list;
+ DataRow[] drGrp = dt.Select("upGuid='' or upGuid is null");
+ foreach (DataRow _dy in drGrp)
+ {
+ TreeNode node = new TreeNode();//瀹氫箟缁撶偣
+ node.Text = _dy["name"].ToString();//涓虹粨鐐硅祴鍊�
+ node.Name = _dy["guid"].ToString();
+ node.ImageIndex = 0;
+ DataRow[] drItem = dt.Select("upGuid='" + _dy["guid"].ToString() + "' and orgGuid='"+ _dy["guid"].ToString() + "'");
+ foreach (DataRow _dy2 in drItem)
+ {
+ TreeNode node22 = new TreeNode();//瀹氫箟缁撶偣
+ node22.Text = _dy2["name"].ToString();//涓虹粨鐐硅祴鍊�
+ node22.Name = _dy2["guid"].ToString();
+ node22.ImageIndex = 1;
+ DataRow[] drItem33 = dt.Select("upGuid='" + _dy2["guid"].ToString() + "' and orgGuid='"+ _dy["guid"].ToString() + "'");
+ foreach (DataRow _dy3 in drItem33)
+ {
+ TreeNode node33 = new TreeNode();//瀹氫箟缁撶偣
+ node33.Text = _dy3["name"].ToString();//涓虹粨鐐硅祴鍊�
+ node33.Name = _dy3["guid"].ToString();
+ node33.ImageIndex = 2;
+ DataRow[] drItem44 = dt.Select("upGuid='" + _dy3["guid"].ToString() + "' and orgGuid='" + _dy["guid"].ToString() + "'");
+ foreach (DataRow _dy4 in drItem44)
+ {
+ TreeNode node44= new TreeNode();//瀹氫箟缁撶偣
+ node44.Text = _dy4["name"].ToString();//涓虹粨鐐硅祴鍊�
+ node44.Name = _dy4["guid"].ToString();
+ node44.ImageIndex = 3;
+ node33.Nodes.Add(node44);
+ }
+ node22.Nodes.Add(node33);
+ }
+ node.Nodes.Add(node22);
+ }
+ node.ExpandAll();
+ trv.Nodes.Add(node);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.resx b/DevApp/Gs.DevApp/DevFrm/User/Role.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/RoleAdd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/RoleAdd.Designer.cs
new file mode 100644
index 0000000..eb973ee
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/User/RoleAdd.Designer.cs
@@ -0,0 +1,251 @@
+锘�
+namespace Gs.DevApp.DevFrm.User
+{
+ partial class RoleAdd
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
+ this.txtName = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+ this.txtRemark = new DevExpress.XtraEditors.MemoEdit();
+ this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.btnEsc = new DevExpress.XtraEditors.SimpleButton();
+ this.btnSave = new DevExpress.XtraEditors.SimpleButton();
+ this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+ this.txtStatus = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.tabControl1.SuspendLayout();
+ this.tabPage1.SuspendLayout();
+ this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txtName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtRemark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtStatus.Properties)).BeginInit();
+ this.SuspendLayout();
+ //
+ // tabControl1
+ //
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControl1.Location = new System.Drawing.Point(0, 0);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(753, 473);
+ this.tabControl1.TabIndex = 3;
+ //
+ // tabPage1
+ //
+ this.tabPage1.Controls.Add(this.panel1);
+ this.tabPage1.Location = new System.Drawing.Point(4, 27);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(745, 442);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "鍩虹淇℃伅";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.labelControl10);
+ this.panel1.Controls.Add(this.txtName);
+ this.panel1.Controls.Add(this.labelControl8);
+ this.panel1.Controls.Add(this.txtRemark);
+ this.panel1.Controls.Add(this.labelControl7);
+ this.panel1.Controls.Add(this.lbGuid);
+ this.panel1.Controls.Add(this.btnEsc);
+ this.panel1.Controls.Add(this.btnSave);
+ this.panel1.Controls.Add(this.labelControl12);
+ this.panel1.Controls.Add(this.labelControl9);
+ this.panel1.Controls.Add(this.labelControl5);
+ this.panel1.Controls.Add(this.txtStatus);
+ this.panel1.Location = new System.Drawing.Point(57, 6);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(585, 386);
+ this.panel1.TabIndex = 0;
+ //
+ // labelControl10
+ //
+ this.labelControl10.Appearance.ForeColor = System.Drawing.Color.Red;
+ this.labelControl10.Appearance.Options.UseForeColor = true;
+ this.labelControl10.Location = new System.Drawing.Point(418, 29);
+ this.labelControl10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl10.Name = "labelControl10";
+ this.labelControl10.Size = new System.Drawing.Size(8, 18);
+ this.labelControl10.TabIndex = 129;
+ this.labelControl10.Text = "*";
+ //
+ // txtName
+ //
+ this.txtName.Location = new System.Drawing.Point(109, 16);
+ this.txtName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txtName.Name = "txtName";
+ this.txtName.Size = new System.Drawing.Size(297, 24);
+ this.txtName.TabIndex = 128;
+ //
+ // labelControl8
+ //
+ this.labelControl8.Location = new System.Drawing.Point(31, 20);
+ this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl8.Name = "labelControl8";
+ this.labelControl8.Size = new System.Drawing.Size(75, 18);
+ this.labelControl8.TabIndex = 127;
+ this.labelControl8.Text = "瑙掕壊鍚嶇О锛�";
+ //
+ // txtRemark
+ //
+ this.txtRemark.Location = new System.Drawing.Point(115, 54);
+ this.txtRemark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txtRemark.Name = "txtRemark";
+ this.txtRemark.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.txtRemark.Size = new System.Drawing.Size(297, 68);
+ this.txtRemark.TabIndex = 126;
+ //
+ // labelControl7
+ //
+ this.labelControl7.Location = new System.Drawing.Point(34, 67);
+ this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl7.Name = "labelControl7";
+ this.labelControl7.Size = new System.Drawing.Size(75, 18);
+ this.labelControl7.TabIndex = 125;
+ this.labelControl7.Text = "瑙掕壊澶囨敞锛�";
+ //
+ // lbGuid
+ //
+ this.lbGuid.AutoSize = true;
+ this.lbGuid.Location = new System.Drawing.Point(62, 251);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(39, 18);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "guid:";
+ //
+ // btnEsc
+ //
+ this.btnEsc.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.reviewingpane_32x32;
+ this.btnEsc.Location = new System.Drawing.Point(246, 198);
+ this.btnEsc.Name = "btnEsc";
+ this.btnEsc.Size = new System.Drawing.Size(94, 29);
+ this.btnEsc.TabIndex = 111;
+ this.btnEsc.Text = "鍙栨秷";
+ //
+ // btnSave
+ //
+ this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbox2_32x321;
+ this.btnSave.Location = new System.Drawing.Point(115, 198);
+ this.btnSave.Name = "btnSave";
+ this.btnSave.Size = new System.Drawing.Size(94, 29);
+ this.btnSave.TabIndex = 110;
+ this.btnSave.Text = "淇濆瓨";
+ //
+ // labelControl12
+ //
+ this.labelControl12.Appearance.ForeColor = System.Drawing.Color.Red;
+ this.labelControl12.Appearance.Options.UseForeColor = true;
+ this.labelControl12.Location = new System.Drawing.Point(418, 55);
+ this.labelControl12.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl12.Name = "labelControl12";
+ this.labelControl12.Size = new System.Drawing.Size(8, 18);
+ this.labelControl12.TabIndex = 107;
+ this.labelControl12.Text = "*";
+ //
+ // labelControl9
+ //
+ this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red;
+ this.labelControl9.Appearance.Options.UseForeColor = true;
+ this.labelControl9.Location = new System.Drawing.Point(415, 98);
+ 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);
+ this.labelControl9.TabIndex = 108;
+ this.labelControl9.Text = "*";
+ //
+ // labelControl5
+ //
+ this.labelControl5.Location = new System.Drawing.Point(37, 152);
+ this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(75, 18);
+ this.labelControl5.TabIndex = 101;
+ this.labelControl5.Text = "瑙掕壊鐘舵�侊細";
+ //
+ // txtStatus
+ //
+ this.txtStatus.Location = new System.Drawing.Point(117, 148);
+ this.txtStatus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txtStatus.Name = "txtStatus";
+ this.txtStatus.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txtStatus.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
+ "绐椾綋绫诲瀷",
+ "鎸夐挳绫诲瀷"});
+ this.txtStatus.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txtStatus.Size = new System.Drawing.Size(297, 24);
+ this.txtStatus.TabIndex = 100;
+ //
+ // RoleAdd
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(753, 473);
+ this.Controls.Add(this.tabControl1);
+ this.Name = "RoleAdd";
+ this.Text = "RoleAdd";
+ this.tabControl1.ResumeLayout(false);
+ this.tabPage1.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txtName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtRemark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtStatus.Properties)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.Panel panel1;
+ private DevExpress.XtraEditors.LabelControl labelControl10;
+ private DevExpress.XtraEditors.TextEdit txtName;
+ private DevExpress.XtraEditors.LabelControl labelControl8;
+ private DevExpress.XtraEditors.MemoEdit txtRemark;
+ private DevExpress.XtraEditors.LabelControl labelControl7;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.SimpleButton btnEsc;
+ private DevExpress.XtraEditors.SimpleButton btnSave;
+ private DevExpress.XtraEditors.LabelControl labelControl12;
+ private DevExpress.XtraEditors.LabelControl labelControl9;
+ private DevExpress.XtraEditors.LabelControl labelControl5;
+ private DevExpress.XtraEditors.ComboBoxEdit txtStatus;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/RoleAdd.cs b/DevApp/Gs.DevApp/DevFrm/User/RoleAdd.cs
new file mode 100644
index 0000000..57fbebb
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/User/RoleAdd.cs
@@ -0,0 +1,77 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Models;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.User
+{
+ public partial class RoleAdd : DevExpress.XtraEditors.XtraForm
+ {
+ public RoleAdd(string guid)
+ {
+ InitializeComponent();
+ btnSave.Click += BtnSave_Click;
+ btnEsc.Click += BtnEsc_Click;
+ lbGuid.Text = guid;
+ }
+
+ private void BtnEsc_Click(object sender, EventArgs e)
+ {
+ this.Dispose();
+ }
+
+ private void BtnSave_Click(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(txtName.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("瑙掕壊鍚嶇О涓嶈兘涓虹┖锛�");
+ txtName.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(txtRemark.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("瑙掕壊澶囨敞涓嶈兘涓虹┖锛�");
+ txtRemark.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(txtStatus.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("瑙掕壊鐘舵�佷笉鑳戒负绌猴紒");
+ txtRemark.Focus();
+ return;
+ }
+ var _obj = new
+ {
+ guid=lbGuid.Text.Trim(),
+ roleName = txtName.Text.Trim(),
+ rolRemark = txtRemark.Text.Trim(),
+ status = txtStatus.SelectedIndex,//鐘舵��
+ };
+ string strJson = "";
+ try
+ {
+ strJson = UtilityHelper.HttpPost("", "Role/EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/RoleAdd.resx b/DevApp/Gs.DevApp/DevFrm/User/RoleAdd.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/User/RoleAdd.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
index d11c316..711142f 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
@@ -36,11 +36,11 @@
this.tlMenu = new DevExpress.XtraTreeList.TreeList();
this.tlcModuleID = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.tlcMenuName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
- this.tlcParentMenuName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.tlcMenuCaption = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.tlcActions = new DevExpress.XtraTreeList.Columns.TreeListColumn();
- this.tlcMenuType = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcParentMenuName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.tlcMenuType = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -53,17 +53,17 @@
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
- this.toolBarMenu1.Size = new System.Drawing.Size(769, 91);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1075, 80);
this.toolBarMenu1.TabIndex = 0;
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(0, 91);
+ this.tabControl1.Location = new System.Drawing.Point(0, 80);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(769, 332);
+ this.tabControl1.Size = new System.Drawing.Size(1075, 343);
this.tabControl1.TabIndex = 4;
//
// tabPage1
@@ -72,7 +72,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 27);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(761, 301);
+ this.tabPage1.Size = new System.Drawing.Size(1067, 312);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鏁版嵁鍒楄〃";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -84,11 +84,11 @@
this.tlMenu.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] {
this.tlcModuleID,
this.tlcMenuName,
- this.tlcParentMenuName,
this.tlcMenuCaption,
this.tlcActions,
- this.tlcMenuType,
- this.treeListColumn1});
+ this.treeListColumn1,
+ this.tlcParentMenuName,
+ this.tlcMenuType});
this.tlMenu.Cursor = System.Windows.Forms.Cursors.Default;
this.tlMenu.Dock = System.Windows.Forms.DockStyle.Fill;
this.tlMenu.Font = new System.Drawing.Font("Tahoma", 9F);
@@ -97,7 +97,7 @@
this.tlMenu.MinWidth = 23;
this.tlMenu.Name = "tlMenu";
this.tlMenu.OptionsBehavior.Editable = false;
- this.tlMenu.Size = new System.Drawing.Size(755, 295);
+ this.tlMenu.Size = new System.Drawing.Size(1061, 306);
this.tlMenu.TabIndex = 2;
this.tlMenu.TreeLevelWidth = 21;
//
@@ -121,16 +121,6 @@
this.tlcMenuName.VisibleIndex = 0;
this.tlcMenuName.Width = 215;
//
- // tlcParentMenuName
- //
- this.tlcParentMenuName.Caption = "鐘舵��";
- this.tlcParentMenuName.FieldName = "statusTxt";
- this.tlcParentMenuName.MinWidth = 23;
- this.tlcParentMenuName.Name = "tlcParentMenuName";
- this.tlcParentMenuName.Visible = true;
- this.tlcParentMenuName.VisibleIndex = 4;
- this.tlcParentMenuName.Width = 64;
- //
// tlcMenuCaption
//
this.tlcMenuCaption.Caption = "绐椾綋璺緞";
@@ -151,6 +141,25 @@
this.tlcActions.VisibleIndex = 3;
this.tlcActions.Width = 50;
//
+ // treeListColumn1
+ //
+ this.treeListColumn1.Caption = "绐椾綋鍥炬爣";
+ this.treeListColumn1.FieldName = "icon";
+ this.treeListColumn1.Name = "treeListColumn1";
+ this.treeListColumn1.Visible = true;
+ this.treeListColumn1.VisibleIndex = 6;
+ this.treeListColumn1.Width = 104;
+ //
+ // tlcParentMenuName
+ //
+ this.tlcParentMenuName.Caption = "鐘舵��";
+ this.tlcParentMenuName.FieldName = "statusTxt";
+ this.tlcParentMenuName.MinWidth = 23;
+ this.tlcParentMenuName.Name = "tlcParentMenuName";
+ this.tlcParentMenuName.Visible = true;
+ this.tlcParentMenuName.VisibleIndex = 4;
+ this.tlcParentMenuName.Width = 64;
+ //
// tlcMenuType
//
this.tlcMenuType.Caption = "鎺掑簭鍙�";
@@ -161,20 +170,11 @@
this.tlcMenuType.VisibleIndex = 1;
this.tlcMenuType.Width = 50;
//
- // treeListColumn1
- //
- this.treeListColumn1.Caption = "绐椾綋鍥炬爣";
- this.treeListColumn1.FieldName = "icon";
- this.treeListColumn1.Name = "treeListColumn1";
- this.treeListColumn1.Visible = true;
- this.treeListColumn1.VisibleIndex = 6;
- this.treeListColumn1.Width = 104;
- //
// SysMenu
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(769, 423);
+ this.ClientSize = new System.Drawing.Size(1075, 423);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "SysMenu";
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
index e170d3a..c46e12a 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
@@ -75,7 +75,7 @@
private void getTree()
{
- Models.PageQueryModel pgq = new Models.PageQueryModel(1, 999999, "idx", "desc", "", "");
+ Models.PageQueryModel pgq = new Models.PageQueryModel(1, 999999, "idx", "asc", "", "");
string json = JsonConvert.SerializeObject(pgq);
string strReturn = "";
try
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index d840053..bad0e2b 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -50,17 +50,17 @@
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 91);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
this.toolBarMenu1.TabIndex = 0;
//
// gc_Main
//
this.gc_Main.Dock = System.Windows.Forms.DockStyle.Fill;
this.gc_Main.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gc_Main.Location = new System.Drawing.Point(0, 91);
+ this.gc_Main.Location = new System.Drawing.Point(0, 80);
this.gc_Main.MainView = this.gridView1;
this.gc_Main.Name = "gc_Main";
- this.gc_Main.Size = new System.Drawing.Size(1128, 361);
+ this.gc_Main.Size = new System.Drawing.Size(1128, 372);
this.gc_Main.TabIndex = 1;
this.gc_Main.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -83,6 +83,8 @@
//
// account
//
+ this.account.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.account.AppearanceCell.Options.UseFont = true;
this.account.Caption = "鐧诲綍璐﹀彿";
this.account.FieldName = "account";
this.account.MinWidth = 25;
@@ -93,6 +95,8 @@
//
// userName
//
+ this.userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.userName.AppearanceCell.Options.UseFont = true;
this.userName.Caption = "鐢ㄦ埛鍚�";
this.userName.FieldName = "userName";
this.userName.MinWidth = 25;
@@ -103,6 +107,8 @@
//
// 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 = 25;
@@ -113,6 +119,8 @@
//
// 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 = 25;
@@ -123,6 +131,8 @@
//
// createTime
//
+ this.createTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.createTime.AppearanceCell.Options.UseFont = true;
this.createTime.Caption = "寤虹珛鏃堕棿";
this.createTime.FieldName = "createTime";
this.createTime.MinWidth = 25;
@@ -133,6 +143,8 @@
//
// lastLoginTime
//
+ this.lastLoginTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lastLoginTime.AppearanceCell.Options.UseFont = true;
this.lastLoginTime.Caption = "鏈�杩戠櫥褰曟椂闂�";
this.lastLoginTime.FieldName = "lastLoginTime";
this.lastLoginTime.MinWidth = 25;
@@ -143,8 +155,10 @@
//
// isLocked
//
+ this.isLocked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.isLocked.AppearanceCell.Options.UseFont = true;
this.isLocked.Caption = "鐘舵��";
- this.isLocked.FieldName = "isLocked";
+ this.isLocked.FieldName = "isLockedTxt";
this.isLocked.MinWidth = 25;
this.isLocked.Name = "isLocked";
this.isLocked.Visible = true;
@@ -153,6 +167,8 @@
//
// loginCounter
//
+ this.loginCounter.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.loginCounter.AppearanceCell.Options.UseFont = true;
this.loginCounter.Caption = "鐧诲綍娆℃暟";
this.loginCounter.FieldName = "loginCounter";
this.loginCounter.MinWidth = 25;
--
Gitblit v1.9.3