Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: [修复自定义按钮无渲染] #7628

Merged
merged 2 commits into from
Jun 10, 2024
Merged

Fix: [修复自定义按钮无渲染] #7628

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9c5cf7
Fix: [修复自定义按钮无渲染]
Jun 5, 2024
6425545
refactor(完善 Tour 自定义按钮代码健壮性): 🦄
Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions components/tour/panelRender.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { computed, defineComponent, toRefs } from 'vue';
import classNames from '../_util/classNames';
import { isFunction } from '../_util/util';
import CloseOutlined from '@ant-design/icons-vue/CloseOutlined';
import { tourStepProps } from './interface';
import type { TourBtnProps } from './interface';
Expand Down Expand Up @@ -119,7 +120,9 @@ const panelRender = defineComponent({
size="small"
class={classNames(`${prefixCls}-prev-btn`, prevButtonProps?.className)}
>
{prevButtonProps?.children ?? contextLocale.Previous}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

要判断下是否是 函数了，毕竟文档里写的是 children 是 vnode类型

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我增加了isFunction判断，看现在代码可否

{isFunction(prevButtonProps?.children)
? prevButtonProps.children()
: prevButtonProps?.children ?? contextLocale.Previous}
</Button>
) : null}
<Button
Expand All @@ -129,8 +132,11 @@ const panelRender = defineComponent({
size="small"
class={classNames(`${prefixCls}-next-btn`, nextButtonProps?.className)}
>
{nextButtonProps?.children ??
(isLastStep.value ? contextLocale.Finish : contextLocale.Next)}
{isFunction(nextButtonProps?.children)
? nextButtonProps?.children()
: isLastStep.value
? contextLocale.Finish
: contextLocale.Next}
</Button>
</div>
</div>
Expand Down