| DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/User/Role.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -28,21 +28,21 @@ /// </summary> private void InitializeComponent() { DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -59,6 +59,9 @@ this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -132,9 +135,13 @@ this.picCheckBox = new System.Windows.Forms.PictureBox(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.gridColumn3 = 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.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(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -305,7 +312,14 @@ this.gridColumn5, this.gridColumn3, this.gridColumn6, this.gridColumn7}); this.gridColumn7, this.gridColumn8, this.gridColumn9, this.gridColumn10, this.gridColumn11, this.gridColumn12, this.gridColumn13, this.gridColumn14}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -334,8 +348,6 @@ this.gridColumn4.FieldName = "guid"; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Tag = "org.fnamber"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 1; this.gridColumn4.Width = 250; // // gridColumn1 @@ -345,7 +357,7 @@ this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 2; this.gridColumn1.VisibleIndex = 1; this.gridColumn1.Width = 94; // // gridColumn2 @@ -355,7 +367,7 @@ this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.OptionsColumn.AllowEdit = false; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 3; this.gridColumn2.VisibleIndex = 2; this.gridColumn2.Width = 150; // // gv_checkUser @@ -368,7 +380,7 @@ this.gv_checkUser.OptionsColumn.AllowEdit = false; this.gv_checkUser.Tag = "query_a.check_user"; this.gv_checkUser.Visible = true; this.gv_checkUser.VisibleIndex = 4; this.gv_checkUser.VisibleIndex = 3; this.gv_checkUser.Width = 94; // // gv_checkDate @@ -381,7 +393,7 @@ this.gv_checkDate.OptionsColumn.AllowEdit = false; this.gv_checkDate.Tag = "query_a.check_date"; this.gv_checkDate.Visible = true; this.gv_checkDate.VisibleIndex = 5; this.gv_checkDate.VisibleIndex = 4; this.gv_checkDate.Width = 180; // // gv_pba005 @@ -394,7 +406,7 @@ this.gv_pba005.OptionsColumn.AllowEdit = false; this.gv_pba005.Tag = "query_a.pba005"; this.gv_pba005.Visible = true; this.gv_pba005.VisibleIndex = 6; this.gv_pba005.VisibleIndex = 5; this.gv_pba005.Width = 94; // // gv_pba006 @@ -407,7 +419,7 @@ this.gv_pba006.OptionsColumn.AllowEdit = false; this.gv_pba006.Tag = "query_a.pba006"; this.gv_pba006.Visible = true; this.gv_pba006.VisibleIndex = 7; this.gv_pba006.VisibleIndex = 6; this.gv_pba006.Width = 180; // // gv_pba009 @@ -420,7 +432,7 @@ this.gv_pba009.OptionsColumn.AllowEdit = false; this.gv_pba009.Tag = "query_a.pba009"; this.gv_pba009.Visible = true; this.gv_pba009.VisibleIndex = 8; this.gv_pba009.VisibleIndex = 7; this.gv_pba009.Width = 100; // // gridColumn5 @@ -430,6 +442,36 @@ this.gridColumn5.MinWidth = 25; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Width = 94; // // gridColumn3 // this.gridColumn3.Caption = "选别良品数"; this.gridColumn3.FieldName = "chooseGoodQty"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 8; this.gridColumn3.Width = 94; // // gridColumn6 // this.gridColumn6.Caption = "选别不良品数"; this.gridColumn6.FieldName = "chooseBadQty"; this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 9; this.gridColumn6.Width = 94; // // gridColumn7 // this.gridColumn7.Caption = "判定结果"; this.gridColumn7.FieldName = "handResult"; this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 10; this.gridColumn7.Width = 94; // // pageBar1 // @@ -764,38 +806,38 @@ this.layoutControlItem26}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition5.Width = 100D; columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition6.Width = 100D; columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition7.Width = 100D; columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition8.Width = 100D; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition1.Width = 100D; columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition2.Width = 100D; columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition3.Width = 100D; columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition4.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition5, columnDefinition6, columnDefinition7, columnDefinition8}); rowDefinition7.Height = 100D; rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition8.Height = 100D; rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition9.Height = 100D; rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition10.Height = 100D; rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition11.Height = 100D; rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition12.Height = 100D; rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition1, columnDefinition2, columnDefinition3, columnDefinition4}); rowDefinition1.Height = 100D; rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition2.Height = 100D; rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition3.Height = 100D; rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition4.Height = 100D; rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition5.Height = 100D; rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition6.Height = 100D; rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition7, rowDefinition8, rowDefinition9, rowDefinition10, rowDefinition11, rowDefinition12}); rowDefinition1, rowDefinition2, rowDefinition3, rowDefinition4, rowDefinition5, rowDefinition6}); this.Root.Size = new System.Drawing.Size(1105, 212); this.Root.TextVisible = false; // @@ -1215,10 +1257,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -1283,35 +1325,75 @@ this.layoutControlItem10.Size = new System.Drawing.Size(0, 0); this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20); // // gridColumn3 // gridColumn8 // this.gridColumn3.Caption = "选别良品数"; this.gridColumn3.FieldName = "chooseGoodQty"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 9; this.gridColumn3.Width = 94; this.gridColumn8.Caption = "物料编码"; this.gridColumn8.FieldName = "itemNo"; this.gridColumn8.MinWidth = 25; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; this.gridColumn8.VisibleIndex = 11; this.gridColumn8.Width = 94; // // gridColumn6 // gridColumn9 // this.gridColumn6.Caption = "选别不良品数"; this.gridColumn6.FieldName = "chooseBadQty"; this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 10; this.gridColumn6.Width = 94; this.gridColumn9.Caption = "物料名称"; this.gridColumn9.FieldName = "itemName"; this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 12; this.gridColumn9.Width = 94; // // gridColumn7 // gridColumn10 // this.gridColumn7.Caption = "判定结果"; this.gridColumn7.FieldName = "handResult"; this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 11; this.gridColumn7.Width = 94; this.gridColumn10.Caption = "物料规格"; this.gridColumn10.FieldName = "itemModel"; this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 13; this.gridColumn10.Width = 94; // // gridColumn11 // this.gridColumn11.Caption = "供应商"; this.gridColumn11.FieldName = "gysName"; this.gridColumn11.MinWidth = 25; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Visible = true; this.gridColumn11.VisibleIndex = 14; this.gridColumn11.Width = 94; // // gridColumn12 // this.gridColumn12.Caption = "到货日期"; this.gridColumn12.FieldName = "dhdDate"; this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; this.gridColumn12.VisibleIndex = 15; this.gridColumn12.Width = 94; // // gridColumn13 // this.gridColumn13.Caption = "到货单号"; this.gridColumn13.FieldName = "dhdNo"; this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; this.gridColumn13.VisibleIndex = 16; this.gridColumn13.Width = 94; // // gridColumn14 // this.gridColumn14.Caption = "检验单号"; this.gridColumn14.FieldName = "jydNo"; this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 17; this.gridColumn14.Width = 94; // // MesQcExceptional // @@ -1500,5 +1582,12 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; 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 gridColumn14; } } DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
@@ -22,6 +22,7 @@ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) => @@ -44,7 +45,19 @@ Task.Delay(100); getPageList(1); } /// <summary> /// 日志 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnLogClick(object sender, EventArgs e) { toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1); toolBarMenu1.guidKey = rowGuid; } /// <summary> /// 分页事件 /// </summary> DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -32,7 +32,7 @@ this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMain = new DevExpress.XtraGrid.GridControl(); this.gcMain1 = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -41,7 +41,7 @@ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); this.SuspendLayout(); // @@ -49,6 +49,7 @@ // this.toolBarMenu1.chkParameter = "SYS_ORGANIZATION,check_date,check_status,check_by"; this.toolBarMenu1.currentAction = null; this.toolBarMenu1.defaultActions = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -73,21 +74,21 @@ // // xtraTabPage1 // this.xtraTabPage1.Controls.Add(this.gcMain); this.xtraTabPage1.Controls.Add(this.gcMain1); this.xtraTabPage1.Name = "xtraTabPage1"; this.xtraTabPage1.Size = new System.Drawing.Size(1072, 584); this.xtraTabPage1.Text = "数据列表"; // // gcMain // gcMain1 // this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F); this.gcMain.Location = new System.Drawing.Point(0, 0); this.gcMain.MainView = this.gridView1; this.gcMain.Name = "gcMain"; this.gcMain.Size = new System.Drawing.Size(1072, 584); this.gcMain.TabIndex = 2; this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill; this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F); this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; this.gcMain1.Size = new System.Drawing.Size(1072, 584); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); // // gridView1 @@ -99,7 +100,7 @@ this.gv_operationTable, this.gv_msg, this.gv_userName}); this.gridView1.GridControl = this.gcMain; this.gridView1.GridControl = this.gcMain1; this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; this.gridView1.OptionsView.ShowAutoFilterRow = true; @@ -173,7 +174,7 @@ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.xtraTabPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); this.ResumeLayout(false); @@ -183,7 +184,7 @@ private UserControl.UcToolBarMenu toolBarMenu1; private DevExpress.XtraTab.XtraTabControl xtraTabControl1; private DevExpress.XtraTab.XtraTabPage xtraTabPage1; private DevExpress.XtraGrid.GridControl gcMain; private DevExpress.XtraGrid.GridControl gcMain1; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime; private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable; DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -17,9 +17,7 @@ InitializeComponent(); toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gridView1); Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList); this.toolBarMenu1.getXmlConfig(); getPageList(1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1); } @@ -60,15 +58,15 @@ if (dd.rtnCode > 0) { DataTable dt = dd.rtnData.list; gcMain.BindingContext = new BindingContext(); gcMain1.BindingContext = new BindingContext(); if (dt.Rows.Count > 0) { gcMain.DataSource = dt; gcMain.ForceInitialize(); gcMain1.DataSource = dt; gcMain1.ForceInitialize(); gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); UtilityHelper.SetDefaultTable(gcMain1, gridView1); } else { DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -34,10 +34,17 @@ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMain = new DevExpress.XtraGrid.GridControl(); this.split1 = new DevExpress.XtraEditors.SplitContainerControl(); this.gcMain1 = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.roleName = new DevExpress.XtraGrid.Columns.GridColumn(); this.rolRemark = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -48,34 +55,51 @@ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.panel1 = new System.Windows.Forms.Panel(); this.labelControl1 = new DevExpress.XtraEditors.LabelControl(); this.labelControl10 = new DevExpress.XtraEditors.LabelControl(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.txt_roleName = new DevExpress.XtraEditors.TextEdit(); this.labelControl8 = new DevExpress.XtraEditors.LabelControl(); this.txt_roleRemark = new DevExpress.XtraEditors.MemoEdit(); this.labelControl7 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); this.labelControl9 = new DevExpress.XtraEditors.LabelControl(); this.labelControl5 = new DevExpress.XtraEditors.LabelControl(); this.txt_roleRemark = new DevExpress.XtraEditors.MemoEdit(); this.txt_isStatus = new DevExpress.XtraEditors.CheckEdit(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit(); this.split1.Panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit(); this.split1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); this.xtraTabPage2.SuspendLayout(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit(); this.splitMx1.Panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit(); this.splitMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); this.layoutMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_roleRemark.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 // this.toolBarMenu1.chkParameter = null; this.toolBarMenu1.currentAction = null; this.toolBarMenu1.defaultActions = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -101,24 +125,43 @@ // // xtraTabPage1 // this.xtraTabPage1.Controls.Add(this.gcMain); this.xtraTabPage1.Controls.Add(this.pageBar1); this.xtraTabPage1.Controls.Add(this.split1); this.xtraTabPage1.Name = "xtraTabPage1"; this.xtraTabPage1.Size = new System.Drawing.Size(1235, 629); this.xtraTabPage1.Text = "数据列表"; // // gcMain // split1 // this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F); this.gcMain.Location = new System.Drawing.Point(0, 0); this.gcMain.MainView = this.gridView1; this.gcMain.Name = "gcMain"; this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.split1.Dock = System.Windows.Forms.DockStyle.Fill; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; // // split1.Panel1 // this.split1.Panel1.Controls.Add(this.gcMain1); this.split1.Panel1.Controls.Add(this.pageBar1); this.split1.Panel1.Text = "Panel1"; // // split1.Panel2 // this.split1.Panel2.Text = "Panel2"; this.split1.Size = new System.Drawing.Size(1235, 629); this.split1.SplitterPosition = 616; this.split1.TabIndex = 0; // // gcMain1 // this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill; this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F); this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1}); this.gcMain.Size = new System.Drawing.Size(1235, 589); this.gcMain.TabIndex = 5; this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gcMain1.Size = new System.Drawing.Size(1235, 576); this.gcMain1.TabIndex = 6; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); // // gridView1 @@ -132,7 +175,7 @@ this.roleCreateBy, this.createDate, this.gridColumn1}); this.gridView1.GridControl = this.gcMain; this.gridView1.GridControl = this.gcMain1; this.gridView1.Name = "gridView1"; this.gridView1.OptionsView.ShowButtonMode = DevExpress.XtraGrid.Views.Base.ShowButtonModeEnum.ShowAlways; this.gridView1.OptionsView.ShowGroupPanel = false; @@ -223,143 +266,172 @@ // this.pageBar1.CurrentPage = 0; this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; this.pageBar1.Location = new System.Drawing.Point(0, 589); this.pageBar1.Location = new System.Drawing.Point(0, 576); this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; this.pageBar1.Size = new System.Drawing.Size(1235, 40); this.pageBar1.TabIndex = 6; this.pageBar1.TabIndex = 7; this.pageBar1.TotalPages = 0; // // xtraTabPage2 // this.xtraTabPage2.Controls.Add(this.panel1); this.xtraTabPage2.Controls.Add(this.splitMx1); this.xtraTabPage2.Name = "xtraTabPage2"; this.xtraTabPage2.Size = new System.Drawing.Size(1235, 629); this.xtraTabPage2.Text = "数据详细"; // // panel1 // splitMx1 // this.panel1.BackColor = System.Drawing.Color.White; this.panel1.Controls.Add(this.txt_isStatus); this.panel1.Controls.Add(this.labelControl1); this.panel1.Controls.Add(this.labelControl10); this.panel1.Controls.Add(this.txt_roleName); this.panel1.Controls.Add(this.labelControl8); this.panel1.Controls.Add(this.txt_roleRemark); this.panel1.Controls.Add(this.labelControl7); this.panel1.Controls.Add(this.lbGuid); this.panel1.Controls.Add(this.labelControl9); this.panel1.Controls.Add(this.labelControl5); this.panel1.Font = new System.Drawing.Font("Tahoma", 10F); this.panel1.Location = new System.Drawing.Point(62, 49); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(507, 293); this.panel1.TabIndex = 1; this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); this.splitMx1.Name = "splitMx1"; // // labelControl1 // splitMx1.Panel1 // this.labelControl1.Location = new System.Drawing.Point(61, 226); this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.labelControl1.Name = "labelControl1"; this.labelControl1.Size = new System.Drawing.Size(45, 18); this.labelControl1.TabIndex = 130; this.labelControl1.Text = "主键："; this.labelControl1.Visible = false; this.splitMx1.Panel1.Controls.Add(this.layoutMx1); this.splitMx1.Panel1.Text = "Panel1"; // // labelControl10 // splitMx1.Panel2 // this.labelControl10.Appearance.ForeColor = System.Drawing.Color.Red; this.labelControl10.Appearance.Options.UseForeColor = true; this.labelControl10.Location = new System.Drawing.Point(426, 25); this.labelControl10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.labelControl10.Name = "labelControl10"; this.labelControl10.Size = new System.Drawing.Size(8, 18); this.labelControl10.TabIndex = 129; this.labelControl10.Text = "*"; this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.Size = new System.Drawing.Size(1235, 629); this.splitMx1.SplitterPosition = 149; this.splitMx1.TabIndex = 0; // // layoutMx1 // this.layoutMx1.Controls.Add(this.txt_roleName); this.layoutMx1.Controls.Add(this.lbGuid); this.layoutMx1.Controls.Add(this.txt_roleRemark); this.layoutMx1.Controls.Add(this.txt_isStatus); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem3}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(650, 420, 812, 500); this.layoutMx1.Root = this.Root; this.layoutMx1.Size = new System.Drawing.Size(1235, 149); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_roleName // this.txt_roleName.Location = new System.Drawing.Point(123, 16); this.txt_roleName.Location = new System.Drawing.Point(99, 12); this.txt_roleName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txt_roleName.Name = "txt_roleName"; this.txt_roleName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_roleName.Properties.Appearance.Options.UseFont = true; this.txt_roleName.Size = new System.Drawing.Size(297, 28); this.txt_roleName.Size = new System.Drawing.Size(314, 28); this.txt_roleName.StyleController = this.layoutMx1; this.txt_roleName.TabIndex = 128; // // labelControl8 // lbGuid // this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl8.Appearance.Options.UseFont = true; this.labelControl8.Location = new System.Drawing.Point(31, 20); this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.labelControl8.Name = "labelControl8"; this.labelControl8.Size = new System.Drawing.Size(85, 21); this.labelControl8.TabIndex = 127; this.labelControl8.Text = "角色名称："; this.lbGuid.Location = new System.Drawing.Point(822, 55); this.lbGuid.Name = "lbGuid"; this.lbGuid.Size = new System.Drawing.Size(401, 39); this.lbGuid.TabIndex = 1; this.lbGuid.Text = "lbGuid"; this.lbGuid.Visible = false; // // txt_roleRemark // this.txt_roleRemark.Location = new System.Drawing.Point(123, 56); this.txt_roleRemark.Location = new System.Drawing.Point(99, 55); this.txt_roleRemark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txt_roleRemark.Name = "txt_roleRemark"; this.txt_roleRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_roleRemark.Properties.Appearance.Options.UseFont = true; this.txt_roleRemark.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None; this.txt_roleRemark.Size = new System.Drawing.Size(297, 84); this.txt_roleRemark.Size = new System.Drawing.Size(314, 39); this.txt_roleRemark.StyleController = this.layoutMx1; this.txt_roleRemark.TabIndex = 126; // // labelControl7 // this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl7.Appearance.Options.UseFont = true; this.labelControl7.Location = new System.Drawing.Point(31, 56); this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.labelControl7.Name = "labelControl7"; this.labelControl7.Size = new System.Drawing.Size(85, 21); this.labelControl7.TabIndex = 125; this.labelControl7.Text = "角色备注："; // // lbGuid // this.lbGuid.AutoSize = true; this.lbGuid.Location = new System.Drawing.Point(121, 226); this.lbGuid.Name = "lbGuid"; this.lbGuid.Size = new System.Drawing.Size(0, 21); this.lbGuid.TabIndex = 1; this.lbGuid.Visible = false; // // labelControl9 // this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red; this.labelControl9.Appearance.Options.UseForeColor = true; this.labelControl9.Location = new System.Drawing.Point(426, 62); this.labelControl9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.labelControl9.Name = "labelControl9"; this.labelControl9.Size = new System.Drawing.Size(8, 18); this.labelControl9.TabIndex = 108; this.labelControl9.Text = "*"; // // labelControl5 // this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl5.Appearance.Options.UseFont = true; this.labelControl5.Location = new System.Drawing.Point(31, 149); this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.labelControl5.Name = "labelControl5"; this.labelControl5.Size = new System.Drawing.Size(85, 21); this.labelControl5.TabIndex = 101; this.labelControl5.Text = "启用状态："; // // txt_isStatus // this.txt_isStatus.Location = new System.Drawing.Point(123, 148); this.txt_isStatus.Location = new System.Drawing.Point(12, 98); this.txt_isStatus.Name = "txt_isStatus"; this.txt_isStatus.Properties.Caption = ""; this.txt_isStatus.Size = new System.Drawing.Size(94, 24); this.txt_isStatus.TabIndex = 226; this.txt_isStatus.Tag = "moren.true"; this.txt_isStatus.Properties.Caption = "启用状态"; this.txt_isStatus.Size = new System.Drawing.Size(401, 24); this.txt_isStatus.StyleController = this.layoutMx1; this.txt_isStatus.TabIndex = 129; // // layoutControlItem3 // this.layoutControlItem3.Control = this.lbGuid; this.layoutControlItem3.Location = new System.Drawing.Point(810, 43); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem3.Size = new System.Drawing.Size(405, 43); this.layoutControlItem3.Text = "lbGuid"; this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem3.TextVisible = false; // // Root // this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.Root.GroupBordersVisible = false; this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem1, this.layoutControlItem2, this.layoutControlItem4}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition1.Width = 100D; columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition2.Width = 100D; columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition3.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition1, columnDefinition2, columnDefinition3}); rowDefinition1.Height = 100D; rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition2.Height = 100D; rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition3.Height = 100D; rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3}); this.Root.Size = new System.Drawing.Size(1235, 149); this.Root.TextVisible = false; // // layoutControlItem1 // this.layoutControlItem1.Control = this.txt_roleName; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(405, 43); this.layoutControlItem1.Text = "角色名称："; this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_roleRemark; this.layoutControlItem2.Location = new System.Drawing.Point(0, 43); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem2.Size = new System.Drawing.Size(405, 43); this.layoutControlItem2.Text = "角色备注："; this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_isStatus; this.layoutControlItem4.Location = new System.Drawing.Point(0, 86); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem4.Size = new System.Drawing.Size(405, 43); this.layoutControlItem4.Text = "启用状态"; this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem4.TextVisible = false; // // Role // @@ -373,15 +445,30 @@ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.xtraTabPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit(); this.split1.Panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit(); this.split1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); this.xtraTabPage2.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit(); this.splitMx1.Panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit(); this.splitMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); this.layoutMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_roleRemark.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); this.ResumeLayout(false); } @@ -390,27 +477,28 @@ private UserControl.UcToolBarMenu toolBarMenu1; private DevExpress.XtraTab.XtraTabControl xtraTabControl1; private DevExpress.XtraTab.XtraTabPage xtraTabPage1; private DevExpress.XtraTab.XtraTabPage xtraTabPage2; private DevExpress.XtraGrid.GridControl gcMain; private DevExpress.XtraEditors.SplitContainerControl split1; private DevExpress.XtraGrid.GridControl gcMain1; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private DevExpress.XtraGrid.Columns.GridColumn roleName; private DevExpress.XtraGrid.Columns.GridColumn rolRemark; private DevExpress.XtraGrid.Columns.GridColumn status; private UserControls.Data.UcPageBar pageBar1; private System.Windows.Forms.Panel panel1; private DevExpress.XtraEditors.LabelControl labelControl10; private DevExpress.XtraEditors.TextEdit txt_roleName; private DevExpress.XtraEditors.LabelControl labelControl8; private DevExpress.XtraEditors.MemoEdit txt_roleRemark; private DevExpress.XtraEditors.LabelControl labelControl7; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraEditors.LabelControl labelControl9; private DevExpress.XtraEditors.LabelControl labelControl5; private DevExpress.XtraEditors.LabelControl labelControl1; private DevExpress.XtraGrid.Columns.GridColumn createDate; private DevExpress.XtraGrid.Columns.GridColumn roleCreateBy; private DevExpress.XtraGrid.Columns.GridColumn createDate; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; private UserControls.Data.UcPageBar pageBar1; private DevExpress.XtraTab.XtraTabPage xtraTabPage2; private DevExpress.XtraEditors.SplitContainerControl splitMx1; private DevExpress.XtraEditors.TextEdit txt_roleName; private DevExpress.XtraEditors.MemoEdit txt_roleRemark; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraLayout.LayoutControl layoutMx1; private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraEditors.CheckEdit txt_isStatus; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; } } DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -26,9 +26,7 @@ toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gridView1); Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList); this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) => { Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); @@ -181,7 +179,7 @@ } else { UtilityHelper.ChangeEnableByControl(panel1.Controls, true); UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true); } } @@ -194,7 +192,7 @@ { lbGuid.Text = ""; Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4); UtilityHelper.CleanValueByControl(panel1.Controls, true); UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true); } /// <summary> @@ -236,7 +234,7 @@ { lbGuid.Text = _rtn.rtnData; toolBarMenu1.isSetBtn = true; UtilityHelper.ChangeEnableByControl(panel1.Controls, false); UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false); } } catch (Exception ex) @@ -262,16 +260,16 @@ if (dd.rtnCode > 0) { DataTable dt = dd.rtnData.list; gcMain.BindingContext = new BindingContext(); gcMain1.BindingContext = new BindingContext(); gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; if (dt.Rows.Count > 0) { gcMain.DataSource = dt; gcMain.ForceInitialize(); gcMain1.DataSource = dt; gcMain1.ForceInitialize(); gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); UtilityHelper.SetDefaultTable(gcMain1, gridView1); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; pageBar1.TotalPages = dd.rtnData.pages;//总页 pageBar1.CurrentPage = curPage;//当前页 @@ -312,7 +310,7 @@ { var dy = _rtn.rtnData; lbGuid.Text = strGuid; UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit); UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit); } else { DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1731,7 +1731,7 @@ public delegate void DelegateGetModel(string guid); public delegate void DelegateGetList(int currentPage); /// <summary> /// /// 设置主表的样式 /// </summary> /// <param name="gridView1">gridview</param> /// <param name="picCheckBox">图标按钮</param> @@ -1884,6 +1884,15 @@ column.Width = 500; } } /// <summary> /// 设置选项卡 /// </summary> /// <param name="gridView1"></param> /// <param name="xtraTabControl1"></param> /// <param name="pageBar1"></param> /// <param name="action"></param> /// <param name="page"></param> public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null) { xtraTabControl1.SelectedPageChanged += (s, e) => DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -1138,6 +1138,9 @@ return spcList; } /// <summary> /// 读取xml配置，目前配置gcMain1,layoutMx1 /// </summary> public void getXmlConfig() { Form parentForm;
