diff --git a/inclure/gamutable.html b/inclure/gamutable.html index 83e805d..ac3a178 100644 --- a/inclure/gamutable.html +++ b/inclure/gamutable.html @@ -30,7 +30,7 @@ apiuri="[(#ENV{apiuri})]" pdfuri="#GET{pdfuri}" :tparpage="#ENV{tparpage, [10, 20, 50, 'Tous']}" - :afficher="#ENV{afficher}" + :afficher="#ENV{afficher,0}" champcsv="#ENV{champcsv,html}" delimitercsv="#ENV{delimitercsv,','}" namecsv="#ENV{namecsv}" @@ -45,9 +45,9 @@ stockage="#ENV{stockage,localstorage}" includespip="#ENV{includespip}" ref="montableau" - filtrer="#ENV{filtrer}" + filtrer="#ENV{rechercher}" :_id="[(#ENV{_id}|intval)]" - filtreselect="[(#ENV{filtrerselect})]" + filtreselect="[(#ENV{filtrer,#ENV{filtrerselect}})]" trier="[(#ENV{trier})]" > @@ -63,7 +63,7 @@ apiuri="[(#ENV{apiuri_deux})]" pdfuri="#GET{pdfuri}" :tparpage="#ENV{tparpage_deux, #ENV{tparpage, [10, 20, 50, 'Tous']}}" - :afficher="#ENV{afficher_deux}" + :afficher="#ENV{afficher_deux,0}" champcsv="[(#ENV{champcsv_deux, #ENV{champcsv,html}})]" delimitercsv="[(#ENV{delimitercsv_deux, #ENV{delimitercsv,','}})]" namecsv="[(#ENV{namecsv_deux, #ENV{namecsv}})]" @@ -78,9 +78,10 @@ stockage="#ENV{stockage,localstorage}" includespip="#ENV{includespip}" ref="montableau_deux" - filtrer="#ENV{filtrer}" + filtrer="#ENV{rechercher}" :_id="[(#ENV{_id}|intval)]" filtreselect="[(#ENV{filtrerselect_deux})]" + filtreselect="[(#ENV{filtrer_deux,#ENV{filtrerselect_deux}})]" trier="[(#ENV{trier_deux})]" > diff --git a/src/components/gamuTable.vue b/src/components/gamuTable.vue index 9518b78..251bcf6 100644 --- a/src/components/gamuTable.vue +++ b/src/components/gamuTable.vue @@ -566,7 +566,7 @@ const tableau = computed(() => { }); return pagination(ttt); }); - +function saveTriCol() {} //~~~~~~~~~~~~~~~~~~~~~~~~~ // les watchers //~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -767,9 +767,16 @@ function chargerJson(id) { nextTick(() => { chargement.value = false; - let filtreselectLS = localStorage.getItem( + const filtreselectLS = localStorage.getItem( "filtreselect_" + nameLocalStorage ); + const triColLS = localStorage.getItem( + "triCol_" + nameLocalStorage + ); + const filtreColLS = localStorage.getItem( + "filtreCol_" + nameLocalStorage + ); + let Tfiltres = []; if (props.filtreselect) { props.filtreselect.split(",").forEach((unFiltre) => { @@ -792,7 +799,7 @@ function chargerJson(id) { } Tfiltres.forEach((col) => { - if (filtreCol.value.includes(col)) { + if (filtreCol.value.includes(col.champ)) { filtreColSelected.value[col.champ] = [ ...filtreColSelected.value[col.champ], ...col.valeurs, @@ -813,6 +820,17 @@ function chargerJson(id) { tri(col, sens); } }); + localStorage.setItem( + "triCol_" + nameLocalStorage, + trierVal + ); + } else if (triColLS) { + triColLS.split(",").forEach((unTri) => { + const [col, sens] = unTri.split("|"); + if (filtreCol.value.includes(col)) { + tri(col, sens); + } + }); } if (parseInt(props._id) > 0) { @@ -853,8 +871,6 @@ function saveHeader() { classes: classes.value, filtreCol: filtreColType.value, ordreCol: ordreCol.value, - afficherVal: afficherVal, - trierVal: trierVal, maj: maj.value, }; localStorage.setItem("header_" + nameLocalStorage, JSON.stringify($header)); @@ -929,6 +945,8 @@ function resetTri() { filtreColSelected.value[col] = []; }); localStorage.removeItem("filtreselect_" + nameLocalStorage); + localStorage.removeItem("filtreCol_" + nameLocalStorage); + localStorage.removeItem("triCol_" + nameLocalStorage); } function selectLigne(id, col) { if (col === "id" && parseInt(id)) {