Home Original page

observation/FOUR-13416 points button is over the table header by gustavobascope · Pull Request #6131 · ProcessMaker/processmaker

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

observation/FOUR-13416 points button is over the table header #6131

Changes from all commits

Commits

File filter

Filter by extension

Conversations

Failed to load comments.

Loading

Jump to

Jump to file

Failed to load files.

Loading

Diff view
Diff view

6 changes: 6 additions & 0 deletions resources/js/components/shared/EllipsisMenu.vue

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<b-dropdown
v-if="filterActions.length > 0"
:variant="variant ? variant : 'ellipsis'"
toggle-class="static-header"
no-caret
no-flip
lazy
Expand Down Expand Up @@ -280,3 +281,8 @@ export default {
color: #6C757D;
}
</style>
<style>
.static-header {
position: static !important;
}
</style>

11 changes: 9 additions & 2 deletions resources/js/components/shared/FilterTable.vue

Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
</tr>
</thead>
<tbody>
<template v-if="!loading">
<tr
v-for="(row, rowIndex) in data.data"
:key="rowIndex"
Expand Down Expand Up @@ -105,6 +106,7 @@
</td>
</slot>
</tr>
</template>
</tbody>
</table>
</div>
Expand Down Expand Up @@ -133,6 +135,12 @@ export default {
return "";
}
},
loading: {
type: Boolean,
default: function () {
return false;
}
},
},
data() {
return {
Expand Down Expand Up @@ -252,8 +260,7 @@ export default {
border-radius: 5px;
scrollbar-width: 8px;
scrollbar-color: #6C757D;
height: calc(100vh - 150px);
min-height: 400px;
max-height: calc(100vh - 150px);
}

.pm-table-container th {
Expand Down

3 changes: 3 additions & 0 deletions resources/js/processes/components/ProcessMixin.js

Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,8 @@ export default {
this.fetch();
}
},
openModeler(data) {
return `/modeler/${data.id}`;
},
},
};

4 changes: 2 additions & 2 deletions resources/js/processes/components/ProcessesListing.vue

Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@
class="mr-2"
:class="{ 'fas fa-check-circle text-success': row.status == 'ACTIVE', 'far fa-circle': row.status == 'INACTIVE' }"
/>
<span>
<a :href="openModeler(row)" class="text-nowrap">
{{ row[header.field] }}
</span>
</a>
</div>
<b-tooltip
v-if="header.truncate"
Expand Down

1 change: 1 addition & 0 deletions resources/js/requests/components/RequestsListing.vue

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:headers="tableHeaders"
:data="data"
:unread="unreadColumnName"
:loading="shouldShowLoader"
@table-row-click="handleRowClick"
>
<!-- Slot Table Header -->
Expand Down

3 changes: 2 additions & 1 deletion resources/js/tasks/components/TasksList.vue

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
:headers="tableHeaders"
:data="data"
:unread="unreadColumnName"
:loading="shouldShowLoader"
@table-row-click="handleRowClick"
@table-row-mouseover="handleRowMouseover"
@table-row-mouseleave="handleRowMouseleave"
Expand Down Expand Up @@ -48,7 +49,7 @@
:id="`element-${rowIndex}-${colIndex}`"
:class="{ 'pm-table-truncate': header.truncate }"
:style="{ maxWidth: header.width + 'px' }"
>
>
<div v-html="sanitize(getNestedPropertyValue(row, header.field))"></div>
</div>
<b-tooltip
Expand Down