From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/02-edit/UniversalChartEditCtrl.Designer.cs | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/02-edit/UniversalChartEditCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/02-edit/UniversalChartEditCtrl.Designer.cs
index 7cc039e..8593e3c 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/02-edit/UniversalChartEditCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/02-edit/UniversalChartEditCtrl.Designer.cs
@@ -28,17 +28,31 @@
/// </summary>
private void InitializeComponent()
{
+ universalChartExcelEditCtrl1 = new Yw.WinFrmUI.Phart.UniversalChartExcelEditCtrl();
SuspendLayout();
+ //
+ // universalChartExcelEditCtrl1
+ //
+ universalChartExcelEditCtrl1.Appearance.BackColor = SystemColors.Control;
+ universalChartExcelEditCtrl1.Appearance.Options.UseBackColor = true;
+ universalChartExcelEditCtrl1.Dock = DockStyle.Fill;
+ universalChartExcelEditCtrl1.Location = new Point(0, 0);
+ universalChartExcelEditCtrl1.Name = "universalChartExcelEditCtrl1";
+ universalChartExcelEditCtrl1.Size = new Size(843, 697);
+ universalChartExcelEditCtrl1.TabIndex = 0;
//
// UniversalChartEditCtrl
//
AutoScaleDimensions = new SizeF(10F, 22F);
AutoScaleMode = AutoScaleMode.Font;
+ Controls.Add(universalChartExcelEditCtrl1);
Name = "UniversalChartEditCtrl";
Size = new Size(843, 697);
ResumeLayout(false);
}
#endregion
+
+ private Yw.WinFrmUI.Phart.UniversalChartExcelEditCtrl universalChartExcelEditCtrl1;
}
}
--
Gitblit v1.9.3