From b6f83ea2adcc1fd6ea30ef58ee5ea0bc70730d9a Mon Sep 17 00:00:00 2001 From: tofulm Date: Wed, 11 May 2022 22:13:35 +0200 Subject: [PATCH] inversion du test, sinon on recupere toujours le localstorage en premier et non le chargemetn par url --- js/gamutable.es6.js | 13 ++++++++++--- js/gamutable.js | 13 +++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/js/gamutable.es6.js b/js/gamutable.es6.js index 2ba429d..6ab70ea 100644 --- a/js/gamutable.es6.js +++ b/js/gamutable.es6.js @@ -562,12 +562,19 @@ let monTableau = { this.chargement = false; let filtreselect = localStorage.getItem('filtreselect_' + this.nameLocalStorage); let Tfiltres = []; - if (filtreselect) { - Tfiltres = JSON.parse(filtreselect); - } else if (this.filtreselect) { + // if (filtreselect) { + // Tfiltres = JSON.parse(filtreselect); + // } else if (this.filtreselect) { + // Tfiltres = recupJson(decodeURIComponent(this.filtreselect)); + // localStorage.setItem('filtreselect_' + this.nameLocalStorage, JSON.stringify(Tfiltres)); + // } + if (this.filtreselect) { Tfiltres = recupJson(decodeURIComponent(this.filtreselect)); localStorage.setItem('filtreselect_' + this.nameLocalStorage, JSON.stringify(Tfiltres)); + } else if (filtreselect) { + Tfiltres = JSON.parse(filtreselect); } + Tfiltres.forEach((col) => { this.filtreColSelected[col.champ] = [...this.filtreColSelected[col.champ], ...col.valeurs]; }); diff --git a/js/gamutable.js b/js/gamutable.js index 5a88657..761fbdb 100644 --- a/js/gamutable.js +++ b/js/gamutable.js @@ -647,13 +647,18 @@ var monTableau = { Vue.nextTick(function () { _this4.chargement = false; var filtreselect = localStorage.getItem('filtreselect_' + _this4.nameLocalStorage); - var Tfiltres = []; + var Tfiltres = []; // if (filtreselect) { + // Tfiltres = JSON.parse(filtreselect); + // } else if (this.filtreselect) { + // Tfiltres = recupJson(decodeURIComponent(this.filtreselect)); + // localStorage.setItem('filtreselect_' + this.nameLocalStorage, JSON.stringify(Tfiltres)); + // } - if (filtreselect) { - Tfiltres = JSON.parse(filtreselect); - } else if (_this4.filtreselect) { + if (_this4.filtreselect) { Tfiltres = recupJson(decodeURIComponent(_this4.filtreselect)); localStorage.setItem('filtreselect_' + _this4.nameLocalStorage, JSON.stringify(Tfiltres)); + } else if (filtreselect) { + Tfiltres = JSON.parse(filtreselect); } Tfiltres.forEach(function (col) {