fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/PMCORE-3324 (pull request #8133)

Browse Source 
PMCORE-3324

Approved-by: Henry Jonathan Quispe Quispe
This commit is contained in:
Rodrigo Quelca
2021-09-20 14:23:42 +00:00
committed by Julio Cesar Laura Avendaño
parent 2574d77a7f 4b4b2a18ef
commit b263dec82e
5 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
resources/assets/js/components/utils/ellipsis.vue
View File

@@ -1,24 +1,29 @@
<template>
<div class="float-right">
<transition name="fade">
<div
class="v-inline"
v-show="showActions"
ref="ellipsis"
>
<div class="buttonGroup">
<b-button
v-for="item in data.buttons"
:key="item.name"
variant="outline-info"
@click="executeFunction(item.fn)"
>
<i class="custom-icon" :class="item.icon" v-bind:style="{color: item.color}"></i>
</b-button>
<div>
<div class="float-right" v-show="showActions">
<transition name="fade">
<div
class="v-inline"
v-show="showActions"
ref="ellipsis"
>
<div class="buttonGroup">
<b-button
v-for="item in data.buttons"
:key="item.name"
variant="outline-info"
@click="executeFunction(item.fn)"
>
<i class="custom-icon" :class="item.icon" v-bind:style="{color: item.color}"></i>
</b-button>
</div>
</div>
</div>
</transition>
<div class="ellipsis-button">
</transition>
</div>
<div
class="ellipsis-button align-middle"
v-show="!showActions"
>
<div @click="showActionButtons()">
<i class="fas fa-ellipsis-v"></i>
</div>
@@ -116,10 +121,7 @@ export default {
}
.ellipsis-button {
font-size: 22px;
width: 15px;
text-align: center;
float: inherit;
margin-top: 9px;
}
.buttonGroup {
position: relative;

11
resources/assets/js/components/vuetable/extends/VtSettingsControl.vue
View File

@@ -1,5 +1,7 @@
<template>
<span v-if="settings()" :class="classObject" :id="id"> </span>
<div class="align-middle table-settings">
<span v-if="settings()" :class="classObject" :id="id"> </span>
</div>
</template>
<script>
export default {
@@ -26,4 +28,9 @@ export default {
},
},
};
</script>
</script>
<style>
.table-settings {
text-align: center;
}
</style>

6
resources/assets/js/home/CustomCaseList/CustomCaseList.vue
View File

@@ -836,12 +836,12 @@ export default {
columns.push(item.field);
});
that.filterItems = newItems;
that.settingOptions = that.formatColumnSettings(columns);
dt = that.formatDataResponse(response.data.data);
that.cardColumns = columns;
if (that.isFistTime) {
that.filters = that.settings && that.settings.filters ? that.settings.filters : {};
that.columns = that.settings && that.settings.columns ? that.settings.columns : that.getTableColumns(columns);
that.filters = that.data.settings && that.data.settings.filters ? that.data.settings.filters : {};
that.columns = that.data.settings && that.data.settings.columns ? that.data.settings.columns : that.getTableColumns(columns);
that.settingOptions = that.formatColumnSettings(columns);
}
resolutionFunc({
data: dt,

7
resources/assets/js/home/CustomCaseList/defaultMixins.js
View File

@@ -207,8 +207,11 @@ export default {
* @returns
*/
formatColumnSettings(columns) {
return _.map(_.pick(this.headings, columns), (value, key) => {
return { value, key }
return _.map(columns, (value, key) => {
if (this.headings[value]) {
return { value: this.headings[value], key: value };
}
return { value, key: value }
});
}
}

4
resources/assets/js/home/Home.vue
View File

@@ -407,9 +407,9 @@ export default {
if (!this.menuMap[item.item.id] && item.item.page !== "LegacyFrame" && item.item.page !== "advanced-search" ) {
this.page = "custom-case-list";
if (this.config.setting[item.item.page] && this.config.setting[item.item.page]["customCaseList"]) {
this.settings = this.config.setting[item.item.page]["customCaseList"][item.item.id];
this.pageData.settings = this.config.setting[item.item.page]["customCaseList"][item.item.id];
} else {
this.settings = {};
this.pageData.settings = {};
}
}
if (this.page === this.lastPage