Skip to content

fix: fixed error with no expected value in expandColumnTitle slot #7265

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

Merged
merged 9 commits into from
Jan 16, 2024
Merged

fix: fixed error with no expected value in expandColumnTitle slot #7265

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
175f5cb
fix: fixed error report with no expected value in `expandColumnTitle`…
cc-hearts Jan 10, 2024
ed24965
fix: optimize optional chain
cc-hearts Jan 10, 2024
bb9c644
fix: use default render
cc-hearts Jan 12, 2024
40c7759
refactor: use `customRenderSlot` replace `renderSlot`
cc-hearts Jan 12, 2024
add90ff
style: code format
cc-hearts Jan 12, 2024
c67eb2f
perf: optimize useColumns code
cc-hearts Jan 12, 2024
b18edbd
fix: fix path
cc-hearts Jan 13, 2024
3eb3932
feat: add customRenderSlot unit test
cc-hearts Jan 14, 2024
e781035
Merge branch 'vueComponent:main' into fix/7260
cc-hearts Jan 16, 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
1 change: 1 addition & 0 deletions components/card/Card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import useStyle from './style';
import Skeleton from '../skeleton';
import type { CustomSlotsType } from '../_util/type';
import { customRenderSlot } from '../_util/vnode';

export interface CardTabListType {
key: string;
tab: any;
Expand Down
3 changes: 2 additions & 1 deletion components/vc-table/hooks/useColumns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import type {
import { INTERNAL_COL_DEFINE } from '../utils/legacyUtil';
import { EXPAND_COLUMN } from '../constant';
import { useInjectSlots } from '../../table/context';
import { customRenderSlot } from 'ant-design-vue/es/_util/vnode';

function flatColumns<RecordType>(columns: ColumnsType<RecordType>): ColumnType<RecordType>[] {
return columns.reduce((list, column) => {
Expand Down Expand Up @@ -179,7 +180,7 @@ function useColumns<RecordType>(
class: `${prefixCls.value}-expand-icon-col`,
columnType: 'EXPAND_COLUMN',
},
title: contextSlots.value.expandColumnTitle?.() || '',
title: customRenderSlot(contextSlots.value, 'expandColumnTitle', {}, () => ['']),
fixed: fixedColumn,
class: `${prefixCls.value}-row-expand-icon-cell`,
width: expandColumnWidth.value,
Expand Down