diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f493764a..c97c4181f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2418.01] + ## [2416.01] - 2024-04-18 ### Added diff --git a/package.json b/package.json index 82f21efe6..88f430d7b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-front", - "version": "24.16.0", + "version": "24.18.0", "description": "Salix frontend", "productName": "Salix", "author": "Verdnatura", diff --git a/quasar.config.js b/quasar.config.js index 5ce46667c..dd7a91002 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -93,13 +93,11 @@ module.exports = configure(function (/* ctx */) { [ VueI18nPlugin({ runtimeOnly: false, + include: [ + path.resolve(__dirname, './src/i18n/locale/**'), + path.resolve(__dirname, './src/pages/**/locale/**'), + ], }), - { - // if you want to use Vue I18n Legacy API, you need to set `compositionOnly: false` - // compositionOnly: false, - // you need to set i18n resource including paths ! - include: path.resolve(__dirname, './src/i18n/**'), - }, ], ], }, diff --git a/src/boot/i18n.js b/src/boot/i18n.js index b23b6d5fd..ede8f5114 100644 --- a/src/boot/i18n.js +++ b/src/boot/i18n.js @@ -1,6 +1,7 @@ import { boot } from 'quasar/wrappers'; import { createI18n } from 'vue-i18n'; import messages from 'src/i18n'; +import { locales } from 'src/i18n/handle'; const i18n = createI18n({ locale: navigator.language || navigator.userLanguage, @@ -12,8 +13,9 @@ const i18n = createI18n({ legacy: false, }); -export default boot(({ app }) => { +export default boot(async ({ app }) => { // Set i18n instance on app + await locales(); app.use(i18n); }); diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue index 2d8886610..718d087fe 100644 --- a/src/components/FormModelPopup.vue +++ b/src/components/FormModelPopup.vue @@ -78,6 +78,7 @@ defineExpose({
{ @@ -109,7 +110,6 @@ async function paginate() { isLoading.value = true; await arrayData.loadMore(); - if (!arrayData.hasMoreData.value) { if (store.userParamsChanged) arrayData.hasMoreData.value = true; store.userParamsChanged = false; @@ -127,6 +127,7 @@ async function paginate() { } function endPagination() { + hasMoreData.value = arrayData.hasMoreData.value; isLoading.value = false; emit('onFetch', store.data); emit('onPaginate'); @@ -195,10 +196,7 @@ defineExpose({ fetch, addFilter });
-
+
diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue index f2d2b55de..a2f89ff3f 100644 --- a/src/components/ui/VnRow.vue +++ b/src/components/ui/VnRow.vue @@ -1,17 +1,17 @@