Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/survey

This commit is contained in:
Dayoung 2025-06-05 18:06:11 +09:00
commit 8c91bd605c
10 changed files with 82 additions and 268 deletions

9
package-lock.json generated
View File

@ -14,7 +14,6 @@
"@tanstack/react-query-devtools": "^5.71.0",
"@types/nodemailer": "^6.4.17",
"axios": "^1.8.4",
"crypto-js": "^4.2.0",
"env-cmd": "^10.1.0",
"iron-session": "^8.0.4",
"lucide": "^0.503.0",
@ -33,7 +32,6 @@
},
"devDependencies": {
"@tailwindcss/postcss": "^4",
"@types/crypto-js": "^4.2.2",
"@types/mysql": "^2.15.27",
"@types/node": "^20",
"@types/react": "^19",
@ -2142,13 +2140,6 @@
"integrity": "sha512-7qSgZbincDDDFyRweCIEvZULFAw5iz/DeunhvuxpL31nfntX3P4Yd4HkHBRg9H8CdqY1e5WFN1PZIz/REL9MVQ==",
"license": "MIT"
},
"node_modules/@types/crypto-js": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.2.2.tgz",
"integrity": "sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==",
"dev": true,
"license": "MIT"
},
"node_modules/@types/mysql": {
"version": "2.15.27",
"resolved": "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.27.tgz",

View File

@ -21,7 +21,6 @@
"@tanstack/react-query-devtools": "^5.71.0",
"@types/nodemailer": "^6.4.17",
"axios": "^1.8.4",
"crypto-js": "^4.2.0",
"env-cmd": "^10.1.0",
"iron-session": "^8.0.4",
"lucide": "^0.503.0",
@ -40,7 +39,6 @@
},
"devDependencies": {
"@tailwindcss/postcss": "^4",
"@types/crypto-js": "^4.2.2",
"@types/mysql": "^2.15.27",
"@types/node": "^20",
"@types/react": "^19",

View File

@ -1,9 +0,0 @@
import SuitableDownloadPdf from '@/components/pdf/SuitableDownloadPdf'
export default function page() {
return (
<>
<SuitableDownloadPdf />
</>
)
}

View File

@ -1,132 +0,0 @@
'use client'
import { useEffect, useRef, useState } from 'react'
import generatePDF, { Margin, Options, Resolution, usePDF } from 'react-to-pdf'
import { useSuitable } from '@/hooks/useSuitable'
import { useSuitableStore } from '@/store/useSuitableStore'
import { SUITABLE_HEAD_CODE, type Suitable, type SuitableDetail } from '@/types/Suitable'
export default function SuitableDownloadPdf() {
const [fileName, setFileName] = useState<string[]>([])
const [createTime, setCreateTime] = useState('')
const targetRef = useRef<HTMLDivElement>(null)
const { toCodeName, toSuitableDetail, selectedSuitables, isSelectedSuitablesLoading } = useSuitable()
const { selectedCategory, suitableCommCode, selectedItemsSearching, setSelectedItemsSearching } = useSuitableStore()
const handleDownPdf = () => {
const options: Options = {
filename: `${fileName.join('_')}.pdf`,
method: 'open' as const,
resolution: Resolution.HIGH,
page: {
margin: Margin.SMALL,
format: 'A4',
orientation: 'landscape' as const,
},
canvas: {
mimeType: 'image/png' as const,
qualityRatio: 1,
},
overrides: {
pdf: {
compress: true,
},
canvas: {
useCORS: true,
},
},
}
generatePDF(targetRef, options)
// generatePDF(targetRef, { filename: 'page.pdf' })
}
const formatDateString = () => {
const now = new Date()
const year = now.getFullYear()
const month = now.getMonth() + 1
const day = now.getDate()
const hours = now.getHours()
const minutes = now.getMinutes()
return `${year}${month}${day}${hours}:${minutes.toString().padStart(2, '0')}`
}
useEffect(() => {
setCreateTime(formatDateString())
setFileName([
`(${suitableCommCode.get(SUITABLE_HEAD_CODE.ROOF_MATL_GRP_CD)?.find((category) => category.code === selectedCategory)?.codeJp})`,
'屋根材適合表',
])
if (!selectedItemsSearching) {
setSelectedItemsSearching(true)
}
}, [])
if (!selectedCategory) return <div> .</div>
if (isSelectedSuitablesLoading) return <div>Loading...</div>
return (
<>
{/* <button onClick={() => handleDownPdf()}>PDFダウンロード</button> */}
<div className="pdf-table-wrap" ref={targetRef}>
<div className="pdf-intro-page">
<div className="pdf-intro-tit-wrap">
<div className="pdf-intro-tit mb20"></div>
<div className="pdf-intro-tit mb20">{fileName.join(' ')}</div>
<div className="pdf-intro-date">{createTime}</div>
</div>
<div className="pdf-intro-cont-wrap">
<p>使</p>
<p></p>
<p></p>
<p></p>
</div>
<div className="pdf-intro-foot-date">{createTime}</div>
</div>
<div className="pdf-table-content">
<div className="pdf-table-grid-wrap">
{selectedSuitables?.map((item: Suitable) => (
<div className="pdf-table-card" key={item.id}>
<div className="pdf-table-tit-wrap">
<span>{item.productName}</span>
<span>{toCodeName(SUITABLE_HEAD_CODE.MANU_FT_CD, item.manuFtCd)}</span>
<span>{toCodeName(SUITABLE_HEAD_CODE.ROOF_MT_CD, item.roofMtCd)}</span>
</div>
<div className="pdf-roof-table">
<table>
<colgroup>
<col width={'18%'} />
<col width={'23%'} />
<col width={'18%'} />
<col />
</colgroup>
<thead>
<tr>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
{toSuitableDetail(item.detail).map((subItem: SuitableDetail) => (
<tr key={subItem.id}>
<td>{toCodeName(SUITABLE_HEAD_CODE.ROOF_SH_CD, item.roofShCd)}</td>
<td>{toCodeName(SUITABLE_HEAD_CODE.TRESTLE_MFPC_CD, subItem.trestleMfpcCd)}</td>
<td>{subItem.trestleManufacturerProductName}</td>
<td>{subItem.memo}</td>
</tr>
))}
</tbody>
</table>
</div>
</div>
))}
</div>
<div className="pdf-intro-foot-date">{createTime}</div>
</div>
</div>
</>
)
}

View File

@ -5,16 +5,14 @@ import { useCallback, useEffect, useState } from 'react'
import SuitableDetailPopupButton from './SuitableDetailPopupButton'
import { useSuitable } from '@/hooks/useSuitable'
import { usePopupController } from '@/store/popupController'
import { useSuitableStore } from '@/store/useSuitableStore'
import { useSpinnerStore } from '@/store/spinnerStore'
import { SUITABLE_HEAD_CODE, type Suitable, type SuitableDetail } from '@/types/Suitable'
export default function SuitableDetailPopup() {
const popupController = usePopupController()
const { toCodeName, toSuitableDetail, suitableCheckIcon, suitableCheckMemo, selectedSuitables, isSelectedSuitablesLoading } = useSuitable()
const { setSelectedItemsSearching } = useSuitableStore()
const { toCodeName, toSuitableDetail, suitableCheckIcon, suitableCheckMemo, getSelectedSuitables } = useSuitable()
const [openItems, setOpenItems] = useState<Set<number>>(new Set())
const [selectedSuitables, setSelectedSuitables] = useState<Suitable[]>([])
/* 아이템 열기/닫기 */
const toggleItemOpen = useCallback((itemId: number) => {
@ -25,13 +23,10 @@ export default function SuitableDetailPopup() {
})
}, [])
/* 데이터 로딩 상태 처리 */
useEffect(() => {
useSpinnerStore.getState().setIsShow(isSelectedSuitablesLoading)
}, [isSelectedSuitablesLoading])
useEffect(() => {
setSelectedItemsSearching(true)
getSelectedSuitables().then((res) => {
setSelectedSuitables(res)
})
}, [])
return (

View File

@ -19,6 +19,7 @@ export default function SuitableDetailPopupButton() {
}
return (
<div className="float-btn-wrap">
<div className="btn-flex-wrap com">
<div className="btn-bx">
<button className="btn-frame n-blue icon" onClick={handleClosePopup}>
@ -36,5 +37,6 @@ export default function SuitableDetailPopupButton() {
</button>
</div>
</div>
</div>
)
}

View File

@ -21,7 +21,7 @@ export default function SuitableList() {
isLoading,
suitableCheckIcon,
} = useSuitable()
const { selectedItems, addSelectedItem, removeSelectedItem, setSelectedItemsSearching } = useSuitableStore()
const { selectedItems, addSelectedItem, removeSelectedItem } = useSuitableStore()
const [openItems, setOpenItems] = useState<Set<number>>(new Set())
const observerTarget = useRef<HTMLDivElement>(null)
@ -49,7 +49,6 @@ export default function SuitableList() {
/* 아이템 클릭 */
const handleItemClick = useCallback(
(mainId: number, detailId?: number, detailIds?: Set<number>): void => {
setSelectedItemsSearching(false)
isItemSelected(mainId, detailId) ? removeSelectedItem(mainId, detailId) : addSelectedItem(mainId, detailId, detailIds)
},
[isItemSelected, addSelectedItem, removeSelectedItem],

View File

@ -7,11 +7,12 @@ import type { CommCode } from '@/types/CommCode'
import { SUITABLE_HEAD_CODE } from '@/types/Suitable'
export default function SuitableSearch() {
const [searchValue, setSearchValue] = useState('')
const [searchValue, setSearchValue] = useState<string>('')
const { getSuitableCommCode, clearSuitableStore } = useSuitable()
const { suitableCommCode, selectedCategory, setSelectedCategory, setSearchKeyword } = useSuitableStore()
const { suitableCommCode, searchCategory, setSearchCategory, setSearchKeyword } = useSuitableStore()
/* 키워드 입력 글자 제한 */
const handleInputChange = (value: string) => {
if (Array.from(value).length > 30) {
alert('検索ワードは最大30文字まで入力できます。')
@ -21,6 +22,7 @@ export default function SuitableSearch() {
setSearchValue(value)
}
/* 키워드 검색 */
const handleInputSearch = async () => {
if (!searchValue.trim()) {
alert('屋根材の製品名を入力してください。')
@ -29,6 +31,7 @@ export default function SuitableSearch() {
setSearchKeyword(searchValue)
}
/* 키워드 초기화 */
const handleInputClear = () => {
setSearchValue('')
clearSuitableStore({ items: true, keyword: true })
@ -42,7 +45,7 @@ export default function SuitableSearch() {
return (
<>
<div className="sale-form-bx">
<select className="select-form" name="" id="" value={selectedCategory || ''} onChange={(e) => setSelectedCategory(e.target.value)}>
<select className="select-form" name="" id="" value={searchCategory || ''} onChange={(e) => setSearchCategory(e.target.value)}>
<option value="">.</option>
{suitableCommCode.get(SUITABLE_HEAD_CODE.ROOF_MATL_GRP_CD)?.map((category: CommCode, index: number) => (
<option key={index} value={category.code}>

View File

@ -1,5 +1,4 @@
import { useInfiniteQuery, useQuery } from '@tanstack/react-query'
import { SHA256 } from 'crypto-js'
import { useInfiniteQuery } from '@tanstack/react-query'
import { transformObjectKeys } from '@/libs/axios'
import { useSuitableStore } from '@/store/useSuitableStore'
import { useAxios } from './useAxios'
@ -13,13 +12,12 @@ export function useSuitable() {
itemPerPage,
suitableCommCode,
setSuitableCommCode,
selectedCategory,
clearSelectedCategory,
searchCategory,
clearSearchCategory,
searchKeyword,
clearSearchKeyword,
selectedItems,
clearSelectedItems,
selectedItemsSearching,
} = useSuitableStore()
const getSuitables = async ({
@ -50,7 +48,7 @@ export function useSuitable() {
const getSuitableIds = async (): Promise<SuitableIds[]> => {
try {
const params: Record<string, string> = {}
if (selectedCategory) params.category = selectedCategory
if (searchCategory) params.category = searchCategory
if (searchKeyword) params.keyword = searchKeyword
const response = await axiosInstance(null).get<SuitableIds[]>('/api/suitable/pick', { params })
return response.data
@ -118,13 +116,13 @@ export function useSuitable() {
// isError,
// error,
} = useInfiniteQuery<Suitable[]>({
queryKey: ['suitables', 'list', selectedCategory, searchKeyword],
queryKey: ['suitables', 'list', searchCategory, searchKeyword],
queryFn: async (context) => {
const pageParam = context.pageParam as number
if (pageParam === 1) clearSuitableStore({ items: true })
return await getSuitables({
pageNumber: pageParam,
...(selectedCategory && { category: selectedCategory }),
...(searchCategory && { category: searchCategory }),
...(searchKeyword && { keyword: searchKeyword }),
})
},
@ -134,48 +132,12 @@ export function useSuitable() {
initialPageParam: 1,
staleTime: 1000 * 60 * 10,
gcTime: 1000 * 60 * 10,
enabled: selectedCategory !== '' || searchKeyword !== '',
})
const serializeSelectedItems = (): { ids: string; detailIds: string } => {
const ids: string[] = []
const detailIds: string[] = []
for (const [key, value] of selectedItems) {
ids.push(String(key))
for (const id of value) detailIds.push(String(id))
}
return { ids: ids.join(','), detailIds: detailIds.length > 0 ? detailIds.join(',') : '' }
}
const getSelectedItemsHash = (): string => {
const entries = Array.from(selectedItems.entries())
.map(([key, value]) => `${key}:${Array.from(value).sort().join(',')}`)
.sort()
.join('|')
return SHA256(entries).toString()
}
const {
data: selectedSuitables,
isLoading: isSelectedSuitablesLoading,
// refetch: refetchSelectedSuitables,
} = useQuery<Suitable[]>({
queryKey: ['suitables', 'selectedItems', getSelectedItemsHash(), selectedItemsSearching],
queryFn: async () => {
const { ids, detailIds } = serializeSelectedItems()
return await getSuitableDetails(ids, detailIds)
},
staleTime: Infinity,
gcTime: Infinity,
enabled: selectedItemsSearching,
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchOnReconnect: false,
enabled: searchCategory !== '' || searchKeyword !== '',
})
const clearSuitableStore = ({ items = false, category = false, keyword = false }: { items?: boolean; category?: boolean; keyword?: boolean }) => {
if (items) clearSelectedItems()
if (category) clearSelectedCategory()
if (category) clearSearchCategory()
if (keyword) clearSearchKeyword()
}
@ -198,11 +160,26 @@ export function useSuitable() {
return `${value}で設置可`
}
const serializeSelectedItems = (): { ids: string; detailIds: string } => {
const ids: string[] = []
const detailIds: string[] = []
for (const [key, value] of selectedItems) {
ids.push(String(key))
for (const id of value) detailIds.push(String(id))
}
return { ids: ids.join(','), detailIds: detailIds.length > 0 ? detailIds.join(',') : '' }
}
const getSelectedSuitables = async (): Promise<Suitable[]> => {
const { ids, detailIds } = serializeSelectedItems()
return await getSuitableDetails(ids, detailIds)
}
const downloadSuitablePdf = async (): Promise<void> => {
try {
const { ids, detailIds } = serializeSelectedItems()
const fileTitle = `(${
suitableCommCode.get(SUITABLE_HEAD_CODE.ROOF_MATL_GRP_CD)?.find((category) => category.code === selectedCategory)?.codeJp
suitableCommCode.get(SUITABLE_HEAD_CODE.ROOF_MATL_GRP_CD)?.find((category) => category.code === searchCategory)?.codeJp
}) `
const form = document.createElement('form')
@ -240,7 +217,6 @@ export function useSuitable() {
return {
getSuitables,
getSuitableIds,
getSuitableDetails,
getSuitableCommCode,
toCodeName,
toSuitableDetail,
@ -250,8 +226,7 @@ export function useSuitable() {
hasNextPage,
isFetchingNextPage,
isLoading,
selectedSuitables,
isSelectedSuitablesLoading,
getSelectedSuitables,
clearSuitableStore,
suitableCheckIcon,
suitableCheckMemo,

View File

@ -11,43 +11,38 @@ interface SuitableState {
/* 공통코드 설정 */
setSuitableCommCode: (headCode: string, commCode: CommCode[]) => void
/* 선택된 카테고리 */
selectedCategory: string
/* 선택된 카테고리 설정 */
setSelectedCategory: (category: string) => void
/* 선택된 카테고리 초기화 */
clearSelectedCategory: () => void
/* 검색 카테고리 */
searchCategory: string
/* 검색 카테고리 설정 */
setSearchCategory: (category: string) => void
/* 검색 카테고리 초기화 */
clearSearchCategory: () => void
/* 검색 */
/* 검색 키워드 */
searchKeyword: string
/* 검색 설정 */
/* 검색 키워드 설정 */
setSearchKeyword: (value: string) => void
/* 검색 초기화 */
/* 검색 키워드 초기화 */
clearSearchKeyword: () => void
/* 선택된 아이템 리스트 */
selectedItems: Map<number, Set<number>>
/* 선택 아이템 추가 */
addSelectedItem: (mainId: number, detailId?: number, detailIds?: Set<number>) => void
/* 아이템 전체 추가 */
/* 선택 아이템 전체 추가 */
addAllSelectedItem: (suitableIds: SuitableIds[]) => void
/* 선택 아이템 제거 */
/* 선택 아이템 제거 */
removeSelectedItem: (mainId: number, detailId?: number) => void
/* 선택 아이템 모두 제거 */
/* 선택 아이템 모두 제거 */
clearSelectedItems: () => void
/* 선택된 아이템 검색 상태 */
selectedItemsSearching: boolean
/* 선택된 아이템 검색 상태 설정 */
setSelectedItemsSearching: (value: boolean) => void
}
export const useSuitableStore = create<SuitableState>((set) => ({
itemPerPage: 100 as number,
suitableCommCode: new Map() as Map<string, CommCode[]>,
selectedCategory: '' as string,
searchCategory: '' as string,
searchKeyword: '' as string,
selectedItems: new Map() as Map<number, Set<number>>,
selectedItemsSearching: false as boolean,
/* 공통코드 설정 */
setSuitableCommCode: (headCode: string, commCode: CommCode[]) =>
@ -55,20 +50,20 @@ export const useSuitableStore = create<SuitableState>((set) => ({
suitableCommCode: new Map(state.suitableCommCode).set(headCode, commCode),
})),
/* 선택된 카테고리 설정 */
setSelectedCategory: (category: string) => set({ selectedCategory: category }),
/* 선택된 카테고리 초기화 */
clearSelectedCategory: () => set({ selectedCategory: '' }),
/* 검색 카테고리 설정 */
setSearchCategory: (category: string) => set({ searchCategory: category }),
/* 검색 카테고리 초기화 */
clearSearchCategory: () => set({ searchCategory: '' }),
/* 검색 설정 */
/* 검색 키워드 설정 */
setSearchKeyword: (value: string) => set({ searchKeyword: value }),
/* 검색 초기화 */
/* 검색 키워드 초기화 */
clearSearchKeyword: () => set({ searchKeyword: '' }),
/* 선택 아이템 추가 */
/* 선택 아이템 추가 */
addSelectedItem: (mainId: number, detailId?: number, detailIds?: Set<number>) => {
if (detailId) {
// 디테일(하위) 아이템 추가
/* 디테일(하위) 아이템 추가 */
set((state) => {
const detailSet = state.selectedItems.get(mainId) || new Set()
detailSet.add(detailId)
@ -76,7 +71,7 @@ export const useSuitableStore = create<SuitableState>((set) => ({
return { selectedItems: state.selectedItems }
})
} else {
// 메인(상위) 아이템 추가
/* 메인(상위) 아이템 추가 */
set((state) => {
state.selectedItems.set(mainId, detailIds || new Set())
return { selectedItems: state.selectedItems }
@ -84,7 +79,7 @@ export const useSuitableStore = create<SuitableState>((set) => ({
}
},
/* 아이템 전체 추가 */
/* 선택 아이템 전체 추가 */
addAllSelectedItem: (suitableIds: SuitableIds[]) => {
set(() => {
const newSelectedItems = new Map()
@ -95,31 +90,28 @@ export const useSuitableStore = create<SuitableState>((set) => ({
})
},
/* 선택 아이템 제거 */
/* 선택 아이템 제거 */
removeSelectedItem: (mainId: number, detailId?: number) => {
set((state) => {
const newSelectedItems = new Map(state.selectedItems)
if (!detailId) {
// 메인(상위) 아이템 제거
/* 메인(상위) 아이템 제거 */
newSelectedItems.delete(mainId)
return { selectedItems: newSelectedItems }
}
// 디테일(하위) 아이템 제거
/* 디테일(하위) 아이템 제거 */
const detailSet = state.selectedItems.get(mainId) || new Set()
detailSet.delete(detailId)
// 디테일(하위)하위 아이템이 모두 제거되면 메인 아이템도 제거
/* 디테일(하위)하위 아이템이 모두 제거되면 메인 아이템도 제거 */
detailSet.size === 0 ? newSelectedItems.delete(mainId) : newSelectedItems.set(mainId, detailSet)
return { selectedItems: newSelectedItems }
})
},
/* 선택 아이템 모두 제거 */
/* 선택 아이템 모두 제거 */
clearSelectedItems: () => set({ selectedItems: new Map() as Map<number, Set<number>> }),
/* 선택된 아이템 검색 상태 설정 */
setSelectedItemsSearching: (value: boolean) => set({ selectedItemsSearching: value }),
}))