Merge branch 'net' into development
This commit is contained in:
commit
bf147e6d6c
1 changed files with 26 additions and 6 deletions
|
|
@ -195,7 +195,6 @@ const columnsFolder: QTableProps['columns'] = [
|
||||||
label: 'สร้างโดย',
|
label: 'สร้างโดย',
|
||||||
field: 'createdBy',
|
field: 'createdBy',
|
||||||
style: 'width: 20px',
|
style: 'width: 20px',
|
||||||
|
|
||||||
sortable: true,
|
sortable: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -301,6 +300,13 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
|
||||||
{{ nameRow.row.name }}
|
{{ nameRow.row.name }}
|
||||||
</q-td>
|
</q-td>
|
||||||
</template>
|
</template>
|
||||||
|
<template v-slot:body-cell-createdBy="createdByRow">
|
||||||
|
<q-td>
|
||||||
|
<div class="justify-center center-content">
|
||||||
|
{{ createdByRow.row.createdBy }}
|
||||||
|
</div>
|
||||||
|
</q-td>
|
||||||
|
</template>
|
||||||
<template v-slot:body-cell-createdAt="createdAtRow">
|
<template v-slot:body-cell-createdAt="createdAtRow">
|
||||||
<q-td>
|
<q-td>
|
||||||
<div class="justify-center">
|
<div class="justify-center">
|
||||||
|
|
@ -311,7 +317,13 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
|
||||||
<template v-slot:body-cell-actions="actionsRow">
|
<template v-slot:body-cell-actions="actionsRow">
|
||||||
<q-td class="justify-center">
|
<q-td class="justify-center">
|
||||||
<div>
|
<div>
|
||||||
<q-icon @click.stop class="q-ma-sm" name="o_info" size="2em" color="primary" />
|
<q-icon
|
||||||
|
@click.stop
|
||||||
|
class="q-ma-sm"
|
||||||
|
name="o_info"
|
||||||
|
size="2em"
|
||||||
|
color="primary"
|
||||||
|
/>
|
||||||
<q-tooltip
|
<q-tooltip
|
||||||
anchor="center left"
|
anchor="center left"
|
||||||
self="center right"
|
self="center right"
|
||||||
|
|
@ -325,7 +337,6 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
|
||||||
flat
|
flat
|
||||||
color="positive"
|
color="positive"
|
||||||
dense
|
dense
|
||||||
|
|
||||||
icon="o_edit"
|
icon="o_edit"
|
||||||
@click.stop="
|
@click.stop="
|
||||||
triggerFolderEdit(
|
triggerFolderEdit(
|
||||||
|
|
@ -335,12 +346,12 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
|
||||||
"
|
"
|
||||||
id="listViewFolderEdit"
|
id="listViewFolderEdit"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<q-btn
|
<q-btn
|
||||||
flat
|
flat
|
||||||
color="negative"
|
color="negative"
|
||||||
dense
|
dense
|
||||||
:data-testid="(actionsRow.row.name)"
|
:data-testid="actionsRow.row.name"
|
||||||
icon="mdi-trash-can-outline"
|
icon="mdi-trash-can-outline"
|
||||||
@click.stop="triggerFolderDelete(actionsRow.row.pathname)"
|
@click.stop="triggerFolderDelete(actionsRow.row.pathname)"
|
||||||
id="listViewFolderDelete"
|
id="listViewFolderDelete"
|
||||||
|
|
@ -412,7 +423,12 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
|
||||||
<template v-slot:body-cell-actions="actionsRow">
|
<template v-slot:body-cell-actions="actionsRow">
|
||||||
<q-td class="justify-center">
|
<q-td class="justify-center">
|
||||||
<div>
|
<div>
|
||||||
<q-icon class="q-ma-sm" name="o_info" size="2em" color="primary" />
|
<q-icon
|
||||||
|
class="q-ma-sm"
|
||||||
|
name="o_info"
|
||||||
|
size="2em"
|
||||||
|
color="primary"
|
||||||
|
/>
|
||||||
<q-tooltip
|
<q-tooltip
|
||||||
anchor="center left"
|
anchor="center left"
|
||||||
self="center right"
|
self="center right"
|
||||||
|
|
@ -491,6 +507,10 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.center-content {
|
||||||
|
margin-right: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
.cursor {
|
.cursor {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue