From c4f46e49677576ac7f1a74feee547b3238c0eeaf Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 19 十一月 2025 16:07:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs | 138 ++++++++++++++++++++++++++-------------------
1 files changed, 80 insertions(+), 58 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
index 724def6..d5bba99 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
@@ -30,12 +30,18 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
- 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();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemType));
+ 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();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -49,6 +55,7 @@
this.gv_description = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -79,6 +86,7 @@
this.split1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -114,7 +122,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(938, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1109, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -125,7 +133,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(938, 401);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1109, 401);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -135,7 +143,7 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(936, 369);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1107, 369);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -156,7 +164,7 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(936, 369);
+ this.split1.Size = new System.Drawing.Size(1107, 369);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
@@ -166,7 +174,9 @@
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(936, 318);
+ this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
+ this.gcMain1.Size = new System.Drawing.Size(1107, 318);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -251,7 +261,7 @@
this.gv_description.OptionsColumn.AllowEdit = false;
this.gv_description.Tag = "query_a.description";
this.gv_description.Visible = true;
- this.gv_description.VisibleIndex = 3;
+ this.gv_description.VisibleIndex = 4;
this.gv_description.Width = 147;
//
// gridColumn1
@@ -262,7 +272,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "query_a.lastupdate_date";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.VisibleIndex = 5;
this.gridColumn1.Width = 180;
//
// gridColumn2
@@ -272,8 +282,18 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 5;
+ this.gridColumn2.VisibleIndex = 6;
this.gridColumn2.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ 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, 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;
//
// pageBar1
//
@@ -283,7 +303,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(936, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1107, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -291,7 +311,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(936, 369);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1107, 369);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -310,7 +330,7 @@
//
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(936, 369);
+ this.splitMx1.Size = new System.Drawing.Size(1107, 369);
this.splitMx1.SplitterPosition = 87;
this.splitMx1.TabIndex = 0;
//
@@ -330,7 +350,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(936, 87);
+ this.layoutMx1.Size = new System.Drawing.Size(1107, 87);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -345,19 +365,19 @@
//
// txt_description
//
- this.txt_description.Location = new System.Drawing.Point(313, 45);
+ this.txt_description.Location = new System.Drawing.Point(355, 45);
this.txt_description.Name = "txt_description";
this.txt_description.Properties.Appearance.Options.UseFont = true;
- this.txt_description.Size = new System.Drawing.Size(153, 24);
+ this.txt_description.Size = new System.Drawing.Size(196, 24);
this.txt_description.StyleController = this.layoutMx1;
this.txt_description.TabIndex = 252;
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(542, 45);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(627, 45);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(153, 24);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(196, 24);
this.txt_lastupdateDate.StyleController = this.layoutMx1;
this.txt_lastupdateDate.TabIndex = 228;
//
@@ -366,25 +386,25 @@
this.txt_tcode.Location = new System.Drawing.Point(84, 12);
this.txt_tcode.Name = "txt_tcode";
this.txt_tcode.Properties.Appearance.Options.UseFont = true;
- this.txt_tcode.Size = new System.Drawing.Size(153, 24);
+ this.txt_tcode.Size = new System.Drawing.Size(195, 24);
this.txt_tcode.StyleController = this.layoutMx1;
this.txt_tcode.TabIndex = 213;
//
// txt_pgroup
//
- this.txt_pgroup.Location = new System.Drawing.Point(313, 12);
+ this.txt_pgroup.Location = new System.Drawing.Point(355, 12);
this.txt_pgroup.Name = "txt_pgroup";
this.txt_pgroup.Properties.Appearance.Options.UseFont = true;
- this.txt_pgroup.Size = new System.Drawing.Size(153, 24);
+ this.txt_pgroup.Size = new System.Drawing.Size(196, 24);
this.txt_pgroup.StyleController = this.layoutMx1;
this.txt_pgroup.TabIndex = 247;
//
// txt_tname
//
- this.txt_tname.Location = new System.Drawing.Point(542, 12);
+ this.txt_tname.Location = new System.Drawing.Point(627, 12);
this.txt_tname.Name = "txt_tname";
this.txt_tname.Properties.Appearance.Options.UseFont = true;
- this.txt_tname.Size = new System.Drawing.Size(153, 24);
+ this.txt_tname.Size = new System.Drawing.Size(196, 24);
this.txt_tname.StyleController = this.layoutMx1;
this.txt_tname.TabIndex = 216;
//
@@ -393,7 +413,7 @@
this.txt_remark.Location = new System.Drawing.Point(84, 45);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(153, 24);
+ this.txt_remark.Size = new System.Drawing.Size(195, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 217;
//
@@ -422,27 +442,27 @@
this.layoutControlItem6});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
- columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition11.Width = 100D;
- columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition12.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[] {
- columnDefinition9,
- columnDefinition10,
- columnDefinition11,
- columnDefinition12});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(936, 87);
+ rowDefinition1,
+ rowDefinition2});
+ this.Root.Size = new System.Drawing.Size(1107, 87);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -450,27 +470,27 @@
this.layoutControlItem1.Control = this.txt_tcode;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(229, 33);
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 33);
this.layoutControlItem1.Text = "绫诲瀷缂栫爜";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_pgroup;
- this.layoutControlItem2.Location = new System.Drawing.Point(229, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(229, 33);
+ this.layoutControlItem2.Size = new System.Drawing.Size(272, 33);
this.layoutControlItem2.Text = "涓婄骇鍒嗙粍";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_tname;
- this.layoutControlItem3.Location = new System.Drawing.Point(458, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(543, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(229, 33);
+ this.layoutControlItem3.Size = new System.Drawing.Size(272, 33);
this.layoutControlItem3.Text = "绫诲瀷鍚嶇О";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -480,29 +500,29 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 33);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(229, 34);
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 34);
this.layoutControlItem4.Text = "澶囨敞";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_description;
- this.layoutControlItem5.Location = new System.Drawing.Point(229, 33);
+ this.layoutControlItem5.Location = new System.Drawing.Point(271, 33);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(229, 34);
+ this.layoutControlItem5.Size = new System.Drawing.Size(272, 34);
this.layoutControlItem5.Text = "鎻忚堪";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_lastupdateDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(458, 33);
+ this.layoutControlItem6.Location = new System.Drawing.Point(543, 33);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(229, 34);
+ this.layoutControlItem6.Size = new System.Drawing.Size(272, 34);
this.layoutControlItem6.Text = "鍚屾鏃堕棿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
@@ -510,7 +530,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(938, 481);
+ this.ClientSize = new System.Drawing.Size(1109, 481);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesItemType";
@@ -525,6 +545,7 @@
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);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
this.splitMx1.Panel1.ResumeLayout(false);
@@ -584,5 +605,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3