This commit is contained in:
focp212@naver.com
2025-11-20 09:36:26 +09:00
parent ed23046356
commit 72e57a9250
6 changed files with 25 additions and 9 deletions

View File

@@ -1,5 +1,5 @@
import moment from 'moment'; import moment from 'moment';
import { useStore } from '@/shared/model/store'; import { useDetailOnStore, useStore } from '@/shared/model/store';
import { ChangeEvent, useEffect, useState } from 'react'; import { ChangeEvent, useEffect, useState } from 'react';
import { IMAGE_ROOT } from '@/shared/constants/common'; import { IMAGE_ROOT } from '@/shared/constants/common';
import { PATHS } from '@/shared/constants/paths'; import { PATHS } from '@/shared/constants/paths';
@@ -89,7 +89,7 @@ export const AllTransactionListPage = () => {
const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState<boolean>(false); const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState<boolean>(false);
const [detailOn, setDetailOn] = useState<boolean>(false); const { detailOn, setDetailOn } = useDetailOnStore();
const [detailTid, setDetailTid] = useState<string>(''); const [detailTid, setDetailTid] = useState<string>('');
const [detailServiceCode, setDetailServiceCode] = useState<string>(''); const [detailServiceCode, setDetailServiceCode] = useState<string>('');

View File

@@ -1,7 +1,7 @@
import moment from 'moment'; import moment from 'moment';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useStore } from '@/shared/model/store'; import { useDetailOnStore, useStore } from '@/shared/model/store';
import { IMAGE_ROOT } from '@/shared/constants/common'; import { IMAGE_ROOT } from '@/shared/constants/common';
import { PATHS } from '@/shared/constants/paths'; import { PATHS } from '@/shared/constants/paths';
import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { useNavigate } from '@/shared/lib/hooks/use-navigate';
@@ -74,7 +74,7 @@ export const BillingListPage = () => {
const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState<boolean>(false); const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState<boolean>(false);
const [detailOn, setDetailOn] = useState<boolean>(false); const { detailOn, setDetailOn } = useDetailOnStore();
const [detailTid, setDetailTid] = useState<string>(''); const [detailTid, setDetailTid] = useState<string>('');
const [filterUsed, setFilterUsed] = useState<boolean>(false); const [filterUsed, setFilterUsed] = useState<boolean>(false);

View File

@@ -33,7 +33,7 @@ import {
useSetFooterMode useSetFooterMode
} from '@/widgets/sub-layout/use-sub-layout'; } from '@/widgets/sub-layout/use-sub-layout';
import { getCashReceiptTransactionTypeBtnGroup } from '@/entities/transaction/model/contant'; import { getCashReceiptTransactionTypeBtnGroup } from '@/entities/transaction/model/contant';
import { useStore } from '@/shared/model/store'; import { useDetailOnStore, useStore } from '@/shared/model/store';
import { useCashReceiptSummaryMutation } from '@/entities/transaction/api/use-cash-receipt-summary-mutation'; import { useCashReceiptSummaryMutation } from '@/entities/transaction/api/use-cash-receipt-summary-mutation';
import { DownloadBottomSheet, DownloadSelectedMode } from '@/entities/common/ui/download-bottom-sheet'; import { DownloadBottomSheet, DownloadSelectedMode } from '@/entities/common/ui/download-bottom-sheet';
import useIntersectionObserver from '@/widgets/intersection-observer'; import useIntersectionObserver from '@/widgets/intersection-observer';
@@ -80,7 +80,7 @@ export const CashReceiptListPage = () => {
const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState<boolean>(false); const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState<boolean>(false);
const [detailOn, setDetailOn] = useState<boolean>(false); const { detailOn, setDetailOn } = useDetailOnStore();
const [detailTid, setDetailTid] = useState<string>(''); const [detailTid, setDetailTid] = useState<string>('');
const [detailServiceCode, setDetailServiceCode] = useState<string>(''); const [detailServiceCode, setDetailServiceCode] = useState<string>('');

View File

@@ -1,7 +1,7 @@
import moment from 'moment'; import moment from 'moment';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useStore } from '@/shared/model/store'; import { useDetailOnStore, useStore } from '@/shared/model/store';
import { IMAGE_ROOT } from '@/shared/constants/common'; import { IMAGE_ROOT } from '@/shared/constants/common';
import { PATHS } from '@/shared/constants/paths'; import { PATHS } from '@/shared/constants/paths';
import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { useNavigate } from '@/shared/lib/hooks/use-navigate';
@@ -73,7 +73,7 @@ export const EscrowListPage = () => {
const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState<boolean>(false); const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState<boolean>(false);
const [detailOn, setDetailOn] = useState<boolean>(false); const { detailOn, setDetailOn } = useDetailOnStore();
const [detailTid, setDetailTid] = useState<string>(''); const [detailTid, setDetailTid] = useState<string>('');
const [detailServiceCode, setDetailServiceCode] = useState<string>(''); const [detailServiceCode, setDetailServiceCode] = useState<string>('');

View File

@@ -10,6 +10,10 @@ export interface ModalOnStore {
modalOn: boolean; modalOn: boolean;
setModalOn: (modalOn: boolean) => void; setModalOn: (modalOn: boolean) => void;
}; };
export interface DetailOnStore {
detailOn: boolean;
setDetailOn: (detailOn: boolean) => void;
};
export interface MenuOnStore { export interface MenuOnStore {
menuOn: boolean; menuOn: boolean;
setMenuOn: (menuOn: boolean) => void; setMenuOn: (menuOn: boolean) => void;
@@ -33,6 +37,14 @@ export const useModalOnStore = create<ModalOnStore>((set) => ({
})); }));
} }
})); }));
export const useDetailOnStore = create<DetailOnStore>((set) => ({
detailOn: false,
setDetailOn: (detailOn: boolean) => {
set((state: {detailOn: boolean}) => ({
detailOn: (state.detailOn = detailOn)
}));
}
}));
export const useMenuOnStore = create<MenuOnStore>((set) => ({ export const useMenuOnStore = create<MenuOnStore>((set) => ({
menuOn: false, menuOn: false,
setMenuOn: (menuOn: boolean) => { setMenuOn: (menuOn: boolean) => {

View File

@@ -18,7 +18,7 @@ import {
import { useHomeGroupsMutation } from '@/entities/home/api/use-home-groups-mutation'; import { useHomeGroupsMutation } from '@/entities/home/api/use-home-groups-mutation';
import { useUserInfo } from '@/entities/user/lib/use-user-info'; import { useUserInfo } from '@/entities/user/lib/use-user-info';
import { useAppBridge } from '@/hooks'; import { useAppBridge } from '@/hooks';
import { useFavoriteEditOnStore, useMenuOnStore, useStore } from '@/shared/model/store'; import { useDetailOnStore, useFavoriteEditOnStore, useMenuOnStore, useStore } from '@/shared/model/store';
import { HomeGroupsParams, HomeGroupsResponse } from '@/entities/home/model/types'; import { HomeGroupsParams, HomeGroupsResponse } from '@/entities/home/model/types';
import { import {
BusinessPropertyParams, BusinessPropertyParams,
@@ -70,6 +70,7 @@ export const SubLayout = () => {
const { reload, navigateBack } = useNavigate(); const { reload, navigateBack } = useNavigate();
const { menuOn, setMenuOn } = useMenuOnStore(); const { menuOn, setMenuOn } = useMenuOnStore();
const { favoriteEditOn, setFavoriteEditOn } = useFavoriteEditOnStore(); const { favoriteEditOn, setFavoriteEditOn } = useFavoriteEditOnStore();
const { detailOn, setDetailOn } = useDetailOnStore();
const location = useLocation(); const location = useLocation();
console.log(location) console.log(location)
@@ -408,6 +409,9 @@ export const SubLayout = () => {
setMenuOn(false); setMenuOn(false);
setFavoriteEditOn(false); setFavoriteEditOn(false);
} }
else if(detailOn){
setDetailOn(false);
}
else{ else{
navigateBack(); navigateBack();
} }