From bc2fecd47a23d5867a9bc0ca601892a05d8f368e Mon Sep 17 00:00:00 2001 From: seorang42 Date: Fri, 7 Feb 2025 22:03:11 +0900 Subject: [PATCH 1/2] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=20=EC=8B=9C=201=ED=8E=98=EC=9D=B4=EC=A7=80=EB=A1=9C?= =?UTF-8?q?=20=EB=8F=8C=EC=95=84=EA=B0=80=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/params.ts | 51 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/src/stores/params.ts b/src/stores/params.ts index a5db7b07..f387f206 100644 --- a/src/stores/params.ts +++ b/src/stores/params.ts @@ -6,7 +6,7 @@ import type { TaskBoardParams } from '@/types/stores' import { defineStore } from 'pinia' -import { ref } from 'vue' +import { ref, watch } from 'vue' export const useRequestParamsStore = defineStore('requestParams', () => { const params = ref({ @@ -22,6 +22,24 @@ export const useRequestParamsStore = defineStore('requestParams', () => { sortDirection: 'DESC' }) + watch( + () => ({ + pageSize: params.value.pageSize, + term: params.value.term, + mainCategoryIds: params.value.mainCategoryIds, + categoryIds: params.value.categoryIds, + title: params.value.title, + nickName: params.value.nickName, + taskStatus: params.value.taskStatus, + sortBy: params.value.sortBy, + sortDirection: params.value.sortDirection + }), + () => { + params.value.page = 0 + }, + { deep: true } + ) + const $reset = () => { params.value.page = 0 params.value.pageSize = 20 @@ -50,6 +68,22 @@ export const useMemberManagementParamsStore = defineStore('userManagementParams' sortDirection: 'DESC' }) + watch( + () => ({ + pageSize: params.value.pageSize, + name: params.value.name, + email: params.value.email, + nickName: params.value.nickName, + departmentName: params.value.departmentName, + role: params.value.role, + sortDirection: params.value.sortDirection + }), + () => { + params.value.page = 0 + }, + { deep: true } + ) + return { params } }) @@ -64,6 +98,21 @@ export const useLogsParamsStore = defineStore('logsParams', () => { sortDirection: 'DESC' }) + watch( + () => ({ + pageSize: params.value.pageSize, + term: params.value.term, + logStatus: params.value.logStatus, + nickName: params.value.nickName, + clientIp: params.value.clientIp, + sortDirection: params.value.sortDirection + }), + () => { + params.value.page = 0 + }, + { deep: true } + ) + const $reset = () => { params.value.page = 0 params.value.pageSize = 20 From a3220e8d5a4d3565b44ae5b33a4114466ae86b7b Mon Sep 17 00:00:00 2001 From: seorang42 Date: Fri, 7 Feb 2025 22:11:30 +0900 Subject: [PATCH 2/2] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9D=BC?= =?UTF-8?q?=EB=B0=98=20=EB=8B=B4=EB=8B=B9=EC=9E=90=20=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=EC=8A=B9=EC=9D=B8=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../requested/RequestedListCard.vue | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/components/requested/RequestedListCard.vue b/src/components/requested/RequestedListCard.vue index 2f105e1e..5bda5157 100644 --- a/src/components/requested/RequestedListCard.vue +++ b/src/components/requested/RequestedListCard.vue @@ -12,13 +12,23 @@ :is-status="tab.isStatus" />
@@ -62,6 +72,7 @@ import { useRouter } from 'vue-router' import ListCardTab from '../lists/ListCardTab.vue' import ModalView from '../ModalView.vue' import TaskDetail from '../task-detail/TaskDetail.vue' +import { useMemberStore } from '@/stores/member' const { info } = defineProps<{ info: RequestedListData }>() const requestedTabList: ListCardProps[] = [ @@ -116,4 +127,6 @@ const rejectRequest = async () => { modalError.value = '작업 거부에 실패했습니다' } } + +const { info: userInfo } = useMemberStore()