diff --git a/.vs/WinformGeneralDeveloperFrame/v16/.suo b/.vs/WinformGeneralDeveloperFrame/v16/.suo index e76817c..e34e9b0 100644 Binary files a/.vs/WinformGeneralDeveloperFrame/v16/.suo and b/.vs/WinformGeneralDeveloperFrame/v16/.suo differ diff --git a/WinformGeneralDeveloperFrame/DB/MESDB.cs b/WinformGeneralDeveloperFrame/DB/MESDB.cs index 534594b..e53933c 100644 --- a/WinformGeneralDeveloperFrame/DB/MESDB.cs +++ b/WinformGeneralDeveloperFrame/DB/MESDB.cs @@ -22,6 +22,8 @@ namespace MES public virtual DbSet sysFunctionInfo { get; set; } public virtual DbSet sysRoleInfo { get; set; } public virtual DbSet lotteryInfo { get; set; } - + public virtual DbSet sysToolButtonInfo { get; set; } + + } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Entity/sysFunctionInfo.cs b/WinformGeneralDeveloperFrame/Entity/sysFunctionInfo.cs index 0266e8c..6f73763 100644 --- a/WinformGeneralDeveloperFrame/Entity/sysFunctionInfo.cs +++ b/WinformGeneralDeveloperFrame/Entity/sysFunctionInfo.cs @@ -19,6 +19,8 @@ namespace MES.Entity public string name{set;get;} [ModelBindControl("txtfunctionCode")] public string functionCode{set;get;} - + + [ModelBindControl("txttoolBtnID")] + public int toolBtnID { set; get; } = 0; } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Entity/sysToolButtonInfo.cs b/WinformGeneralDeveloperFrame/Entity/sysToolButtonInfo.cs new file mode 100644 index 0000000..e003d29 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Entity/sysToolButtonInfo.cs @@ -0,0 +1,26 @@ +using WinformGeneralDeveloperFrame.Commons; + +namespace MES.Entity +{ + using System; + using System.Collections.Generic; + using System.ComponentModel.DataAnnotations; + using System.ComponentModel.DataAnnotations.Schema; + using System.Data.Entity.Spatial; + + [Table("sysToolButton")] + public partial class sysToolButtonInfo + { + [ModelBindControl("txtid")] + public int id{set;get;} + [ModelBindControl("txtbtnName")] + public string btnName{set;get;} + [ModelBindControl("txtbtnCode")] + public string btnCode{set;get;} + [ModelBindControl("txtbtnIcon")] + public string btnIcon{set;get;} + [ModelBindControl("txtremark")] + public string remark{set;get;} + + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/Frmstock.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmstock.designer.cs index 8b031c4..e296dbe 100644 --- a/WinformGeneralDeveloperFrame/Form/Frmstock.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/Frmstock.designer.cs @@ -650,7 +650,7 @@ namespace MES.Form // this.txtcode.Location = new System.Drawing.Point(75, 12); this.txtcode.Name = "txtcode"; - this.txtcode.Size = new System.Drawing.Size(1186, 20); + this.txtcode.Size = new System.Drawing.Size(1203, 20); this.txtcode.StyleController = this.layoutControl1; this.txtcode.TabIndex = 1; // @@ -658,7 +658,7 @@ namespace MES.Form // this.txtname.Location = new System.Drawing.Point(75, 36); this.txtname.Name = "txtname"; - this.txtname.Size = new System.Drawing.Size(1186, 20); + this.txtname.Size = new System.Drawing.Size(1203, 20); this.txtname.StyleController = this.layoutControl1; this.txtname.TabIndex = 2; // @@ -666,7 +666,7 @@ namespace MES.Form // this.txtstartPrice.Location = new System.Drawing.Point(75, 60); this.txtstartPrice.Name = "txtstartPrice"; - this.txtstartPrice.Size = new System.Drawing.Size(1186, 20); + this.txtstartPrice.Size = new System.Drawing.Size(1203, 20); this.txtstartPrice.StyleController = this.layoutControl1; this.txtstartPrice.TabIndex = 3; // @@ -674,7 +674,7 @@ namespace MES.Form // this.txtolePrice.Location = new System.Drawing.Point(75, 84); this.txtolePrice.Name = "txtolePrice"; - this.txtolePrice.Size = new System.Drawing.Size(1186, 20); + this.txtolePrice.Size = new System.Drawing.Size(1203, 20); this.txtolePrice.StyleController = this.layoutControl1; this.txtolePrice.TabIndex = 4; // @@ -682,7 +682,7 @@ namespace MES.Form // this.txtnowPrice.Location = new System.Drawing.Point(75, 108); this.txtnowPrice.Name = "txtnowPrice"; - this.txtnowPrice.Size = new System.Drawing.Size(1186, 20); + this.txtnowPrice.Size = new System.Drawing.Size(1203, 20); this.txtnowPrice.StyleController = this.layoutControl1; this.txtnowPrice.TabIndex = 5; // @@ -690,7 +690,7 @@ namespace MES.Form // this.txtmaxPrice.Location = new System.Drawing.Point(75, 132); this.txtmaxPrice.Name = "txtmaxPrice"; - this.txtmaxPrice.Size = new System.Drawing.Size(1186, 20); + this.txtmaxPrice.Size = new System.Drawing.Size(1203, 20); this.txtmaxPrice.StyleController = this.layoutControl1; this.txtmaxPrice.TabIndex = 6; // @@ -698,7 +698,7 @@ namespace MES.Form // this.txtminPrice.Location = new System.Drawing.Point(75, 156); this.txtminPrice.Name = "txtminPrice"; - this.txtminPrice.Size = new System.Drawing.Size(1186, 20); + this.txtminPrice.Size = new System.Drawing.Size(1203, 20); this.txtminPrice.StyleController = this.layoutControl1; this.txtminPrice.TabIndex = 7; // @@ -706,7 +706,7 @@ namespace MES.Form // this.txtbidderPrice.Location = new System.Drawing.Point(75, 180); this.txtbidderPrice.Name = "txtbidderPrice"; - this.txtbidderPrice.Size = new System.Drawing.Size(1186, 20); + this.txtbidderPrice.Size = new System.Drawing.Size(1203, 20); this.txtbidderPrice.StyleController = this.layoutControl1; this.txtbidderPrice.TabIndex = 8; // @@ -714,7 +714,7 @@ namespace MES.Form // this.txtauctionPrice.Location = new System.Drawing.Point(75, 204); this.txtauctionPrice.Name = "txtauctionPrice"; - this.txtauctionPrice.Size = new System.Drawing.Size(1186, 20); + this.txtauctionPrice.Size = new System.Drawing.Size(1203, 20); this.txtauctionPrice.StyleController = this.layoutControl1; this.txtauctionPrice.TabIndex = 9; // @@ -722,7 +722,7 @@ namespace MES.Form // this.txtturnover.Location = new System.Drawing.Point(75, 228); this.txtturnover.Name = "txtturnover"; - this.txtturnover.Size = new System.Drawing.Size(1186, 20); + this.txtturnover.Size = new System.Drawing.Size(1203, 20); this.txtturnover.StyleController = this.layoutControl1; this.txtturnover.TabIndex = 10; // @@ -730,7 +730,7 @@ namespace MES.Form // this.txtturnoverPrice.Location = new System.Drawing.Point(75, 252); this.txtturnoverPrice.Name = "txtturnoverPrice"; - this.txtturnoverPrice.Size = new System.Drawing.Size(1186, 20); + this.txtturnoverPrice.Size = new System.Drawing.Size(1203, 20); this.txtturnoverPrice.StyleController = this.layoutControl1; this.txtturnoverPrice.TabIndex = 11; // @@ -738,7 +738,7 @@ namespace MES.Form // this.txtbuyOneNum.Location = new System.Drawing.Point(75, 276); this.txtbuyOneNum.Name = "txtbuyOneNum"; - this.txtbuyOneNum.Size = new System.Drawing.Size(1186, 20); + this.txtbuyOneNum.Size = new System.Drawing.Size(1203, 20); this.txtbuyOneNum.StyleController = this.layoutControl1; this.txtbuyOneNum.TabIndex = 12; // @@ -746,7 +746,7 @@ namespace MES.Form // this.txtbuyOnePrice.Location = new System.Drawing.Point(75, 300); this.txtbuyOnePrice.Name = "txtbuyOnePrice"; - this.txtbuyOnePrice.Size = new System.Drawing.Size(1186, 20); + this.txtbuyOnePrice.Size = new System.Drawing.Size(1203, 20); this.txtbuyOnePrice.StyleController = this.layoutControl1; this.txtbuyOnePrice.TabIndex = 13; // @@ -754,7 +754,7 @@ namespace MES.Form // this.txtbuyTwoNum.Location = new System.Drawing.Point(75, 324); this.txtbuyTwoNum.Name = "txtbuyTwoNum"; - this.txtbuyTwoNum.Size = new System.Drawing.Size(1186, 20); + this.txtbuyTwoNum.Size = new System.Drawing.Size(1203, 20); this.txtbuyTwoNum.StyleController = this.layoutControl1; this.txtbuyTwoNum.TabIndex = 14; // @@ -762,7 +762,7 @@ namespace MES.Form // this.txtbuyTwoPrice.Location = new System.Drawing.Point(75, 348); this.txtbuyTwoPrice.Name = "txtbuyTwoPrice"; - this.txtbuyTwoPrice.Size = new System.Drawing.Size(1186, 20); + this.txtbuyTwoPrice.Size = new System.Drawing.Size(1203, 20); this.txtbuyTwoPrice.StyleController = this.layoutControl1; this.txtbuyTwoPrice.TabIndex = 15; // @@ -770,7 +770,7 @@ namespace MES.Form // this.txtbuyThreeNum.Location = new System.Drawing.Point(75, 372); this.txtbuyThreeNum.Name = "txtbuyThreeNum"; - this.txtbuyThreeNum.Size = new System.Drawing.Size(1186, 20); + this.txtbuyThreeNum.Size = new System.Drawing.Size(1203, 20); this.txtbuyThreeNum.StyleController = this.layoutControl1; this.txtbuyThreeNum.TabIndex = 16; // @@ -778,7 +778,7 @@ namespace MES.Form // this.txtbuyThreePrice.Location = new System.Drawing.Point(75, 396); this.txtbuyThreePrice.Name = "txtbuyThreePrice"; - this.txtbuyThreePrice.Size = new System.Drawing.Size(1186, 20); + this.txtbuyThreePrice.Size = new System.Drawing.Size(1203, 20); this.txtbuyThreePrice.StyleController = this.layoutControl1; this.txtbuyThreePrice.TabIndex = 17; // @@ -786,7 +786,7 @@ namespace MES.Form // this.txtbuyFourNum.Location = new System.Drawing.Point(75, 420); this.txtbuyFourNum.Name = "txtbuyFourNum"; - this.txtbuyFourNum.Size = new System.Drawing.Size(1186, 20); + this.txtbuyFourNum.Size = new System.Drawing.Size(1203, 20); this.txtbuyFourNum.StyleController = this.layoutControl1; this.txtbuyFourNum.TabIndex = 18; // @@ -794,7 +794,7 @@ namespace MES.Form // this.txtbuyFourPrice.Location = new System.Drawing.Point(75, 444); this.txtbuyFourPrice.Name = "txtbuyFourPrice"; - this.txtbuyFourPrice.Size = new System.Drawing.Size(1186, 20); + this.txtbuyFourPrice.Size = new System.Drawing.Size(1203, 20); this.txtbuyFourPrice.StyleController = this.layoutControl1; this.txtbuyFourPrice.TabIndex = 19; // @@ -802,7 +802,7 @@ namespace MES.Form // this.txtbuyFiveNum.Location = new System.Drawing.Point(75, 468); this.txtbuyFiveNum.Name = "txtbuyFiveNum"; - this.txtbuyFiveNum.Size = new System.Drawing.Size(1186, 20); + this.txtbuyFiveNum.Size = new System.Drawing.Size(1203, 20); this.txtbuyFiveNum.StyleController = this.layoutControl1; this.txtbuyFiveNum.TabIndex = 20; // @@ -810,7 +810,7 @@ namespace MES.Form // this.txtbuyFivePrice.Location = new System.Drawing.Point(75, 492); this.txtbuyFivePrice.Name = "txtbuyFivePrice"; - this.txtbuyFivePrice.Size = new System.Drawing.Size(1186, 20); + this.txtbuyFivePrice.Size = new System.Drawing.Size(1203, 20); this.txtbuyFivePrice.StyleController = this.layoutControl1; this.txtbuyFivePrice.TabIndex = 21; // @@ -818,7 +818,7 @@ namespace MES.Form // this.txtsellOneNum.Location = new System.Drawing.Point(75, 516); this.txtsellOneNum.Name = "txtsellOneNum"; - this.txtsellOneNum.Size = new System.Drawing.Size(1186, 20); + this.txtsellOneNum.Size = new System.Drawing.Size(1203, 20); this.txtsellOneNum.StyleController = this.layoutControl1; this.txtsellOneNum.TabIndex = 22; // @@ -826,7 +826,7 @@ namespace MES.Form // this.txtsellOnePrice.Location = new System.Drawing.Point(75, 540); this.txtsellOnePrice.Name = "txtsellOnePrice"; - this.txtsellOnePrice.Size = new System.Drawing.Size(1186, 20); + this.txtsellOnePrice.Size = new System.Drawing.Size(1203, 20); this.txtsellOnePrice.StyleController = this.layoutControl1; this.txtsellOnePrice.TabIndex = 23; // @@ -834,7 +834,7 @@ namespace MES.Form // this.txtsellTwoNum.Location = new System.Drawing.Point(75, 564); this.txtsellTwoNum.Name = "txtsellTwoNum"; - this.txtsellTwoNum.Size = new System.Drawing.Size(1186, 20); + this.txtsellTwoNum.Size = new System.Drawing.Size(1203, 20); this.txtsellTwoNum.StyleController = this.layoutControl1; this.txtsellTwoNum.TabIndex = 24; // @@ -842,7 +842,7 @@ namespace MES.Form // this.txtsellTwoPrice.Location = new System.Drawing.Point(75, 588); this.txtsellTwoPrice.Name = "txtsellTwoPrice"; - this.txtsellTwoPrice.Size = new System.Drawing.Size(1186, 20); + this.txtsellTwoPrice.Size = new System.Drawing.Size(1203, 20); this.txtsellTwoPrice.StyleController = this.layoutControl1; this.txtsellTwoPrice.TabIndex = 25; // @@ -850,7 +850,7 @@ namespace MES.Form // this.txtsellThreeNum.Location = new System.Drawing.Point(75, 612); this.txtsellThreeNum.Name = "txtsellThreeNum"; - this.txtsellThreeNum.Size = new System.Drawing.Size(1186, 20); + this.txtsellThreeNum.Size = new System.Drawing.Size(1203, 20); this.txtsellThreeNum.StyleController = this.layoutControl1; this.txtsellThreeNum.TabIndex = 26; // @@ -858,7 +858,7 @@ namespace MES.Form // this.txtsellThreePrice.Location = new System.Drawing.Point(75, 636); this.txtsellThreePrice.Name = "txtsellThreePrice"; - this.txtsellThreePrice.Size = new System.Drawing.Size(1186, 20); + this.txtsellThreePrice.Size = new System.Drawing.Size(1203, 20); this.txtsellThreePrice.StyleController = this.layoutControl1; this.txtsellThreePrice.TabIndex = 27; // @@ -866,7 +866,7 @@ namespace MES.Form // this.txtsellFourNum.Location = new System.Drawing.Point(75, 660); this.txtsellFourNum.Name = "txtsellFourNum"; - this.txtsellFourNum.Size = new System.Drawing.Size(1186, 20); + this.txtsellFourNum.Size = new System.Drawing.Size(1203, 20); this.txtsellFourNum.StyleController = this.layoutControl1; this.txtsellFourNum.TabIndex = 28; // @@ -874,7 +874,7 @@ namespace MES.Form // this.txtsellFourPrice.Location = new System.Drawing.Point(75, 684); this.txtsellFourPrice.Name = "txtsellFourPrice"; - this.txtsellFourPrice.Size = new System.Drawing.Size(1186, 20); + this.txtsellFourPrice.Size = new System.Drawing.Size(1203, 20); this.txtsellFourPrice.StyleController = this.layoutControl1; this.txtsellFourPrice.TabIndex = 29; // @@ -882,7 +882,7 @@ namespace MES.Form // this.txtsellFiveNum.Location = new System.Drawing.Point(75, 708); this.txtsellFiveNum.Name = "txtsellFiveNum"; - this.txtsellFiveNum.Size = new System.Drawing.Size(1186, 20); + this.txtsellFiveNum.Size = new System.Drawing.Size(1203, 20); this.txtsellFiveNum.StyleController = this.layoutControl1; this.txtsellFiveNum.TabIndex = 30; // @@ -890,7 +890,7 @@ namespace MES.Form // this.txtsellFivePrice.Location = new System.Drawing.Point(75, 732); this.txtsellFivePrice.Name = "txtsellFivePrice"; - this.txtsellFivePrice.Size = new System.Drawing.Size(1186, 20); + this.txtsellFivePrice.Size = new System.Drawing.Size(1203, 20); this.txtsellFivePrice.StyleController = this.layoutControl1; this.txtsellFivePrice.TabIndex = 31; // @@ -906,7 +906,7 @@ namespace MES.Form new DevExpress.XtraEditors.Controls.EditorButton()}); this.txttimeStr.Properties.DisplayFormat.FormatString = "G"; this.txttimeStr.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.txttimeStr.Size = new System.Drawing.Size(1186, 20); + this.txttimeStr.Size = new System.Drawing.Size(1203, 20); this.txttimeStr.StyleController = this.layoutControl1; this.txttimeStr.TabIndex = 32; // @@ -914,7 +914,7 @@ namespace MES.Form // this.txtid.Location = new System.Drawing.Point(75, 780); this.txtid.Name = "txtid"; - this.txtid.Size = new System.Drawing.Size(1186, 20); + this.txtid.Size = new System.Drawing.Size(1203, 20); this.txtid.StyleController = this.layoutControl1; this.txtid.TabIndex = 33; // @@ -957,7 +957,7 @@ namespace MES.Form this.layoutControlItem32, this.layoutControlItem33}); this.layoutControlGroup1.Name = "layoutControlGroup1"; - this.layoutControlGroup1.Size = new System.Drawing.Size(1273, 812); + this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 812); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem1 @@ -966,7 +966,7 @@ namespace MES.Form this.layoutControlItem1.CustomizationFormText = "代码"; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem1.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem1.Text = "代码"; this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14); // @@ -976,7 +976,7 @@ namespace MES.Form this.layoutControlItem2.CustomizationFormText = "名称"; this.layoutControlItem2.Location = new System.Drawing.Point(0, 24); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem2.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem2.Text = "名称"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14); // @@ -986,7 +986,7 @@ namespace MES.Form this.layoutControlItem3.CustomizationFormText = "今日开盘价"; this.layoutControlItem3.Location = new System.Drawing.Point(0, 48); this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem3.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem3.Text = "今日开盘价"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14); // @@ -996,7 +996,7 @@ namespace MES.Form this.layoutControlItem4.CustomizationFormText = "昨日收盘价"; this.layoutControlItem4.Location = new System.Drawing.Point(0, 72); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem4.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem4.Text = "昨日收盘价"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14); // @@ -1006,7 +1006,7 @@ namespace MES.Form this.layoutControlItem5.CustomizationFormText = "当前价格"; this.layoutControlItem5.Location = new System.Drawing.Point(0, 96); this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem5.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem5.Text = "当前价格"; this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 14); // @@ -1016,7 +1016,7 @@ namespace MES.Form this.layoutControlItem6.CustomizationFormText = "今日最高价"; this.layoutControlItem6.Location = new System.Drawing.Point(0, 120); this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem6.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem6.Text = "今日最高价"; this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 14); // @@ -1026,7 +1026,7 @@ namespace MES.Form this.layoutControlItem7.CustomizationFormText = "今日最低价"; this.layoutControlItem7.Location = new System.Drawing.Point(0, 144); this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem7.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem7.Text = "今日最低价"; this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 14); // @@ -1036,7 +1036,7 @@ namespace MES.Form this.layoutControlItem8.CustomizationFormText = "竞买价"; this.layoutControlItem8.Location = new System.Drawing.Point(0, 168); this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem8.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem8.Text = "竞买价"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 14); // @@ -1046,7 +1046,7 @@ namespace MES.Form this.layoutControlItem9.CustomizationFormText = "竞卖价"; this.layoutControlItem9.Location = new System.Drawing.Point(0, 192); this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem9.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem9.Text = "竞卖价"; this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 14); // @@ -1056,7 +1056,7 @@ namespace MES.Form this.layoutControlItem10.CustomizationFormText = "成交股票数"; this.layoutControlItem10.Location = new System.Drawing.Point(0, 216); this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem10.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem10.Text = "成交股票数"; this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 14); // @@ -1066,7 +1066,7 @@ namespace MES.Form this.layoutControlItem11.CustomizationFormText = "成交金额"; this.layoutControlItem11.Location = new System.Drawing.Point(0, 240); this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem11.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem11.Text = "成交金额"; this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 14); // @@ -1076,7 +1076,7 @@ namespace MES.Form this.layoutControlItem12.CustomizationFormText = "买1数量"; this.layoutControlItem12.Location = new System.Drawing.Point(0, 264); this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem12.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem12.Text = "买1数量"; this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 14); // @@ -1086,7 +1086,7 @@ namespace MES.Form this.layoutControlItem13.CustomizationFormText = "买1价格"; this.layoutControlItem13.Location = new System.Drawing.Point(0, 288); this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem13.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem13.Text = "买1价格"; this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 14); // @@ -1096,7 +1096,7 @@ namespace MES.Form this.layoutControlItem14.CustomizationFormText = "买2数量"; this.layoutControlItem14.Location = new System.Drawing.Point(0, 312); this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem14.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem14.Text = "买2数量"; this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 14); // @@ -1106,7 +1106,7 @@ namespace MES.Form this.layoutControlItem15.CustomizationFormText = "买2价格"; this.layoutControlItem15.Location = new System.Drawing.Point(0, 336); this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem15.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem15.Text = "买2价格"; this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 14); // @@ -1116,7 +1116,7 @@ namespace MES.Form this.layoutControlItem16.CustomizationFormText = "买3数量"; this.layoutControlItem16.Location = new System.Drawing.Point(0, 360); this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem16.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem16.Text = "买3数量"; this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 14); // @@ -1126,7 +1126,7 @@ namespace MES.Form this.layoutControlItem17.CustomizationFormText = "买3价格"; this.layoutControlItem17.Location = new System.Drawing.Point(0, 384); this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem17.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem17.Text = "买3价格"; this.layoutControlItem17.TextSize = new System.Drawing.Size(60, 14); // @@ -1136,7 +1136,7 @@ namespace MES.Form this.layoutControlItem18.CustomizationFormText = "买4数量"; this.layoutControlItem18.Location = new System.Drawing.Point(0, 408); this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem18.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem18.Text = "买4数量"; this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 14); // @@ -1146,7 +1146,7 @@ namespace MES.Form this.layoutControlItem19.CustomizationFormText = "买4价格"; this.layoutControlItem19.Location = new System.Drawing.Point(0, 432); this.layoutControlItem19.Name = "layoutControlItem19"; - this.layoutControlItem19.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem19.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem19.Text = "买4价格"; this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 14); // @@ -1156,7 +1156,7 @@ namespace MES.Form this.layoutControlItem20.CustomizationFormText = "买5数量"; this.layoutControlItem20.Location = new System.Drawing.Point(0, 456); this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem20.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem20.Text = "买5数量"; this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 14); // @@ -1166,7 +1166,7 @@ namespace MES.Form this.layoutControlItem21.CustomizationFormText = "买5价格"; this.layoutControlItem21.Location = new System.Drawing.Point(0, 480); this.layoutControlItem21.Name = "layoutControlItem21"; - this.layoutControlItem21.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem21.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem21.Text = "买5价格"; this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 14); // @@ -1176,7 +1176,7 @@ namespace MES.Form this.layoutControlItem22.CustomizationFormText = "卖1数量"; this.layoutControlItem22.Location = new System.Drawing.Point(0, 504); this.layoutControlItem22.Name = "layoutControlItem22"; - this.layoutControlItem22.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem22.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem22.Text = "卖1数量"; this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 14); // @@ -1186,7 +1186,7 @@ namespace MES.Form this.layoutControlItem23.CustomizationFormText = "卖1价格"; this.layoutControlItem23.Location = new System.Drawing.Point(0, 528); this.layoutControlItem23.Name = "layoutControlItem23"; - this.layoutControlItem23.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem23.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem23.Text = "卖1价格"; this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 14); // @@ -1196,7 +1196,7 @@ namespace MES.Form this.layoutControlItem24.CustomizationFormText = "卖2数量"; this.layoutControlItem24.Location = new System.Drawing.Point(0, 552); this.layoutControlItem24.Name = "layoutControlItem24"; - this.layoutControlItem24.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem24.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem24.Text = "卖2数量"; this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 14); // @@ -1206,7 +1206,7 @@ namespace MES.Form this.layoutControlItem25.CustomizationFormText = "卖2价格"; this.layoutControlItem25.Location = new System.Drawing.Point(0, 576); this.layoutControlItem25.Name = "layoutControlItem25"; - this.layoutControlItem25.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem25.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem25.Text = "卖2价格"; this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 14); // @@ -1216,7 +1216,7 @@ namespace MES.Form this.layoutControlItem26.CustomizationFormText = "卖3数量"; this.layoutControlItem26.Location = new System.Drawing.Point(0, 600); this.layoutControlItem26.Name = "layoutControlItem26"; - this.layoutControlItem26.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem26.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem26.Text = "卖3数量"; this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 14); // @@ -1226,7 +1226,7 @@ namespace MES.Form this.layoutControlItem27.CustomizationFormText = "卖3价格"; this.layoutControlItem27.Location = new System.Drawing.Point(0, 624); this.layoutControlItem27.Name = "layoutControlItem27"; - this.layoutControlItem27.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem27.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem27.Text = "卖3价格"; this.layoutControlItem27.TextSize = new System.Drawing.Size(60, 14); // @@ -1236,7 +1236,7 @@ namespace MES.Form this.layoutControlItem28.CustomizationFormText = "卖4数量"; this.layoutControlItem28.Location = new System.Drawing.Point(0, 648); this.layoutControlItem28.Name = "layoutControlItem28"; - this.layoutControlItem28.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem28.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem28.Text = "卖4数量"; this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 14); // @@ -1246,7 +1246,7 @@ namespace MES.Form this.layoutControlItem29.CustomizationFormText = "卖4价格"; this.layoutControlItem29.Location = new System.Drawing.Point(0, 672); this.layoutControlItem29.Name = "layoutControlItem29"; - this.layoutControlItem29.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem29.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem29.Text = "卖4价格"; this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 14); // @@ -1256,7 +1256,7 @@ namespace MES.Form this.layoutControlItem30.CustomizationFormText = "卖5数量"; this.layoutControlItem30.Location = new System.Drawing.Point(0, 696); this.layoutControlItem30.Name = "layoutControlItem30"; - this.layoutControlItem30.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem30.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem30.Text = "卖5数量"; this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 14); // @@ -1266,7 +1266,7 @@ namespace MES.Form this.layoutControlItem31.CustomizationFormText = "卖5价格"; this.layoutControlItem31.Location = new System.Drawing.Point(0, 720); this.layoutControlItem31.Name = "layoutControlItem31"; - this.layoutControlItem31.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem31.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem31.Text = "卖5价格"; this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 14); // @@ -1276,7 +1276,7 @@ namespace MES.Form this.layoutControlItem32.CustomizationFormText = "时间"; this.layoutControlItem32.Location = new System.Drawing.Point(0, 744); this.layoutControlItem32.Name = "layoutControlItem32"; - this.layoutControlItem32.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem32.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem32.Text = "时间"; this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 14); // @@ -1286,7 +1286,7 @@ namespace MES.Form this.layoutControlItem33.CustomizationFormText = "id"; this.layoutControlItem33.Location = new System.Drawing.Point(0, 768); this.layoutControlItem33.Name = "layoutControlItem33"; - this.layoutControlItem33.Size = new System.Drawing.Size(1253, 24); + this.layoutControlItem33.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem33.Text = "id"; this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 14); // diff --git a/WinformGeneralDeveloperFrame/Form/FrmsysDept.cs b/WinformGeneralDeveloperFrame/Form/FrmsysDept.cs index 2eac040..75477e6 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmsysDept.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmsysDept.cs @@ -53,13 +53,13 @@ namespace MES.Form private void InitSearchDicData() { fieldDictionary.Add("ID","id"); - fieldDictionary.Add("父ID","pid"); + //fieldDictionary.Add("父ID","pid"); fieldDictionary.Add("名称","name"); fieldDictionary.Add("地址","address"); fieldDictionary.Add("电话","phone"); - fieldDictionary.Add("创建人","creatorId"); + //fieldDictionary.Add("创建人","creatorId"); fieldDictionary.Add("创建时间","createTime"); - fieldDictionary.Add("编辑人","editorId"); + //fieldDictionary.Add("编辑人","editorId"); fieldDictionary.Add("编辑时间","editTime"); } /// diff --git a/WinformGeneralDeveloperFrame/Form/FrmsysDictType.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmsysDictType.designer.cs index 4f15088..9aac05b 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmsysDictType.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmsysDictType.designer.cs @@ -53,26 +53,26 @@ namespace MES.Form this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage(); this.panelControl2 = new DevExpress.XtraEditors.PanelControl(); this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); - this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.txtid = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.txtpid = new DevExpress.XtraEditors.TreeListLookUpEdit(); this.txtpidTreeList = new DevExpress.XtraTreeList.TreeList(); - this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.txtname = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.txtsort = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.txtcreatorId = new DevExpress.XtraEditors.LookUpEdit(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.txtcreateTime = new DevExpress.XtraEditors.DateEdit(); - this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.txteditorId = new DevExpress.XtraEditors.LookUpEdit(); - this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.txteditTime = new DevExpress.XtraEditors.DateEdit(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.txtremark = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpidTreeList)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcreatorId)).BeginInit(); @@ -87,28 +87,28 @@ namespace MES.Form this.panelControl2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); this.layoutControl1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtpid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtpidTreeList)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtname.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtsort.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txteditorId.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txteditTime.Properties.CalendarTimeProperties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txteditTime.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); this.SuspendLayout(); // // gridColumn1 @@ -284,7 +284,7 @@ namespace MES.Form // this.tabDataDetail.Controls.Add(this.panelControl2); this.tabDataDetail.Name = "tabDataDetail"; - this.tabDataDetail.Size = new System.Drawing.Size(579, 407); + this.tabDataDetail.Size = new System.Drawing.Size(1294, 737); this.tabDataDetail.Text = "数据编辑"; // // panelControl2 @@ -293,7 +293,7 @@ namespace MES.Form this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelControl2.Location = new System.Drawing.Point(0, 0); this.panelControl2.Name = "panelControl2"; - this.panelControl2.Size = new System.Drawing.Size(579, 407); + this.panelControl2.Size = new System.Drawing.Size(1294, 737); this.panelControl2.TabIndex = 0; // // layoutControl1 @@ -311,10 +311,127 @@ namespace MES.Form this.layoutControl1.Location = new System.Drawing.Point(2, 2); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup1; - this.layoutControl1.Size = new System.Drawing.Size(575, 403); + this.layoutControl1.Size = new System.Drawing.Size(1290, 733); this.layoutControl1.TabIndex = 6; this.layoutControl1.Text = "layoutControl1"; // + // txtid + // + this.txtid.Location = new System.Drawing.Point(63, 12); + this.txtid.Name = "txtid"; + this.txtid.Size = new System.Drawing.Size(1215, 20); + this.txtid.StyleController = this.layoutControl1; + this.txtid.TabIndex = 1; + // + // txtpid + // + this.txtpid.EditValue = ""; + this.txtpid.Location = new System.Drawing.Point(63, 36); + this.txtpid.Name = "txtpid"; + this.txtpid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtpid.Properties.DisplayMember = "Name"; + this.txtpid.Properties.TreeList = this.txtpidTreeList; + this.txtpid.Properties.ValueMember = "ID"; + this.txtpid.Size = new System.Drawing.Size(1215, 20); + this.txtpid.StyleController = this.layoutControl1; + this.txtpid.TabIndex = 2; + // + // txtpidTreeList + // + this.txtpidTreeList.Location = new System.Drawing.Point(0, 0); + this.txtpidTreeList.Name = "txtpidTreeList"; + this.txtpidTreeList.OptionsView.ShowIndentAsRowStyle = true; + this.txtpidTreeList.ParentFieldName = "PID"; + this.txtpidTreeList.Size = new System.Drawing.Size(400, 200); + this.txtpidTreeList.TabIndex = 0; + // + // txtname + // + this.txtname.Location = new System.Drawing.Point(63, 60); + this.txtname.Name = "txtname"; + this.txtname.Size = new System.Drawing.Size(1215, 20); + this.txtname.StyleController = this.layoutControl1; + this.txtname.TabIndex = 3; + // + // txtsort + // + this.txtsort.Location = new System.Drawing.Point(63, 84); + this.txtsort.Name = "txtsort"; + this.txtsort.Size = new System.Drawing.Size(1215, 20); + this.txtsort.StyleController = this.layoutControl1; + this.txtsort.TabIndex = 4; + // + // txtcreatorId + // + this.txtcreatorId.EditValue = ""; + this.txtcreatorId.Location = new System.Drawing.Point(63, 108); + this.txtcreatorId.Name = "txtcreatorId"; + this.txtcreatorId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtcreatorId.Properties.DisplayMember = "Name"; + this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtcreatorId.Properties.ValueMember = "ID"; + this.txtcreatorId.Size = new System.Drawing.Size(1215, 20); + this.txtcreatorId.StyleController = this.layoutControl1; + this.txtcreatorId.TabIndex = 5; + // + // txtcreateTime + // + this.txtcreateTime.EditValue = null; + this.txtcreateTime.ImeMode = System.Windows.Forms.ImeMode.Off; + this.txtcreateTime.Location = new System.Drawing.Point(63, 132); + this.txtcreateTime.Name = "txtcreateTime"; + this.txtcreateTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtcreateTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txtcreateTime.Properties.DisplayFormat.FormatString = "G"; + this.txtcreateTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.txtcreateTime.Size = new System.Drawing.Size(1215, 20); + this.txtcreateTime.StyleController = this.layoutControl1; + this.txtcreateTime.TabIndex = 6; + // + // txteditorId + // + this.txteditorId.EditValue = ""; + this.txteditorId.Location = new System.Drawing.Point(63, 156); + this.txteditorId.Name = "txteditorId"; + this.txteditorId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txteditorId.Properties.DisplayMember = "Name"; + this.txteditorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txteditorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txteditorId.Properties.ValueMember = "ID"; + this.txteditorId.Size = new System.Drawing.Size(1215, 20); + this.txteditorId.StyleController = this.layoutControl1; + this.txteditorId.TabIndex = 7; + // + // txteditTime + // + this.txteditTime.EditValue = null; + this.txteditTime.ImeMode = System.Windows.Forms.ImeMode.Off; + this.txteditTime.Location = new System.Drawing.Point(63, 180); + this.txteditTime.Name = "txteditTime"; + this.txteditTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txteditTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txteditTime.Properties.DisplayFormat.FormatString = "G"; + this.txteditTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.txteditTime.Size = new System.Drawing.Size(1215, 20); + this.txteditTime.StyleController = this.layoutControl1; + this.txteditTime.TabIndex = 8; + // + // txtremark + // + this.txtremark.Location = new System.Drawing.Point(63, 204); + this.txtremark.Name = "txtremark"; + this.txtremark.Size = new System.Drawing.Size(1215, 20); + this.txtremark.StyleController = this.layoutControl1; + this.txtremark.TabIndex = 9; + // // layoutControlGroup1 // this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1"; @@ -330,7 +447,7 @@ namespace MES.Form this.layoutControlItem8, this.layoutControlItem9}); this.layoutControlGroup1.Name = "layoutControlGroup1"; - this.layoutControlGroup1.Size = new System.Drawing.Size(575, 403); + this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem1 @@ -339,207 +456,90 @@ namespace MES.Form this.layoutControlItem1.CustomizationFormText = "id"; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(555, 24); + this.layoutControlItem1.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem1.Text = "id"; this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14); // - // txtid - // - this.txtid.Location = new System.Drawing.Point(63, 12); - this.txtid.Name = "txtid"; - this.txtid.Size = new System.Drawing.Size(500, 20); - this.txtid.StyleController = this.layoutControl1; - this.txtid.TabIndex = 1; - // // layoutControlItem2 // this.layoutControlItem2.Control = this.txtpid; this.layoutControlItem2.CustomizationFormText = "父类型"; this.layoutControlItem2.Location = new System.Drawing.Point(0, 24); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(555, 24); + this.layoutControlItem2.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem2.Text = "父类型"; this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14); // - // txtpid - // - this.txtpid.EditValue = ""; - this.txtpid.Location = new System.Drawing.Point(63, 36); - this.txtpid.Name = "txtpid"; - this.txtpid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txtpid.Properties.DisplayMember = "Name"; - this.txtpid.Properties.TreeList = this.txtpidTreeList; - this.txtpid.Properties.ValueMember = "ID"; - this.txtpid.Size = new System.Drawing.Size(500, 20); - this.txtpid.StyleController = this.layoutControl1; - this.txtpid.TabIndex = 2; - // - // txtpidTreeList - // - this.txtpidTreeList.Location = new System.Drawing.Point(0, 0); - this.txtpidTreeList.Name = "txtpidTreeList"; - this.txtpidTreeList.OptionsView.ShowIndentAsRowStyle = true; - this.txtpidTreeList.ParentFieldName = "PID"; - this.txtpidTreeList.Size = new System.Drawing.Size(400, 200); - this.txtpidTreeList.TabIndex = 0; - // // layoutControlItem3 // this.layoutControlItem3.Control = this.txtname; this.layoutControlItem3.CustomizationFormText = "名称"; this.layoutControlItem3.Location = new System.Drawing.Point(0, 48); this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(555, 24); + this.layoutControlItem3.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem3.Text = "名称"; this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14); // - // txtname - // - this.txtname.Location = new System.Drawing.Point(63, 60); - this.txtname.Name = "txtname"; - this.txtname.Size = new System.Drawing.Size(500, 20); - this.txtname.StyleController = this.layoutControl1; - this.txtname.TabIndex = 3; - // // layoutControlItem4 // this.layoutControlItem4.Control = this.txtsort; this.layoutControlItem4.CustomizationFormText = "排序"; this.layoutControlItem4.Location = new System.Drawing.Point(0, 72); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(555, 24); + this.layoutControlItem4.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem4.Text = "排序"; this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14); // - // txtsort - // - this.txtsort.Location = new System.Drawing.Point(63, 84); - this.txtsort.Name = "txtsort"; - this.txtsort.Size = new System.Drawing.Size(500, 20); - this.txtsort.StyleController = this.layoutControl1; - this.txtsort.TabIndex = 4; - // // layoutControlItem5 // this.layoutControlItem5.Control = this.txtcreatorId; this.layoutControlItem5.CustomizationFormText = "创建人"; this.layoutControlItem5.Location = new System.Drawing.Point(0, 96); this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(555, 24); + this.layoutControlItem5.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem5.Text = "创建人"; this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14); // - // txtcreatorId - // - this.txtcreatorId.EditValue = ""; - this.txtcreatorId.Location = new System.Drawing.Point(63, 108); - this.txtcreatorId.Name = "txtcreatorId"; - this.txtcreatorId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txtcreatorId.Properties.DisplayMember = "Name"; - this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; - this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; - this.txtcreatorId.Properties.ValueMember = "ID"; - this.txtcreatorId.Size = new System.Drawing.Size(500, 20); - this.txtcreatorId.StyleController = this.layoutControl1; - this.txtcreatorId.TabIndex = 5; - // // layoutControlItem6 // this.layoutControlItem6.Control = this.txtcreateTime; this.layoutControlItem6.CustomizationFormText = "创建时间"; this.layoutControlItem6.Location = new System.Drawing.Point(0, 120); this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Size = new System.Drawing.Size(555, 24); + this.layoutControlItem6.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem6.Text = "创建时间"; this.layoutControlItem6.TextSize = new System.Drawing.Size(48, 14); // - // txtcreateTime - // - this.txtcreateTime.EditValue = null; - this.txtcreateTime.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txtcreateTime.Location = new System.Drawing.Point(63, 132); - this.txtcreateTime.Name = "txtcreateTime"; - this.txtcreateTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txtcreateTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton()}); - this.txtcreateTime.Properties.DisplayFormat.FormatString = "G"; - this.txtcreateTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.txtcreateTime.Size = new System.Drawing.Size(500, 20); - this.txtcreateTime.StyleController = this.layoutControl1; - this.txtcreateTime.TabIndex = 6; - // // layoutControlItem7 // this.layoutControlItem7.Control = this.txteditorId; this.layoutControlItem7.CustomizationFormText = "编辑人"; this.layoutControlItem7.Location = new System.Drawing.Point(0, 144); this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Size = new System.Drawing.Size(555, 24); + this.layoutControlItem7.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem7.Text = "编辑人"; this.layoutControlItem7.TextSize = new System.Drawing.Size(48, 14); // - // txteditorId - // - this.txteditorId.EditValue = ""; - this.txteditorId.Location = new System.Drawing.Point(63, 156); - this.txteditorId.Name = "txteditorId"; - this.txteditorId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txteditorId.Properties.DisplayMember = "Name"; - this.txteditorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; - this.txteditorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; - this.txteditorId.Properties.ValueMember = "ID"; - this.txteditorId.Size = new System.Drawing.Size(500, 20); - this.txteditorId.StyleController = this.layoutControl1; - this.txteditorId.TabIndex = 7; - // // layoutControlItem8 // this.layoutControlItem8.Control = this.txteditTime; this.layoutControlItem8.CustomizationFormText = "编辑时间"; this.layoutControlItem8.Location = new System.Drawing.Point(0, 168); this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Size = new System.Drawing.Size(555, 24); + this.layoutControlItem8.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem8.Text = "编辑时间"; this.layoutControlItem8.TextSize = new System.Drawing.Size(48, 14); // - // txteditTime - // - this.txteditTime.EditValue = null; - this.txteditTime.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txteditTime.Location = new System.Drawing.Point(63, 180); - this.txteditTime.Name = "txteditTime"; - this.txteditTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txteditTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton()}); - this.txteditTime.Properties.DisplayFormat.FormatString = "G"; - this.txteditTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.txteditTime.Size = new System.Drawing.Size(500, 20); - this.txteditTime.StyleController = this.layoutControl1; - this.txteditTime.TabIndex = 8; - // // layoutControlItem9 // this.layoutControlItem9.Control = this.txtremark; this.layoutControlItem9.CustomizationFormText = "备注"; this.layoutControlItem9.Location = new System.Drawing.Point(0, 192); this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.Size = new System.Drawing.Size(555, 191); + this.layoutControlItem9.Size = new System.Drawing.Size(1270, 521); this.layoutControlItem9.Text = "备注"; this.layoutControlItem9.TextSize = new System.Drawing.Size(48, 14); // - // txtremark - // - this.txtremark.Location = new System.Drawing.Point(63, 204); - this.txtremark.Name = "txtremark"; - this.txtremark.Size = new System.Drawing.Size(500, 20); - this.txtremark.StyleController = this.layoutControl1; - this.txtremark.TabIndex = 9; - // // FrmsysDictType // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); @@ -547,7 +547,7 @@ namespace MES.Form this.ClientSize = new System.Drawing.Size(1300, 800); this.Controls.Add(this.xtraTabControl1); this.Name = "FrmsysDictType"; - this.Text = "参数类型维护"; + this.Text = "参数维护"; this.Load += new System.EventHandler(this.FrmsysDictType_Load); this.Controls.SetChildIndex(this.xtraTabControl1, 0); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpid)).EndInit(); @@ -564,28 +564,28 @@ namespace MES.Form this.panelControl2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); this.layoutControl1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtpid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtpidTreeList)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtname.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtsort.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txteditorId.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txteditTime.Properties.CalendarTimeProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txteditTime.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); this.ResumeLayout(false); } diff --git a/WinformGeneralDeveloperFrame/Form/FrmsysFunction.cs b/WinformGeneralDeveloperFrame/Form/FrmsysFunction.cs index b1244e4..75735c5 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmsysFunction.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmsysFunction.cs @@ -12,6 +12,8 @@ using DevExpress.XtraLayout; using MES.Entity; using System.Data.Entity.Migrations; using System.Data.Entity; +using DevExpress.Data.Helpers; + namespace MES.Form { public partial class FrmsysFunction : FrmBaseForm @@ -35,6 +37,27 @@ namespace MES.Form { txtpid.Properties.DataSource = GetDataTableUtils.SqlTable("角色功能"); repositoryItemTreeListtxtpid.DataSource= GetDataTableUtils.SqlTable("角色功能"); + txtToolBtnList.Properties.DataSource = GetDataTableUtils.SqlTable("功能按钮"); + + + } + public override void gridControlMouseDoubleClickFunction(object sender, EventArgs e) + { + sysFunctionInfo user = grdListView.GetFocusedRow() as sysFunctionInfo; + if (user != null) + { + using (var db=new MESDB()) + { + List list = db.sysFunctionInfo.Where(p => p.pid == user.id).Select(p=>p.toolBtnID).ToList(); + string value = ""; + foreach (int item in list) + { + value += item + ","; + } + txtToolBtnList.EditValue = value; + this.txtToolBtnList.RefreshEditValue(); + } + } } /// /// 搜索字段 @@ -43,7 +66,7 @@ namespace MES.Form private void InitSearchDicData() { fieldDictionary.Add("ID","id"); - fieldDictionary.Add("父ID","pid"); + //fieldDictionary.Add("父ID","pid"); fieldDictionary.Add("名称","name"); fieldDictionary.Add("权限编码","functionCode"); } @@ -60,6 +83,15 @@ namespace MES.Form { db.sysFunctionInfo.AddOrUpdate(info); db.SaveChanges(); + db.Database.ExecuteSqlCommand($"delete from sysFunction where pid={info.id}"); + List list = db.sysToolButtonInfo.ToList(); + string sql = ""; + foreach (var item in txtToolBtnList.EditValue.ToString().Split(',')) + { + sysToolButtonInfo info1 = list.Where(p => p.id == item.ToInt16()).First(); + sql += $"INSERT INTO sysFunction(pid,name,functionCode,toolBtnID) VALUES ({info.id},'{info1.btnName}','{info.functionCode+"-"+info1.btnCode}',{info1.id});"; + } + db.Database.ExecuteSqlCommand(sql); } } catch (Exception ex) @@ -73,7 +105,7 @@ namespace MES.Form { using (var con=new MESDB())/// { - grdList.DataSource=con.sysFunctionInfo.ToList(); + grdList.DataSource=con.sysFunctionInfo.ToList().OrderBy(p=>p.pid); } Init(); } @@ -115,6 +147,7 @@ namespace MES.Form using (var db = new MESDB()) { db.Entry(info).State=EntityState.Deleted; + db.Database.ExecuteSqlCommand($"delete from sysFunction where pid={info.id}"); db.SaveChanges(); } } diff --git a/WinformGeneralDeveloperFrame/Form/FrmsysFunction.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmsysFunction.designer.cs index 17e2b5a..eedfd08 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmsysFunction.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmsysFunction.designer.cs @@ -46,6 +46,7 @@ namespace MES.Form this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage(); this.panelControl2 = new DevExpress.XtraEditors.PanelControl(); this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.txtToolBtnList = new DevExpress.XtraEditors.CheckedComboBoxEdit(); this.txtid = new DevExpress.XtraEditors.TextEdit(); this.txtpid = new DevExpress.XtraEditors.TreeListLookUpEdit(); this.txtpidTreeList = new DevExpress.XtraTreeList.TreeList(); @@ -56,6 +57,10 @@ namespace MES.Form this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem(); + this.txttoolBtnID = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpidTreeList)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -68,6 +73,7 @@ namespace MES.Form this.panelControl2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txtToolBtnList.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtpid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtpidTreeList)).BeginInit(); @@ -78,6 +84,10 @@ namespace MES.Form ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txttoolBtnID.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); this.SuspendLayout(); // // gridColumn1 @@ -196,6 +206,8 @@ namespace MES.Form // // layoutControl1 // + this.layoutControl1.Controls.Add(this.txttoolBtnID); + this.layoutControl1.Controls.Add(this.txtToolBtnList); this.layoutControl1.Controls.Add(this.txtid); this.layoutControl1.Controls.Add(this.txtpid); this.layoutControl1.Controls.Add(this.txtname); @@ -203,30 +215,43 @@ namespace MES.Form this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutControl1.Location = new System.Drawing.Point(2, 2); this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1270, 533, 650, 400); this.layoutControl1.Root = this.layoutControlGroup1; this.layoutControl1.Size = new System.Drawing.Size(1290, 733); this.layoutControl1.TabIndex = 6; this.layoutControl1.Text = "layoutControl1"; // + // txtToolBtnList + // + this.txtToolBtnList.Location = new System.Drawing.Point(202, 108); + this.txtToolBtnList.Name = "txtToolBtnList"; + this.txtToolBtnList.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtToolBtnList.Properties.DisplayMember = "Name"; + this.txtToolBtnList.Properties.ValueMember = "ID"; + this.txtToolBtnList.Size = new System.Drawing.Size(1076, 20); + this.txtToolBtnList.StyleController = this.layoutControl1; + this.txtToolBtnList.TabIndex = 14; + // // txtid // - this.txtid.Location = new System.Drawing.Point(63, 12); + this.txtid.Location = new System.Drawing.Point(202, 12); this.txtid.Name = "txtid"; - this.txtid.Size = new System.Drawing.Size(1215, 20); + this.txtid.Size = new System.Drawing.Size(1076, 20); this.txtid.StyleController = this.layoutControl1; this.txtid.TabIndex = 1; // // txtpid // this.txtpid.EditValue = ""; - this.txtpid.Location = new System.Drawing.Point(63, 36); + this.txtpid.Location = new System.Drawing.Point(202, 36); this.txtpid.Name = "txtpid"; this.txtpid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txtpid.Properties.DisplayMember = "Name"; this.txtpid.Properties.TreeList = this.txtpidTreeList; this.txtpid.Properties.ValueMember = "ID"; - this.txtpid.Size = new System.Drawing.Size(1215, 20); + this.txtpid.Size = new System.Drawing.Size(1076, 20); this.txtpid.StyleController = this.layoutControl1; this.txtpid.TabIndex = 2; // @@ -241,17 +266,17 @@ namespace MES.Form // // txtname // - this.txtname.Location = new System.Drawing.Point(63, 60); + this.txtname.Location = new System.Drawing.Point(202, 60); this.txtname.Name = "txtname"; - this.txtname.Size = new System.Drawing.Size(1215, 20); + this.txtname.Size = new System.Drawing.Size(1076, 20); this.txtname.StyleController = this.layoutControl1; this.txtname.TabIndex = 3; // // txtfunctionCode // - this.txtfunctionCode.Location = new System.Drawing.Point(63, 84); + this.txtfunctionCode.Location = new System.Drawing.Point(202, 84); this.txtfunctionCode.Name = "txtfunctionCode"; - this.txtfunctionCode.Size = new System.Drawing.Size(1215, 20); + this.txtfunctionCode.Size = new System.Drawing.Size(441, 20); this.txtfunctionCode.StyleController = this.layoutControl1; this.txtfunctionCode.TabIndex = 4; // @@ -263,8 +288,11 @@ namespace MES.Form this.layoutControlItem1, this.layoutControlItem2, this.layoutControlItem3, - this.layoutControlItem4}); - this.layoutControlGroup1.Name = "layoutControlGroup1"; + this.layoutControlItem4, + this.layoutControlItem6, + this.emptySpaceItem2, + this.layoutControlItem5}); + this.layoutControlGroup1.Name = "Root"; this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733); this.layoutControlGroup1.TextVisible = false; // @@ -276,7 +304,7 @@ namespace MES.Form this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem1.Text = "ID"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14); + this.layoutControlItem1.TextSize = new System.Drawing.Size(187, 14); // // layoutControlItem2 // @@ -286,7 +314,7 @@ namespace MES.Form this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem2.Text = "父ID"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14); + this.layoutControlItem2.TextSize = new System.Drawing.Size(187, 14); // // layoutControlItem3 // @@ -296,7 +324,7 @@ namespace MES.Form this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem3.Text = "名称"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14); + this.layoutControlItem3.TextSize = new System.Drawing.Size(187, 14); // // layoutControlItem4 // @@ -304,9 +332,43 @@ namespace MES.Form this.layoutControlItem4.CustomizationFormText = "权限编码"; this.layoutControlItem4.Location = new System.Drawing.Point(0, 72); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(1270, 641); + this.layoutControlItem4.Size = new System.Drawing.Size(635, 24); this.layoutControlItem4.Text = "权限编码"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14); + this.layoutControlItem4.TextSize = new System.Drawing.Size(187, 14); + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txtToolBtnList; + this.layoutControlItem6.Location = new System.Drawing.Point(0, 96); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem6.Text = "功能按钮"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(187, 14); + // + // emptySpaceItem2 + // + this.emptySpaceItem2.AllowHotTrack = false; + this.emptySpaceItem2.Location = new System.Drawing.Point(0, 120); + this.emptySpaceItem2.Name = "emptySpaceItem2"; + this.emptySpaceItem2.Size = new System.Drawing.Size(1270, 593); + this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0); + // + // txttoolBtnID + // + this.txttoolBtnID.Location = new System.Drawing.Point(837, 84); + this.txttoolBtnID.Name = "txttoolBtnID"; + this.txttoolBtnID.Size = new System.Drawing.Size(441, 20); + this.txttoolBtnID.StyleController = this.layoutControl1; + this.txttoolBtnID.TabIndex = 15; + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txttoolBtnID; + this.layoutControlItem5.Location = new System.Drawing.Point(635, 72); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.Size = new System.Drawing.Size(635, 24); + this.layoutControlItem5.Text = "功能按钮id(该项为功能按钮时填写)"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(187, 14); // // FrmsysFunction // @@ -330,6 +392,7 @@ namespace MES.Form this.panelControl2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.txtToolBtnList.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtpid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtpidTreeList)).EndInit(); @@ -340,6 +403,10 @@ namespace MES.Form ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txttoolBtnID.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); this.ResumeLayout(false); } @@ -376,5 +443,10 @@ namespace MES.Form private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private CheckedComboBoxEdit txtToolBtnList; + private LayoutControlItem layoutControlItem6; + private EmptySpaceItem emptySpaceItem2; + private TextEdit txttoolBtnID; + private LayoutControlItem layoutControlItem5; } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmsysMenu.cs b/WinformGeneralDeveloperFrame/Form/FrmsysMenu.cs index f338d3d..57ec120 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmsysMenu.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmsysMenu.cs @@ -53,7 +53,7 @@ namespace MES.Form private void InitSearchDicData() { fieldDictionary.Add("菜单名称", "name"); - fieldDictionary.Add("创建时间", "createTime"); + //fieldDictionary.Add("创建时间", "createTime"); } private void simpleButton1_Click(object sender, EventArgs e) { diff --git a/WinformGeneralDeveloperFrame/Form/FrmsysMenu.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmsysMenu.designer.cs index 0afb545..29fa327 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmsysMenu.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmsysMenu.designer.cs @@ -5,7 +5,7 @@ using DevExpress.XtraTab; namespace MES.Form { - partial class FrmsysMenu + partial class FrmsysMenu { /// /// Required designer variable. @@ -843,22 +843,22 @@ namespace MES.Form private DevExpress.XtraLayout.LayoutControl layoutControl1; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; private DevExpress.XtraTreeList.TreeList txtpidTreeList; private DevExpress.XtraEditors.Repository.RepositoryItemTreeListLookUpEdit repositoryItemTreeListtxtpid; - private DevExpress.XtraTreeList.TreeList repositoryItemTreeListtxtpidTreeList; + private DevExpress.XtraTreeList.TreeList repositoryItemTreeListtxtpidTreeList; private DevExpress.XtraEditors.TreeListLookUpEdit txtpid; /////////////////////////////// private DevExpress.XtraEditors.TextEdit txticon; diff --git a/WinformGeneralDeveloperFrame/Form/FrmsysRole.cs b/WinformGeneralDeveloperFrame/Form/FrmsysRole.cs index d052b28..a1ad1ca 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmsysRole.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmsysRole.cs @@ -17,6 +17,8 @@ using System.Data.SqlClient; using DevExpress.XtraPrinting.Export.Text; using DevExpress.XtraTreeList.Nodes; using WinformGeneralDeveloperFrame.Commons; +using DevExpress.XtraGrid; + namespace MES.Form { public partial class FrmsysRole : FrmBaseForm @@ -83,6 +85,7 @@ namespace MES.Form public override void gridControlMouseDoubleClickFunction(object sender, EventArgs e) { + treeList1.DataSource = null; treeList1.DataSource = GetDataTableUtils.SqlTable("角色功能"); treeList1.ExpandAll(); @@ -92,35 +95,41 @@ namespace MES.Form treeList2.ExpandAll(); gridControl1.DataSource = null; - using (var db = new MESDB()) - { - ids= db.Database.SqlQuery($"select functionId from sysRoleFunction where roleId={txtid.Text}").ToListAsync().Result; - ///根据角色id获取用户 - userids = db.Database - .SqlQuery( - $"select u.id from sysuserrole r left join sysuser u on r.userid=u.id where r.roleid={txtid.Text}").ToListAsync() - .Result; - gridControl1.DataSource = db.sysUserInfo.ToList().Where(p => userids.Contains(p.id)); - } - if (treeList2.Nodes.Count > 0) + sysRoleInfo user = grdListView.GetFocusedRow() as sysRoleInfo; + if (user != null) { - foreach (TreeListNode node in treeList2.Nodes)//拿所有结点 + using (var db = new MESDB()) { - DataRowView drv = treeList2.GetDataRecordByNode(node) as DataRowView;//强转选中状态的行 - if (userids.Contains((int)drv["id"])) + ids = db.Database.SqlQuery($"select functionId from sysRoleFunction where roleId={user.id}").ToListAsync().Result; + ///根据角色id获取用户 + userids = db.Database + .SqlQuery( + $"select u.id from sysuserrole r left join sysuser u on r.userid=u.id where r.roleid={user.id}").ToListAsync() + .Result; + gridControl1.DataSource = db.sysUserInfo.ToList().Where(p => userids.Contains(p.id)); + + } + if (treeList2.Nodes.Count > 0) + { + foreach (TreeListNode node in treeList2.Nodes)//拿所有结点 { - node.Checked = true; + DataRowView drv = treeList2.GetDataRecordByNode(node) as DataRowView;//强转选中状态的行 + if (userids.Contains((int)drv["id"])) + { + node.Checked = true; + } + } + } + if (treeList1.Nodes.Count > 0) + { + foreach (TreeListNode node in treeList1.Nodes)//拿所有结点 + { + SetCheckStatus(node); } } } - if (treeList1.Nodes.Count > 0) - { - foreach (TreeListNode node in treeList1.Nodes)//拿所有结点 - { - SetCheckStatus(node); - } - } + } /// /// 搜索字段 @@ -129,12 +138,12 @@ namespace MES.Form private void InitSearchDicData() { fieldDictionary.Add("ID","id"); - fieldDictionary.Add("公司id","companyId"); + //fieldDictionary.Add("公司id","companyId"); fieldDictionary.Add("公司名称","companyName"); fieldDictionary.Add("角色名称","name"); - fieldDictionary.Add("创建人","creatorId"); + //fieldDictionary.Add("创建人","creatorId"); fieldDictionary.Add("创建时间","createTime"); - fieldDictionary.Add("编辑人","editorId"); + //fieldDictionary.Add("编辑人","editorId"); fieldDictionary.Add("编辑时间","editTime"); } List ids = new List();//用来存储ID diff --git a/WinformGeneralDeveloperFrame/Form/FrmsysToolButton.cs b/WinformGeneralDeveloperFrame/Form/FrmsysToolButton.cs new file mode 100644 index 0000000..8db966b --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmsysToolButton.cs @@ -0,0 +1,183 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using WinformGeneralDeveloperFrame; +using WinformGeneralDeveloperFrame.Commons; +using DevExpress.XtraLayout; +using MES.Entity; +using System.Data.Entity.Migrations; +using System.Data.Entity; +namespace MES.Form +{ + public partial class FrmsysToolButton : FrmBaseForm + { + private Dictionary fieldDictionary = new Dictionary(); + public FrmsysToolButton() + { + InitializeComponent(); + } + private void FrmsysToolButton_Load(object sender, EventArgs e) + { + + InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new sysToolButtonInfo()); + InitSearchDicData(); + } + /// + /// 数据源初始化 + /// + /// + private void Init() + { + + + + + + + } + /// + /// 搜索字段 + /// + /// + private void InitSearchDicData() + { + fieldDictionary.Add("id","id"); + fieldDictionary.Add("名称","btnName"); + fieldDictionary.Add("编码","btnCode"); + fieldDictionary.Add("图标","btnIcon"); + //fieldDictionary.Add("备注","remark"); + } + /// + /// 保存 + /// + /// + public override bool SaveFunction() + { + try + { + sysToolButtonInfo info= (sysToolButtonInfo)this.ControlDataToModel(new sysToolButtonInfo()); + using (var db = new MESDB()) + { + db.sysToolButtonInfo.AddOrUpdate(info); + db.SaveChanges(); + } + } + catch (Exception ex) + { + ex.Message.ShowError(); + return false; + } + return true; + } + public override void InitgrdListDataSource() + { + using (var con=new MESDB())/// + { + grdList.DataSource=con.sysToolButtonInfo.ToList(); + } + Init(); + } + /// + /// 字段为空校验 + /// + /// + public override bool CheckInput() + { + if(string.IsNullOrEmpty(txtbtnName.EditValue.ToString())) + { + "名称不能为空".ShowWarning(); + txtbtnName.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtbtnCode.EditValue.ToString())) + { + "编码不能为空".ShowWarning(); + txtbtnCode.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtbtnIcon.EditValue.ToString())) + { + "图标不能为空".ShowWarning(); + txtbtnIcon.Focus(); + return false; + } + //if(string.IsNullOrEmpty(txtremark.EditValue.ToString())) + //{ + // "备注不能为空".ShowWarning(); + // txtremark.Focus(); + // return false; + //} + return true; + } + /// + /// 删除 + /// + /// + public override bool DelFunction() + { + try + { + sysToolButtonInfo info = (sysToolButtonInfo)this.ControlDataToModel(new sysToolButtonInfo()); + using (var db = new MESDB()) + { + db.Entry(info).State=EntityState.Deleted; + db.SaveChanges(); + } + } + catch (Exception ex) + { + ex.Message.ShowError(); + return false; + } + return true; + } + /// + /// 搜索 + /// + /// + public override void SearchFunction() + { + FrmSearch frm = new FrmSearch(fieldDictionary); + if (frm.ShowDialog()==DialogResult.OK) + { + string sql = frm.sql; + using (var db = new MESDB()) + { + if (string.IsNullOrEmpty(sql)) + { + grdList.DataSource = db.sysToolButtonInfo.SqlQuery("select * from sysToolButton").ToList(); + } + else + { + grdList.DataSource = db.sysToolButtonInfo.SqlQuery($"select * from sysToolButton where {sql}").ToList(); + } + } + } + } + + private void simpleButton1_Click(object sender, EventArgs e) + { + string file = GetIconPath(); + if (!string.IsNullOrEmpty(file)) + { + this.txtbtnIcon.Text = file; + } + } + private string GetIconPath() + { + string file = FileDialogHelper.Open("选择图标文件", FileDialogHelper.ImageFilter, "", Application.StartupPath + "\\Images"); + string result = ""; + if (!string.IsNullOrEmpty(file)) + { + result = file.Replace(Application.StartupPath, "").Trim('\\'); + } + + return result; + } + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmsysToolButton.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmsysToolButton.designer.cs new file mode 100644 index 0000000..b717309 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmsysToolButton.designer.cs @@ -0,0 +1,398 @@ + +using DevExpress.XtraEditors; +using DevExpress.XtraLayout; +using DevExpress.XtraTab; + +namespace MES.Form +{ + partial class FrmsysToolButton + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); + this.tabDataList = new DevExpress.XtraTab.XtraTabPage(); + this.grdList = new DevExpress.XtraGrid.GridControl(); + this.grdListView = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage(); + this.panelControl2 = new DevExpress.XtraEditors.PanelControl(); + this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.txtid = new DevExpress.XtraEditors.TextEdit(); + this.txtbtnName = new DevExpress.XtraEditors.TextEdit(); + this.txtbtnCode = new DevExpress.XtraEditors.TextEdit(); + this.txtbtnIcon = new DevExpress.XtraEditors.TextEdit(); + this.txtremark = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); + this.xtraTabControl1.SuspendLayout(); + this.tabDataList.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.grdListView)).BeginInit(); + this.tabDataDetail.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit(); + this.panelControl2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtbtnName.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtbtnCode.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtbtnIcon.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + this.SuspendLayout(); + // + // gridColumn1 + // + this.gridColumn1.Caption = "id"; + this.gridColumn1.FieldName = "id"; + this.gridColumn1.Name = "gridColumn1"; + // + // gridColumn2 + // + this.gridColumn2.Caption = "名称"; + this.gridColumn2.FieldName = "btnName"; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 0; + this.gridColumn2.Width = 201; + // + // gridColumn3 + // + this.gridColumn3.Caption = "编码"; + this.gridColumn3.FieldName = "btnCode"; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 1; + this.gridColumn3.Width = 201; + // + // gridColumn4 + // + this.gridColumn4.Caption = "图标"; + this.gridColumn4.FieldName = "btnIcon"; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 2; + this.gridColumn4.Width = 201; + // + // gridColumn5 + // + this.gridColumn5.Caption = "备注"; + this.gridColumn5.FieldName = "remark"; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 3; + this.gridColumn5.Width = 201; + // + // xtraTabControl1 + // + this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.xtraTabControl1.Location = new System.Drawing.Point(0, 34); + this.xtraTabControl1.Name = "xtraTabControl1"; + this.xtraTabControl1.SelectedTabPage = this.tabDataList; + this.xtraTabControl1.Size = new System.Drawing.Size(1300, 766); + this.xtraTabControl1.TabIndex = 1; + this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.tabDataList, + this.tabDataDetail}); + // + // tabDataList + // + this.tabDataList.Controls.Add(this.grdList); + this.tabDataList.Name = "tabDataList"; + this.tabDataList.Size = new System.Drawing.Size(1294, 737); + this.tabDataList.Text = "数据列表"; + // + // grdList + // + this.grdList.Dock = System.Windows.Forms.DockStyle.Fill; + this.grdList.Location = new System.Drawing.Point(0, 0); + this.grdList.MainView = this.grdListView; + this.grdList.Name = "grdList"; + this.grdList.Size = new System.Drawing.Size(1294, 737); + this.grdList.TabIndex = 0; + this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.grdListView}); + // + // grdListView + // + this.grdListView.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn1, + this.gridColumn2, + this.gridColumn3, + this.gridColumn4, + this.gridColumn5}); + this.grdListView.GridControl = this.grdList; + this.grdListView.Name = "grdListView"; + this.grdListView.OptionsBehavior.Editable = false; + this.grdListView.OptionsView.ColumnAutoWidth = false; + // + // tabDataDetail + // + this.tabDataDetail.Controls.Add(this.panelControl2); + this.tabDataDetail.Name = "tabDataDetail"; + this.tabDataDetail.Size = new System.Drawing.Size(1294, 737); + this.tabDataDetail.Text = "数据编辑"; + // + // panelControl2 + // + this.panelControl2.Controls.Add(this.layoutControl1); + this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelControl2.Location = new System.Drawing.Point(0, 0); + this.panelControl2.Name = "panelControl2"; + this.panelControl2.Size = new System.Drawing.Size(1294, 737); + this.panelControl2.TabIndex = 0; + // + // layoutControl1 + // + this.layoutControl1.Controls.Add(this.simpleButton1); + this.layoutControl1.Controls.Add(this.txtid); + this.layoutControl1.Controls.Add(this.txtbtnName); + this.layoutControl1.Controls.Add(this.txtbtnCode); + this.layoutControl1.Controls.Add(this.txtbtnIcon); + this.layoutControl1.Controls.Add(this.txtremark); + this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutControl1.Location = new System.Drawing.Point(2, 2); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.Root = this.layoutControlGroup1; + this.layoutControl1.Size = new System.Drawing.Size(1290, 733); + this.layoutControl1.TabIndex = 6; + this.layoutControl1.Text = "layoutControl1"; + // + // txtid + // + this.txtid.Location = new System.Drawing.Point(39, 12); + this.txtid.Name = "txtid"; + this.txtid.Size = new System.Drawing.Size(1239, 20); + this.txtid.StyleController = this.layoutControl1; + this.txtid.TabIndex = 1; + // + // txtbtnName + // + this.txtbtnName.Location = new System.Drawing.Point(39, 36); + this.txtbtnName.Name = "txtbtnName"; + this.txtbtnName.Size = new System.Drawing.Size(1239, 20); + this.txtbtnName.StyleController = this.layoutControl1; + this.txtbtnName.TabIndex = 2; + // + // txtbtnCode + // + this.txtbtnCode.Location = new System.Drawing.Point(39, 60); + this.txtbtnCode.Name = "txtbtnCode"; + this.txtbtnCode.Size = new System.Drawing.Size(1239, 20); + this.txtbtnCode.StyleController = this.layoutControl1; + this.txtbtnCode.TabIndex = 3; + // + // txtbtnIcon + // + this.txtbtnIcon.Location = new System.Drawing.Point(39, 84); + this.txtbtnIcon.Name = "txtbtnIcon"; + this.txtbtnIcon.Properties.ReadOnly = true; + this.txtbtnIcon.Size = new System.Drawing.Size(1016, 20); + this.txtbtnIcon.StyleController = this.layoutControl1; + this.txtbtnIcon.TabIndex = 4; + // + // txtremark + // + this.txtremark.Location = new System.Drawing.Point(39, 110); + this.txtremark.Name = "txtremark"; + this.txtremark.Size = new System.Drawing.Size(1239, 20); + this.txtremark.StyleController = this.layoutControl1; + this.txtremark.TabIndex = 5; + // + // layoutControlGroup1 + // + this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1"; + this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem1, + this.layoutControlItem2, + this.layoutControlItem3, + this.layoutControlItem4, + this.layoutControlItem5, + this.layoutControlItem6}); + this.layoutControlGroup1.Name = "layoutControlGroup1"; + this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733); + this.layoutControlGroup1.TextVisible = false; + // + // layoutControlItem1 + // + this.layoutControlItem1.Control = this.txtid; + this.layoutControlItem1.CustomizationFormText = "id"; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem1.Text = "id"; + this.layoutControlItem1.TextSize = new System.Drawing.Size(24, 14); + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txtbtnName; + this.layoutControlItem2.CustomizationFormText = "名称"; + this.layoutControlItem2.Location = new System.Drawing.Point(0, 24); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem2.Text = "名称"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(24, 14); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txtbtnCode; + this.layoutControlItem3.CustomizationFormText = "编码"; + this.layoutControlItem3.Location = new System.Drawing.Point(0, 48); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem3.Text = "编码"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(24, 14); + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txtbtnIcon; + this.layoutControlItem4.CustomizationFormText = "图标"; + this.layoutControlItem4.Location = new System.Drawing.Point(0, 72); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.Size = new System.Drawing.Size(1047, 26); + this.layoutControlItem4.Text = "图标"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(24, 14); + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txtremark; + this.layoutControlItem5.CustomizationFormText = "备注"; + this.layoutControlItem5.Location = new System.Drawing.Point(0, 98); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.Size = new System.Drawing.Size(1270, 615); + this.layoutControlItem5.Text = "备注"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(24, 14); + // + // simpleButton1 + // + this.simpleButton1.Location = new System.Drawing.Point(1059, 84); + this.simpleButton1.Name = "simpleButton1"; + this.simpleButton1.Size = new System.Drawing.Size(219, 22); + this.simpleButton1.StyleController = this.layoutControl1; + this.simpleButton1.TabIndex = 6; + this.simpleButton1.Text = "选择图标"; + this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click); + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.simpleButton1; + this.layoutControlItem6.Location = new System.Drawing.Point(1047, 72); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.Size = new System.Drawing.Size(223, 26); + this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem6.TextVisible = false; + // + // FrmsysToolButton + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1300, 800); + this.Controls.Add(this.xtraTabControl1); + this.Name = "FrmsysToolButton"; + this.Text = "功能按钮维护"; + this.Load += new System.EventHandler(this.FrmsysToolButton_Load); + this.Controls.SetChildIndex(this.xtraTabControl1, 0); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); + this.xtraTabControl1.ResumeLayout(false); + this.tabDataList.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.grdListView)).EndInit(); + this.tabDataDetail.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit(); + this.panelControl2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtbtnName.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtbtnCode.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtbtnIcon.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private XtraTabControl xtraTabControl1; + private XtraTabPage tabDataList; + private XtraTabPage tabDataDetail; + private DevExpress.XtraGrid.GridControl grdList; + private DevExpress.XtraGrid.Views.Grid.GridView grdListView; + private PanelControl panelControl2; + private DevExpress.XtraLayout.LayoutControl layoutControl1; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; + + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtid; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtbtnName; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtbtnCode; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtbtnIcon; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtremark; + + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private SimpleButton simpleButton1; + private LayoutControlItem layoutControlItem6; + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmsysToolButton.resx b/WinformGeneralDeveloperFrame/Form/FrmsysToolButton.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmsysToolButton.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/FrmBaseForm.cs b/WinformGeneralDeveloperFrame/FrmBaseForm.cs index 4e4c37c..8bf86f5 100644 --- a/WinformGeneralDeveloperFrame/FrmBaseForm.cs +++ b/WinformGeneralDeveloperFrame/FrmBaseForm.cs @@ -64,10 +64,10 @@ namespace WinformGeneralDeveloperFrame if (dr != null) { this.ModelDataToControl(dr); + gridControlMouseDoubleClickFunction(sender, e); xtraTab.SelectedTabPageIndex = 1; SetControlStatus(controlGroups, true); InitToolBtntatus(EFormStatus.eView); - gridControlMouseDoubleClickFunction(sender, e); } } public virtual void gridControlMouseDoubleClickFunction(object sender, EventArgs e) @@ -132,25 +132,24 @@ namespace WinformGeneralDeveloperFrame public void initTools() { - List list = null; + List list = null; using (var db=new MESDB()) { - list = db.sysDictTypeInfo.Where(p => p.pid == 10).ToList(); + list = db.sysToolButtonInfo.ToList(); } - //List list = BLLFactory.Instance.GetAll().Where(p => p.IsToolBtn == true).ToList(); int i = 1; int width = 0; - foreach (sysDictTypeInfo info in list) + foreach (sysToolButtonInfo info in list) { - if (AppInfo.FunctionList.Contains(menucode+"-"+info.remark)) + if (AppInfo.FunctionList.Contains(menucode+"-"+info.btnCode)) { SimpleButton button = new SimpleButton(); - button.Name = "btn" + info.remark; - button.Text = info.name; + button.Name = "btn" + info.btnCode; + button.Text = info.btnName; button.Location = new Point(width, 5); button.PaintStyle = PaintStyles.Light; - button.AutoSize = true; - // button.ImageOptions.Image = Image.FromFile(Application.StartupPath + "\\" + info.Icon); + button.AutoSize = true; + button.ImageOptions.Image = Image.FromFile(Application.StartupPath + "\\" + info.btnIcon); button.Click += (sender, e) => { ToolFunction(sender, e); @@ -301,7 +300,7 @@ namespace WinformGeneralDeveloperFrame if (button.GetType().Name == "SimpleButton") { var btn = (SimpleButton)button; - if (btn.Name == "btnCanel" || btn.Name == "btnSave" ) + if (btn.Name == "btnCanle" || btn.Name == "btnSave" ) { btn.Enabled = true; } diff --git a/WinformGeneralDeveloperFrame/FrmShowForm.cs b/WinformGeneralDeveloperFrame/FrmShowForm.cs index c7a824f..c2ba04c 100644 --- a/WinformGeneralDeveloperFrame/FrmShowForm.cs +++ b/WinformGeneralDeveloperFrame/FrmShowForm.cs @@ -43,6 +43,9 @@ namespace WinformGeneralDeveloperFrame btn.Name = "btn" + item.id; btn.Size = new System.Drawing.Size(90, 75); btn.Text = item.name; + if(!string.IsNullOrEmpty(item.icon)&& File.Exists(Application.StartupPath + "\\" + item.icon)) + btn.ImageOptions.Image = Image.FromFile(Application.StartupPath+"\\" +item.icon); + btn.ImageOptions.Location = DevExpress.XtraEditors.ImageLocation.TopCenter; btn.Click += (o, args) => { try diff --git a/WinformGeneralDeveloperFrame/FrmsysDataBase.designer.cs b/WinformGeneralDeveloperFrame/FrmsysDataBase.designer.cs index dfc23ca..6422917 100644 --- a/WinformGeneralDeveloperFrame/FrmsysDataBase.designer.cs +++ b/WinformGeneralDeveloperFrame/FrmsysDataBase.designer.cs @@ -151,11 +151,13 @@ namespace MES.Form // // xtraTabControl1 // - this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.xtraTabControl1.Location = new System.Drawing.Point(0, 0); + this.xtraTabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.xtraTabControl1.Location = new System.Drawing.Point(0, 36); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.tabDataList; - this.xtraTabControl1.Size = new System.Drawing.Size(1300, 800); + this.xtraTabControl1.Size = new System.Drawing.Size(1300, 767); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabDataList, @@ -198,7 +200,7 @@ namespace MES.Form // this.tabDataDetail.Controls.Add(this.panelControl2); this.tabDataDetail.Name = "tabDataDetail"; - this.tabDataDetail.Size = new System.Drawing.Size(1294, 771); + this.tabDataDetail.Size = new System.Drawing.Size(1294, 738); this.tabDataDetail.Text = "数据编辑"; // // panelControl2 @@ -207,7 +209,7 @@ namespace MES.Form this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelControl2.Location = new System.Drawing.Point(0, 0); this.panelControl2.Name = "panelControl2"; - this.panelControl2.Size = new System.Drawing.Size(1294, 771); + this.panelControl2.Size = new System.Drawing.Size(1294, 738); this.panelControl2.TabIndex = 0; // // layoutControl1 @@ -225,7 +227,7 @@ namespace MES.Form this.layoutControl1.Location = new System.Drawing.Point(2, 2); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.Root; - this.layoutControl1.Size = new System.Drawing.Size(1290, 767); + this.layoutControl1.Size = new System.Drawing.Size(1290, 734); this.layoutControl1.TabIndex = 0; this.layoutControl1.Text = "layoutControl1"; // @@ -325,7 +327,7 @@ namespace MES.Form this.layoutControlItem7, this.layoutControlItem8}); this.Root.Name = "Root"; - this.Root.Size = new System.Drawing.Size(1290, 767); + this.Root.Size = new System.Drawing.Size(1290, 734); this.Root.TextVisible = false; // // layoutControlItem1 @@ -388,7 +390,7 @@ namespace MES.Form this.emptySpaceItem1.AllowHotTrack = false; this.emptySpaceItem1.Location = new System.Drawing.Point(0, 170); this.emptySpaceItem1.Name = "emptySpaceItem1"; - this.emptySpaceItem1.Size = new System.Drawing.Size(1270, 577); + this.emptySpaceItem1.Size = new System.Drawing.Size(1270, 544); this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); // // layoutControlItem9 @@ -436,6 +438,7 @@ namespace MES.Form this.Name = "FrmsysDataBase"; this.Text = "数据源维护"; this.Load += new System.EventHandler(this.FrmsysDataBase_Load); + this.Controls.SetChildIndex(this.xtraTabControl1, 0); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.tabDataList.ResumeLayout(false); diff --git a/WinformGeneralDeveloperFrame/FrmsysDataTable.designer.cs b/WinformGeneralDeveloperFrame/FrmsysDataTable.designer.cs index 677c369..224f68d 100644 --- a/WinformGeneralDeveloperFrame/FrmsysDataTable.designer.cs +++ b/WinformGeneralDeveloperFrame/FrmsysDataTable.designer.cs @@ -115,11 +115,13 @@ namespace MES.Form // // xtraTabControl1 // - this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.xtraTabControl1.Location = new System.Drawing.Point(0, 0); + this.xtraTabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.xtraTabControl1.Location = new System.Drawing.Point(0, 33); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.tabDataList; - this.xtraTabControl1.Size = new System.Drawing.Size(1300, 800); + this.xtraTabControl1.Size = new System.Drawing.Size(1300, 766); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabDataList, @@ -129,7 +131,7 @@ namespace MES.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(1294, 771); + this.tabDataList.Size = new System.Drawing.Size(1294, 737); this.tabDataList.Text = "数据列表"; // // grdList @@ -138,7 +140,7 @@ namespace MES.Form this.grdList.Location = new System.Drawing.Point(0, 0); this.grdList.MainView = this.grdListView; this.grdList.Name = "grdList"; - this.grdList.Size = new System.Drawing.Size(1294, 771); + this.grdList.Size = new System.Drawing.Size(1294, 737); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -168,7 +170,7 @@ namespace MES.Form // this.tabDataDetail.Controls.Add(this.panelControl2); this.tabDataDetail.Name = "tabDataDetail"; - this.tabDataDetail.Size = new System.Drawing.Size(1294, 737); + this.tabDataDetail.Size = new System.Drawing.Size(1294, 771); this.tabDataDetail.Text = "数据编辑"; // // panelControl2 @@ -177,7 +179,7 @@ namespace MES.Form this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelControl2.Location = new System.Drawing.Point(0, 0); this.panelControl2.Name = "panelControl2"; - this.panelControl2.Size = new System.Drawing.Size(1294, 737); + this.panelControl2.Size = new System.Drawing.Size(1294, 771); this.panelControl2.TabIndex = 0; // // layoutControl1 @@ -193,13 +195,13 @@ namespace MES.Form this.layoutControl1.Location = new System.Drawing.Point(2, 2); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup1; - this.layoutControl1.Size = new System.Drawing.Size(1290, 733); + this.layoutControl1.Size = new System.Drawing.Size(1290, 767); this.layoutControl1.TabIndex = 6; this.layoutControl1.Text = "layoutControl1"; // // btnTest // - this.btnTest.Location = new System.Drawing.Point(12, 265); + this.btnTest.Location = new System.Drawing.Point(12, 275); this.btnTest.Name = "btnTest"; this.btnTest.Size = new System.Drawing.Size(631, 22); this.btnTest.StyleController = this.layoutControl1; @@ -209,7 +211,7 @@ namespace MES.Form // // btnSave // - this.btnSave.Location = new System.Drawing.Point(647, 265); + this.btnSave.Location = new System.Drawing.Point(647, 275); this.btnSave.Name = "btnSave"; this.btnSave.Size = new System.Drawing.Size(631, 22); this.btnSave.StyleController = this.layoutControl1; @@ -219,10 +221,10 @@ namespace MES.Form // // gridControl1 // - this.gridControl1.Location = new System.Drawing.Point(12, 291); + this.gridControl1.Location = new System.Drawing.Point(12, 301); this.gridControl1.MainView = this.gridView1; this.gridControl1.Name = "gridControl1"; - this.gridControl1.Size = new System.Drawing.Size(1266, 430); + this.gridControl1.Size = new System.Drawing.Size(1266, 454); this.gridControl1.TabIndex = 6; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -236,7 +238,7 @@ namespace MES.Form // this.txtDataTableSql.Location = new System.Drawing.Point(75, 84); this.txtDataTableSql.Name = "txtDataTableSql"; - this.txtDataTableSql.Size = new System.Drawing.Size(1203, 177); + this.txtDataTableSql.Size = new System.Drawing.Size(1203, 187); this.txtDataTableSql.StyleController = this.layoutControl1; this.txtDataTableSql.TabIndex = 5; // @@ -280,7 +282,7 @@ namespace MES.Form this.layoutControlItem7, this.layoutControlItem6}); this.layoutControlGroup1.Name = "layoutControlGroup1"; - this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733); + this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 767); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem1 @@ -317,23 +319,23 @@ namespace MES.Form this.layoutControlItem5.Control = this.txtDataTableSql; this.layoutControlItem5.Location = new System.Drawing.Point(0, 72); this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(1270, 181); + this.layoutControlItem5.Size = new System.Drawing.Size(1270, 191); this.layoutControlItem5.Text = "数据集SQL"; this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 14); // // layoutControlItem2 // this.layoutControlItem2.Control = this.gridControl1; - this.layoutControlItem2.Location = new System.Drawing.Point(0, 279); + this.layoutControlItem2.Location = new System.Drawing.Point(0, 289); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(1270, 434); + this.layoutControlItem2.Size = new System.Drawing.Size(1270, 458); this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem2.TextVisible = false; // // layoutControlItem7 // this.layoutControlItem7.Control = this.btnTest; - this.layoutControlItem7.Location = new System.Drawing.Point(0, 253); + this.layoutControlItem7.Location = new System.Drawing.Point(0, 263); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.Size = new System.Drawing.Size(635, 26); this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0); @@ -342,7 +344,7 @@ namespace MES.Form // layoutControlItem6 // this.layoutControlItem6.Control = this.btnSave; - this.layoutControlItem6.Location = new System.Drawing.Point(635, 253); + this.layoutControlItem6.Location = new System.Drawing.Point(635, 263); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.Size = new System.Drawing.Size(635, 26); this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0); @@ -357,6 +359,7 @@ namespace MES.Form this.Name = "FrmsysDataTable"; this.Text = "数据集维护"; this.Load += new System.EventHandler(this.FrmsysDataTable_Load); + this.Controls.SetChildIndex(this.xtraTabControl1, 0); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.tabDataList.ResumeLayout(false); diff --git a/WinformGeneralDeveloperFrame/MainForm.Designer.cs b/WinformGeneralDeveloperFrame/MainForm.Designer.cs index 45c4828..060c8d1 100644 --- a/WinformGeneralDeveloperFrame/MainForm.Designer.cs +++ b/WinformGeneralDeveloperFrame/MainForm.Designer.cs @@ -223,9 +223,9 @@ namespace WinformGeneralDeveloperFrame this.navBarControl1.OptionsNavPane.ExpandedWidth = 184; this.navBarControl1.PaintStyleKind = DevExpress.XtraNavBar.NavBarViewKind.NavigationPane; this.navBarControl1.Size = new System.Drawing.Size(184, 618); + this.navBarControl1.StoreDefaultPaintStyleName = true; this.navBarControl1.TabIndex = 8; this.navBarControl1.Text = "navBarControl1"; - this.navBarControl1.View = new DevExpress.XtraNavBar.ViewInfo.StandardSkinNavigationPaneViewInfoRegistrator("Blue"); this.navBarControl1.Click += new System.EventHandler(this.navBarControl1_Click); // // timer1 diff --git a/WinformGeneralDeveloperFrame/Properties/Resources.Designer.cs b/WinformGeneralDeveloperFrame/Properties/Resources.Designer.cs index 28ee91e..b5903d0 100644 --- a/WinformGeneralDeveloperFrame/Properties/Resources.Designer.cs +++ b/WinformGeneralDeveloperFrame/Properties/Resources.Designer.cs @@ -70,6 +70,16 @@ namespace WinformGeneralDeveloperFrame.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bocountry_32x32 { + get { + object obj = ResourceManager.GetObject("bocountry_32x32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/WinformGeneralDeveloperFrame/Properties/Resources.resx b/WinformGeneralDeveloperFrame/Properties/Resources.resx index ba9e751..f5ef598 100644 --- a/WinformGeneralDeveloperFrame/Properties/Resources.resx +++ b/WinformGeneralDeveloperFrame/Properties/Resources.resx @@ -124,6 +124,9 @@ ..\Resources\lock_open_24px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\user_24px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\operatingsystem_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -139,6 +142,9 @@ ..\Resources\team_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pagesetup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\removepivotfield_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -169,9 +175,6 @@ ..\Resources\mail_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\bocustomer_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\bosaleitem_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -190,8 +193,11 @@ ..\Resources\time_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pagesetup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bocustomer_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\removepivotfield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bocustomer_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -202,16 +208,13 @@ ..\Resources\database_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\user_24px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\operatingsystem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\folderpanel_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\removepivotfield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bocountry_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Resources/bocountry_32x32.png b/WinformGeneralDeveloperFrame/Resources/bocountry_32x32.png new file mode 100644 index 0000000..a661e58 Binary files /dev/null and b/WinformGeneralDeveloperFrame/Resources/bocountry_32x32.png differ diff --git a/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj b/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj index ae315a9..f3ec351 100644 --- a/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj +++ b/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj @@ -145,6 +145,7 @@ + Form @@ -194,6 +195,12 @@ FrmsysRole.cs + + Form + + + FrmsysToolButton.cs + Form @@ -322,6 +329,9 @@ FrmsysRole.cs + + FrmsysToolButton.cs + FrmsysUser.cs @@ -7685,6 +7695,7 @@ Always + diff --git a/WinformGeneralDeveloperFrame/XtraForm1.Designer.cs b/WinformGeneralDeveloperFrame/XtraForm1.Designer.cs index 91e07a1..d973ef4 100644 --- a/WinformGeneralDeveloperFrame/XtraForm1.Designer.cs +++ b/WinformGeneralDeveloperFrame/XtraForm1.Designer.cs @@ -33,581 +33,268 @@ namespace WinformGeneralDeveloperFrame /// private void InitializeComponent() { - this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); - this.tabDataList = new DevExpress.XtraTab.XtraTabPage(); this.grdList = new DevExpress.XtraGrid.GridControl(); this.grdListView = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemTreeListLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemTreeListLookUpEdit(); - this.repositoryItemTreeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit(); - this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.repositoryItemColorEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemColorEdit(); - this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage(); - this.panelControl2 = new DevExpress.XtraEditors.PanelControl(); - this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemCheckedComboBoxEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit(); + this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit(); + this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton(); - this.checkedComboBoxEdit1 = new DevExpress.XtraEditors.CheckedComboBoxEdit(); - this.searchLookUpEdit1 = new DevExpress.XtraEditors.SearchLookUpEdit(); - this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.comboBoxEdit1 = new DevExpress.XtraEditors.ComboBoxEdit(); - this.treeListLookUpEdit1 = new DevExpress.XtraEditors.TreeListLookUpEdit(); - this.treeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList(); - this.lookUpEdit1 = new DevExpress.XtraEditors.LookUpEdit(); - this.dateEdit1 = new DevExpress.XtraEditors.DateEdit(); - this.textEdit1 = new DevExpress.XtraEditors.TextEdit(); - this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); - this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); - this.textEdit2 = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); - ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); - this.xtraTabControl1.SuspendLayout(); - this.tabDataList.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.grdListView)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListLookUpEdit1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListLookUpEdit1TreeList)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemColorEdit1)).BeginInit(); - this.tabDataDetail.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit(); - this.panelControl2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); - this.layoutControl1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.checkedComboBoxEdit1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1TreeList)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.lookUpEdit1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties.CalendarTimeProperties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckedComboBoxEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit(); this.SuspendLayout(); // - // xtraTabControl1 - // - this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.xtraTabControl1.Location = new System.Drawing.Point(0, 34); - this.xtraTabControl1.Name = "xtraTabControl1"; - this.xtraTabControl1.SelectedTabPage = this.tabDataList; - this.xtraTabControl1.Size = new System.Drawing.Size(1074, 615); - this.xtraTabControl1.TabIndex = 1; - this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { - this.tabDataList, - this.tabDataDetail}); - this.xtraTabControl1.SelectedPageChanged += new DevExpress.XtraTab.TabPageChangedEventHandler(this.xtraTabControl1_SelectedPageChanged); - // - // tabDataList - // - this.tabDataList.Controls.Add(this.grdList); - this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(1068, 586); - this.tabDataList.Text = "数据列表"; - // // grdList // this.grdList.Dock = System.Windows.Forms.DockStyle.Fill; - this.grdList.Location = new System.Drawing.Point(0, 0); + this.grdList.Location = new System.Drawing.Point(0, 34); this.grdList.MainView = this.grdListView; this.grdList.Name = "grdList"; this.grdList.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { - this.repositoryItemTreeListLookUpEdit1, - this.repositoryItemLookUpEdit1, - this.repositoryItemColorEdit1, - this.repositoryItemDateEdit1, - this.repositoryItemSearchLookUpEdit1}); - this.grdList.Size = new System.Drawing.Size(1068, 586); - this.grdList.TabIndex = 0; + this.repositoryItemCheckEdit1, + this.repositoryItemCheckedComboBoxEdit1}); + this.grdList.Size = new System.Drawing.Size(1074, 615); + this.grdList.TabIndex = 1; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); // // grdListView // this.grdListView.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { - this.gridColumn2, this.gridColumn1, + this.gridColumn2, this.gridColumn3, - this.gridColumn4}); + this.gridColumn4, + this.gridColumn5, + this.gridColumn6, + this.gridColumn7, + this.gridColumn8, + this.gridColumn9, + this.gridColumn10, + this.gridColumn11, + this.gridColumn12, + this.gridColumn13, + this.gridColumn14, + this.gridColumn15}); this.grdListView.GridControl = this.grdList; this.grdListView.Name = "grdListView"; this.grdListView.OptionsBehavior.Editable = false; - this.grdListView.DoubleClick += new System.EventHandler(this.grdListView_DoubleClick); - // - // gridColumn2 - // - this.gridColumn2.Caption = "gridColumn2"; - this.gridColumn2.ColumnEdit = this.repositoryItemTreeListLookUpEdit1; - this.gridColumn2.FieldName = "Name"; - this.gridColumn2.Name = "gridColumn2"; - this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 0; - // - // repositoryItemTreeListLookUpEdit1 - // - this.repositoryItemTreeListLookUpEdit1.AutoHeight = false; - this.repositoryItemTreeListLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemTreeListLookUpEdit1.DisplayMember = "Name"; - this.repositoryItemTreeListLookUpEdit1.Name = "repositoryItemTreeListLookUpEdit1"; - this.repositoryItemTreeListLookUpEdit1.TreeList = this.repositoryItemTreeListLookUpEdit1TreeList; - this.repositoryItemTreeListLookUpEdit1.ValueMember = "ID"; - // - // repositoryItemTreeListLookUpEdit1TreeList - // - this.repositoryItemTreeListLookUpEdit1TreeList.Location = new System.Drawing.Point(0, 0); - this.repositoryItemTreeListLookUpEdit1TreeList.Name = "repositoryItemTreeListLookUpEdit1TreeList"; - this.repositoryItemTreeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true; - this.repositoryItemTreeListLookUpEdit1TreeList.ParentFieldName = "PID"; - this.repositoryItemTreeListLookUpEdit1TreeList.Size = new System.Drawing.Size(400, 200); - this.repositoryItemTreeListLookUpEdit1TreeList.TabIndex = 0; + this.grdListView.OptionsView.ColumnAutoWidth = false; + this.grdListView.SortInfo.AddRange(new DevExpress.XtraGrid.Columns.GridColumnSortInfo[] { + new DevExpress.XtraGrid.Columns.GridColumnSortInfo(this.gridColumn7, DevExpress.Data.ColumnSortOrder.Ascending)}); // // gridColumn1 // - this.gridColumn1.Caption = "gridColumn1"; - this.gridColumn1.ColumnEdit = this.repositoryItemLookUpEdit1; + this.gridColumn1.Caption = "ID"; + this.gridColumn1.FieldName = "id"; this.gridColumn1.Name = "gridColumn1"; - this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 1; // - // repositoryItemLookUpEdit1 + // gridColumn2 // - this.repositoryItemLookUpEdit1.AutoHeight = false; - this.repositoryItemLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemLookUpEdit1.Name = "repositoryItemLookUpEdit1"; + this.gridColumn2.Caption = "父id"; + this.gridColumn2.FieldName = "pid"; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 0; + this.gridColumn2.Width = 128; // // gridColumn3 // - this.gridColumn3.Caption = "gridColumn3"; - this.gridColumn3.ColumnEdit = this.repositoryItemDateEdit1; + this.gridColumn3.Caption = "菜单名称"; + this.gridColumn3.FieldName = "name"; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 2; - // - // repositoryItemDateEdit1 - // - this.repositoryItemDateEdit1.AutoHeight = false; - this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1"; + this.gridColumn3.VisibleIndex = 1; + this.gridColumn3.Width = 122; // // gridColumn4 // - this.gridColumn4.Caption = "gridColumn4"; - this.gridColumn4.ColumnEdit = this.repositoryItemSearchLookUpEdit1; + this.gridColumn4.Caption = "图标"; + this.gridColumn4.FieldName = "icon"; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 3; + this.gridColumn4.VisibleIndex = 2; + this.gridColumn4.Width = 135; // - // repositoryItemSearchLookUpEdit1 + // gridColumn5 // - this.repositoryItemSearchLookUpEdit1.AutoHeight = false; - this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + this.gridColumn5.Caption = "菜单类型"; + this.gridColumn5.FieldName = "winformType"; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 3; + this.gridColumn5.Width = 109; + // + // gridColumn6 + // + this.gridColumn6.Caption = "排序"; + this.gridColumn6.FieldName = "sort"; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 4; + this.gridColumn6.Width = 80; + // + // gridColumn7 + // + this.gridColumn7.Caption = "有效"; + this.gridColumn7.FieldName = "isEnabled"; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 5; + this.gridColumn7.Width = 100; + // + // gridColumn8 + // + this.gridColumn8.Caption = "功能按钮"; + this.gridColumn8.ColumnEdit = this.repositoryItemCheckedComboBoxEdit1; + this.gridColumn8.FieldName = "toolList"; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Width = 201; + // + // repositoryItemCheckedComboBoxEdit1 + // + this.repositoryItemCheckedComboBoxEdit1.AutoHeight = false; + this.repositoryItemCheckedComboBoxEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1"; - this.repositoryItemSearchLookUpEdit1.NullText = ""; - this.repositoryItemSearchLookUpEdit1.PopupView = this.repositoryItemSearchLookUpEdit1View; + this.repositoryItemCheckedComboBoxEdit1.DisplayMember = "Name"; + this.repositoryItemCheckedComboBoxEdit1.Name = "repositoryItemCheckedComboBoxEdit1"; + this.repositoryItemCheckedComboBoxEdit1.ValueMember = "ID"; // - // repositoryItemSearchLookUpEdit1View + // gridColumn9 // - this.repositoryItemSearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus; - this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View"; - this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false; - this.repositoryItemSearchLookUpEdit1View.OptionsSelection.MultiSelect = true; - this.repositoryItemSearchLookUpEdit1View.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect; - this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false; + this.gridColumn9.Caption = "创建人"; + this.gridColumn9.FieldName = "creatorId"; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.Visible = true; + this.gridColumn9.VisibleIndex = 8; + this.gridColumn9.Width = 201; // - // repositoryItemColorEdit1 + // gridColumn10 // - this.repositoryItemColorEdit1.AutoHeight = false; - this.repositoryItemColorEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemColorEdit1.Name = "repositoryItemColorEdit1"; + this.gridColumn10.Caption = "创建时间"; + this.gridColumn10.DisplayFormat.FormatString = "G"; + this.gridColumn10.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn10.FieldName = "createTime"; + this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.Visible = true; + this.gridColumn10.VisibleIndex = 9; + this.gridColumn10.Width = 201; // - // tabDataDetail + // gridColumn11 // - this.tabDataDetail.Controls.Add(this.panelControl2); - this.tabDataDetail.Name = "tabDataDetail"; - this.tabDataDetail.Size = new System.Drawing.Size(1068, 586); - this.tabDataDetail.Text = "数据编辑"; + this.gridColumn11.Caption = "编辑人"; + this.gridColumn11.FieldName = "editorId"; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 10; + this.gridColumn11.Width = 201; // - // panelControl2 + // gridColumn12 // - this.panelControl2.Controls.Add(this.layoutControl1); - this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panelControl2.Location = new System.Drawing.Point(0, 0); - this.panelControl2.Name = "panelControl2"; - this.panelControl2.Size = new System.Drawing.Size(1068, 586); - this.panelControl2.TabIndex = 0; + this.gridColumn12.Caption = "编辑时间"; + this.gridColumn12.FieldName = "editTime"; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 11; + this.gridColumn12.Width = 201; // - // layoutControl1 + // gridColumn13 // - this.layoutControl1.Controls.Add(this.textEdit2); - this.layoutControl1.Controls.Add(this.simpleButton1); - this.layoutControl1.Controls.Add(this.checkedComboBoxEdit1); - this.layoutControl1.Controls.Add(this.searchLookUpEdit1); - this.layoutControl1.Controls.Add(this.comboBoxEdit1); - this.layoutControl1.Controls.Add(this.treeListLookUpEdit1); - this.layoutControl1.Controls.Add(this.lookUpEdit1); - this.layoutControl1.Controls.Add(this.dateEdit1); - this.layoutControl1.Controls.Add(this.textEdit1); - this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.layoutControl1.Location = new System.Drawing.Point(2, 2); - this.layoutControl1.Name = "layoutControl1"; - this.layoutControl1.Root = this.Root; - this.layoutControl1.Size = new System.Drawing.Size(1064, 582); - this.layoutControl1.TabIndex = 0; - this.layoutControl1.Text = "layoutControl1"; + this.gridColumn13.Caption = "是否界面"; + this.gridColumn13.FieldName = "isForm"; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 6; + this.gridColumn13.Width = 201; + // + // gridColumn14 + // + this.gridColumn14.Caption = "是否功能按钮"; + this.gridColumn14.ColumnEdit = this.repositoryItemCheckEdit1; + this.gridColumn14.FieldName = "isToolBtn"; + this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.Visible = true; + this.gridColumn14.VisibleIndex = 7; + // + // repositoryItemCheckEdit1 + // + this.repositoryItemCheckEdit1.AutoHeight = false; + this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1"; + // + // gridColumn15 + // + this.gridColumn15.Caption = "权限编码"; + this.gridColumn15.FieldName = "functionCode"; + this.gridColumn15.Name = "gridColumn15"; + this.gridColumn15.Visible = true; + this.gridColumn15.VisibleIndex = 12; // // simpleButton1 // - this.simpleButton1.Location = new System.Drawing.Point(12, 180); + this.simpleButton1.ImageOptions.Image = global::WinformGeneralDeveloperFrame.Properties.Resources.bocountry_32x32; + this.simpleButton1.ImageOptions.Location = DevExpress.XtraEditors.ImageLocation.TopCenter; + this.simpleButton1.Location = new System.Drawing.Point(622, 181); this.simpleButton1.Name = "simpleButton1"; - this.simpleButton1.Size = new System.Drawing.Size(1040, 22); - this.simpleButton1.StyleController = this.layoutControl1; - this.simpleButton1.TabIndex = 11; + this.simpleButton1.Size = new System.Drawing.Size(123, 124); + this.simpleButton1.TabIndex = 2; this.simpleButton1.Text = "simpleButton1"; - this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click); - // - // checkedComboBoxEdit1 - // - this.checkedComboBoxEdit1.Location = new System.Drawing.Point(120, 156); - this.checkedComboBoxEdit1.Name = "checkedComboBoxEdit1"; - this.checkedComboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.checkedComboBoxEdit1.Properties.DisplayMember = "Name"; - this.checkedComboBoxEdit1.Size = new System.Drawing.Size(932, 20); - this.checkedComboBoxEdit1.StyleController = this.layoutControl1; - this.checkedComboBoxEdit1.TabIndex = 10; - // - // searchLookUpEdit1 - // - this.searchLookUpEdit1.Location = new System.Drawing.Point(120, 132); - this.searchLookUpEdit1.Name = "searchLookUpEdit1"; - this.searchLookUpEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.searchLookUpEdit1.Properties.DisplayMember = "Name"; - this.searchLookUpEdit1.Properties.PopupView = this.searchLookUpEdit1View; - this.searchLookUpEdit1.Properties.ValueMember = "ID"; - this.searchLookUpEdit1.Size = new System.Drawing.Size(932, 20); - this.searchLookUpEdit1.StyleController = this.layoutControl1; - this.searchLookUpEdit1.TabIndex = 9; - // - // searchLookUpEdit1View - // - this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus; - this.searchLookUpEdit1View.Name = "searchLookUpEdit1View"; - this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false; - this.searchLookUpEdit1View.OptionsSelection.MultiSelect = true; - this.searchLookUpEdit1View.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect; - this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false; - // - // comboBoxEdit1 - // - this.comboBoxEdit1.Location = new System.Drawing.Point(120, 108); - this.comboBoxEdit1.Name = "comboBoxEdit1"; - this.comboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.comboBoxEdit1.Size = new System.Drawing.Size(932, 20); - this.comboBoxEdit1.StyleController = this.layoutControl1; - this.comboBoxEdit1.TabIndex = 8; - // - // treeListLookUpEdit1 - // - this.treeListLookUpEdit1.EditValue = ""; - this.treeListLookUpEdit1.Location = new System.Drawing.Point(120, 84); - this.treeListLookUpEdit1.Name = "treeListLookUpEdit1"; - this.treeListLookUpEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.treeListLookUpEdit1.Properties.DisplayMember = "Name"; - this.treeListLookUpEdit1.Properties.TreeList = this.treeListLookUpEdit1TreeList; - this.treeListLookUpEdit1.Properties.ValueMember = "ID"; - this.treeListLookUpEdit1.Size = new System.Drawing.Size(932, 20); - this.treeListLookUpEdit1.StyleController = this.layoutControl1; - this.treeListLookUpEdit1.TabIndex = 7; - // - // treeListLookUpEdit1TreeList - // - this.treeListLookUpEdit1TreeList.Location = new System.Drawing.Point(0, 0); - this.treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList"; - this.treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true; - this.treeListLookUpEdit1TreeList.ParentFieldName = "PID"; - this.treeListLookUpEdit1TreeList.Size = new System.Drawing.Size(400, 200); - this.treeListLookUpEdit1TreeList.TabIndex = 0; - // - // lookUpEdit1 - // - this.lookUpEdit1.Location = new System.Drawing.Point(120, 60); - this.lookUpEdit1.Name = "lookUpEdit1"; - this.lookUpEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.lookUpEdit1.Properties.DisplayMember = "Value"; - this.lookUpEdit1.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; - this.lookUpEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; - this.lookUpEdit1.Properties.ValueMember = "Code"; - this.lookUpEdit1.Size = new System.Drawing.Size(932, 20); - this.lookUpEdit1.StyleController = this.layoutControl1; - this.lookUpEdit1.TabIndex = 6; - // - // dateEdit1 - // - this.dateEdit1.EditValue = null; - this.dateEdit1.Location = new System.Drawing.Point(120, 36); - this.dateEdit1.Name = "dateEdit1"; - this.dateEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.dateEdit1.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.dateEdit1.Size = new System.Drawing.Size(932, 20); - this.dateEdit1.StyleController = this.layoutControl1; - this.dateEdit1.TabIndex = 5; - this.dateEdit1.Visible = false; - // - // textEdit1 - // - this.textEdit1.Location = new System.Drawing.Point(120, 12); - this.textEdit1.Name = "textEdit1"; - this.textEdit1.Size = new System.Drawing.Size(932, 20); - this.textEdit1.StyleController = this.layoutControl1; - this.textEdit1.TabIndex = 4; - // - // Root - // - this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.Root.GroupBordersVisible = false; - this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem1, - this.emptySpaceItem1, - this.layoutControlItem2, - this.layoutControlItem3, - this.layoutControlItem4, - this.layoutControlItem5, - this.layoutControlItem6, - this.layoutControlItem7, - this.layoutControlItem8, - this.layoutControlItem9}); - this.Root.Name = "Root"; - this.Root.Size = new System.Drawing.Size(1064, 582); - this.Root.TextVisible = false; - // - // layoutControlItem1 - // - this.layoutControlItem1.Control = this.textEdit1; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(1044, 24); - this.layoutControlItem1.TextSize = new System.Drawing.Size(105, 14); - this.layoutControlItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never; - // - // emptySpaceItem1 - // - this.emptySpaceItem1.AllowHotTrack = false; - this.emptySpaceItem1.Location = new System.Drawing.Point(0, 218); - this.emptySpaceItem1.Name = "emptySpaceItem1"; - this.emptySpaceItem1.Size = new System.Drawing.Size(1044, 344); - this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.dateEdit1; - this.layoutControlItem2.Location = new System.Drawing.Point(0, 24); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(1044, 24); - this.layoutControlItem2.TextSize = new System.Drawing.Size(105, 14); - // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.lookUpEdit1; - this.layoutControlItem3.Location = new System.Drawing.Point(0, 48); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(1044, 24); - this.layoutControlItem3.TextSize = new System.Drawing.Size(105, 14); - // - // layoutControlItem4 - // - this.layoutControlItem4.Control = this.treeListLookUpEdit1; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 72); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(1044, 24); - this.layoutControlItem4.TextSize = new System.Drawing.Size(105, 14); - // - // layoutControlItem5 - // - this.layoutControlItem5.Control = this.comboBoxEdit1; - this.layoutControlItem5.Location = new System.Drawing.Point(0, 96); - this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(1044, 24); - this.layoutControlItem5.TextSize = new System.Drawing.Size(105, 14); - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.searchLookUpEdit1; - this.layoutControlItem6.Location = new System.Drawing.Point(0, 120); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Size = new System.Drawing.Size(1044, 24); - this.layoutControlItem6.TextSize = new System.Drawing.Size(105, 14); - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.checkedComboBoxEdit1; - this.layoutControlItem7.Location = new System.Drawing.Point(0, 144); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Size = new System.Drawing.Size(1044, 24); - this.layoutControlItem7.TextSize = new System.Drawing.Size(105, 14); - // - // layoutControlItem8 - // - this.layoutControlItem8.Control = this.simpleButton1; - this.layoutControlItem8.Location = new System.Drawing.Point(0, 168); - this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Size = new System.Drawing.Size(1044, 26); - this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem8.TextVisible = false; - // - // textEdit2 - // - this.textEdit2.Location = new System.Drawing.Point(120, 206); - this.textEdit2.Name = "textEdit2"; - this.textEdit2.Size = new System.Drawing.Size(932, 20); - this.textEdit2.StyleController = this.layoutControl1; - this.textEdit2.TabIndex = 12; - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.textEdit2; - this.layoutControlItem9.Location = new System.Drawing.Point(0, 194); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.Size = new System.Drawing.Size(1044, 24); - this.layoutControlItem9.TextSize = new System.Drawing.Size(105, 14); // // XtraForm1 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1074, 649); - this.Controls.Add(this.xtraTabControl1); + this.Controls.Add(this.simpleButton1); + this.Controls.Add(this.grdList); this.Name = "XtraForm1"; this.Text = "XtraForm1"; this.Load += new System.EventHandler(this.XtraForm1_Load); - this.Controls.SetChildIndex(this.xtraTabControl1, 0); - ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); - this.xtraTabControl1.ResumeLayout(false); - this.tabDataList.ResumeLayout(false); + this.Controls.SetChildIndex(this.grdList, 0); + this.Controls.SetChildIndex(this.simpleButton1, 0); ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.grdListView)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListLookUpEdit1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListLookUpEdit1TreeList)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemColorEdit1)).EndInit(); - this.tabDataDetail.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit(); - this.panelControl2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); - this.layoutControl1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.checkedComboBoxEdit1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1TreeList)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.lookUpEdit1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties.CalendarTimeProperties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckedComboBoxEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit(); this.ResumeLayout(false); } #endregion - private XtraTabControl xtraTabControl1; - private XtraTabPage tabDataList; - private XtraTabPage tabDataDetail; private DevExpress.XtraGrid.GridControl grdList; private DevExpress.XtraGrid.Views.Grid.GridView grdListView; - private PanelControl panelControl2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; - private LayoutControl layoutControl1; - private LayoutControlGroup Root; - private TextEdit textEdit1; - private LayoutControlItem layoutControlItem1; - private EmptySpaceItem emptySpaceItem1; - private DateEdit dateEdit1; - private LayoutControlItem layoutControlItem2; - private LookUpEdit lookUpEdit1; - private LayoutControlItem layoutControlItem3; - private TreeListLookUpEdit treeListLookUpEdit1; - private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList; - private LayoutControlItem layoutControlItem4; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; - private DevExpress.XtraEditors.Repository.RepositoryItemTreeListLookUpEdit repositoryItemTreeListLookUpEdit1; - private DevExpress.XtraTreeList.TreeList repositoryItemTreeListLookUpEdit1TreeList; - private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEdit1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; - private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1; - private DevExpress.XtraEditors.Repository.RepositoryItemColorEdit repositoryItemColorEdit1; - private ComboBoxEdit comboBoxEdit1; - private LayoutControlItem layoutControlItem5; - private SearchLookUpEdit searchLookUpEdit1; - private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View; - private LayoutControlItem layoutControlItem6; private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; - private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1; - private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View; - private CheckedComboBoxEdit checkedComboBoxEdit1; - private LayoutControlItem layoutControlItem7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit repositoryItemCheckedComboBoxEdit1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; + private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; private SimpleButton simpleButton1; - private LayoutControlItem layoutControlItem8; - private TextEdit textEdit2; - private LayoutControlItem layoutControlItem9; } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/XtraForm1.cs b/WinformGeneralDeveloperFrame/XtraForm1.cs index c4c5dea..3ec6dd2 100644 --- a/WinformGeneralDeveloperFrame/XtraForm1.cs +++ b/WinformGeneralDeveloperFrame/XtraForm1.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using DevExpress.XtraEditors; using DevExpress.XtraLayout; +using MES; using WinformGeneralDeveloperFrame; using WinformGeneralDeveloperFrame.Commons; @@ -33,25 +34,10 @@ namespace WinformGeneralDeveloperFrame private void XtraForm1_Load(object sender, EventArgs e) { - //using (var db =new Model1()) - //{ - // grdList.DataSource = db.T_ACL_Menu.ToList(); - // treeListLookUpEdit1.Properties.DataSource = GetDataTableUtils.SqlTable(""); - // lookUpEdit1.Properties.DataSource = db.T_ACL_Menu.Select(p => new {p.Name, p.ID}).ToList(); - // repositoryItemTreeListLookUpEdit1TreeList.DataSource = db.T_ACL_Menu.Select(p => new { p.Name, p.ID, p.PID }).ToList(); - // repositoryItemTreeListLookUpEdit1.DataSource= db.T_ACL_Menu.Select(p => new { p.Name, p.ID, p.PID }).ToList(); - // repositoryItemLookUpEdit1.DataSource= db.T_ACL_Menu.Select(p => new { p.Name, p.ID }).ToList(); - // repositoryItemSearchLookUpEdit1.DataSource=db.T_ACL_Menu.Select(p => new { p.Name, p.ID }).ToList(); - // searchLookUpEdit1.Properties.DataSource= db.T_ACL_Menu.Select(p => new { p.Name, p.ID }).ToList(); - // checkedComboBoxEdit1.EditValue = "新增,复核"; - // checkedComboBoxEdit1.Properties.DataSource= GetDataTableUtils.SqlTable("菜单tree"); - // //comboBoxEdit1.Properties.Items.Add(db.T_ACL_Menu.Select(p => new { p.Name }).ToList()); - // foreach (DataRow info in GetDataTableUtils.SqlTable("菜单tree").Rows) - // { - // comboBoxEdit1.Properties.Items.Add(info.ItemArray[2].ToString()); - // } - //} - //InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{Root},ne); + using (var db = new MESDB()) + { + //treeList1.DataSource = db.sysMenuInfo.ToList(); + } } private void simpleButton1_Click(object sender, EventArgs e)