mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2024-12-09 04:31:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: solve merge conflict

Browse Source
This commit is contained in:
07akioni 2019-10-18 16:49:47 +08:00
commit 71a9290dea
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demo/documentation/components/advancedTable/enUS/basic.md
View File

@ -68,7 +68,10 @@ const _columns3 = ($this) => {
title: 'Name',
key: 'name',
sortable: true,
width: 300
width: 300,
renderHeader(h,column){
return <n-tag>{column.title}</n-tag>
}
},
{
title: 'Age',

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "naive-ui",
"version": "0.5.8",
"version": "0.5.9",
"description": "",
"main": "index.js",
"scripts": {

4
packages/common/AdvanceTable/row/index.js
View File

@ -10,9 +10,9 @@ export default {
render: (h, ctx) => {
const params = ctx.props.row
const { keyName, render, row } = ctx.props
const { keyName, render } = ctx.props
if (render) {
return h('div', [render(h, params)])
return render(h, params)
} else return h('div', [params.row[keyName]])
}
}

11
packages/common/AdvanceTable/src/main.vue
View File

@ -62,7 +62,7 @@
:class="{
'n-advance-table__sortable-column': column.sortable
}"
@click.native="()=>sortByColumn(column)"
@click.native.self="()=>sortByColumn(column)"
>
<!-- 当前页全选 -->
<n-checkbox
@ -71,7 +71,14 @@
:indeterminate="!isCheckedBoxAllIndeterminate"
@click.native="onAllCheckboxesClick"
/>
{{ column.title }}
<row
v-if="column.renderHeader"
:index="i"
:row="column"
:key-name="column.key || i"
:render="column.renderHeader"
/>
{{ !column.renderHeader ? column.title : '' }}
<SortIcon
v-if="column.sortable"
:ref="'sorter_' + (column.key || i)"