Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions resources/js/components/shared/FilterTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,17 @@
<div
v-if="index !== headers.length - 1"
class="pm-table-column-resizer"
@mousedown="startResize(index)"
@mousedown="startResize($event, index)"
/>
<b-tooltip
v-if="column.tooltip"
:target="`${tableName}-column-${index}`"
custom-class="pm-table-tooltip-header"
placement="bottom"
delay="500"
>
{{ column.tooltip }}
</b-tooltip>
</th>
</tr>
<tr>
Expand Down Expand Up @@ -75,6 +84,7 @@
v-if="header.truncate"
:target="`${tableName}-element-${rowIndex}-${index}`"
custom-class="pm-table-tooltip"
@show="checkIfTooltipIsNeeded"
>
{{ sanitizeTooltip(getNestedPropertyValue(row, header)) }}
</b-tooltip>
Expand All @@ -97,6 +107,7 @@
v-if="header.truncate"
:target="`${tableName}-element-${rowIndex}-${index}`"
custom-class="pm-table-tooltip"
@show="checkIfTooltipIsNeeded"
>
{{ getNestedPropertyValue(row, header) }}
</b-tooltip>
Expand Down Expand Up @@ -175,7 +186,7 @@ export default {
}
});
},
startResize(index) {
startResize(event, index) {
this.isResizing = true;
this.calculateColumnWidth();
this.resizingColumnIndex = index;
Expand Down Expand Up @@ -343,6 +354,21 @@ export default {
border-bottom-color: #F2F8FE !important;
border-top-color: #F2F8FE !important;
}
.pm-table-tooltip-header {
opacity: 1 !important;
}
.pm-table-tooltip-header .tooltip-inner {
background-color: #deebff;
color: #104a75;
box-shadow: -5px 5px 5px rgba(0, 0, 0, 0.3);
max-width: 250px;
padding: 14px;
border-radius: 7px;
}
.pm-table-tooltip-header .arrow::before {
border-bottom-color: #deebff !important;
border-top-color: #deebff !important;
}
.pm-table-filter-applied {
color: #1572C2;
background-color: #F2F8FE !important;
Expand Down
5 changes: 5 additions & 0 deletions resources/js/components/shared/FilterTableBodyMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,10 @@ export default {
}
return "-";
},
checkIfTooltipIsNeeded(e,v){
if (e.target.offsetWidth >= e.target.scrollWidth) {
e.preventDefault();
}
}
},
};
1 change: 1 addition & 0 deletions resources/js/processes/components/ArchivedProcessList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
v-if="header.truncate"
:target="`element-archived-${row.id}`"
custom-class="pm-table-tooltip"
@show="checkIfTooltipIsNeeded"
>
{{ row[header.field] }}
</b-tooltip>
Expand Down
1 change: 1 addition & 0 deletions resources/js/processes/components/ProcessesListing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
v-if="header.truncate"
:target="`element-${row.id}`"
custom-class="pm-table-tooltip"
@show="checkIfTooltipIsNeeded"
>
{{ row[header.field] }}
</b-tooltip>
Expand Down
18 changes: 9 additions & 9 deletions resources/js/requests/components/RequestsListing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
v-if="header.truncate"
:target="`element-${rowIndex}-${colIndex}`"
custom-class="pm-table-tooltip"
@show="checkIfTooltipIsNeeded"
>
{{ sanitizeTooltip(getNestedPropertyValue(row, header)) }}
</b-tooltip>
Expand All @@ -77,6 +78,7 @@
v-if="header.truncate"
:target="`element-${rowIndex}-${colIndex}`"
custom-class="pm-table-tooltip"
@show="checkIfTooltipIsNeeded"
>
{{ getNestedPropertyValue(row, header) }}
</b-tooltip>
Expand Down Expand Up @@ -259,6 +261,7 @@ export default {
default: true,
width: 140,
truncate: true,
tooltip: this.$t("This column can not be sorted or filtered."),
},
{
label: this.$t("Participants"),
Expand Down Expand Up @@ -334,16 +337,13 @@ export default {
);
},
formatActiveTasks(value) {
let htmlString = '';
for (const task of value) {
htmlString += `
<div class="text-truncate">
<a class="text-nowrap" href="${this.openTask(task)}">
${task.element_name}
</a>
</div>
return value.map((task) => {
return `
<a href="${this.openTask(task)}">
${task.element_name}
</a>
`;
}
}).join('<br/>');
return htmlString;
},
formatCaseNumber(value) {
Expand Down
2 changes: 2 additions & 0 deletions resources/js/tasks/components/TasksList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
v-if="header.truncate"
:target="`element-${rowIndex}-${colIndex}`"
custom-class="pm-table-tooltip"
@show="checkIfTooltipIsNeeded"
>
{{ sanitizeTooltip(getNestedPropertyValue(row, header)) }}
</b-tooltip>
Expand Down Expand Up @@ -86,6 +87,7 @@
v-if="header.truncate"
:target="`element-${rowIndex}-${colIndex}`"
custom-class="pm-table-tooltip"
@show="checkIfTooltipIsNeeded"
>
{{ getNestedPropertyValue(row, header) }}
</b-tooltip>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
v-if="header.truncate"
:target="`element-${row.id}`"
custom-class="pm-table-tooltip"
@show="checkIfTooltipIsNeeded"
>
{{ row[header.field] }}
</b-tooltip>
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1768,6 +1768,7 @@
"There is a validation error in your form.": "There is a validation error in your form.",
"These credentials do not match our records.": "These credentials do not match our records.",
"This application installs a new version of ProcessMaker.": "This application installs a new version of ProcessMaker.",
"This column can not be sorted or filtered.": "This column can not be sorted or filtered.",
"This control is hidden until this expression is true": "This control is hidden until this expression is true",
"This environment already contains a newer version of the {{ item }} named '{{ name }}.'":"This environment already contains a newer version of the {{ item }} named '{{ name }}.'",
"This environment already contains an older version of the {{ item }} named '{{ name }}.'":"This environment already contains an older version of the {{ item }} named '{{ name }}.'",
Expand Down