提交 77262554 编写于 作者: richard_1015's avatar richard_1015 提交者: GitHub

Revert "table支持自定义表头icon、支持render入参等 (#1261)"

This reverts commit 2ad539ee.
上级 2ad539ee
...@@ -22,12 +22,6 @@ ...@@ -22,12 +22,6 @@
<nut-table :columns="columns3" :data="data5"> </nut-table> <nut-table :columns="columns3" :data="data5"> </nut-table>
<h2>支持排序</h2> <h2>支持排序</h2>
<nut-table :columns="columns6" :data="data6" @sorter="handleSorter"> </nut-table> <nut-table :columns="columns6" :data="data6" @sorter="handleSorter"> </nut-table>
<h2>支持自定义表头icon</h2>
<nut-table :columns="columns1" :data="data1">
<template #icon-name>
<nut-icon name="people"></nut-icon>
</template>
</nut-table>
</div> </div>
</template> </template>
...@@ -104,10 +98,7 @@ export default createDemo({ ...@@ -104,10 +98,7 @@ export default createDemo({
{ {
title: '姓名', title: '姓名',
key: 'name', key: 'name',
align: 'center', align: 'center'
render(data) {
return `${data.name}(${data.sex})`;
}
}, },
{ {
title: '性别', title: '性别',
...@@ -191,8 +182,7 @@ export default createDemo({ ...@@ -191,8 +182,7 @@ export default createDemo({
name: 'Tom', name: 'Tom',
sex: '', sex: '',
record: '小学', record: '小学',
render: (data) => { render: () => {
console.log(data);
return h( return h(
Button, Button,
{ {
...@@ -257,7 +247,8 @@ export default createDemo({ ...@@ -257,7 +247,8 @@ export default createDemo({
timer: null as number | null, timer: null as number | null,
summary: () => { summary: () => {
return { return {
value: '这是总结栏' value: '这是总结栏',
colspan: 5
}; };
} }
}); });
......
...@@ -12,12 +12,7 @@ ...@@ -12,12 +12,7 @@
> >
{{ item.title }} {{ item.title }}
<slot name="icon"></slot> <slot name="icon"></slot>
<slot :name="`icon-${item.key}`"></slot> <nut-icon v-if="!$slots.icon && item.sorter" name="down-arrow" size="12px"></nut-icon>
<nut-icon
v-if="!$slots.icon && !$slots[`icon-${item.key}`] && item.sorter"
name="down-arrow"
size="12px"
></nut-icon>
</span> </span>
</view> </view>
</view> </view>
...@@ -30,12 +25,7 @@ ...@@ -30,12 +25,7 @@
:key="value" :key="value"
> >
{{ typeof item[value] !== 'function' ? item[value] : '' }} {{ typeof item[value] !== 'function' ? item[value] : '' }}
<RenderColumn :slots="item[value]" :data="item" v-if="typeof item[value] === 'function'"></RenderColumn> <RenderColumn :slots="item[value]" v-if="typeof item[value] === 'function'"></RenderColumn>
<RenderColumn
:slots="getColumnItem(value).render"
:data="item"
v-else-if="typeof getColumnItem(value).render === 'function'"
></RenderColumn>
</span> </span>
</view> </view>
</view> </view>
......
import { h } from 'vue'; import { h } from 'vue';
export default { export default {
setup(props: any) { setup(props: any) {
return () => h(`view`, {}, props.slots(props.data)); return () => h(`view`, {}, props.slots());
}, },
props: { props: {
slots: Object, slots: Object
data: Object
} }
}; };
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册