From c8c43e3dc181a4736396db1d1e0bfe65475ceeff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B0=E9=91=AB?= <1192065030@qq.com> Date: Thu, 3 Mar 2022 18:25:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=BB=84=E4=BB=B6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9ASteps=20=E7=82=B9=E7=8A=B6=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E6=9D=A1=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=20#554?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/react-steps/src/Step.tsx | 22 ++++++++++++---------- packages/react-steps/src/Steps.tsx | 6 +++--- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/react-steps/src/Step.tsx b/packages/react-steps/src/Step.tsx index b47a45387a..9cda70ff20 100644 --- a/packages/react-steps/src/Step.tsx +++ b/packages/react-steps/src/Step.tsx @@ -1,5 +1,5 @@ import React, { CSSProperties } from 'react'; -import Icon, { IconProps } from '@uiw/react-icon'; +import Icon, { IconProps, IconsName } from '@uiw/react-icon'; import { IProps, HTMLDivProps } from '@uiw/utils'; import './style/index.less'; @@ -57,14 +57,16 @@ export default function Step(props: StepProps) { } else if ((icon && typeof icon === 'string') || status === 'finish' || status === 'error') { iconNode = ( ); } else { @@ -73,7 +75,7 @@ export default function Step(props: StepProps) { return (
- +
diff --git a/packages/react-steps/src/Steps.tsx b/packages/react-steps/src/Steps.tsx index 599abd866f..962e02d747 100644 --- a/packages/react-steps/src/Steps.tsx +++ b/packages/react-steps/src/Steps.tsx @@ -3,8 +3,8 @@ import { IProps, HTMLDivProps } from '@uiw/utils'; import Step, { StepProps } from './Step'; export interface StepsProps extends IProps, HTMLDivProps { - status?: StepProps['status']; - progressDot?: StepProps['progressDot']; + status?: StepProps['status']; + progressDot?: StepProps['progressDot']; direction?: 'horizontal' | 'vertical'; /** * 指定当前步骤,从 `0` 开始记数。 @@ -71,7 +71,7 @@ function InternalSteps(props: StepsProps) { childProps.className = `${prefixCls}-next-error`; } if (!child.props.status) { - if (index === current) { + if (index === current!) { childProps.status = status; } else if (index < (current as number)) { childProps.status = 'finish'; From 81c604856fa99831781451eca8e26e605bf3c955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B0=E9=91=AB?= <1192065030@qq.com> Date: Fri, 4 Mar 2022 10:15:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20form=E6=94=AF=E6=8C=81TreeChecked?= =?UTF-8?q?=20=E6=A0=91=E5=BD=A2=E9=80=89=E6=8B=A9=E6=8E=A7=E4=BB=B6=20#60?= =?UTF-8?q?5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- website/src/routes/components/form/index.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/src/routes/components/form/index.tsx b/website/src/routes/components/form/index.tsx index 432704d064..2d4b797b19 100755 --- a/website/src/routes/components/form/index.tsx +++ b/website/src/routes/components/form/index.tsx @@ -17,6 +17,7 @@ import { Notify, Menu, Dropdown, + TreeChecked, } from 'uiw'; import Markdown from '../../../components/Markdown'; @@ -41,6 +42,7 @@ export default function Page() { Textarea, Notify, Menu, + TreeChecked, Dropdown, useRef, }}