From 2caa1d97437e4089a7d6547c2efb87c7990b3b16 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 03 八月 2025 08:51:24 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rpt/Frm_MesQL.Designer.cs | 35 ++++++++++-------------------------
1 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/Frm_MesQL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/Frm_MesQL.Designer.cs
index 1bd02d9..86b3727 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/Frm_MesQL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/Frm_MesQL.Designer.cs
@@ -35,8 +35,6 @@
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.pageBar1 = new UserControls.Data.UcPageBar();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -44,6 +42,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -65,7 +64,7 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1450, 98);
@@ -77,7 +76,7 @@
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
this.xtraTabControl1.Size = new System.Drawing.Size(1450, 736);
@@ -88,7 +87,7 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1448, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
@@ -99,13 +98,12 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4);
+ this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
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
@@ -119,12 +117,12 @@
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1448, 635);
+ this.gcMain1.Size = new System.Drawing.Size(1448, 683);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -154,18 +152,6 @@
this.gridView1.OptionsView.RowAutoHeight = true;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // pageBar1
- //
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 635);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
- this.pageBar1.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1448, 48);
- this.pageBar1.TabIndex = 4;
- this.pageBar1.TotalPages = 0;
//
// gridColumn1
//
@@ -244,9 +230,9 @@
this.ClientSize = new System.Drawing.Size(1450, 834);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_MesQL";
- this.Text = "鐗╂枡淇℃伅";
+ this.Text = "娆犳枡琛�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -267,7 +253,6 @@
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private UserControls.Data.UcPageBar pageBar1;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
--
Gitblit v1.9.3