From 895c38a3e682df58469ae5346a70408b2bdbca57 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期六, 14 九月 2024 11:48:11 +0800
Subject: [PATCH] 基础资料
---
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/User/Organization.resx | 13 ---
DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 23 +++++
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs | 37 ++++++++-
DevApp/Gs.DevApp/DevFrm/User/User.cs | 22 +++++
DevApp/Gs.DevApp/DevFrm/User/Role.resx | 13 ---
DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs | 77 +++++++++---------
9 files changed, 118 insertions(+), 74 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs
index ce74d42..8f50f89 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs
@@ -29,7 +29,6 @@
/// </summary>
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Organization));
this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -69,7 +68,6 @@
//
// toolBarMenu1
//
- this.toolBarMenu1.actions = ((System.Collections.Generic.List<string>)(resources.GetObject("toolBarMenu1.actions")));
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
@@ -109,6 +107,7 @@
//
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(915, 532);
this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
//
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Organization.resx b/DevApp/Gs.DevApp/DevFrm/User/Organization.resx
index 9fc8a0a..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Organization.resx
+++ b/DevApp/Gs.DevApp/DevFrm/User/Organization.resx
@@ -117,17 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="toolBarMenu1.actions" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u
- ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u
- PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB
- AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLlN0cmluZwMAAAAGX2l0
- ZW1zBV9zaXplCF92ZXJzaW9uBgAACAgCAAAACQMAAAAQAAAAEAAAABEDAAAAEAAAAAYEAAAABuWinuWK
- oAYFAAAABuWIoOmZpAYGAAAABuS/ruaUuQYHAAAABuS/neWtmAYIAAAABuWPlua2iAYJAAAABuWIt+aW
- sAYKAAAABuWvvOWHugYLAAAABuWuoeaguAYMAAAACeWPjeWuoeaguAYNAAAABuaJk+WNsAYOAAAABuWQ
- iOW5tgYPAAAABuWvvOWFpQYQAAAABuaXpeW/lwYRAAAABuW8gOW3pQYSAAAABuWIl+ihqAYTAAAADOS/
- neWtmOadg+mZkAs=
-</value>
- </data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
index 7d1024c..8448785 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -29,7 +29,6 @@
/// </summary>
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Role));
this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -69,7 +68,6 @@
//
// toolBarMenu1
//
- this.toolBarMenu1.actions = ((System.Collections.Generic.List<string>)(resources.GetObject("toolBarMenu1.actions")));
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
@@ -184,6 +182,7 @@
//
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(933, 629);
this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
//
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 81ffd27..20ee0bc 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -25,6 +25,7 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnRoleClick += ToolBarMenu1_btnRoleClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
gridView1.FocusedRowChanged += GridView1_FocusedRowChanged;
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -76,6 +77,28 @@
getPageList(curPage, pageSize);
}
/// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ string strWhere = e.Data;
+ MessageBox.Show(strWhere);
+ }
+
+ /// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
/// <param name="sender"></param>
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.resx b/DevApp/Gs.DevApp/DevFrm/User/Role.resx
index 9fc8a0a..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.resx
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.resx
@@ -117,17 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="toolBarMenu1.actions" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u
- ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u
- PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB
- AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLlN0cmluZwMAAAAGX2l0
- ZW1zBV9zaXplCF92ZXJzaW9uBgAACAgCAAAACQMAAAAQAAAAEAAAABEDAAAAEAAAAAYEAAAABuWinuWK
- oAYFAAAABuWIoOmZpAYGAAAABuS/ruaUuQYHAAAABuS/neWtmAYIAAAABuWPlua2iAYJAAAABuWIt+aW
- sAYKAAAABuWvvOWHugYLAAAABuWuoeaguAYMAAAACeWPjeWuoeaguAYNAAAABuaJk+WNsAYOAAAABuWQ
- iOW5tgYPAAAABuWvvOWFpQYQAAAABuaXpeW/lwYRAAAABuW8gOW3pQYSAAAABuWIl+ihqAYTAAAADOS/
- neWtmOadg+mZkAs=
-</value>
- </data>
</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 7f0b28e..ecad0d6 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
@@ -43,11 +43,11 @@
this.tlcMenuType = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_formPath = new DevExpress.XtraEditors.ComboBoxEdit();
this.label3 = new System.Windows.Forms.Label();
this.txt_name = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
this.txt_upGuid = new DevExpress.XtraEditors.TreeListLookUpEdit();
@@ -60,32 +60,32 @@
this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
- this.txt_formPath = new DevExpress.XtraEditors.MemoEdit();
this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
this.txt_category = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_icon = new DevExpress.XtraEditors.TextEdit();
this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.label2 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tlMenu)).BeginInit();
this.xtraTabPage2.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_formPath.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_upGuid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1TreeList)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_idx)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_formPath.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_category.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_icon.Properties)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
//
- this.toolBarMenu1.actions = ((System.Collections.Generic.List<string>)(resources.GetObject("toolBarMenu1.actions")));
+ //this.toolBarMenu1.actions = ((System.Collections.Generic.List<string>)(resources.GetObject("toolBarMenu1.actions")));
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
@@ -216,11 +216,12 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.label2);
+ this.panel1.Controls.Add(this.txt_formPath);
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.txt_name);
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.labelControl8);
this.panel1.Controls.Add(this.txt_upGuid);
@@ -231,7 +232,6 @@
this.panel1.Controls.Add(this.labelControl12);
this.panel1.Controls.Add(this.labelControl9);
this.panel1.Controls.Add(this.labelControl6);
- this.panel1.Controls.Add(this.txt_formPath);
this.panel1.Controls.Add(this.labelControl5);
this.panel1.Controls.Add(this.txt_category);
this.panel1.Controls.Add(this.txt_icon);
@@ -241,8 +241,20 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(29, 34);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(665, 411);
+ this.panel1.Size = new System.Drawing.Size(679, 411);
this.panel1.TabIndex = 2;
+ //
+ // txt_formPath
+ //
+ this.txt_formPath.Location = new System.Drawing.Point(111, 160);
+ this.txt_formPath.Name = "txt_formPath";
+ this.txt_formPath.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_formPath.Properties.Appearance.Options.UseFont = true;
+ this.txt_formPath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_formPath.Properties.DropDownRows = 100;
+ this.txt_formPath.Size = new System.Drawing.Size(297, 28);
+ this.txt_formPath.TabIndex = 134;
//
// label3
//
@@ -267,7 +279,7 @@
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(13, 342);
+ this.labelControl11.Location = new System.Drawing.Point(13, 319);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -277,19 +289,10 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(111, 342);
+ this.lbGuid.Location = new System.Drawing.Point(111, 319);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(412, 168);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(180, 42);
- this.label2.TabIndex = 119;
- this.label2.Text = "锛堣嫢鎸囪祩绐椾綋锛屽垯濉啓\r\n鍛藉悕绌洪棿鍏ㄧО锛�";
//
// label1
//
@@ -304,7 +307,7 @@
//
this.labelControl8.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl8.Appearance.Options.UseForeColor = true;
- this.labelControl8.Location = new System.Drawing.Point(418, 234);
+ this.labelControl8.Location = new System.Drawing.Point(418, 211);
this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl8.Name = "labelControl8";
this.labelControl8.Size = new System.Drawing.Size(8, 18);
@@ -349,7 +352,7 @@
//
this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl7.Appearance.Options.UseFont = true;
- this.labelControl7.Location = new System.Drawing.Point(13, 232);
+ this.labelControl7.Location = new System.Drawing.Point(13, 209);
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);
@@ -358,7 +361,7 @@
//
// txt_isStatus
//
- this.txt_isStatus.Location = new System.Drawing.Point(111, 231);
+ this.txt_isStatus.Location = new System.Drawing.Point(111, 208);
this.txt_isStatus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_isStatus.Name = "txt_isStatus";
this.txt_isStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -375,7 +378,7 @@
//
// txt_idx
//
- this.txt_idx.Location = new System.Drawing.Point(111, 267);
+ this.txt_idx.Location = new System.Drawing.Point(111, 244);
this.txt_idx.Name = "txt_idx";
this.txt_idx.Size = new System.Drawing.Size(297, 28);
this.txt_idx.TabIndex = 113;
@@ -389,7 +392,7 @@
//
this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(13, 275);
+ this.labelControl1.Location = new System.Drawing.Point(13, 252);
this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(85, 21);
@@ -422,23 +425,12 @@
//
this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl6.Appearance.Options.UseFont = true;
- this.labelControl6.Location = new System.Drawing.Point(13, 155);
+ this.labelControl6.Location = new System.Drawing.Point(13, 161);
this.labelControl6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl6.Name = "labelControl6";
this.labelControl6.Size = new System.Drawing.Size(85, 21);
this.labelControl6.TabIndex = 103;
this.labelControl6.Text = "绐椾綋绫诲悕锛�";
- //
- // txt_formPath
- //
- this.txt_formPath.Location = new System.Drawing.Point(111, 155);
- this.txt_formPath.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.txt_formPath.Name = "txt_formPath";
- this.txt_formPath.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_formPath.Properties.Appearance.Options.UseFont = true;
- this.txt_formPath.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.txt_formPath.Size = new System.Drawing.Size(297, 68);
- this.txt_formPath.TabIndex = 102;
//
// labelControl5
//
@@ -512,6 +504,15 @@
this.labelControl2.TabIndex = 94;
this.labelControl2.Text = "鑿滃崟鍚嶇О锛�";
//
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(429, 163);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(197, 21);
+ this.label2.TabIndex = 135;
+ this.label2.Text = "锛堝缓璁粠涓嬫媺妗嗕腑閫夋嫨锛�";
+ //
// SysMenu
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -528,12 +529,12 @@
this.xtraTabPage2.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_formPath.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_upGuid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1TreeList)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_idx)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_formPath.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_category.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_icon.Properties)).EndInit();
this.ResumeLayout(false);
@@ -557,7 +558,6 @@
private System.Windows.Forms.Panel panel1;
private DevExpress.XtraEditors.LabelControl labelControl11;
private System.Windows.Forms.Label lbGuid;
- private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private DevExpress.XtraEditors.LabelControl labelControl8;
private DevExpress.XtraEditors.TreeListLookUpEdit txt_upGuid;
@@ -570,7 +570,6 @@
private DevExpress.XtraEditors.LabelControl labelControl12;
private DevExpress.XtraEditors.LabelControl labelControl9;
private DevExpress.XtraEditors.LabelControl labelControl6;
- private DevExpress.XtraEditors.MemoEdit txt_formPath;
private DevExpress.XtraEditors.LabelControl labelControl5;
private DevExpress.XtraEditors.ComboBoxEdit txt_category;
private DevExpress.XtraEditors.TextEdit txt_icon;
@@ -579,5 +578,7 @@
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraEditors.ComboBoxEdit txt_name;
private System.Windows.Forms.Label label3;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_formPath;
+ private System.Windows.Forms.Label label2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
index c6c5a7a..9fee2da 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
@@ -4,7 +4,10 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
+using System.Collections.Generic;
using System.Data;
+using System.Reflection;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.User
{
@@ -19,7 +22,7 @@
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- // txt_category.TextChanged += Txt_category_TextChanged;
+ txt_category.TextChanged += Txt_category_TextChanged;
tlMenu.MouseDoubleClick += TlMenu_MouseDoubleClick;
getTree();
getDownList();
@@ -33,7 +36,7 @@
/// <param name="e"></param>
private void Txt_category_TextChanged(object sender, EventArgs e)
{
- if (txt_category.SelectedIndex == 1)
+ if (txt_category.SelectedIndex ==1)
{
this.txt_formPath.Enabled = true;
this.txt_icon.Enabled = true;
@@ -44,8 +47,6 @@
this.txt_icon.Enabled = false;
this.txt_formPath.Text = "";
this.txt_icon.Text = "";
- MsgHelper.ShowError(txt_formPath.Enabled.ToString());
- MsgHelper.ShowError(txt_icon.Enabled.ToString());
}
}
/// <summary>
@@ -134,6 +135,16 @@
return;
}
getModel(rowGuid, true, 1);
+ if (txt_category.SelectedIndex == 1)
+ {
+ this.txt_formPath.Enabled = true;
+ this.txt_icon.Enabled = true;
+ }
+ else
+ {
+ this.txt_formPath.Enabled = false;
+ this.txt_icon.Enabled = false;
+ }
}
/// <summary>
/// 鏂板浜嬩欢
@@ -208,6 +219,9 @@
}
}
+ /// <summary>
+ /// 璇诲彇鍒楄〃
+ /// </summary>
private void getTree()
{
PageQueryModel pgq = new PageQueryModel(1, 999999, "idx", "asc", "", "");
@@ -262,7 +276,9 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 璇诲彇涓婄骇鏍�
+ /// </summary>
private void getDownList()
{
PageQueryModel pgq = new PageQueryModel(1, 999999, "idx", "asc", "", " and category=1");
@@ -285,7 +301,18 @@
}
private void getActionList()
{
+ List<string> lst = new List<string>();
+ lst = toolBarMenu1.actions;
txt_name.Properties.Items.AddRange(toolBarMenu1.actions);
+ Assembly assembly = Assembly.GetExecutingAssembly();
+ Type[] types = assembly.GetTypes();
+ foreach (Type type in types)
+ {
+ if (type.IsSubclassOf(typeof(Form)))
+ {
+ txt_formPath.Properties.Items.Add(type.FullName);
+ }
+ }
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index d0e8b20..3b1156f 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -109,7 +109,6 @@
//
// toolBarMenu1
//
- this.toolBarMenu1.actions = ((System.Collections.Generic.List<string>)(resources.GetObject("toolBarMenu1.actions")));
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index aab6cec..b0c400e 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -24,6 +24,7 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -79,6 +80,27 @@
{
getPageList(curPage, pageSize);
}
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ string strWhere = e.Data;
+ MessageBox.Show(strWhere);
+ }
/// <summary>
/// 鍙栨秷浜嬩欢
--
Gitblit v1.9.3