Merged in bugfix/PMCORE-3326 (pull request #8143)

Bugfix/PMCORE-3326

Approved-by: Rodrigo Quelca
This commit is contained in:
Henry Jonathan Quispe Quispe
2021-09-20 14:19:04 +00:00
committed by Julio Cesar Laura Avendaño
2 changed files with 32 additions and 11 deletions

View File

@@ -26,7 +26,7 @@
@click.native="clickEvent" @click.native="clickEvent"
> >
<custom-sidebar-menu-icon <custom-sidebar-menu-icon
v-if="item.icon && !isMobileItem" v-if="item.icon && !isMobileItem && item.specialType !='header'"
:icon="item.icon" :icon="item.icon"
v-bind:style="setIconColor" v-bind:style="setIconColor"
/> />
@@ -38,8 +38,7 @@
isMobileItem isMobileItem
" "
> >
<span :class="item.specialType != 'header'?'vsm--title': 'vsm--header vsm--title--header'">
<span class="vsm--title">
<template v-if="itemTaskList"> <template v-if="itemTaskList">
<custom-tooltip <custom-tooltip
:data="item" :data="item"
@@ -57,6 +56,11 @@
</span> </span>
</template> </template>
</transition> </transition>
<custom-sidebar-menu-icon
v-if="item.icon && !isMobileItem && item.specialType =='header'"
:icon="item.icon"
v-bind:style="setIconColor"
/>
<template <template
v-if=" v-if="
(isCollapsed && !isFirstLevel) || (isCollapsed && !isFirstLevel) ||
@@ -568,3 +572,20 @@ export default {
inject: ["emitActiveShow", "emitItemClick", "emitItemUpdate"], inject: ["emitActiveShow", "emitItemClick", "emitItemUpdate"],
}; };
</script> </script>
<style scoped>
.vsm--header.vsm--title--header{
display: initial;
white-space: nowrap;
max-width: 150px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.vsm--header.vsm--title--header + .vsm--icon{
float: none;
line-height: 30px;
margin-right: 10px;
margin-left: 0px;
}
</style>

View File

@@ -109,7 +109,8 @@ export default {
CASES_SELFSERVICE: "unassigned", CASES_SELFSERVICE: "unassigned",
CONSOLIDATED_CASES: "batch-routing", CONSOLIDATED_CASES: "batch-routing",
CASES_TO_REASSIGN: "task-reassignments", CASES_TO_REASSIGN: "task-reassignments",
CASES_FOLDERS: "my-documents" CASES_FOLDERS: "my-documents",
TASK_METRICS:"task-metrics"
}, },
defaultOption: window.config.defaultOption || '', defaultOption: window.config.defaultOption || '',
pageData: {}, pageData: {},
@@ -294,16 +295,15 @@ export default {
props: { props: {
isCollapsed: this.collapsed? true: false, isCollapsed: this.collapsed? true: false,
item: { item: {
header: data[i].header, href: "/task-metrics/" + data[i].id,
icon: "fas fa-chart-pie",
id: "TASK_METRICS",
page: "task-metrics",
title: data[i].title, title: data[i].title,
hiddenOnCollapse: data[i].hiddenOnCollapse, specialType: "header"
icon: 'pie-chart-fill',
onClick: function (item) {
that.onUpdatePage("task-metrics");
}
}
} }
} }
};
} }
if (data[i].customCasesList) { if (data[i].customCasesList) {
data[i]["child"] = this.sortCustomCasesList( data[i]["child"] = this.sortCustomCasesList(