hamzus-ui 0.0.77 → 0.0.79
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,39 +80,6 @@
|
|
|
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
|
|
116
83
|
if (newValue === null || newValue === undefined || newValue === '') {
|
|
117
84
|
actualValue[tableId].columns[i].filter = newValue;
|
|
118
85
|
actualValue[tableId].columns[i].filterAfter = newValue;
|
|
@@ -25,7 +25,6 @@
|
|
|
25
25
|
let rows = [];
|
|
26
26
|
let defaultColumns = [...columns];
|
|
27
27
|
let selection = [];
|
|
28
|
-
let requestCount = 0
|
|
29
28
|
|
|
30
29
|
// life component
|
|
31
30
|
onMount(async () => {
|
|
@@ -124,11 +123,6 @@
|
|
|
124
123
|
}
|
|
125
124
|
loading = true
|
|
126
125
|
|
|
127
|
-
// faire la requete
|
|
128
|
-
requestCount += 1
|
|
129
|
-
|
|
130
|
-
let requestId = requestCount
|
|
131
|
-
|
|
132
126
|
const actualTableData = $tableData[tableId];
|
|
133
127
|
|
|
134
128
|
let filters = {
|
|
@@ -157,8 +151,6 @@
|
|
|
157
151
|
}
|
|
158
152
|
}
|
|
159
153
|
|
|
160
|
-
|
|
161
|
-
|
|
162
154
|
const request = await getRows(
|
|
163
155
|
actualTableData.globalSearch,
|
|
164
156
|
filters,
|
|
@@ -166,15 +158,6 @@
|
|
|
166
158
|
actualTableData.limit,
|
|
167
159
|
actualTableData.offset
|
|
168
160
|
);
|
|
169
|
-
console.log("----");
|
|
170
|
-
console.log(requestCount);
|
|
171
|
-
console.log(requestId);
|
|
172
|
-
|
|
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
|
|
174
|
-
if (requestCount !== requestId) {
|
|
175
|
-
return
|
|
176
|
-
}
|
|
177
|
-
|
|
178
161
|
totalOfRows = request.totalOfRows
|
|
179
162
|
tableData.update((actualTable)=>{
|
|
180
163
|
if (!actualTable[tableId]) {
|