diff --git a/src/main/front/package-lock.json b/src/main/front/package-lock.json index cd4f94d..d8fb90d 100644 --- a/src/main/front/package-lock.json +++ b/src/main/front/package-lock.json @@ -23,7 +23,7 @@ "devDependencies": { "@vitejs/plugin-vue": "^6.0.0", "prettier": "3.5.3", - "vite": "^7.0.0", + "vite": "^7.0.7", "vite-plugin-vue-devtools": "^7.7.7" } }, @@ -1854,9 +1854,9 @@ "license": "MIT" }, "node_modules/axios": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.11.0.tgz", - "integrity": "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz", + "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", @@ -3301,13 +3301,13 @@ } }, "node_modules/tinyglobby": { - "version": "0.2.14", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz", - "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==", + "version": "0.2.15", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", + "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", "license": "MIT", "dependencies": { - "fdir": "^6.4.4", - "picomatch": "^4.0.2" + "fdir": "^6.5.0", + "picomatch": "^4.0.3" }, "engines": { "node": ">=12.0.0" @@ -3317,10 +3317,13 @@ } }, "node_modules/tinyglobby/node_modules/fdir": { - "version": "6.4.6", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz", - "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, "peerDependencies": { "picomatch": "^3 || ^4" }, @@ -3420,17 +3423,17 @@ } }, "node_modules/vite": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.6.tgz", - "integrity": "sha512-MHFiOENNBd+Bd9uvc8GEsIzdkn1JxMmEeYX35tI3fv0sJBUTfW5tQsoaOwuY4KhBI09A3dUJ/DXf2yxPVPUceg==", + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.2.4.tgz", + "integrity": "sha512-NL8jTlbo0Tn4dUEXEsUg8KeyG/Lkmc4Fnzb8JXN/Ykm9G4HNImjtABMJgkQoVjOBN/j2WAwDTRytdqJbZsah7w==", "license": "MIT", "dependencies": { "esbuild": "^0.25.0", - "fdir": "^6.4.6", + "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", - "rollup": "^4.40.0", - "tinyglobby": "^0.2.14" + "rollup": "^4.43.0", + "tinyglobby": "^0.2.15" }, "bin": { "vite": "bin/vite.js" @@ -3599,10 +3602,13 @@ } }, "node_modules/vite/node_modules/fdir": { - "version": "6.4.6", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz", - "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, "peerDependencies": { "picomatch": "^3 || ^4" }, diff --git a/src/main/front/package.json b/src/main/front/package.json index ee7c905..2bb3c23 100644 --- a/src/main/front/package.json +++ b/src/main/front/package.json @@ -25,7 +25,7 @@ "devDependencies": { "@vitejs/plugin-vue": "^6.0.0", "prettier": "3.5.3", - "vite": "^7.0.0", + "vite": "^7.0.7", "vite-plugin-vue-devtools": "^7.7.7" } } diff --git a/src/main/front/src/components/Pagination.vue b/src/main/front/src/components/Pagination.vue index 9337290..47418ed 100644 --- a/src/main/front/src/components/Pagination.vue +++ b/src/main/front/src/components/Pagination.vue @@ -11,19 +11,19 @@ async function retrieveDataList(pageIndex) { } async function retrievePreviousDataList() { - if (searchParameterDto.value.page < 2) { + if (props.searchParameterDto.page < 2) { return } else { - this.retrieveDataList(props.searchParameterDto.value.page--) + retrieveDataList(--props.searchParameterDto.page) } } async function retrieveNextDataList() { - const maxPage = Math.ceil(props.searchParameterDto.value.totalItemCount / props.searchParameterDto.value.itemCountPerPage) - if (maxPage == 0 || props.searchParameterDto.value.page == maxPage) { + const maxPage = Math.ceil(props.searchParameterDto.totalItemCount / props.searchParameterDto.itemCountPerPage) + if (maxPage == 0 || props.searchParameterDto.page == maxPage) { return } else { - this.retrieveDataList(props.searchParameterDto.value.page++) + retrieveDataList(++props.searchParameterDto.page) } } diff --git a/src/main/front/src/components/SearchParameterDto.js b/src/main/front/src/components/SearchParameterDto.js index 1b6247e..13039eb 100644 --- a/src/main/front/src/components/SearchParameterDto.js +++ b/src/main/front/src/components/SearchParameterDto.js @@ -13,7 +13,7 @@ SearchParameterDto.prototype.calculatePageList = function (currentPage, currentI let pageSize = Math.floor(this.totalItemCount / this.itemCountPerPage) + 1 this.page = currentPage >= 1 && currentPage <= pageSize ? currentPage : 1 let startPage = Math.floor((this.page - 1) / 10) * 10 + 1 - let lastPage = Math.max(startPage + 10, pageSize) + let lastPage = Math.min(startPage + 10, pageSize) let pageArray = [] for (let i = startPage; i <= lastPage; i++) { pageArray.push(i)