From e9f8f27864a6a329f5ea67a6872cf7ab3fc1b4b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=87=AF=20=E7=8E=8B?= <648428741@qq.com> Date: Wed, 12 May 2021 08:50:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WinformGeneralDeveloperFrame/v16/.suo | Bin 448000 -> 542720 bytes .../Commons/AppInfo.cs | 1 + .../Entity/sysMenuInfo.cs | 3 +- .../Form/FrmsysMenu.designer.cs | 118 ++++++++++++------ WinformGeneralDeveloperFrame/FrmShowForm.cs | 1 + WinformGeneralDeveloperFrame/MainForm.cs | 18 ++- 6 files changed, 97 insertions(+), 44 deletions(-) diff --git a/.vs/WinformGeneralDeveloperFrame/v16/.suo b/.vs/WinformGeneralDeveloperFrame/v16/.suo index 906479d3a242189489193a7ca57a1ae6cf789d3f..fc40c67c472d3277b0c7fbaf91552b56e4956976 100644 GIT binary patch delta 38049 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 M=3Tb_BVeZg12XW>vH$=8 delta 22136 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 lyh&z@{d>7)%heI$qdRx FunctionList = new List(); } } diff --git a/WinformGeneralDeveloperFrame/Entity/sysMenuInfo.cs b/WinformGeneralDeveloperFrame/Entity/sysMenuInfo.cs index d6f3846..6f346e3 100644 --- a/WinformGeneralDeveloperFrame/Entity/sysMenuInfo.cs +++ b/WinformGeneralDeveloperFrame/Entity/sysMenuInfo.cs @@ -39,6 +39,7 @@ namespace MES.Entity public bool isForm{set;get;} [ModelBindControl("txtisToolBtn")] public bool isToolBtn { set; get; } - + [ModelBindControl("txtfunctionCode")] + public string functionCode { set; get; } } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmsysMenu.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmsysMenu.designer.cs index eb3b906..8c6232d 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmsysMenu.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmsysMenu.designer.cs @@ -93,6 +93,9 @@ namespace MES.Form this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.xtraOpenFileDialog1 = new DevExpress.XtraEditors.XtraOpenFileDialog(this.components); + this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.txtfunctionCode = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpidTreeList)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckedComboBoxEdit1)).BeginInit(); @@ -141,6 +144,8 @@ namespace MES.Form ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtfunctionCode.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); this.SuspendLayout(); // // gridColumn1 @@ -358,7 +363,8 @@ namespace MES.Form this.gridColumn11, this.gridColumn12, this.gridColumn13, - this.gridColumn14}); + this.gridColumn14, + this.gridColumn15}); this.grdListView.GridControl = this.grdList; this.grdListView.Name = "grdListView"; this.grdListView.OptionsBehavior.Editable = false; @@ -398,6 +404,7 @@ namespace MES.Form // // layoutControl1 // + this.layoutControl1.Controls.Add(this.txtfunctionCode); this.layoutControl1.Controls.Add(this.txtname); this.layoutControl1.Controls.Add(this.txtid); this.layoutControl1.Controls.Add(this.simpleButton1); @@ -422,9 +429,9 @@ namespace MES.Form // // txtname // - this.txtname.Location = new System.Drawing.Point(391, 12); + this.txtname.Location = new System.Drawing.Point(401, 12); this.txtname.Name = "txtname"; - this.txtname.Size = new System.Drawing.Size(273, 20); + this.txtname.Size = new System.Drawing.Size(263, 20); this.txtname.StyleController = this.layoutControl1; this.txtname.TabIndex = 15; // @@ -432,7 +439,7 @@ namespace MES.Form // this.txtid.Location = new System.Drawing.Point(63, 12); this.txtid.Name = "txtid"; - this.txtid.Size = new System.Drawing.Size(109, 20); + this.txtid.Size = new System.Drawing.Size(114, 20); this.txtid.StyleController = this.layoutControl1; this.txtid.TabIndex = 14; // @@ -440,7 +447,7 @@ namespace MES.Form // this.simpleButton1.Location = new System.Drawing.Point(311, 36); this.simpleButton1.Name = "simpleButton1"; - this.simpleButton1.Size = new System.Drawing.Size(24, 22); + this.simpleButton1.Size = new System.Drawing.Size(35, 22); this.simpleButton1.StyleController = this.layoutControl1; this.simpleButton1.TabIndex = 13; this.simpleButton1.Text = "..."; @@ -449,14 +456,14 @@ namespace MES.Form // txtpid // this.txtpid.EditValue = ""; - this.txtpid.Location = new System.Drawing.Point(227, 12); + this.txtpid.Location = new System.Drawing.Point(232, 12); 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(109, 20); + this.txtpid.Size = new System.Drawing.Size(114, 20); this.txtpid.StyleController = this.layoutControl1; this.txtpid.TabIndex = 1; // @@ -480,9 +487,9 @@ namespace MES.Form // // txtwinformType // - this.txtwinformType.Location = new System.Drawing.Point(390, 36); + this.txtwinformType.Location = new System.Drawing.Point(401, 36); this.txtwinformType.Name = "txtwinformType"; - this.txtwinformType.Size = new System.Drawing.Size(274, 20); + this.txtwinformType.Size = new System.Drawing.Size(263, 20); this.txtwinformType.StyleController = this.layoutControl1; this.txtwinformType.TabIndex = 4; // @@ -490,19 +497,19 @@ namespace MES.Form // this.txtsort.Location = new System.Drawing.Point(63, 62); this.txtsort.Name = "txtsort"; - this.txtsort.Size = new System.Drawing.Size(273, 20); + this.txtsort.Size = new System.Drawing.Size(114, 20); this.txtsort.StyleController = this.layoutControl1; this.txtsort.TabIndex = 5; // // txtisEnabled // this.txtisEnabled.EditValue = null; - this.txtisEnabled.Location = new System.Drawing.Point(340, 62); + this.txtisEnabled.Location = new System.Drawing.Point(516, 62); this.txtisEnabled.Name = "txtisEnabled"; this.txtisEnabled.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Default; this.txtisEnabled.Properties.Caption = "有效"; this.txtisEnabled.Properties.NullStyle = DevExpress.XtraEditors.Controls.StyleIndeterminate.Unchecked; - this.txtisEnabled.Size = new System.Drawing.Size(144, 19); + this.txtisEnabled.Size = new System.Drawing.Size(64, 19); this.txtisEnabled.StyleController = this.layoutControl1; this.txtisEnabled.TabIndex = 6; // @@ -529,7 +536,7 @@ namespace MES.Form 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(273, 20); + this.txtcreatorId.Size = new System.Drawing.Size(283, 20); this.txtcreatorId.StyleController = this.layoutControl1; this.txtcreatorId.TabIndex = 8; // @@ -537,7 +544,7 @@ namespace MES.Form // this.txtcreateTime.EditValue = null; this.txtcreateTime.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txtcreateTime.Location = new System.Drawing.Point(391, 110); + this.txtcreateTime.Location = new System.Drawing.Point(401, 110); this.txtcreateTime.Name = "txtcreateTime"; this.txtcreateTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -545,7 +552,7 @@ namespace MES.Form 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(273, 20); + this.txtcreateTime.Size = new System.Drawing.Size(263, 20); this.txtcreateTime.StyleController = this.layoutControl1; this.txtcreateTime.TabIndex = 9; // @@ -560,7 +567,7 @@ namespace MES.Form 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(273, 20); + this.txteditorId.Size = new System.Drawing.Size(283, 20); this.txteditorId.StyleController = this.layoutControl1; this.txteditorId.TabIndex = 10; // @@ -568,7 +575,7 @@ namespace MES.Form // this.txteditTime.EditValue = null; this.txteditTime.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txteditTime.Location = new System.Drawing.Point(391, 134); + this.txteditTime.Location = new System.Drawing.Point(401, 134); this.txteditTime.Name = "txteditTime"; this.txteditTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -576,19 +583,19 @@ namespace MES.Form 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(273, 20); + this.txteditTime.Size = new System.Drawing.Size(263, 20); this.txteditTime.StyleController = this.layoutControl1; this.txteditTime.TabIndex = 11; // // txtisForm // this.txtisForm.EditValue = null; - this.txtisForm.Location = new System.Drawing.Point(488, 62); + this.txtisForm.Location = new System.Drawing.Point(584, 62); this.txtisForm.Name = "txtisForm"; this.txtisForm.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Default; this.txtisForm.Properties.Caption = "是否界面"; this.txtisForm.Properties.NullStyle = DevExpress.XtraEditors.Controls.StyleIndeterminate.Unchecked; - this.txtisForm.Size = new System.Drawing.Size(176, 19); + this.txtisForm.Size = new System.Drawing.Size(80, 19); this.txtisForm.StyleController = this.layoutControl1; this.txtisForm.TabIndex = 12; // @@ -611,7 +618,8 @@ namespace MES.Form this.layoutControlItem11, this.layoutControlItem13, this.layoutControlItem14, - this.layoutControlItem2}); + this.layoutControlItem2, + this.layoutControlItem15}); this.layoutControlGroup1.Name = "layoutControlGroup1"; this.layoutControlGroup1.Size = new System.Drawing.Size(676, 394); this.layoutControlGroup1.TextVisible = false; @@ -620,9 +628,9 @@ namespace MES.Form // this.layoutControlItem1.Control = this.txtpid; this.layoutControlItem1.CustomizationFormText = "父id"; - this.layoutControlItem1.Location = new System.Drawing.Point(164, 0); + this.layoutControlItem1.Location = new System.Drawing.Point(169, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(164, 24); + this.layoutControlItem1.Size = new System.Drawing.Size(169, 24); this.layoutControlItem1.Text = "父id"; this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14); // @@ -642,7 +650,7 @@ namespace MES.Form this.layoutControlItem5.CustomizationFormText = "排序"; this.layoutControlItem5.Location = new System.Drawing.Point(0, 50); this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(328, 24); + this.layoutControlItem5.Size = new System.Drawing.Size(169, 24); this.layoutControlItem5.Text = "排序"; this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14); // @@ -662,7 +670,7 @@ namespace MES.Form this.layoutControlItem8.CustomizationFormText = "创建人"; this.layoutControlItem8.Location = new System.Drawing.Point(0, 98); this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Size = new System.Drawing.Size(328, 24); + this.layoutControlItem8.Size = new System.Drawing.Size(338, 24); this.layoutControlItem8.Text = "创建人"; this.layoutControlItem8.TextSize = new System.Drawing.Size(48, 14); // @@ -672,7 +680,7 @@ namespace MES.Form this.layoutControlItem10.CustomizationFormText = "编辑人"; this.layoutControlItem10.Location = new System.Drawing.Point(0, 122); this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.Size = new System.Drawing.Size(328, 24); + this.layoutControlItem10.Size = new System.Drawing.Size(338, 24); this.layoutControlItem10.Text = "编辑人"; this.layoutControlItem10.TextSize = new System.Drawing.Size(48, 14); // @@ -680,9 +688,9 @@ namespace MES.Form // this.layoutControlItem4.Control = this.txtwinformType; this.layoutControlItem4.CustomizationFormText = "菜单类型"; - this.layoutControlItem4.Location = new System.Drawing.Point(327, 24); + this.layoutControlItem4.Location = new System.Drawing.Point(338, 24); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(329, 26); + this.layoutControlItem4.Size = new System.Drawing.Size(318, 26); this.layoutControlItem4.Text = "菜单类型"; this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14); // @@ -690,9 +698,9 @@ namespace MES.Form // this.layoutControlItem6.Control = this.txtisEnabled; this.layoutControlItem6.CustomizationFormText = "有效"; - this.layoutControlItem6.Location = new System.Drawing.Point(328, 50); + this.layoutControlItem6.Location = new System.Drawing.Point(504, 50); this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Size = new System.Drawing.Size(148, 24); + this.layoutControlItem6.Size = new System.Drawing.Size(68, 24); this.layoutControlItem6.Text = "有效"; this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem6.TextVisible = false; @@ -701,9 +709,9 @@ namespace MES.Form // this.layoutControlItem12.Control = this.txtisForm; this.layoutControlItem12.CustomizationFormText = "是否界面"; - this.layoutControlItem12.Location = new System.Drawing.Point(476, 50); + this.layoutControlItem12.Location = new System.Drawing.Point(572, 50); this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.Size = new System.Drawing.Size(180, 24); + this.layoutControlItem12.Size = new System.Drawing.Size(84, 24); this.layoutControlItem12.Text = "是否界面"; this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem12.TextVisible = false; @@ -720,9 +728,9 @@ namespace MES.Form // this.layoutControlItem9.Control = this.txtcreateTime; this.layoutControlItem9.CustomizationFormText = "创建时间"; - this.layoutControlItem9.Location = new System.Drawing.Point(328, 98); + this.layoutControlItem9.Location = new System.Drawing.Point(338, 98); this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.Size = new System.Drawing.Size(328, 24); + this.layoutControlItem9.Size = new System.Drawing.Size(318, 24); this.layoutControlItem9.Text = "创建时间"; this.layoutControlItem9.TextSize = new System.Drawing.Size(48, 14); // @@ -730,9 +738,9 @@ namespace MES.Form // this.layoutControlItem11.Control = this.txteditTime; this.layoutControlItem11.CustomizationFormText = "编辑时间"; - this.layoutControlItem11.Location = new System.Drawing.Point(328, 122); + this.layoutControlItem11.Location = new System.Drawing.Point(338, 122); this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.Size = new System.Drawing.Size(328, 24); + this.layoutControlItem11.Size = new System.Drawing.Size(318, 24); this.layoutControlItem11.Text = "编辑时间"; this.layoutControlItem11.TextSize = new System.Drawing.Size(48, 14); // @@ -741,7 +749,7 @@ namespace MES.Form this.layoutControlItem13.Control = this.simpleButton1; this.layoutControlItem13.Location = new System.Drawing.Point(299, 24); this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.Size = new System.Drawing.Size(28, 26); + this.layoutControlItem13.Size = new System.Drawing.Size(39, 26); this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem13.TextVisible = false; // @@ -750,16 +758,16 @@ namespace MES.Form this.layoutControlItem14.Control = this.txtid; this.layoutControlItem14.Location = new System.Drawing.Point(0, 0); this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.Size = new System.Drawing.Size(164, 24); + this.layoutControlItem14.Size = new System.Drawing.Size(169, 24); this.layoutControlItem14.Text = "id"; this.layoutControlItem14.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txtname; - this.layoutControlItem2.Location = new System.Drawing.Point(328, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(338, 0); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(328, 24); + this.layoutControlItem2.Size = new System.Drawing.Size(318, 24); this.layoutControlItem2.Text = "菜单名称"; this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14); // @@ -767,6 +775,31 @@ namespace MES.Form // this.xtraOpenFileDialog1.FileName = "xtraOpenFileDialog1"; // + // gridColumn15 + // + this.gridColumn15.Caption = "权限编码"; + this.gridColumn15.FieldName = "functionCode"; + this.gridColumn15.Name = "gridColumn15"; + this.gridColumn15.Visible = true; + this.gridColumn15.VisibleIndex = 13; + // + // txtfunctionCode + // + this.txtfunctionCode.Location = new System.Drawing.Point(232, 62); + this.txtfunctionCode.Name = "txtfunctionCode"; + this.txtfunctionCode.Size = new System.Drawing.Size(280, 20); + this.txtfunctionCode.StyleController = this.layoutControl1; + this.txtfunctionCode.TabIndex = 16; + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txtfunctionCode; + this.layoutControlItem15.Location = new System.Drawing.Point(169, 50); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.Size = new System.Drawing.Size(335, 24); + this.layoutControlItem15.Text = "权限编码"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(48, 14); + // // FrmsysMenu // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); @@ -825,6 +858,8 @@ namespace MES.Form ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtfunctionCode.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); this.ResumeLayout(false); } @@ -902,5 +937,8 @@ namespace MES.Form private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1; private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit repositoryItemCheckedComboBoxEdit1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; + private TextEdit txtfunctionCode; + private LayoutControlItem layoutControlItem15; } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/FrmShowForm.cs b/WinformGeneralDeveloperFrame/FrmShowForm.cs index a5e8b22..b4099c6 100644 --- a/WinformGeneralDeveloperFrame/FrmShowForm.cs +++ b/WinformGeneralDeveloperFrame/FrmShowForm.cs @@ -82,6 +82,7 @@ namespace WinformGeneralDeveloperFrame foreach (var item in data) { + if(!AppInfo.FunctionList.Contains(item.functionCode))continue; SimpleButton btn = new SimpleButton(); btn.Name = "btn" + item.id; btn.Size = new System.Drawing.Size(90, 75); diff --git a/WinformGeneralDeveloperFrame/MainForm.cs b/WinformGeneralDeveloperFrame/MainForm.cs index 1876b8b..17991ee 100644 --- a/WinformGeneralDeveloperFrame/MainForm.cs +++ b/WinformGeneralDeveloperFrame/MainForm.cs @@ -29,6 +29,18 @@ namespace WinformGeneralDeveloperFrame SplashScreenManager.CloseForm(false); } + private void InitData() + { + using (var db=new MESDB()) + { + AppInfo.FunctionList = db.Database.SqlQuery(string.Format(@"SELECT a.functionCode + FROM[winformdevfarme].[dbo].[sysFunction] a + left join[winformdevfarme].[dbo].[sysRoleFunction] b on a.id = b.functionId + left join[winformdevfarme].[dbo].[sysUserRole] c on b.roleId = c.roleId + left join[winformdevfarme].[dbo].[sysUser] d on d.id = c.userId + where d.account = '{0}'",AppInfo.LoginUserInfo.account)).ToListAsync().Result; + } + } private void ribbonControl1_Click(object sender, EventArgs e) { @@ -57,6 +69,7 @@ namespace WinformGeneralDeveloperFrame private void Init() { + InitData(); NarBarInit(); } @@ -68,15 +81,14 @@ namespace WinformGeneralDeveloperFrame { menusList=db.sysMenuInfo.Where(p=>p.isEnabled).ToList(); } - foreach (var item in menusList) { - if (item.pid == 0) + if (item.pid == 0&&AppInfo.FunctionList.Contains(item.functionCode)) { NavBarGroup gNavBarGroup = new NavBarGroup(item.name); foreach (var itemInfo in menusList) { - if (itemInfo.pid == item.id) + if (itemInfo.pid == item.id && AppInfo.FunctionList.Contains(itemInfo.functionCode)) { NavBarItem navBarItem = new NavBarItem(itemInfo.name); navBarItem.LinkClicked += (sender, args) =>