SPIP/gamutable
SPIP/gamutable
4
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

inversion du test, sinon on recupere toujours le localstorage en premier et non le chargemetn par url

Browse source
This commit is contained in:
Christophe 2022-05-11 22:13:35 +02:00
parent 00bed075c6
commit b6f83ea2ad
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
js/gamutable.es6.js
View file

@ -562,12 +562,19 @@ let monTableau = {
this.chargement = false; this.chargement = false;
let filtreselect = localStorage.getItem('filtreselect_' + this.nameLocalStorage); let filtreselect = localStorage.getItem('filtreselect_' + this.nameLocalStorage);
let Tfiltres = []; let Tfiltres = [];
if (filtreselect) { // if (filtreselect) {
Tfiltres = JSON.parse(filtreselect); // Tfiltres = JSON.parse(filtreselect);
} else if (this.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)); Tfiltres = recupJson(decodeURIComponent(this.filtreselect));
localStorage.setItem('filtreselect_' + this.nameLocalStorage, JSON.stringify(Tfiltres)); localStorage.setItem('filtreselect_' + this.nameLocalStorage, JSON.stringify(Tfiltres));
} else if (filtreselect) {
Tfiltres = JSON.parse(filtreselect);
} }
Tfiltres.forEach((col) => { Tfiltres.forEach((col) => {
this.filtreColSelected[col.champ] = [...this.filtreColSelected[col.champ], ...col.valeurs]; this.filtreColSelected[col.champ] = [...this.filtreColSelected[col.champ], ...col.valeurs];
}); });

13
js/gamutable.js
View file

@ -647,13 +647,18 @@ var monTableau = {
Vue.nextTick(function () { Vue.nextTick(function () {
_this4.chargement = false; _this4.chargement = false;
var filtreselect = localStorage.getItem('filtreselect_' + _this4.nameLocalStorage); 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) { if (_this4.filtreselect) {
Tfiltres = JSON.parse(filtreselect);
} else if (_this4.filtreselect) {
Tfiltres = recupJson(decodeURIComponent(_this4.filtreselect)); Tfiltres = recupJson(decodeURIComponent(_this4.filtreselect));
localStorage.setItem('filtreselect_' + _this4.nameLocalStorage, JSON.stringify(Tfiltres)); localStorage.setItem('filtreselect_' + _this4.nameLocalStorage, JSON.stringify(Tfiltres));
} else if (filtreselect) {
Tfiltres = JSON.parse(filtreselect);
} }
Tfiltres.forEach(function (col) { Tfiltres.forEach(function (col) {