페이징 구조 수정

This commit is contained in:
focp212@naver.com
2025-10-26 11:28:06 +09:00
parent 35edb19062
commit f4b8ee29d8
10 changed files with 118 additions and 27 deletions

View File

@@ -361,8 +361,9 @@ export const FundAccountResultListWrap = () => {
<section className="transaction-list"> <section className="transaction-list">
{ getListDateGroup() } { getListDateGroup() }
<div ref={ setTarget }></div>
</section> </section>
<div ref={ setTarget }></div>
<div className="apply-row"> <div className="apply-row">
<button <button
className="btn-50 btn-blue flex-1" className="btn-50 btn-blue flex-1"

View File

@@ -298,8 +298,8 @@ export const FundAccountTransferListWrap = () => {
<section className="transaction-list pb-86"> <section className="transaction-list pb-86">
{ getListDateGroup() } { getListDateGroup() }
<div ref={ setTarget }></div>
</section> </section>
<div ref={ setTarget }></div>
<div className="apply-row"> <div className="apply-row">
<button <button
className="btn-50 btn-blue flex-1" className="btn-50 btn-blue flex-1"

View File

@@ -481,8 +481,8 @@ export const ListWrap = ({
{ (periodType === SettlementPeriodType.TRANSACTION_DATE) && { (periodType === SettlementPeriodType.TRANSACTION_DATE) &&
getTransactionDateListDateGroup() getTransactionDateListDateGroup()
} }
<div ref={ setTarget }></div>
</div> </div>
<div ref={ setTarget }></div>
<ListFilter <ListFilter
filterOn={ filterOn } filterOn={ filterOn }
setFilterOn={ setFilterOn } setFilterOn={ setFilterOn }

View File

@@ -32,6 +32,7 @@ import { snackBar } from '@/shared/lib';
import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet'; import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet';
import { AlimtalkFilter } from '@/entities/additional-service/ui/filter/alimtalk-filter'; import { AlimtalkFilter } from '@/entities/additional-service/ui/filter/alimtalk-filter';
import { useExtensionAccessCheck } from '@/shared/lib/hooks/use-extension-access-check'; import { useExtensionAccessCheck } from '@/shared/lib/hooks/use-extension-access-check';
import useIntersectionObserver from '@/widgets/intersection-observer';
export const AlimtalkListPage = () => { export const AlimtalkListPage = () => {
const { navigate } = useNavigate(); const { navigate } = useNavigate();
@@ -42,7 +43,7 @@ export const AlimtalkListPage = () => {
extensionCode: 'ALIMTALK' extensionCode: 'ALIMTALK'
}); });
const [sortType, setSortType] = useState<SortTypeKeys>(SortTypeKeys.LATEST); const [onActionIntersect, setOnActionIntersect] = useState<boolean>(false);
const [listItems, setListItems] = useState<Array<AlimtalkListContent>>([]); const [listItems, setListItems] = useState<Array<AlimtalkListContent>>([]);
const [filterOn, setFilterOn] = useState<boolean>(false); const [filterOn, setFilterOn] = useState<boolean>(false);
const [pageParam, setPageParam] = useState<DefaultRequestPagination>(DEFAULT_PAGE_PARAM); const [pageParam, setPageParam] = useState<DefaultRequestPagination>(DEFAULT_PAGE_PARAM);
@@ -59,6 +60,24 @@ export const AlimtalkListPage = () => {
const [emailBottomSheetOn, setEmailBottomSheetOn] = useState<boolean>(false); const [emailBottomSheetOn, setEmailBottomSheetOn] = useState<boolean>(false);
const { mutateAsync: extensionAlimtalkList } = useExtensionAlimtalkListMutation(); const { mutateAsync: extensionAlimtalkList } = useExtensionAlimtalkListMutation();
const { mutateAsync: extensionAlimtalkDownloadExcel } = useExtensionAlimtalkDownloadExcelMutation(); const { mutateAsync: extensionAlimtalkDownloadExcel } = useExtensionAlimtalkDownloadExcelMutation();
const onIntersect: IntersectionObserverCallback = (entries: Array<IntersectionObserverEntry>) => {
entries.forEach((entry: IntersectionObserverEntry) => {
if(entry.isIntersecting){
console.log('Element is now intersecting with the root. [' + onActionIntersect + ']');
if(onActionIntersect && !!pageParam.cursor){
callList('page');
}
}
else{
console.log('Element is no longer intersecting with the root.');
}
});
};
const { setTarget } = useIntersectionObserver({
threshold: 1,
onIntersect
});
useSetHeaderTitle('알림톡 결제통보'); useSetHeaderTitle('알림톡 결제통보');
useSetHeaderType(HeaderType.LeftArrow); useSetHeaderType(HeaderType.LeftArrow);
@@ -67,10 +86,8 @@ export const AlimtalkListPage = () => {
navigate(PATHS.home); navigate(PATHS.home);
}); });
const callList = (option?: { const callList = (type?: string) => {
sortType?: SortTypeKeys let listParams: ExtensionAlimtalkListParams = {
}) => {
let params: ExtensionAlimtalkListParams = {
mid: mid, mid: mid,
searchCl: searchCl, searchCl: searchCl,
searchValue: searchValue, searchValue: searchValue,
@@ -82,14 +99,38 @@ export const AlimtalkListPage = () => {
sendCl: sendCl, sendCl: sendCl,
page: pageParam page: pageParam
}; };
if(type !== 'page' && listParams.page){
if (params.page) { listParams.page.cursor = null;
params.page.sortType = option?.sortType || sortType;
setPageParam(params.page);
} }
extensionAlimtalkList(params).then((rs: ExtensionAlimtalkListResponse) => { extensionAlimtalkList(listParams).then((rs: ExtensionAlimtalkListResponse) => {
setListItems(rs.content); if(type === 'page'){
setListItems([
...listItems,
...rs.content
]);
}
else{
setListItems(rs.content);
}
if(rs.hasNext
&& rs.content.length === DEFAULT_PAGE_PARAM.size
){
setPageParam({
...pageParam,
...{ cursor: rs.nextCursor }
});
}
else{
setPageParam({
...pageParam,
...{ cursor: null }
});
}
setOnActionIntersect(
!!rs.hasNext
&& rs.content.length === DEFAULT_PAGE_PARAM.size
);
}); });
}; };
@@ -233,6 +274,7 @@ export const AlimtalkListPage = () => {
<section className="transaction-list"> <section className="transaction-list">
{getAlimtalkList()} {getAlimtalkList()}
</section> </section>
<div ref={ setTarget }></div>
</div> </div>
</div> </div>
</main> </main>

View File

@@ -296,8 +296,8 @@ export const PayoutListPage = () => {
</section> </section>
<section className="transaction-list"> <section className="transaction-list">
{ getListDateGroup() } { getListDateGroup() }
<div ref={ setTarget }></div>
</section> </section>
<div ref={ setTarget }></div>
<div className="apply-row"> <div className="apply-row">
<button <button
className="btn-50 btn-blue flex-1" className="btn-50 btn-blue flex-1"

View File

@@ -22,6 +22,7 @@ import { AdditionalServiceCategory } from '@/entities/additional-service/model/t
import { PATHS } from '@/shared/constants/paths'; import { PATHS } from '@/shared/constants/paths';
import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet'; import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet';
import { useExtensionAccessCheck } from '@/shared/lib/hooks/use-extension-access-check'; import { useExtensionAccessCheck } from '@/shared/lib/hooks/use-extension-access-check';
import useIntersectionObserver from '@/widgets/intersection-observer';
export const SmsPaymentPage = () => { export const SmsPaymentPage = () => {
const { navigate } = useNavigate(); const { navigate } = useNavigate();
@@ -34,7 +35,7 @@ export const SmsPaymentPage = () => {
const [bottomSmsPaymentDetailResendOn, setBottomSmsPaymentDetailResendOn] = useState<boolean>(false) const [bottomSmsPaymentDetailResendOn, setBottomSmsPaymentDetailResendOn] = useState<boolean>(false)
const [sortType, setSortType] = useState<SortTypeKeys>(SortTypeKeys.LATEST); const [onActionIntersect, setOnActionIntersect] = useState<boolean>(false);
const [listItems, setListItems] = useState<Array<SmsPaymentListItem>>([]); const [listItems, setListItems] = useState<Array<SmsPaymentListItem>>([]);
const [pageParam, setPageParam] = useState<DefaultRequestPagination>(DEFAULT_PAGE_PARAM); const [pageParam, setPageParam] = useState<DefaultRequestPagination>(DEFAULT_PAGE_PARAM);
const [filterOn, setFilterOn] = useState<boolean>(false); const [filterOn, setFilterOn] = useState<boolean>(false);
@@ -52,6 +53,24 @@ export const SmsPaymentPage = () => {
const { mutateAsync: smsPaymentList } = useExtensionSmsListMutation(); const { mutateAsync: smsPaymentList } = useExtensionSmsListMutation();
const { mutateAsync: downloadExcel } = useExtensionSmsDownloadExcelMutation(); const { mutateAsync: downloadExcel } = useExtensionSmsDownloadExcelMutation();
const { mutateAsync: detail } = useExtensionSmsDetailMutation(); const { mutateAsync: detail } = useExtensionSmsDetailMutation();
const onIntersect: IntersectionObserverCallback = (entries: Array<IntersectionObserverEntry>) => {
entries.forEach((entry: IntersectionObserverEntry) => {
if(entry.isIntersecting){
console.log('Element is now intersecting with the root. [' + onActionIntersect + ']');
if(onActionIntersect && !!pageParam.cursor){
callList('page');
}
}
else{
console.log('Element is no longer intersecting with the root.');
}
});
};
const { setTarget } = useIntersectionObserver({
threshold: 1,
onIntersect
});
useSetHeaderTitle('SMS 결제 통보'); useSetHeaderTitle('SMS 결제 통보');
useSetHeaderType(HeaderType.LeftArrow); useSetHeaderType(HeaderType.LeftArrow);
@@ -59,9 +78,8 @@ export const SmsPaymentPage = () => {
useSetOnBack(() => { useSetOnBack(() => {
navigate(PATHS.home); navigate(PATHS.home);
}); });
const callList = (option?: { const callList = (type?: string) => {
sortType?: SortTypeKeys setOnActionIntersect(false);
}) => {
let listParams: ExtensionSmsPaymentListParams = { let listParams: ExtensionSmsPaymentListParams = {
mid: mid, mid: mid,
searchCl: searchCl, searchCl: searchCl,
@@ -71,14 +89,38 @@ export const SmsPaymentPage = () => {
smsCl: smsCl, smsCl: smsCl,
page: pageParam page: pageParam
} }
if(type !== 'page' && listParams.page){
if (listParams.page) { listParams.page.cursor = null;
listParams.page.sortType = option?.sortType || sortType;
setPageParam(listParams.page);
} }
smsPaymentList(listParams).then((rs) => { smsPaymentList(listParams).then((rs) => {
setListItems(rs.content); if(type === 'page'){
setListItems([
...listItems,
...rs.content
]);
}
else{
setListItems(rs.content);
}
if(rs.hasNext
&& rs.content.length === DEFAULT_PAGE_PARAM.size
){
setPageParam({
...pageParam,
...{ cursor: rs.nextCursor }
});
}
else{
setPageParam({
...pageParam,
...{ cursor: null }
});
}
setOnActionIntersect(
!!rs.hasNext
&& rs.content.length === DEFAULT_PAGE_PARAM.size
);
}); });
} }

View File

@@ -176,8 +176,8 @@ export const FaqListPage = () => {
</div> </div>
<div className="faq-list"> <div className="faq-list">
{ getFaqList() } { getFaqList() }
<div ref={ setTarget }></div>
</div> </div>
<div ref={ setTarget }></div>
</div> </div>
<div className="apply-row"> <div className="apply-row">
<button <button

View File

@@ -170,8 +170,8 @@ export const NoticeListPage = () => {
</div> </div>
<div className="notice-list-114"> <div className="notice-list-114">
{ getNoticeList() } { getNoticeList() }
<div ref={ setTarget }></div>
</div> </div>
<div ref={ setTarget }></div>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -166,8 +166,8 @@ export const QnaListPage = () => {
</div> </div>
<div className="inq-list" > <div className="inq-list" >
{ getQnaList() } { getQnaList() }
<div ref={ setTarget }></div>
</div> </div>
<div ref={ setTarget }></div>
</div> </div>
<div className="apply-row"> <div className="apply-row">
<button <button

View File

@@ -385,4 +385,10 @@ main.home-main{
font-weight: unset !important; font-weight: unset !important;
width: unset !important; width: unset !important;
text-align: unset !important; text-align: unset !important;
}
.transaction-content > .transaction-title{
text-overflow: ellipsis;
overflow-x: hidden;
width: 100%;
} }