Merge pull request #3 from HandyOrg/master

merge

src/Shared/HandyControlDemo_Shared/App.xaml.cs

@@ -71,6 +71,8 @@ namespace HandyControlDemo
                 }
 
                 ConfigHelper.Instance.SetSystemVersionInfo(CommonHelper.GetSystemVersionInfo());
+                ConfigHelper.Instance.SetWindowDefaultStyle();
+                ConfigHelper.Instance.SetNavigationWindowDefaultStyle();
 
                 ServicePointManager.SecurityProtocol = (SecurityProtocolType)(SslProtocols)0x00000C00;
             }

src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml

@@ -18,7 +18,7 @@
                 <ColumnDefinition/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <hc:StepBar Grid.ColumnSpan="2">
+            <hc:StepBar Grid.ColumnSpan="2" StepIndex="{Binding StepIndex}">
                 <hc:StepBarItem Content="{x:Static langs:Lang.Register}"/>
                 <hc:StepBarItem Content="{x:Static langs:Lang.BasicInfo}"/>
                 <hc:StepBarItem Content="{x:Static langs:Lang.UploadFile}"/>

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs

@@ -16,6 +16,18 @@ namespace HandyControlDemo.ViewModel
     {
         public StepBarDemoViewModel(DataService dataService) => DataList = dataService.GetStepBarDemoDataList();
 
+        private int _stepIndex;
+
+        public int StepIndex
+        {
+            get => _stepIndex;
+#if netle40
+            set => Set(nameof(StepIndex), ref _stepIndex, value);
+#else
+            set => Set(ref _stepIndex, value);
+#endif
+        }
+
         /// <summary>
         ///     下一步
         /// </summary>