diff --git a/resources/js/common/PMColumnFilterPopoverCommonMixin.js b/resources/js/common/PMColumnFilterPopoverCommonMixin.js index d68c200839..3fe22a0125 100644 --- a/resources/js/common/PMColumnFilterPopoverCommonMixin.js +++ b/resources/js/common/PMColumnFilterPopoverCommonMixin.js @@ -2,6 +2,10 @@ import { get, cloneDeep } from "lodash"; const PMColumnFilterCommonMixin = { props: { + autosaveFilter: { + type: Boolean, + default: true + }, advancedFilterProp: { type: Object, default: null @@ -55,7 +59,9 @@ const PMColumnFilterCommonMixin = { order }; - ProcessMaker.apiClient.put(url, config); + if (!this.autosaveFilter) { + ProcessMaker.apiClient.put(url, config); + } window.ProcessMaker.advanced_filter = config; window.ProcessMaker.EventBus.$emit("advanced-filter-updated"); }, diff --git a/resources/js/components/PMTable.vue b/resources/js/components/PMTable.vue index ce90719c3e..01ab3d2c77 100644 --- a/resources/js/components/PMTable.vue +++ b/resources/js/components/PMTable.vue @@ -67,7 +67,7 @@ methods: { tableRowMouseover(row, rowIndex) { let container = this.$refs.filterTable.$el; - let scrolledWidth = container.scrollWidth - container.clientWidth; + let scrolledWidth = container.scrollWidth - container.clientWidth - container.scrollLeft; this.$emit('onRowMouseover', row, scrolledWidth, rowIndex); }, getSlotName(field) { diff --git a/resources/js/processes-catalogue/components/ProcessTab.vue b/resources/js/processes-catalogue/components/ProcessTab.vue index c327460d78..4a266b6d40 100644 --- a/resources/js/processes-catalogue/components/ProcessTab.vue +++ b/resources/js/processes-catalogue/components/ProcessTab.vue @@ -4,23 +4,33 @@ id="tabs-custom" pills lazy - > + @input="onTabChanged" + > - + > + - + > + @@ -29,10 +39,14 @@ + \ No newline at end of file diff --git a/resources/js/tasks/components/TasksList.vue b/resources/js/tasks/components/TasksList.vue index 955e406d6e..f9f8b2014a 100644 --- a/resources/js/tasks/components/TasksList.vue +++ b/resources/js/tasks/components/TasksList.vue @@ -5,6 +5,7 @@ data-cy="tasks-table" > @@ -71,6 +73,21 @@ :class="{ 'pm-table-filter-applied-tbody': header.sortAsc || header.sortDesc }" :key="colIndex" > + + - - - @@ -864,49 +863,10 @@ export default { width: 197px; height: 40px; } - -.icon-button { - color: #888; - width: 32px; - height: 32px; - border: 0; -} -.vertical-separator { - display: inline-block; - width: 1px; - height: 24px; - background-color: #ccc; /* Color del separador */ - margin: 0 1px; /* Espaciado alrededor del separador */ - vertical-align: middle; /* Alinear verticalmente con los botones */ -} .btn-light:hover { background-color: #EDF1F6; color: #888; } -.task-hover-tooltip { - opacity: 1 !important; -} -.task-hover-tooltip .tooltip-inner { - background-color: #F2F6F7; - color: #556271; - box-shadow: -5px 5px 5px rgba(0, 0, 0, 0.3); - border-radius: 7px; - padding: 9px 12px 9px 12px; - border: 1px solid #CDDDEE -} -.task-hover-tooltip .arrow::before { - border-bottom-color: #CDDDEE !important; -} -.task-hover-tooltip .arrow::after { - content: ""; - position: absolute; - bottom: 0; - border-width: 0 .4rem .4rem; - transform: translateY(3px); - border-color: transparent; - border-style: solid; - border-bottom-color: #F2F6F7; -}