From 7d49fe63d26ec26ebee525a7ee26d8ee1dfbbc60 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期四, 22 八月 2024 08:48:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/05-ImportCompleted/ImportXhsProjectCompletedCtrl.cs | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/05-ImportCompleted/ImportXhsProjectCompletedCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/05-ImportCompleted/ImportXhsProjectCompletedCtrl.cs
index 4403a0a..4258b0d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/05-ImportCompleted/ImportXhsProjectCompletedCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/05-ImportCompleted/ImportXhsProjectCompletedCtrl.cs
@@ -40,16 +40,16 @@
if (vm.BimfaceFileRelationID.HasValue)
{
this.stepProgressBar1.SelectNext();
- if (vm.BimfaceConverted)
+ if (!vm.BimfaceConverted)
{
- this.stepProgressBar1.SelectNext();
+ this.stepItemForBimfaceTranslate.ContentBlock2.Description = "璺宠繃Bimface杞婚噺鍖栫瓑寰�...";
}
+ this.stepProgressBar1.SelectNext();
}
}
}
}
}
-
}
/// <summary>
@@ -65,7 +65,7 @@
/// </summary>
public bool AllowNext
{
- get { return false; }
+ get { return true; }
}
/// <summary>
@@ -81,7 +81,7 @@
/// </summary>
public bool AllowComplete
{
- get { return true; }
+ get { return false; }
}
/// <summary>
@@ -97,7 +97,7 @@
/// </summary>
public bool CanNext()
{
- return false;
+ return true;
}
/// <summary>
@@ -113,14 +113,8 @@
/// </summary>
public bool CanComplete()
{
- _vm.IsCompleted = true;
- return true;
+ _vm.IsCompleted = false;
+ return false;
}
-
-
-
-
-
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3