- trier=champ1|asc => OK
- filtre=champ1|valeur1 => OK
- afficher=50 => OK
- rechercher=toto => OK
ref #10
This commit is contained in:
Christophe 2023-01-16 12:57:03 +01:00
parent eb3119b655
commit 80f007950d
2 changed files with 29 additions and 10 deletions

View file

@ -30,7 +30,7 @@
apiuri="[(#ENV{apiuri})]" apiuri="[(#ENV{apiuri})]"
pdfuri="#GET{pdfuri}" pdfuri="#GET{pdfuri}"
:tparpage="#ENV{tparpage, [10, 20, 50, 'Tous']}" :tparpage="#ENV{tparpage, [10, 20, 50, 'Tous']}"
:afficher="#ENV{afficher}" :afficher="#ENV{afficher,0}"
champcsv="#ENV{champcsv,html}" champcsv="#ENV{champcsv,html}"
delimitercsv="#ENV{delimitercsv,','}" delimitercsv="#ENV{delimitercsv,','}"
namecsv="#ENV{namecsv}" namecsv="#ENV{namecsv}"
@ -45,9 +45,9 @@
stockage="#ENV{stockage,localstorage}" stockage="#ENV{stockage,localstorage}"
includespip="#ENV{includespip}" includespip="#ENV{includespip}"
ref="montableau" ref="montableau"
filtrer="#ENV{filtrer}" filtrer="#ENV{rechercher}"
:_id="[(#ENV{_id}|intval)]" :_id="[(#ENV{_id}|intval)]"
filtreselect="[(#ENV{filtrerselect})]" filtreselect="[(#ENV{filtrer,#ENV{filtrerselect}})]"
trier="[(#ENV{trier})]" trier="[(#ENV{trier})]"
></gamu-table> ></gamu-table>
</div> </div>
@ -63,7 +63,7 @@
apiuri="[(#ENV{apiuri_deux})]" apiuri="[(#ENV{apiuri_deux})]"
pdfuri="#GET{pdfuri}" pdfuri="#GET{pdfuri}"
:tparpage="#ENV{tparpage_deux, #ENV{tparpage, [10, 20, 50, 'Tous']}}" :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}})]" champcsv="[(#ENV{champcsv_deux, #ENV{champcsv,html}})]"
delimitercsv="[(#ENV{delimitercsv_deux, #ENV{delimitercsv,','}})]" delimitercsv="[(#ENV{delimitercsv_deux, #ENV{delimitercsv,','}})]"
namecsv="[(#ENV{namecsv_deux, #ENV{namecsv}})]" namecsv="[(#ENV{namecsv_deux, #ENV{namecsv}})]"
@ -78,9 +78,10 @@
stockage="#ENV{stockage,localstorage}" stockage="#ENV{stockage,localstorage}"
includespip="#ENV{includespip}" includespip="#ENV{includespip}"
ref="montableau_deux" ref="montableau_deux"
filtrer="#ENV{filtrer}" filtrer="#ENV{rechercher}"
:_id="[(#ENV{_id}|intval)]" :_id="[(#ENV{_id}|intval)]"
filtreselect="[(#ENV{filtrerselect_deux})]" filtreselect="[(#ENV{filtrerselect_deux})]"
filtreselect="[(#ENV{filtrer_deux,#ENV{filtrerselect_deux}})]"
trier="[(#ENV{trier_deux})]" trier="[(#ENV{trier_deux})]"
></gamu-table> ></gamu-table>
</div> </div>

View file

@ -566,7 +566,7 @@ const tableau = computed(() => {
}); });
return pagination(ttt); return pagination(ttt);
}); });
function saveTriCol() {}
//~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~
// les watchers // les watchers
//~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~
@ -767,9 +767,16 @@ function chargerJson(id) {
nextTick(() => { nextTick(() => {
chargement.value = false; chargement.value = false;
let filtreselectLS = localStorage.getItem( const filtreselectLS = localStorage.getItem(
"filtreselect_" + nameLocalStorage "filtreselect_" + nameLocalStorage
); );
const triColLS = localStorage.getItem(
"triCol_" + nameLocalStorage
);
const filtreColLS = localStorage.getItem(
"filtreCol_" + nameLocalStorage
);
let Tfiltres = []; let Tfiltres = [];
if (props.filtreselect) { if (props.filtreselect) {
props.filtreselect.split(",").forEach((unFiltre) => { props.filtreselect.split(",").forEach((unFiltre) => {
@ -792,7 +799,7 @@ function chargerJson(id) {
} }
Tfiltres.forEach((col) => { Tfiltres.forEach((col) => {
if (filtreCol.value.includes(col)) { if (filtreCol.value.includes(col.champ)) {
filtreColSelected.value[col.champ] = [ filtreColSelected.value[col.champ] = [
...filtreColSelected.value[col.champ], ...filtreColSelected.value[col.champ],
...col.valeurs, ...col.valeurs,
@ -813,6 +820,17 @@ function chargerJson(id) {
tri(col, sens); 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) { if (parseInt(props._id) > 0) {
@ -853,8 +871,6 @@ function saveHeader() {
classes: classes.value, classes: classes.value,
filtreCol: filtreColType.value, filtreCol: filtreColType.value,
ordreCol: ordreCol.value, ordreCol: ordreCol.value,
afficherVal: afficherVal,
trierVal: trierVal,
maj: maj.value, maj: maj.value,
}; };
localStorage.setItem("header_" + nameLocalStorage, JSON.stringify($header)); localStorage.setItem("header_" + nameLocalStorage, JSON.stringify($header));
@ -929,6 +945,8 @@ function resetTri() {
filtreColSelected.value[col] = []; filtreColSelected.value[col] = [];
}); });
localStorage.removeItem("filtreselect_" + nameLocalStorage); localStorage.removeItem("filtreselect_" + nameLocalStorage);
localStorage.removeItem("filtreCol_" + nameLocalStorage);
localStorage.removeItem("triCol_" + nameLocalStorage);
} }
function selectLigne(id, col) { function selectLigne(id, col) {
if (col === "id" && parseInt(id)) { if (col === "id" && parseInt(id)) {