Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

duheng

2024-07-22 fcf32c2aed6a83904576016b1a113ec9972f00b5

Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectViewModel.cs

@@ -5,10 +5,17 @@
    /// </summary>
    public class ImportXhsProjectViewModel
    {
        #region 第一步选择压缩文件

        /// <summary>
        /// 压缩文件
        /// </summary>
        public string ZipFile { get; set; }


        #endregion

        #region 第二步录入项目信息

        /// <summary>
        /// 编号
@@ -45,11 +52,17 @@
        /// </summary>
        public string Description { get; set; }

        #endregion

        #region 第三步设置地图位置

        /// <summary>
        /// 位置
        /// </summary>
        public Yw.Model.Map.Marker Location { get; set; }

        #endregion



    }

 WinFrmUI/Yw.WinFrmUI.Core/08-wizard/IWizardManager.cs

@@ -72,6 +72,5 @@
        #endregion



    }
}

 WinFrmUI/Yw.WinFrmUI.Core/08-wizard/WizardManager.cs

@@ -38,12 +38,12 @@
                    {
                        if (page == this.SelectedPage)
                        {
                            this.SelectedPageStateChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
                            TriggerSelectedPageStateChangedEvent();
                        }
                    };
                }
                _selectedIndex = 0;
                this.SelectedPageChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
                TriggerSelectedPageChangedEvent();
                this.SelectedPage.InitialPage(_vm);
            }
            else
@@ -65,7 +65,7 @@
        /// <summary>
        /// vm对象
        /// </summary>
        protected readonly T _vm = new T();
        protected readonly T _vm = new();

        #endregion

@@ -93,6 +93,7 @@
        {
            get { return _selectedIndex; }
        }

        /// <summary>
        /// 选择索引
        /// </summary>
@@ -118,7 +119,7 @@
            if (this.SelectedPage.CanPrev())
            {
                --_selectedIndex;
                this.SelectedPageChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
                TriggerSelectedPageChangedEvent();
                this.SelectedPage.InitialPage(_vm);
                return true;
            }
@@ -141,7 +142,7 @@
            if (this.SelectedPage.CanNext())
            {
                ++_selectedIndex;
                this.SelectedPageChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
                TriggerSelectedPageChangedEvent();
                this.SelectedPage.InitialPage(_vm);
                return true;
            }
@@ -190,6 +191,26 @@

        #endregion

        #region 方法

        /// <summary>
        /// 触发选择页面改变事件
        /// </summary>
        protected void TriggerSelectedPageChangedEvent()
        {
            this.SelectedPageChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
        }

        /// <summary>
        /// 触发选择页面状态改变事件
        /// </summary>
        protected void TriggerSelectedPageStateChangedEvent()
        {
            this.SelectedPageStateChangedEvent?.Invoke(this.SelectedPage, this.SelectedIndex);
        }

        #endregion


    }
}