Skip to content

Commit

Permalink
fix: allow attributes on actions column
Browse files Browse the repository at this point in the history
  • Loading branch information
cafadev committed Dec 22, 2023
1 parent 4f481b2 commit 8e9e12f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion demo-element-plus/src/viewer/FTableViewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const table = useTable({
created_at: {
format: (value: string) => 'anything',
},
actions: { value: 'actions', label: '' },
actions: { value: 'actions', label: '', width: '200px', align: 'right' },
},
pagination: {
rowsPerPage: 10,
Expand Down
6 changes: 3 additions & 3 deletions packages/wrapper-element-plus/src/table/WeTableBody.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</slot>
</el-table-column>

<template v-if="hasActionHeader">
<el-table-column v-slot="bind" prop="actions" label="Actions">
<template v-if="actionHeader">
<el-table-column v-slot="bind" prop="actions" v-bind="actionHeader">
<slot name="column-actions" v-bind="bind">
<f-table-row-actions
@edit="emit('edit', bind.row)"
Expand Down Expand Up @@ -42,7 +42,7 @@ const bus = new Bus()
const parseHeaders = computed(() => props.headers.map(header => ({ ...header, title: header.label, key: header.value })))
const excludeActionsHeaders = computed(() => parseHeaders.value.filter(header => header.key !== 'actions'))
const hasActionHeader = computed(() => props.headers.some(header => header.value === 'actions' && header.exclude !== true))
const actionHeader = computed(() => props.headers.find(header => header.value === 'actions' && header.exclude !== true))
function getValue(row: any, column: NormalizedColumn, rowIndex: number) {
return bus.execute(
Expand Down
4 changes: 2 additions & 2 deletions packages/wrapper-oruga-ui/src/table/WoTableBody.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</o-table-column>

<template v-else>
<o-table-column v-if="hasActionHeader" v-slot="{ row, index }">
<o-table-column v-if="actionHeader" v-slot="{ row, index }" v-bind="actionHeader">
<slot name="column-actions" v-bind="{ row, index }">
<f-table-row-actions
@edit="emit('edit', row)"
Expand Down Expand Up @@ -46,7 +46,7 @@ const emit = defineEmits<TableBodyEmit>()
const bus = new Bus()
const hasActionHeader = computed(() => props.headers.some(header => header.value === 'actions' && header.exclude !== true))
const actionHeader = computed(() => props.headers.find(header => header.value === 'actions' && header.exclude !== true))
function getValue(row: any, column: NormalizedColumn, rowIndex: number) {
return bus.execute(
Expand Down
6 changes: 3 additions & 3 deletions packages/wrapper-quasar/src/table/WqTableBody.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
</slot>
</q-td>
</template>
<template v-if="hasActionHeader" #[`body-cell-actions`]="bind">
<q-td key="actions" :props="bind">
<template v-if="actionHeader" #[`body-cell-actions`]="bind">
<q-td key="actions" :props="bind" v-bind="actionHeader">
<slot name="column-actions" v-bind="bind">
<f-table-row-actions
@edit="emit('edit', bind.row)"
Expand Down Expand Up @@ -66,7 +66,7 @@ const parseHeaders = computed((): QuasarColumn[] => props.headers.map((header) =
}
}))
const hasActionHeader = computed(() => props.headers.some(header => header.value === 'actions' && header.exclude !== true))
const actionHeader = computed(() => props.headers.find(header => header.value === 'actions' && header.exclude !== true))
const excludeActionsHeaders = computed(() => parseHeaders.value.filter(header => header.name !== 'actions'))
Expand Down

0 comments on commit 8e9e12f

Please sign in to comment.