Compare commits

...

3 Commits

Author SHA1 Message Date
Javier Segarra de450cdfc1 Merge branch 'dev' into 6611_popup-proxy_descriptor
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-04 10:57:34 +00:00
Javier Segarra 65b8df79ef refs #6611 fix: QpoupProxy descriptor bug
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-04 10:37:25 +01:00
Javier Segarra b7847ab351 refs #6611 fix: QpoupProxy descriptor bug
gitea/salix-front/pipeline/head There was a failure building this commit Details
2024-01-04 10:15:03 +01:00
2 changed files with 6 additions and 6 deletions

View File

@ -62,7 +62,7 @@ async function getData() {
filter: $props.filter, filter: $props.filter,
skip: 0, skip: 0,
}); });
const { data } = await arrayData.fetch({ append: false }); const { data } = await arrayData.fetch({ append: false, updateRouter: false });
entity.value = data; entity.value = data;
emit('onFetch', data); emit('onFetch', data);
} }

View File

@ -58,7 +58,7 @@ export function useArrayData(key, userOptions) {
} }
} }
async function fetch({ append = false }) { async function fetch({ append = false, updateRouter = true }) {
if (!store.url) return; if (!store.url) return;
cancelRequest(); cancelRequest();
@ -100,15 +100,15 @@ export function useArrayData(key, userOptions) {
hasMoreData.value = response.data.length === limit; hasMoreData.value = response.data.length === limit;
if (append === true) { if (append) {
if (!store.data) store.data = []; if (!store.data) store.data = [];
for (const row of response.data) store.data.push(row); for (const row of response.data) store.data.push(row);
} }
if (append === false) { else {
store.data = response.data; store.data = response.data;
updateStateParams(); updateRouter && updateStateParams();
} }
store.isLoading = false; store.isLoading = false;