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.

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

fix(comp:table): pagination should hide when data empty #1782

Merged
merged 1 commit into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`Table > basic work > render work 1`] = `
"<div class=\\"ix-table ix-table-borderless ix-table-md\\">
<!---->
<div class=\\"ix-table-container ix-table-inset-shadow\\">
<div class=\\"ix-table-content\\">
<div class=\\"ix-table-content\\" style=\\"overflow-x: auto; overflow-y: auto;\\">
<table class=\\"ix-table-table\\" style=\\"table-layout: auto;\\">
<colgroup>
<col class=\\"ix-table-col-expandable\\">
Expand Down Expand Up @@ -34,6 +34,8 @@ exports[`Table > basic work > render work 1`] = `
</tr>
</thead>
<tbody class=\\"ix-table-tbody\\">
<!---->
<!---->
<!---->
<tr class=\\"ix-table-row\\">
<td class=\\"ix-table-cell\\">
Expand Down
16 changes: 14 additions & 2 deletions packages/components/table/demo/AutoHeight.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
</template>
</IxTable>
</div>
<br />
<IxButton @click="toggleEmpty">ToggleEmpty</IxButton>
</template>

<script lang="ts" setup>
Expand Down Expand Up @@ -100,15 +102,25 @@ const columns: TableColumn<Data>[] = [
},
]

