From b285a8905bfcba473fa2ea4f243daee894d8ef39 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期四, 19 十二月 2024 22:16:20 +0800
Subject: [PATCH] 通用模块曲线编辑修改
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/03-import/01-excel/UniversalChartExcelEditCtrl.designer.cs | 151 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 109 insertions(+), 42 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/03-import/01-excel/UniversalChartExcelImportCtrl.designer.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/03-import/01-excel/UniversalChartExcelEditCtrl.designer.cs
similarity index 70%
rename from WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/03-import/01-excel/UniversalChartExcelImportCtrl.designer.cs
rename to WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/03-import/01-excel/UniversalChartExcelEditCtrl.designer.cs
index d878490..b8724d2 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/03-import/01-excel/UniversalChartExcelImportCtrl.designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/02-universal/03-import/01-excel/UniversalChartExcelEditCtrl.designer.cs
@@ -1,6 +1,6 @@
锘縩amespace Yw.WinFrmUI.Phart
{
- partial class UniversalChartExcelImportCtrl
+ partial class UniversalChartExcelEditCtrl
{
/// <summary>
/// Requipuired designer variable.
@@ -37,7 +37,6 @@
colX = new DevExpress.XtraGrid.Columns.GridColumn();
colY = new DevExpress.XtraGrid.Columns.GridColumn();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
universalEditChart1 = new UniversalEditChart();
sidePanel1 = new DevExpress.XtraEditors.SidePanel();
@@ -45,23 +44,32 @@
barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
barManager1 = new DevExpress.XtraBars.BarManager(components);
bar2 = new DevExpress.XtraBars.Bar();
+ barEditModel = new DevExpress.XtraBars.BarEditItem();
+ repImgCmbEditModel = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
barFeatType = new DevExpress.XtraBars.BarEditItem();
repImgCmbFeatType = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
+ barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
+ barBtnDelete = new DevExpress.XtraBars.BarButtonItem();
barDockControlTop = new DevExpress.XtraBars.BarDockControl();
barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
barDockControlRight = new DevExpress.XtraBars.BarDockControl();
+ barCheckItem1 = new DevExpress.XtraBars.BarCheckItem();
+ repCmbEditModel = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ bar1 = new DevExpress.XtraBars.Bar();
+ bar3 = new DevExpress.XtraBars.Bar();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)bindingSource1).BeginInit();
((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
sidePanel1.SuspendLayout();
sidePanel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)repImgCmbEditModel).BeginInit();
((System.ComponentModel.ISupportInitialize)repImgCmbFeatType).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)repCmbEditModel).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -72,17 +80,17 @@
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(784, 368, 986, 935);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(425, 660);
+ layoutControl1.Size = new Size(425, 626);
layoutControl1.TabIndex = 0;
layoutControl1.Text = "layoutControl1";
//
// gridControl1
//
gridControl1.DataSource = bindingSource1;
- gridControl1.Location = new Point(0, 33);
+ gridControl1.Location = new Point(0, 0);
gridControl1.MainView = gridView1;
gridControl1.Name = "gridControl1";
- gridControl1.Size = new Size(425, 627);
+ gridControl1.Size = new Size(425, 626);
gridControl1.TabIndex = 9;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -128,22 +136,11 @@
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- Root.Size = new Size(425, 660);
+ Root.Size = new Size(425, 626);
Root.TextVisible = false;
- //
- // layoutControlGroup1
- //
- layoutControlGroup1.GroupStyle = DevExpress.Utils.GroupStyle.Title;
- layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3 });
- layoutControlGroup1.Location = new Point(0, 0);
- layoutControlGroup1.Name = "layoutControlGroup1";
- layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup1.Size = new Size(425, 660);
- layoutControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup1.Text = "瀹氫箟鐐�";
//
// layoutControlItem3
//
@@ -151,7 +148,7 @@
layoutControlItem3.Location = new Point(0, 0);
layoutControlItem3.Name = "layoutControlItem3";
layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem3.Size = new Size(425, 627);
+ layoutControlItem3.Size = new Size(425, 626);
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
//
@@ -160,25 +157,26 @@
universalEditChart1.AxisXTitle = "Z";
universalEditChart1.AxisYTitle = "鎵▼/m";
universalEditChart1.Dock = DockStyle.Fill;
- universalEditChart1.Location = new Point(0, 31);
+ universalEditChart1.Location = new Point(0, 34);
universalEditChart1.MouseModel = false;
universalEditChart1.Name = "universalEditChart1";
- universalEditChart1.Size = new Size(574, 629);
+ universalEditChart1.Size = new Size(574, 626);
universalEditChart1.TabIndex = 3;
//
// sidePanel1
//
sidePanel1.Controls.Add(layoutControl1);
sidePanel1.Dock = DockStyle.Right;
- sidePanel1.Location = new Point(574, 0);
+ sidePanel1.Location = new Point(574, 34);
sidePanel1.Name = "sidePanel1";
- sidePanel1.Size = new Size(426, 660);
+ sidePanel1.Size = new Size(426, 626);
sidePanel1.TabIndex = 2;
sidePanel1.Text = "sidePanel1";
//
// sidePanel2
//
sidePanel2.Controls.Add(universalEditChart1);
+ sidePanel2.Controls.Add(sidePanel1);
sidePanel2.Controls.Add(barDockControlLeft);
sidePanel2.Controls.Add(barDockControlRight);
sidePanel2.Controls.Add(barDockControlBottom);
@@ -186,7 +184,7 @@
sidePanel2.Dock = DockStyle.Fill;
sidePanel2.Location = new Point(0, 0);
sidePanel2.Name = "sidePanel2";
- sidePanel2.Size = new Size(574, 660);
+ sidePanel2.Size = new Size(1000, 660);
sidePanel2.TabIndex = 3;
sidePanel2.Text = "sidePanel2";
//
@@ -194,9 +192,9 @@
//
barDockControlLeft.CausesValidation = false;
barDockControlLeft.Dock = DockStyle.Left;
- barDockControlLeft.Location = new Point(0, 31);
+ barDockControlLeft.Location = new Point(0, 34);
barDockControlLeft.Manager = barManager1;
- barDockControlLeft.Size = new Size(0, 629);
+ barDockControlLeft.Size = new Size(0, 626);
//
// barManager1
//
@@ -205,11 +203,11 @@
barManager1.DockControls.Add(barDockControlBottom);
barManager1.DockControls.Add(barDockControlLeft);
barManager1.DockControls.Add(barDockControlRight);
- barManager1.Form = sidePanel2;
- barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barFeatType });
+ barManager1.Form = this;
+ barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barFeatType, barEditModel, barBtnAdd, barCheckItem1, barBtnDelete });
barManager1.MainMenu = bar2;
- barManager1.MaxItemId = 1;
- barManager1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repImgCmbFeatType });
+ barManager1.MaxItemId = 9;
+ barManager1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repImgCmbFeatType, repCmbEditModel, repImgCmbEditModel });
//
// bar2
//
@@ -217,19 +215,35 @@
bar2.DockCol = 0;
bar2.DockRow = 0;
bar2.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
- bar2.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barFeatType) });
+ bar2.HideWhenMerging = DevExpress.Utils.DefaultBoolean.False;
+ bar2.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barEditModel), new DevExpress.XtraBars.LinkPersistInfo(barFeatType), new DevExpress.XtraBars.LinkPersistInfo(barBtnAdd), new DevExpress.XtraBars.LinkPersistInfo(barBtnDelete) });
bar2.OptionsBar.AllowQuickCustomization = false;
bar2.OptionsBar.DrawBorder = false;
bar2.OptionsBar.DrawDragBorder = false;
bar2.OptionsBar.UseWholeRow = true;
bar2.Text = "Main menu";
//
+ // barEditModel
+ //
+ barEditModel.Caption = "鐐规ā寮�:";
+ barEditModel.Edit = repImgCmbEditModel;
+ barEditModel.EditWidth = 80;
+ barEditModel.Id = 3;
+ barEditModel.Name = "barEditModel";
+ barEditModel.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
+ barEditModel.EditValueChanged += barEditModel_EditValueChanged;
+ //
+ // repImgCmbEditModel
+ //
+ repImgCmbEditModel.AutoHeight = false;
+ repImgCmbEditModel.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ repImgCmbEditModel.Name = "repImgCmbEditModel";
+ //
// barFeatType
//
- barFeatType.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
barFeatType.Caption = "鎷熷悎鏂瑰紡:";
barFeatType.Edit = repImgCmbFeatType;
- barFeatType.EditWidth = 120;
+ barFeatType.EditWidth = 100;
barFeatType.Id = 0;
barFeatType.Name = "barFeatType";
barFeatType.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
@@ -241,13 +255,31 @@
repImgCmbFeatType.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
repImgCmbFeatType.Name = "repImgCmbFeatType";
//
+ // barBtnAdd
+ //
+ barBtnAdd.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
+ barBtnAdd.Caption = "娣诲姞";
+ barBtnAdd.Id = 6;
+ barBtnAdd.ImageOptions.SvgImage = Core.Properties.Resources.insertgroupfooter2;
+ barBtnAdd.Name = "barBtnAdd";
+ barBtnAdd.ItemClick += barAdd_ItemClick;
+ //
+ // barBtnDelete
+ //
+ barBtnDelete.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
+ barBtnDelete.Caption = "鍒犻櫎";
+ barBtnDelete.Id = 8;
+ barBtnDelete.ImageOptions.SvgImage = Core.Properties.Resources.deletetablerows2;
+ barBtnDelete.Name = "barBtnDelete";
+ barBtnDelete.ItemClick += btnDelete_ItemClick;
+ //
// barDockControlTop
//
barDockControlTop.CausesValidation = false;
barDockControlTop.Dock = DockStyle.Top;
barDockControlTop.Location = new Point(0, 0);
barDockControlTop.Manager = barManager1;
- barDockControlTop.Size = new Size(574, 31);
+ barDockControlTop.Size = new Size(1000, 34);
//
// barDockControlBottom
//
@@ -255,15 +287,43 @@
barDockControlBottom.Dock = DockStyle.Bottom;
barDockControlBottom.Location = new Point(0, 660);
barDockControlBottom.Manager = barManager1;
- barDockControlBottom.Size = new Size(574, 0);
+ barDockControlBottom.Size = new Size(1000, 0);
//
// barDockControlRight
//
barDockControlRight.CausesValidation = false;
barDockControlRight.Dock = DockStyle.Right;
- barDockControlRight.Location = new Point(574, 31);
+ barDockControlRight.Location = new Point(1000, 34);
barDockControlRight.Manager = barManager1;
- barDockControlRight.Size = new Size(0, 629);
+ barDockControlRight.Size = new Size(0, 626);
+ //
+ // barCheckItem1
+ //
+ barCheckItem1.Caption = "barCheckItem1";
+ barCheckItem1.Id = 7;
+ barCheckItem1.Name = "barCheckItem1";
+ //
+ // repCmbEditModel
+ //
+ repCmbEditModel.AutoHeight = false;
+ repCmbEditModel.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ repCmbEditModel.Name = "repCmbEditModel";
+ //
+ // bar1
+ //
+ bar1.BarName = "Custom 3";
+ bar1.DockCol = 0;
+ bar1.DockRow = 1;
+ bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
+ bar1.Text = "Custom 3";
+ //
+ // bar3
+ //
+ bar3.BarName = "Custom 3";
+ bar3.DockCol = 0;
+ bar3.DockRow = 1;
+ bar3.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
+ bar3.Text = "Custom 3";
//
// UniversalChartExcelImportCtrl
//
@@ -271,7 +331,6 @@
Appearance.Options.UseBackColor = true;
AutoScaleMode = AutoScaleMode.None;
Controls.Add(sidePanel2);
- Controls.Add(sidePanel1);
Name = "UniversalChartExcelImportCtrl";
Size = new Size(1000, 660);
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
@@ -280,13 +339,14 @@
((System.ComponentModel.ISupportInitialize)bindingSource1).EndInit();
((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
sidePanel1.ResumeLayout(false);
sidePanel2.ResumeLayout(false);
sidePanel2.PerformLayout();
((System.ComponentModel.ISupportInitialize)barManager1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)repImgCmbEditModel).EndInit();
((System.ComponentModel.ISupportInitialize)repImgCmbFeatType).EndInit();
+ ((System.ComponentModel.ISupportInitialize)repCmbEditModel).EndInit();
ResumeLayout(false);
}
@@ -300,7 +360,6 @@
private DevExpress.XtraGrid.Columns.GridColumn colX;
private DevExpress.XtraGrid.Columns.GridColumn colY;
private DevExpress.XtraEditors.SidePanel sidePanel1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private UniversalEditChart universalEditChart1;
private DevExpress.XtraEditors.SidePanel sidePanel2;
private DevExpress.XtraBars.BarDockControl barDockControlLeft;
@@ -311,6 +370,14 @@
private DevExpress.XtraBars.BarDockControl barDockControlRight;
private DevExpress.XtraBars.BarEditItem barFeatType;
private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repImgCmbFeatType;
- private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repCmbEditModel;
+ private DevExpress.XtraBars.BarEditItem barEditModel;
+ private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repImgCmbEditModel;
+ private DevExpress.XtraBars.Bar bar1;
+ private DevExpress.XtraBars.Bar bar3;
+ private DevExpress.XtraBars.BarButtonItem barBtnAdd;
+ private DevExpress.XtraBars.BarButtonItem barBtnDelete;
+ private DevExpress.XtraBars.BarCheckItem barCheckItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
}
}
--
Gitblit v1.9.3