Merge pull request #14 from actiontech/fix/order-steps-executing

[fix]: Order steps status error
actiontech · Oct 20, 2023 · f0cb67f · f0cb67f
2 parents 287f7a1 + 5e7c949
commit f0cb67f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/sqle/src/page/Order/Detail/OrderRecordInfo/OrderSteps.tsx b/packages/sqle/src/page/Order/Detail/OrderRecordInfo/OrderSteps.tsx
@@ -40,10 +40,11 @@ const OrderSteps: React.FC<OrderStepsProps> = ({
       return number;
     }
 
-    // 上线成功 或 上线失败
+    // 上线成功 上线失败 或 正在上线
     if (
       orderStatus === WorkflowRecordResV2StatusEnum.finished ||
-      orderStatus === WorkflowRecordResV2StatusEnum.exec_failed
+      orderStatus === WorkflowRecordResV2StatusEnum.exec_failed ||
+      orderStatus === WorkflowRecordResV2StatusEnum.executing
     ) {
       return workflowSteps.length + 1;
     }

diff --git a/packages/sqle/src/page/Order/Detail/index.tsx b/packages/sqle/src/page/Order/Detail/index.tsx
@@ -96,7 +96,10 @@ const OrderDetail: React.FC = () => {
                 <OrderDetailPageHeaderExtra
                   projectName={projectName}
                   orderInfo={orderInfo}
-                  refreshOrder={refreshOrder}
+                  refreshOrder={() => {
+                    refreshOrder();
+                    refreshOverviewAction();
+                  }}
                   pass={pass}
                   reject={reject}
                   canRejectOrder={canRejectOrder}