diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 17fabf10d..185d41ebb 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -500,7 +500,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) { props.data, () => { store.data = props.data; - } + }, ); watch( @@ -132,12 +132,12 @@ watch( if (!mounted.value) return; emit('onChange', data); }, - { immediate: true } + { immediate: true }, ); watch( () => [props.url, props.filter], - ([url, filter]) => mounted.value && fetch({ url, filter }) + ([url, filter]) => mounted.value && fetch({ url, filter }), ); const addFilter = async (filter, params) => { await arrayData.addFilter({ filter, params }); @@ -198,7 +198,7 @@ function endPagination() { async function onLoad(index, done) { if (!store.data || !mounted.value) return done(); - if (store.data.length === 0 || !props.url) return done(false); + if (store.data.length === 0 || !arrayData.store.url) return done(false); pagination.value.page = pagination.value.page + 1; diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue index d7efdb726..4b3992f21 100644 --- a/src/pages/Order/Card/OrderCatalog.vue +++ b/src/pages/Order/Card/OrderCatalog.vue @@ -22,7 +22,6 @@ const catalogParams = { }; const arrayData = useArrayData(dataKey, { url: 'Orders/CatalogFilter', - limit: 50, userParams: catalogParams, }); const store = arrayData.store; @@ -66,7 +65,7 @@ function extractValueTags(items) { .filter((k) => /^value\d+$/.test(k)) .map((v) => x[v]) .filter((v) => v) - .sort() + .sort(), ); tagValue.value = resultValueTags; } @@ -76,7 +75,7 @@ watch( (val) => { extractTags(val); }, - { immediate: true } + { immediate: true }, );