hrms-bangkok/hrms-edm
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'development' of https://github.com/Frappet/EDM into development

Browse source
This commit is contained in:
oat 2023-12-06 12:15:00 +07:00
commit fb1dbaec11
7 changed files with 104 additions and 468 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Services/client/src/components/FileItemAction.vue
View file

@ -17,8 +17,8 @@ const props =
<q-item clickable @click="() => $emit('edit')" id="FileltemActionEdit">
<q-item-section>
<div class="row items-center white">
<q-icon name="edit" color="positive" />
<span class="q-ml-sm">แก้ไข</span>
<q-icon name="o_edit" color="positive" />
<span class="q-ml-sm ">แก้ไข</span>
</div>
</q-item-section>
</q-item>
@ -29,7 +29,7 @@ const props =
>
<q-item-section>
<div class="row items-center white">
<q-icon name="delete" color="negative" />
<q-icon name="mdi-trash-can-outline" color="negative" />
<span class="q-ml-sm">ลบ</span>
</div>
</q-item-section>

6
Services/client/src/components/FileSearched.vue
View file

@ -320,7 +320,7 @@ onMounted(() => {
<template v-slot:body-cell-actions="actionData">
<q-td class="justify-center">
<div>
<q-icon class="q-ma-sm" name="info" size="2em" color="primary" />
<q-icon class="q-ma-sm" name="o_info" size="2em" color="primary" />
<q-tooltip
anchor="center left"
self="center right"
@ -334,7 +334,7 @@ onMounted(() => {
flat
color="positive"
dense
icon="edit"
icon="o_edit"
@click="
() => triggerFileEdit(actionData.row, actionData.row.pathname)
"
@ -344,7 +344,7 @@ onMounted(() => {
flat
color="negative"
dense
icon="delete"
icon="mdi-trash-can-outline"
@click="() => triggerFileDelete(actionData.row.pathname)"
id="listViewFileDelete"
/>

15
Services/client/src/components/ListView.vue
View file

@ -311,7 +311,7 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
<template v-slot:body-cell-actions="actionsRow">
<q-td class="justify-center">
<div>
<q-icon class="q-ma-sm" name="info" size="2em" color="primary" />
<q-icon class="q-ma-sm" name="o_info" size="2em" color="primary" />
<q-tooltip
anchor="center left"
self="center right"
@ -325,7 +325,8 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
flat
color="positive"
dense
icon="edit"
icon="o_edit"
@click.stop="
triggerFolderEdit(
actionsRow.row.name,
@ -334,12 +335,12 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
"
id="listViewFolderEdit"
/>
<q-btn
flat
color="negative"
dense
:data-testid="(actionsRow.row.name)"
icon="delete"
icon="mdi-trash-can-outline"
@click.stop="triggerFolderDelete(actionsRow.row.pathname)"
id="listViewFolderDelete"
/>
@ -410,7 +411,7 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
<template v-slot:body-cell-actions="actionsRow">
<q-td class="justify-center">
<div>
<q-icon class="q-ma-sm" name="info" size="2em" color="primary" />
<q-icon class="q-ma-sm" name="o_info" size="2em" color="primary" />
<q-tooltip
anchor="center left"
self="center right"
@ -424,7 +425,7 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
flat
color="positive"
dense
icon="edit"
icon="o_edit"
@click="
() => triggerFileEdit(actionsRow.row, actionsRow.row.pathname)
"
@ -434,7 +435,7 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
flat
color="negative"
dense
icon="delete"
icon="mdi-trash-can-outline"
@click="() => triggerFileDelete(actionsRow.row.pathname)"
id="listViewFileDelete"
/>