From c0be7c001375f73e2c3b49a1b1d447b6fc297bdd Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 21 三月 2025 13:43:00 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/QuickModelingPlaceWizardPage.Designer.cs | 92 +++++++++++++++++++++++----------------------
1 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/QuickModelingPlaceWizardPage.Designer.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/QuickModelingPlaceWizardPage.Designer.cs
index 99cf2b7..0fa45f8 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/QuickModelingPlaceWizardPage.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/QuickModelingPlaceWizardPage.Designer.cs
@@ -29,18 +29,17 @@
private void InitializeComponent()
{
components = new Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = 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.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
placeInfoCtrl1 = new PlaceInfoCtrl();
setFlagsEditCtrl1 = new SetFlagsEditCtrl();
txtTagName = new TextEdit();
txtDescription = new MemoEdit();
imgCmbPlaceType = new ImageComboBoxEdit();
- mapSetSimpleMarkerContainer1 = new MapSetSimpleMarkerContainer();
txtName = new TextEdit();
txtAddress = new TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -53,10 +52,11 @@
layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+ webView = new Microsoft.Web.WebView2.WinForms.WebView2();
+ layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)txtTagName.Properties).BeginInit();
@@ -74,20 +74,21 @@
((ISupportInitialize)layoutControlGroup4).BeginInit();
((ISupportInitialize)layoutControlItem8).BeginInit();
((ISupportInitialize)layoutControlGroup1).BeginInit();
- ((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)layoutControlGroup3).BeginInit();
((ISupportInitialize)layoutControlItem3).BeginInit();
((ISupportInitialize)dxErrorProvider1).BeginInit();
+ ((ISupportInitialize)webView).BeginInit();
+ ((ISupportInitialize)layoutControlItem1).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(webView);
layoutControl1.Controls.Add(placeInfoCtrl1);
layoutControl1.Controls.Add(setFlagsEditCtrl1);
layoutControl1.Controls.Add(txtTagName);
layoutControl1.Controls.Add(txtDescription);
layoutControl1.Controls.Add(imgCmbPlaceType);
- layoutControl1.Controls.Add(mapSetSimpleMarkerContainer1);
layoutControl1.Controls.Add(txtName);
layoutControl1.Controls.Add(txtAddress);
layoutControl1.Dock = DockStyle.Fill;
@@ -144,17 +145,6 @@
imgCmbPlaceType.TabIndex = 3;
imgCmbPlaceType.EditValueChanged += imgCmbPlaceType_EditValueChanged;
//
- // mapSetSimpleMarkerContainer1
- //
- mapSetSimpleMarkerContainer1.BorderColor = Color.LightGray;
- mapSetSimpleMarkerContainer1.BorderWidth = 1;
- mapSetSimpleMarkerContainer1.Location = new Point(1, 27);
- mapSetSimpleMarkerContainer1.Margin = new Padding(4, 4, 4, 4);
- mapSetSimpleMarkerContainer1.Name = "mapSetSimpleMarkerContainer1";
- mapSetSimpleMarkerContainer1.ShowBorder = false;
- mapSetSimpleMarkerContainer1.Size = new Size(492, 621);
- mapSetSimpleMarkerContainer1.TabIndex = 0;
- //
// txtName
//
txtName.Location = new Point(591, 38);
@@ -178,18 +168,18 @@
Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup2, layoutControlGroup4, layoutControlGroup1, layoutControlGroup3 });
Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
Root.Name = "Root";
- columnDefinition1.SizeType = SizeType.Percent;
- columnDefinition1.Width = 60D;
- columnDefinition2.SizeType = SizeType.Percent;
- columnDefinition2.Width = 40D;
- Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition1, columnDefinition2 });
- rowDefinition1.Height = 30D;
- rowDefinition1.SizeType = SizeType.Percent;
- rowDefinition2.Height = 40D;
- rowDefinition2.SizeType = SizeType.Percent;
- rowDefinition3.Height = 30D;
- rowDefinition3.SizeType = SizeType.Percent;
- Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3 });
+ columnDefinition3.SizeType = SizeType.Percent;
+ columnDefinition3.Width = 60D;
+ columnDefinition4.SizeType = SizeType.Percent;
+ columnDefinition4.Width = 40D;
+ Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition3, columnDefinition4 });
+ rowDefinition4.Height = 30D;
+ rowDefinition4.SizeType = SizeType.Percent;
+ rowDefinition5.Height = 40D;
+ rowDefinition5.SizeType = SizeType.Percent;
+ rowDefinition6.Height = 30D;
+ rowDefinition6.SizeType = SizeType.Percent;
+ Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition4, rowDefinition5, rowDefinition6 });
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
Root.Size = new Size(824, 649);
Root.TextVisible = false;
@@ -287,16 +277,6 @@
layoutControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup1.Text = "鍦板浘";
//
- // layoutControlItem1
- //
- layoutControlItem1.Control = mapSetSimpleMarkerContainer1;
- layoutControlItem1.Location = new Point(0, 0);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem1.Size = new Size(492, 621);
- layoutControlItem1.TextSize = new Size(0, 0);
- layoutControlItem1.TextVisible = false;
- //
// layoutControlGroup3
//
layoutControlGroup3.GroupStyle = DevExpress.Utils.GroupStyle.Card;
@@ -323,6 +303,27 @@
//
dxErrorProvider1.ContainerControl = this;
//
+ // webView
+ //
+ webView.AllowExternalDrop = true;
+ webView.CreationProperties = null;
+ webView.DefaultBackgroundColor = Color.White;
+ webView.Location = new Point(1, 27);
+ webView.Name = "webView";
+ webView.Size = new Size(492, 621);
+ webView.TabIndex = 9;
+ webView.ZoomFactor = 1D;
+ //
+ // layoutControlItem1
+ //
+ layoutControlItem1.Control = webView;
+ layoutControlItem1.Location = new Point(0, 0);
+ layoutControlItem1.Name = "layoutControlItem1";
+ layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ layoutControlItem1.Size = new Size(492, 621);
+ layoutControlItem1.TextSize = new Size(0, 0);
+ layoutControlItem1.TextVisible = false;
+ //
// QuickModelingPlaceWizardPage
//
AutoScaleDimensions = new SizeF(8F, 18F);
@@ -348,10 +349,11 @@
((ISupportInitialize)layoutControlGroup4).EndInit();
((ISupportInitialize)layoutControlItem8).EndInit();
((ISupportInitialize)layoutControlGroup1).EndInit();
- ((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)layoutControlGroup3).EndInit();
((ISupportInitialize)layoutControlItem3).EndInit();
((ISupportInitialize)dxErrorProvider1).EndInit();
+ ((ISupportInitialize)webView).EndInit();
+ ((ISupportInitialize)layoutControlItem1).EndInit();
ResumeLayout(false);
}
@@ -359,9 +361,7 @@
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private MapSetSimpleMarkerContainer mapSetSimpleMarkerContainer1;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private TextEdit txtName;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
@@ -380,5 +380,7 @@
private PlaceInfoCtrl placeInfoCtrl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
+ private Microsoft.Web.WebView2.WinForms.WebView2 webView;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
}
}
--
Gitblit v1.9.3