const data: Data[] = []
const fullData: Data[] = []
for (let i = 0; i < 100; i++) {
data.push({
fullData.push({
key: i,
name: `Edrward ${i}`,
age: 32,
address: `London Park no. ${i}`,
})
}

const data = ref<Data[]>(fullData)

const toggleEmpty = () => {
if (data.value.length > 0) {
data.value = []
} else {
data.value = fullData
}
}

const scroll: TableScroll = { width: 1500 }
</script>
41 changes: 27 additions & 14 deletions packages/components/table/demo/Basic.vue
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
<template>
<IxTable :columns="columns" :dataSource="data">
<template #name="{ value }">
<IxButton mode="link">{{ value }}</IxButton>
</template>
<template #action="{ record }">
<IxButtonGroup :gap="8" mode="link" separator="|">
<IxButton>Invite {{ record.name }}</IxButton>
<IxButton>Delete</IxButton>
</IxButtonGroup>
</template>
</IxTable>
<IxSpace vertical style="width: 100%">
<IxTable :columns="columns" :dataSource="data">
<template #name="{ value }">
<IxButton mode="link">{{ value }}</IxButton>
</template>
<template #action="{ record }">
<IxButtonGroup :gap="8" mode="link" separator="|">
<IxButton>Invite {{ record.name }}</IxButton>
<IxButton>Delete</IxButton>
</IxButtonGroup>
</template>
</IxTable>
<IxButton @click="toggleEmpty"> ToggleEmpty </IxButton>
</IxSpace>
</template>

<script lang="ts" setup>
import { h } from 'vue'
import { h, ref } from 'vue'

import { TableColumn } from '@idux/components/table'
import { IxTag } from '@idux/components/tag'
Expand Down Expand Up @@ -59,14 +62,24 @@ const columns: TableColumn<Data>[] = [
},
]

const data: Data[] = []
const fullData: Data[] = []
for (let index = 0; index < 100; index++) {
data.push({
fullData.push({
key: index,
name: `Edrward ${index}`,
age: 18 + index,
address: `London Park no. ${index}`,
tags: ['nice', 'developer'],
})
}

const data = ref<Data[]>(fullData)

const toggleEmpty = () => {
if (data.value.length > 0) {
data.value = []
} else {
data.value = fullData
}
}
</script>
53 changes: 52 additions & 1 deletion packages/components/table/demo/Expandable.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<template>
<IxTable v-model:expandedRowKeys="expandedRowKeys" :columns="columns" :dataSource="data" :pagination="false">
<IxTable
v-model:expandedRowKeys="expandedRowKeys"
tableLayout="fixed"
:columns="columns"
:dataSource="data"
:pagination="false"
>
<template #name="{ value }">
<IxButton mode="link">{{ value }}</IxButton>
</template>
Expand Down Expand Up @@ -27,23 +33,68 @@ const expandedRowKeys = ref([1])
const columns: TableColumn<Data>[] = [
{
type: 'expandable',
width: 60,
fixed: 'start',
disabled: record => !record.description,
onChange: expendedRowKeys => console.log(expendedRowKeys),
customExpand: 'expand',
},
{
width: 400,
title: 'Name',
dataKey: 'name',
customCell: 'name',
},
{
width: 200,
title: 'Age',
dataKey: 'age',
},
{
width: 400,
title: 'Address',
dataKey: 'address',
},
{
width: 400,
title: 'data1',
dataKey: 'data1',
},
{
width: 400,
title: 'data2',
dataKey: 'data2',
},
{
width: 400,
title: 'data3',
dataKey: 'data3',
},
{
width: 400,
title: 'data4',
dataKey: 'data4',
},
{
width: 400,
title: 'data5',
dataKey: 'data5',
},
{
width: 400,
title: 'data6',
dataKey: 'data6',
},
{
width: 400,
title: 'data7',
dataKey: 'data7',
},
{
width: 400,
title: 'data8',
dataKey: 'data8',
},
]

const data: Data[] = [
Expand Down
19 changes: 15 additions & 4 deletions packages/components/table/demo/VirtualBoth.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
:virtualColWidth="150"
>
</IxTable>
<IxButton @click="toggleEmpty"> ToggleEmpty </IxButton>
</template>

<script lang="ts" setup>
import { h } from 'vue'
import { h, ref } from 'vue'

import { TableColumn } from '@idux/components/table'
import { IxText } from '@idux/components/text'
Expand Down Expand Up @@ -42,16 +43,26 @@ for (let index = 0; index < columnCount; index++) {
})
}

const data: Data[] = []
const fullData: Data[] = []
for (let index = 0; index < rowCount; index++) {
const item: Data = { key: index }

for (let colIndex = 0; colIndex < columnCount; colIndex++) {
item[`column${colIndex}`] = `row-${index} col-${colIndex} hahahahahahahahahahah`
}

data.push(item)
fullData.push(item)
}

const scroll = { height: 800 }
const data = ref<Data[]>(fullData)

const toggleEmpty = () => {
if (data.value.length > 0) {
data.value = []
} else {
data.value = fullData
}
}

const scroll = { height: 800, fullHeight: true }
</script>
18 changes: 16 additions & 2 deletions packages/components/table/demo/VirtualHorizontal.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<template>
<IxTable :columns="columns" :dataSource="data" :pagination="false" virtualHorizontal :virtualColWidth="150">
</IxTable>
<br />
<IxButton @click="toggleEmpty"> ToggleEmpty </IxButton>
</template>

<script lang="ts" setup>
import { ref } from 'vue'

import { TableColumn } from '@idux/components/table'

interface Data {
Expand All @@ -25,14 +29,24 @@ for (let index = 0; index < columnCount; index++) {
})
}

const data: Data[] = []
const fullData: Data[] = []
for (let index = 0; index < 8; index++) {
const item: Data = { key: index }

for (let colIndex = 0; colIndex < columnCount; colIndex++) {
item[`column${colIndex}`] = `row-${index} col-${colIndex}`
}

data.push(item)
fullData.push(item)
}

const data = ref<Data[]>(fullData)

const toggleEmpty = () => {
if (data.value.length > 0) {
data.value = []
} else {
data.value = fullData
}
}
</script>
23 changes: 15 additions & 8 deletions packages/components/table/src/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default defineComponent({
const { mergedPagination } = usePagination(props, config, mergedSize)

const stickyContext = useSticky(props)
const scrollContext = useScroll(props, mergedAutoHeight, stickyContext)
const scrollContext = useScroll(props, stickyContext)
const columnsContext = useColumns(props, slots, config, scrollContext.scrollBarSizeOnFixedHolder)
const sortableContext = useSortable(columnsContext.flattedColumns)
const filterableContext = useFilterable(columnsContext.flattedColumns)
Expand Down Expand Up @@ -145,14 +145,21 @@ export default defineComponent({
const prefixCls = mergedPrefixCls.value
const header = <ɵHeader v-slots={slots} header={props.header} />
const footer = renderFooter(slots, prefixCls)
const [paginationTop, paginationBottom] = renderPagination(
slots,
mergedPagination.value,
filteredData.value,
prefixCls,
)

const children = [header]
const resetChildren = [paginationTop, <MainTable />, footer, paginationBottom].filter(Boolean) as VNode[]
let resetChildren = [<MainTable />, footer].filter(Boolean) as VNode[]

if (flattedData.value.length > 0) {
const [paginationTop, paginationBottom] = renderPagination(
slots,
mergedPagination.value,
filteredData.value,
prefixCls,
)

resetChildren = [paginationTop, ...resetChildren, paginationBottom].filter(Boolean) as VNode[]
}

const spinProps = convertSpinProps(props.spin)
if (spinProps) {
children.push(<IxSpin {...spinProps}>{resetChildren}</IxSpin>)
Expand Down
Loading