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

ÂPMCORE-3324: Column Settings and Task Action Ellipses Icons should be aligned PMCORE_3.7.0 build

Browse Source
This commit is contained in:
Rodrigo Quelca
2021-09-17 22:02:18 +00:00
parent ae652084a3
commit c109c6e18c
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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,
@@ -1065,6 +1065,8 @@ export default {
color: newData.color
}
this.data.settings = newData.settings;
// this.settings = newData.settings;
this.filters = {};
}
if (this.typeView === "GRID" && this.$refs["vueTable"]) {

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 }
});
}
}

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

@@ -387,6 +387,7 @@ export default {
* @param {object} item
*/
pageFactory(item){
debugger;
this.filters = [];
this.page = item.item.page;
this.filters = item.item.filters;
@@ -407,9 +408,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