lixiaojun
2024-07-26 ded0ea786b19afa0accbbeb3cbe98e2156c05c35
增加基础控件边框属性
已修改4个文件
136 ■■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.Designer.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Map.Core/01-ViewMarker/MapViewMarkerContainer.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Map.Core/02-SetMarker/MapSetMarkerContainer.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Map.Core/03-SetSimpleMarker/MapSetSimpleMarkerContainer.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.Designer.cs
@@ -44,9 +44,12 @@
            // 
            // mapSetSimpleMarkerContainer1
            // 
            mapSetSimpleMarkerContainer1.BorderColor = Color.LightGray;
            mapSetSimpleMarkerContainer1.BorderWidth = 1;
            mapSetSimpleMarkerContainer1.Location = new Point(2, 2);
            mapSetSimpleMarkerContainer1.Margin = new Padding(3, 2, 3, 2);
            mapSetSimpleMarkerContainer1.Name = "mapSetSimpleMarkerContainer1";
            mapSetSimpleMarkerContainer1.ShowBorder = true;
            mapSetSimpleMarkerContainer1.Size = new Size(761, 431);
            mapSetSimpleMarkerContainer1.TabIndex = 0;
            // 
@@ -98,12 +101,12 @@
            layoutControlItem2.Text = "详细地址:";
            layoutControlItem2.TextSize = new Size(60, 14);
            // 
            // SetXhsProjectMapLocationCtrl
            // SetXhsProjectMapLocationWizardPage
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(layoutControl1);
            Name = "SetXhsProjectMapLocationCtrl";
            Name = "SetXhsProjectMapLocationWizardPage";
            Size = new Size(765, 459);
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
WinFrmUI/Yw.WinFrmUI.Map.Core/01-ViewMarker/MapViewMarkerContainer.cs
@@ -1,4 +1,7 @@
namespace Yw.WinFrmUI
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace Yw.WinFrmUI
{
    public partial class MapViewMarkerContainer : UserControl, IMapViewMarkerContainer
    {
@@ -79,6 +82,46 @@
            return await this.webViewControl1.EvaluateScriptAsync<bool>("loadMarker", marker);
        }
        #region 边框
        /// <summary>
        /// 显示边框
        /// </summary>
        [Display(Name = "显示边框")]
        [DisplayName("显示边框")]
        [Browsable(true)]
        public bool ShowBorder
        {
            get { return this.webViewControl1.ShowBorder; }
            set { this.webViewControl1.ShowBorder = value; }
        }
        /// <summary>
        /// 边框颜色
        /// </summary>
        [Display(Name = "边框颜色")]
        [DisplayName("边框颜色")]
        [Browsable(true)]
        public Color BorderColor
        {
            get { return this.webViewControl1.BorderColor; }
            set { this.webViewControl1.BorderColor = value; }
        }
        /// <summary>
        /// 边框宽度
        /// </summary>
        [Display(Name = "边框宽度")]
        [DisplayName("边框宽度")]
        [Browsable(true)]
        public int BorderWidth
        {
            get { return this.webViewControl1.BorderWidth; }
            set { this.webViewControl1.BorderWidth = value; }
        }
        #endregion
    }
}
WinFrmUI/Yw.WinFrmUI.Map.Core/02-SetMarker/MapSetMarkerContainer.cs
@@ -1,4 +1,6 @@
using Yw.Model.Map;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel;
using Yw.Model.Map;
namespace Yw.WinFrmUI
{
@@ -138,7 +140,45 @@
            await this.webViewControl1.EvaluateScriptAsync("setInfoPanelVisibility()");
        }
        #region 边框
        /// <summary>
        /// 显示边框
        /// </summary>
        [Display(Name = "显示边框")]
        [DisplayName("显示边框")]
        [Browsable(true)]
        public bool ShowBorder
        {
            get { return this.webViewControl1.ShowBorder; }
            set { this.webViewControl1.ShowBorder = value; }
        }
        /// <summary>
        /// 边框颜色
        /// </summary>
        [Display(Name = "边框颜色")]
        [DisplayName("边框颜色")]
        [Browsable(true)]
        public Color BorderColor
        {
            get { return this.webViewControl1.BorderColor; }
            set { this.webViewControl1.BorderColor = value; }
        }
        /// <summary>
        /// 边框宽度
        /// </summary>
        [Display(Name = "边框宽度")]
        [DisplayName("边框宽度")]
        [Browsable(true)]
        public int BorderWidth
        {
            get { return this.webViewControl1.BorderWidth; }
            set { this.webViewControl1.BorderWidth = value; }
        }
        #endregion
    }
WinFrmUI/Yw.WinFrmUI.Map.Core/03-SetSimpleMarker/MapSetSimpleMarkerContainer.cs
@@ -1,4 +1,6 @@
using Yw.Model.Map;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel;
using Yw.Model.Map;
namespace Yw.WinFrmUI
{
@@ -88,7 +90,45 @@
        #region 边框
        /// <summary>
        /// 显示边框
        /// </summary>
        [Display(Name = "显示边框")]
        [DisplayName("显示边框")]
        [Browsable(true)]
        public bool ShowBorder
        {
            get { return this.webViewControl1.ShowBorder; }
            set { this.webViewControl1.ShowBorder = value; }
        }
        /// <summary>
        /// 边框颜色
        /// </summary>
        [Display(Name = "边框颜色")]
        [DisplayName("边框颜色")]
        [Browsable(true)]
        public Color BorderColor
        {
            get { return this.webViewControl1.BorderColor; }
            set { this.webViewControl1.BorderColor = value; }
        }
        /// <summary>
        /// 边框宽度
        /// </summary>
        [Display(Name = "边框宽度")]
        [DisplayName("边框宽度")]
        [Browsable(true)]
        public int BorderWidth
        {
            get { return this.webViewControl1.BorderWidth; }
            set { this.webViewControl1.BorderWidth = value; }
        }
        #endregion