hamzus-ui 0.0.74 → 0.0.76
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -80,6 +80,39 @@
|
|
|
80
80
|
for (let i = 0; i < actualValue[tableId].columns.length; i++) {
|
|
81
81
|
const element = actualValue[tableId].columns[i];
|
|
82
82
|
if (element.name === columnName) {
|
|
83
|
+
// si le filtre a pas changer alors on ignore
|
|
84
|
+
let ignore = false
|
|
85
|
+
switch (position) {
|
|
86
|
+
case 'after':
|
|
87
|
+
// filtre datetime apres le
|
|
88
|
+
if (actualValue[tableId].columns[i].filterAfter === newValue) {
|
|
89
|
+
ignore = true
|
|
90
|
+
break
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
break;
|
|
94
|
+
case 'before':
|
|
95
|
+
// filtre datetime apres le
|
|
96
|
+
if (actualValue[tableId].columns[i].filterBefore === newValue) {
|
|
97
|
+
ignore = true
|
|
98
|
+
break
|
|
99
|
+
}
|
|
100
|
+
break;
|
|
101
|
+
|
|
102
|
+
default:
|
|
103
|
+
// filtre standart (recherche textuelle)
|
|
104
|
+
if (actualValue[tableId].columns[i].filter === newValue) {
|
|
105
|
+
ignore = true
|
|
106
|
+
break
|
|
107
|
+
}
|
|
108
|
+
break;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
if (ignore) {
|
|
112
|
+
break
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
// si le filtre est vide on unset tout et on break
|
|
83
116
|
if (newValue === null || newValue === undefined || newValue === '') {
|
|
84
117
|
actualValue[tableId].columns[i].filter = newValue;
|
|
85
118
|
actualValue[tableId].columns[i].filterAfter = newValue;
|
|
@@ -25,6 +25,7 @@
|
|
|
25
25
|
let rows = [];
|
|
26
26
|
let defaultColumns = [...columns];
|
|
27
27
|
let selection = [];
|
|
28
|
+
let requestCount = 0
|
|
28
29
|
|
|
29
30
|
// life component
|
|
30
31
|
onMount(async () => {
|
|
@@ -151,6 +152,11 @@
|
|
|
151
152
|
}
|
|
152
153
|
}
|
|
153
154
|
|
|
155
|
+
// faire la requete
|
|
156
|
+
requestCount += 1
|
|
157
|
+
|
|
158
|
+
let requestId = requestCount
|
|
159
|
+
|
|
154
160
|
const request = await getRows(
|
|
155
161
|
actualTableData.globalSearch,
|
|
156
162
|
filters,
|
|
@@ -158,6 +164,15 @@
|
|
|
158
164
|
actualTableData.limit,
|
|
159
165
|
actualTableData.offset
|
|
160
166
|
);
|
|
167
|
+
console.log("----");
|
|
168
|
+
console.log(requestCount);
|
|
169
|
+
console.log(requestId);
|
|
170
|
+
|
|
171
|
+
// si le compteur de requete n est plus egal au numero de requete c'est que une autre requete async l'a devancer il ne faut donc pas mettre ajour les resultat
|
|
172
|
+
if (requestCount !== requestId) {
|
|
173
|
+
return
|
|
174
|
+
}
|
|
175
|
+
|
|
161
176
|
totalOfRows = request.totalOfRows
|
|
162
177
|
tableData.update((actualTable)=>{
|
|
163
178
|
if (!actualTable[tableId]) {
|