hamzus-ui 0.0.75 → 0.0.77
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
|
@@ -81,10 +81,12 @@
|
|
|
81
81
|
const element = actualValue[tableId].columns[i];
|
|
82
82
|
if (element.name === columnName) {
|
|
83
83
|
// si le filtre a pas changer alors on ignore
|
|
84
|
+
let ignore = false
|
|
84
85
|
switch (position) {
|
|
85
86
|
case 'after':
|
|
86
87
|
// filtre datetime apres le
|
|
87
88
|
if (actualValue[tableId].columns[i].filterAfter === newValue) {
|
|
89
|
+
ignore = true
|
|
88
90
|
break
|
|
89
91
|
}
|
|
90
92
|
|
|
@@ -92,6 +94,7 @@
|
|
|
92
94
|
case 'before':
|
|
93
95
|
// filtre datetime apres le
|
|
94
96
|
if (actualValue[tableId].columns[i].filterBefore === newValue) {
|
|
97
|
+
ignore = true
|
|
95
98
|
break
|
|
96
99
|
}
|
|
97
100
|
break;
|
|
@@ -99,11 +102,16 @@
|
|
|
99
102
|
default:
|
|
100
103
|
// filtre standart (recherche textuelle)
|
|
101
104
|
if (actualValue[tableId].columns[i].filter === newValue) {
|
|
105
|
+
ignore = true
|
|
102
106
|
break
|
|
103
107
|
}
|
|
104
108
|
break;
|
|
105
109
|
}
|
|
106
110
|
|
|
111
|
+
if (ignore) {
|
|
112
|
+
break
|
|
113
|
+
}
|
|
114
|
+
|
|
107
115
|
// si le filtre est vide on unset tout et on break
|
|
108
116
|
if (newValue === null || newValue === undefined || newValue === '') {
|
|
109
117
|
actualValue[tableId].columns[i].filter = newValue;
|
|
@@ -124,6 +124,11 @@
|
|
|
124
124
|
}
|
|
125
125
|
loading = true
|
|
126
126
|
|
|
127
|
+
// faire la requete
|
|
128
|
+
requestCount += 1
|
|
129
|
+
|
|
130
|
+
let requestId = requestCount
|
|
131
|
+
|
|
127
132
|
const actualTableData = $tableData[tableId];
|
|
128
133
|
|
|
129
134
|
let filters = {
|
|
@@ -152,10 +157,7 @@
|
|
|
152
157
|
}
|
|
153
158
|
}
|
|
154
159
|
|
|
155
|
-
// faire la requete
|
|
156
|
-
requestCount += 1
|
|
157
160
|
|
|
158
|
-
let requestId = requestCount
|
|
159
161
|
|
|
160
162
|
const request = await getRows(
|
|
161
163
|
actualTableData.globalSearch,
|
|
@@ -164,6 +166,9 @@
|
|
|
164
166
|
actualTableData.limit,
|
|
165
167
|
actualTableData.offset
|
|
166
168
|
);
|
|
169
|
+
console.log("----");
|
|
170
|
+
console.log(requestCount);
|
|
171
|
+
console.log(requestId);
|
|
167
172
|
|
|
168
173
|
// 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
|
|
169
174
|
if (requestCount !== requestId) {
|