From 7aba4847e623f2682a2cbbf5f787647207fa751d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=A3=E8=93=A6?= <mcdaddychen@126.com>
Date: Tue, 12 Apr 2022 19:45:59 +0800
Subject: [PATCH] fix(antd/next): form step setCurrent bug (#3039)

---
 packages/antd/src/form-step/index.tsx | 3 +--
 packages/next/src/form-step/index.tsx | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/antd/src/form-step/index.tsx b/packages/antd/src/form-step/index.tsx
index 4ca4fa39a87..d0e1931be3e 100644
--- a/packages/antd/src/form-step/index.tsx
+++ b/packages/antd/src/form-step/index.tsx
@@ -89,14 +89,12 @@ const createFormStep = (defaultCurrent = 0): IFormStep => {
 
   const next = action.bound(() => {
     if (formStep.allowNext) {
-      setDisplay(formStep.current + 1)
       formStep.setCurrent(formStep.current + 1)
     }
   })
 
   const back = action.bound(() => {
     if (formStep.allowBack) {
-      setDisplay(formStep.current - 1)
       formStep.setCurrent(formStep.current - 1)
     }
   })
@@ -109,6 +107,7 @@ const createFormStep = (defaultCurrent = 0): IFormStep => {
     },
     current: defaultCurrent,
     setCurrent(key: number) {
+      setDisplay(key)
       formStep.current = key
     },
     get allowNext() {
diff --git a/packages/next/src/form-step/index.tsx b/packages/next/src/form-step/index.tsx
index 3d58395dc2f..42d12801b18 100644
--- a/packages/next/src/form-step/index.tsx
+++ b/packages/next/src/form-step/index.tsx
@@ -92,14 +92,12 @@ const createFormStep = (defaultCurrent = 0): IFormStep => {
 
   const next = () => {
     if (formStep.allowNext) {
-      setDisplay(formStep.current + 1)
       formStep.setCurrent(formStep.current + 1)
     }
   }
 
   const back = () => {
     if (formStep.allowBack) {
-      setDisplay(formStep.current - 1)
       formStep.setCurrent(formStep.current - 1)
     }
   }
@@ -112,6 +110,7 @@ const createFormStep = (defaultCurrent = 0): IFormStep => {
     },
     current: defaultCurrent,
     setCurrent(key: number) {
+      setDisplay(key)
       formStep.current = key
     },
     get allowNext() {