@@ -304,6 +347,7 @@ export default function Estimate({ params }) {
value={'YJSS'}
checked={state?.estimateType === 'YJSS' ? true : false}
onChange={(e) => {
+ //주문분류
setState({ estimateType: e.target.value })
}}
/>
@@ -380,9 +424,18 @@ export default function Estimate({ params }) {
@@ -416,7 +469,7 @@ export default function Estimate({ params }) {
- {isNotEmptyArray(originFiles) &&
+ {originFiles.length > 0 &&
originFiles.map((originFile) => {
return (
-
@@ -486,13 +539,13 @@ export default function Estimate({ params }) {
return (
- {row.codeNm}
- - {row.remarks}
+
)
}
})}
- {/* 견적특이사항 선택한 내용?영역끝 */}
+ {/* 견적특이사항 선택한 내용 영역끝 */}
@@ -565,12 +618,30 @@ export default function Estimate({ params }) {
{getMessage('estimate.detail.header.showPrice')}
-
+ {session?.storeLvl === '1' ? (
+
+ ) : (
+
+ )}
-
+
@@ -605,7 +676,83 @@ export default function Estimate({ params }) {
{/* 가격표시영역끝 */}
{/* html테이블시작 */}
-
+
+
{/* html테이블끝 */}
diff --git a/src/components/estimate/EstimateFileUploader.jsx b/src/components/estimate/EstimateFileUploader.jsx
index c2bccb22..dfc82d49 100644
--- a/src/components/estimate/EstimateFileUploader.jsx
+++ b/src/components/estimate/EstimateFileUploader.jsx
@@ -27,6 +27,7 @@ export default function EstimateFileUploader({ uploadFiles, setUploadFiles }) {
// if (res.data > 0) setUploadFiles([...files, { name: e.target.files[0].name, id: uuidv4() }])
// })
setUploadFiles([...uploadFiles, { data: e.target.files[0], id: uuidv4() }])
+ e.target.value = ''
}
const deleteFile = (id) => {
diff --git a/src/components/estimate/popup/DocDownOptionPop.jsx b/src/components/estimate/popup/DocDownOptionPop.jsx
new file mode 100644
index 00000000..0c859c59
--- /dev/null
+++ b/src/components/estimate/popup/DocDownOptionPop.jsx
@@ -0,0 +1,255 @@
+'use client'
+import { useState } from 'react'
+import { useMessage } from '@/hooks/useMessage'
+import { useAxios } from '@/hooks/useAxios'
+import { useRecoilValue } from 'recoil'
+import { floorPlanObjectState } from '@/store/floorPlanObjectAtom'
+
+export default function DocDownOptionPop({ planNo, setEstimatePopupOpen }) {
+ // console.log('플랜번호::::::::::::', planNo)
+ const { getMessage } = useMessage()
+ const { promiseGet } = useAxios()
+
+ //다운로드 파일 EXCEL
+ const [schUnitPriceFlg, setSchUnitPriceFlg] = useState('0')
+
+ //견적제출서 표시명
+ const [schDisplayFlg, setSchSchDisplayFlg] = useState('0')
+ //가대 중량표 포함
+ const [schWeightFlg, setSchWeightFlg] = useState('0')
+ //도면/시뮬레이션 파일 포함
+ const [schDrawingFlg, setSchDrawingFlg] = useState('0')
+
+ // recoil 물건번호
+ const objectRecoil = useRecoilValue(floorPlanObjectState)
+
+ //문서 다운로드
+ const handleFileDown = async () => {
+ // console.log('물건번호:::', objectRecoil.floorPlanObjectNo)
+ // console.log('planNo::', planNo)
+ // 고른 옵션값들
+ //0 : 견적가 Excel 1 : 정가용Excel 2: 견적가 PDF 3 :정가용PDF
+ // console.log(schUnitPriceFlg)
+ // console.log(schDisplayFlg)
+ // console.log(schWeightFlg)
+ // console.log(schDrawingFlg)
+ const url = '/api/estimate/excel-download'
+ const params = {}
+ const options = { responseType: 'blob' }
+ }
+
+ return (
+
+
+
+
+ {getMessage('estimate.detail.docPopup.title')}
+
+
+
+
+ {getMessage('estimate.detail.docPopup.explane')}
+
+
+
+
+
+
+
+
+ |
+ {getMessage('estimate.detail.docPopup.schUnitPriceFlg')}
+ *
+ |
+
+
+ |
+
+
+ |
+ {getMessage('estimate.detail.docPopup.schDisplayFlg')} *
+ |
+
+
+ |
+
+
+ |
+ {getMessage('estimate.detail.docPopup.schWeightFlg')} *
+ |
+
+
+ |
+
+
+ | {getMessage('estimate.detail.docPopup.schDrawingFlg')} |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- |
| {getMessage('common.input.file')} |
-
+
+
+ {/* 파일 불러오기 */}
+ {refFileMethod === '1' && (
+
+ )}
+
+ {/* 주소 불러오기 */}
+ {refFileMethod === '2' && (
+
+ setMapPositionAddress(e.target.value)}
+ />
+
+
+
+ {mapPositionAddress && }
+ {/* */}
+
+ )}
+ {/*
+ |
diff --git a/src/components/simulator/Simulator.jsx b/src/components/simulator/Simulator.jsx
new file mode 100644
index 00000000..c909ca17
--- /dev/null
+++ b/src/components/simulator/Simulator.jsx
@@ -0,0 +1,365 @@
+'use client'
+
+import 'chart.js/auto'
+import { Bar } from 'react-chartjs-2'
+import dayjs from 'dayjs'
+
+import { useEffect, useState, useRef } from 'react'
+import { useRecoilValue } from 'recoil'
+import { floorPlanObjectState } from '@/store/floorPlanObjectAtom'
+
+import { useAxios } from '@/hooks/useAxios'
+import { useMessage } from '@/hooks/useMessage'
+import { usePlan } from '@/hooks/usePlan'
+import { useCanvasMenu } from '@/hooks/common/useCanvasMenu'
+
+import { convertNumberToPriceDecimal } from '@/util/common-utils'
+
+export default function Simulator() {
+ const { plans } = usePlan()
+ const plan = plans.find((plan) => plan.isCurrent === true)
+
+ const chartRef = useRef(null)
+
+ // recoil 물건번호
+ const objectRecoil = useRecoilValue(floorPlanObjectState)
+ const [objectNo, setObjectNo] = useState('')
+
+ useEffect(() => {
+ setObjectNo(objectRecoil.floorPlanObjectNo)
+ }, [objectRecoil])
+
+ // 캔버스 메뉴 넘버 셋팅
+ const { setMenuNumber } = useCanvasMenu()
+
+ useEffect(() => {
+ setMenuNumber(6)
+ }, [])
+
+ const { get } = useAxios()
+ const { getMessage } = useMessage()
+
+ // 차트 관련
+ const [chartData, setChartData] = useState([])
+ const data = {
+ labels: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+ datasets: [
+ {
+ label: 'kWh',
+ data: chartData.slice(0, 12),
+
+ backgroundColor: [
+ 'rgba(255, 99, 132, 0.2)',
+ 'rgba(54, 162, 235, 0.2)',
+ 'rgba(255, 206, 86, 0.2)',
+ 'rgba(75, 192, 192, 0.2)',
+ 'rgba(153, 102, 255, 0.2)',
+ 'rgba(255, 159, 64, 0.2)',
+ 'rgba(0, 99, 132, 0.2)',
+ 'rgba(0, 162, 235, 0.2)',
+ 'rgba(0, 206, 86, 0.2)',
+ 'rgba(0, 192, 192, 0.2)',
+ 'rgba(0, 102, 255, 0.2)',
+ 'rgba(0, 159, 64, 0.2)',
+ ],
+ borderColor: [
+ 'rgba(255, 99, 132, 0.2)',
+ 'rgba(54, 162, 235, 0.2)',
+ 'rgba(255, 206, 86, 0.2)',
+ 'rgba(75, 192, 192, 0.2)',
+ 'rgba(153, 102, 255, 0.2)',
+ 'rgba(255, 159, 64, 0.2)',
+ 'rgba(0, 99, 132, 0.2)',
+ 'rgba(0, 162, 235, 0.2)',
+ 'rgba(0, 206, 86, 0.2)',
+ 'rgba(0, 192, 192, 0.2)',
+ 'rgba(0, 102, 255, 0.2)',
+ 'rgba(0, 159, 64, 0.2)',
+ ],
+ borderWidth: 1,
+ },
+ ],
+ }
+
+ const options = {
+ plugins: {
+ legend: {
+ position: 'top',
+ },
+ },
+ scales: {
+ x: {
+ grid: {
+ display: false,
+ },
+ },
+ y: {
+ beginAtZero: true,
+ grid: {
+ display: true,
+ },
+ },
+ },
+ }
+
+ useEffect(() => {
+ if (objectNo) {
+ fetchObjectDetail(objectNo)
+ }
+ fetchSimulatorNotice()
+ }, [objectNo, plan])
+
+ // 물건 상세 정보 조회
+ const [objectDetail, setObjectDetail] = useState({})
+
+ // 모듈배치정보 조회
+ const [moduleInfoList, setModuleInfoList] = useState([])
+
+ // 파워컨디셔너 조회
+ const [pcsInfoList, setPcsInfoList] = useState([])
+
+ const fetchObjectDetail = async (objectNo) => {
+ const apiUrl = `/api/pwrGnrSimulation/calculations?objectNo=${objectNo}&planNo=${plan?.id}`
+ const resultData = await get({ url: apiUrl })
+ if (resultData) {
+ setObjectDetail(resultData)
+ if (resultData.frcPwrGnrList) {
+ setChartData(resultData.frcPwrGnrList)
+ }
+ if (resultData.pcsList) {
+ setPcsInfoList(resultData.pcsList)
+ }
+ if (resultData.roofModuleList) {
+ setModuleInfoList(resultData.roofModuleList)
+ }
+ }
+ }
+
+ // 시뮬레이션 안내사항 조회
+ const [content, setContent] = useState('')
+
+ const fetchSimulatorNotice = async () => {
+ get({ url: '/api/pwrGnrSimulation/guideInfo' }).then((res) => {
+ if (res.data) {
+ setContent(res.data.replaceAll('\n', '
'))
+ } else {
+ setContent(getMessage('common.message.no.data'))
+ }
+ })
+ }
+
+ return (
+
+
+
+
+
+ {/* 물건번호 */}
+
+
{getMessage('simulator.title.sub1')}
+
+ {objectDetail.objectNo} (Plan No: {objectDetail.planNo})
+
+
+ {/* 작성일 */}
+
+
{getMessage('simulator.title.sub2')}
+
{`${dayjs(objectDetail.drawingEstimateCreateDate).format('YYYY.MM.DD')}`}
+
+ {/* 시스템용량 */}
+
+
{getMessage('simulator.title.sub3')}
+
{convertNumberToPriceDecimal(objectDetail.capacity)}kW
+
+ {/* 연간예측발전량 */}
+
+
{getMessage('simulator.title.sub4')}
+
{convertNumberToPriceDecimal(objectDetail.anlFrcsGnrt)}
+
+
+
+ {/* 도도부현 */}
+
+
{getMessage('simulator.title.sub5')}
+
{objectDetail.prefName}
+
+ {/* 일사량 관측지점 */}
+
+
{getMessage('simulator.title.sub6')}
+
{objectDetail.areaName}
+
+ {/* 적설조건 */}
+
+
{getMessage('simulator.title.sub7')}
+
{objectDetail.snowfall}
+
+ {/* 풍속조건 */}
+
+
{getMessage('simulator.title.sub8')}
+
{objectDetail.standardWindSpeedId}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{getMessage('simulator.table.sub9')}
+
+
+ {/* 예측발전량 */}
+
+
+
+
+ | 1月 |
+ 2月 |
+ 3月 |
+ 4月 |
+ 5月 |
+ 6月 |
+ 7月 |
+ 8月 |
+ 9月 |
+ 10月 |
+ 11月 |
+ 12月 |
+ {getMessage('simulator.table.sub6')} |
+
+
+
+ {chartData.length > 0 ? (
+
+ {chartData.map((data) => (
+ | {convertNumberToPriceDecimal(data)} |
+ ))}
+
+ ) : (
+
+ | {getMessage('common.message.no.data')} |
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
+ | {getMessage('simulator.table.sub1')} |
+ {getMessage('simulator.table.sub2')} |
+ {getMessage('simulator.table.sub3')} |
+ {getMessage('simulator.table.sub4')} |
+ {getMessage('simulator.table.sub5')} |
+
+
+
+ {moduleInfoList.length > 0 ? (
+ moduleInfoList.map((moduleInfo) => {
+ return (
+ <>
+
+ {/* 지붕면 */}
+ | {moduleInfo.roofSurface} |
+ {/* 경사각 */}
+ {convertNumberToPriceDecimal(moduleInfo.slope)}寸 |
+ {/* 방위각(도) */}
+ {convertNumberToPriceDecimal(moduleInfo.angle)} |
+ {/* 태양전지모듈 */}
+
+ {moduleInfo.itemNo}
+ |
+ {/* 매수 */}
+ {moduleInfo.amount} |
+
+
+ )
+ })
+ ) : (
+
+ | {getMessage('common.message.no.data')} |
+
+ )}
+
+
+ {moduleInfoList.length > 0 && (
+
+
{getMessage('simulator.table.sub6')}
+
+ {moduleInfoList.reduce((acc, moduleInfo) => convertNumberToPriceDecimal(Number(acc) + Number(moduleInfo.amount)), 0)}
+
+
+ )}
+
+
+
+
+
+
+
+ | {getMessage('simulator.table.sub7')} |
+ {getMessage('simulator.table.sub8')} |
+
+
+
+ {pcsInfoList.length > 0 ? (
+ pcsInfoList.map((pcsInfo) => {
+ return (
+ <>
+
+ {/* 파워컨디셔너 */}
+ |
+ {pcsInfo.itemNo}
+ |
+ {/* 대 */}
+ {pcsInfo.amount} |
+
+
+ )
+ })
+ ) : (
+
+ | {getMessage('common.message.no.data')} |
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
+
+ {getMessage('simulator.notice.sub1')}
+
+ {getMessage('simulator.notice.sub2')}
+
+
+ {/* 시뮬레이션 안내사항 */}
+
+
+
+
+
+
+ )
+}
diff --git a/src/hooks/common/useCanvasConfigInitialize.js b/src/hooks/common/useCanvasConfigInitialize.js
index c4f137b0..a07d4a00 100644
--- a/src/hooks/common/useCanvasConfigInitialize.js
+++ b/src/hooks/common/useCanvasConfigInitialize.js
@@ -7,6 +7,7 @@ import { useFont } from '@/hooks/common/useFont'
import { useGrid } from '@/hooks/common/useGrid'
import { globalFontAtom } from '@/store/fontAtom'
import { useRoof } from '@/hooks/common/useRoof'
+import { usePolygon } from '@/hooks/usePolygon'
export function useCanvasConfigInitialize() {
const canvas = useRecoilValue(canvasState)
@@ -20,6 +21,7 @@ export function useCanvasConfigInitialize() {
const {} = useFont()
const {} = useGrid()
const {} = useRoof()
+ const { drawDirectionArrow } = usePolygon()
useEffect(() => {
if (!canvas) return
@@ -173,6 +175,7 @@ export function useCanvasConfigInitialize() {
//그룹 객체로 다시 만든다 (좌표때문에)
const group = new fabric.Group(objectArray, {
+ ...objectArray,
groupId: id,
name: objectsName,
selectable: true,
diff --git a/src/hooks/common/useRefFiles.js b/src/hooks/common/useRefFiles.js
new file mode 100644
index 00000000..1b36a109
--- /dev/null
+++ b/src/hooks/common/useRefFiles.js
@@ -0,0 +1,112 @@
+import { useRef, useState } from 'react'
+import { useRecoilState } from 'recoil'
+import { v4 as uuidv4 } from 'uuid'
+
+import { useSwal } from '@/hooks/useSwal'
+import { convertDwgToPng } from '@/lib/cadAction'
+import { useAxios } from '../useAxios'
+import { currentCanvasPlanState } from '@/store/canvasAtom'
+
+export default function useRefFiles() {
+ const converterUrl = process.env.NEXT_PUBLIC_CONVERTER_API_URL
+ const [refImage, setRefImage] = useState(null)
+ const [refFileMethod, setRefFileMethod] = useState('1')
+ const [mapPositionAddress, setMapPositionAddress] = useState('')
+ const [currentCanvasPlan, setCurrentCanvasPlan] = useRecoilState(currentCanvasPlanState)
+ const queryRef = useRef(null)
+
+ const { swalFire } = useSwal()
+ const { get, promisePut } = useAxios()
+ // const { currentCanvasPlan, setCurrentCanvasPlan } = usePlan()
+
+ /**
+ * 파일 불러오기 버튼 컨트롤
+ * @param {*} file
+ */
+ const handleRefFile = (file) => {
+ setRefImage(file)
+ file.name.split('.').pop() === 'dwg' ? handleUploadRefFile(file) : () => {}
+ // handleUploadRefFile(file)
+ }
+
+ /**
+ * 파일 삭제
+ */
+ const handleFileDelete = () => {
+ setRefImage(null)
+ setCurrentCanvasPlan((prev) => ({ ...prev, bgFileName: null }))
+ }
+
+ /**
+ * 주소 삭제
+ */
+ const handleAddressDelete = () => {
+ setCurrentCanvasPlan((prev) => ({ ...prev, mapPositionAddress: null }))
+ }
+
+ /**
+ * 주소로 구글 맵 이미지 다운로드
+ */
+ const handleMapImageDown = async () => {
+ if (queryRef.current.value === '' || queryRef.current.value === null) {
+ return
+ }
+
+ const res = await get({ url: `http://localhost:3000/api/html2canvas?q=${queryRef.current.value}&fileNm=${uuidv4()}&zoom=20` })
+ console.log('🚀 ~ handleMapImageDown ~ res:', res)
+ setCurrentCanvasPlan((prev) => ({ ...prev, bgFileName: res.fileNm, mapPositionAddress: queryRef.current.value }))
+ }
+
+ /**
+ * 현재 플랜이 변경되면 플랜 상태 저장
+ */
+ useEffect(() => {
+ const handleCurrentPlan = async () => {
+ await promisePut({ url: '/api/canvas-management/canvas-statuses', data: currentCanvasPlan }).then((res) => {
+ console.log('🚀 ~ awaitpromisePut ~ res:', res)
+ })
+ }
+ handleCurrentPlan()
+ }, [currentCanvasPlan])
+
+ /**
+ * RefFile이 캐드 도면 파일일 경우 변환하여 이미지로 저장
+ * @param {*} file
+ */
+ const handleUploadRefFile = async (file) => {
+ const formData = new FormData()
+ formData.append('file', file)
+
+ await promisePost({ url: converterUrl, data: formData })
+ .then((res) => {
+ convertDwgToPng(res.data.Files[0].FileName, res.data.Files[0].FileData)
+ swalFire({ text: '파일 변환 성공' })
+ })
+ .catch((err) => {
+ swalFire({ text: '파일 변환 실패', icon: 'error' })
+ })
+ }
+
+ /**
+ * 라디오 버튼 컨트롤
+ * @param {*} e
+ */
+ const handleRefFileMethod = (e) => {
+ setRefFileMethod(e.target.value)
+ }
+
+ return {
+ refImage,
+ queryRef,
+ setRefImage,
+ handleRefFile,
+ refFileMethod,
+ setRefFileMethod,
+ mapPositionAddress,
+ setMapPositionAddress,
+ handleRefFileMethod,
+ handleFileDelete,
+ handleAddressDelete,
+ handleMapImageDown,
+ }
+}
diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js
index 2b92a14a..5a0c49e1 100644
--- a/src/hooks/floorPlan/estimate/useEstimateController.js
+++ b/src/hooks/floorPlan/estimate/useEstimateController.js
@@ -5,6 +5,7 @@ import { globalLocaleStore } from '@/store/localeAtom'
import { estimateState, floorPlanObjectState } from '@/store/floorPlanObjectAtom'
import { isObjectNotEmpty } from '@/util/common-utils'
import { SessionContext } from '@/app/SessionProvider'
+import { useMessage } from '@/hooks/useMessage'
const reducer = (prevState, nextState) => {
return { ...prevState, ...nextState }
@@ -21,35 +22,33 @@ const defaultEstimateData = {
estimateType: 'YJOD', //주문분류
remarks: '', //비고
estimateOption: '', //견적특이사항
- // itemList: [{ id: 1, name: '' }],
//아이템에 필요없는거 빼기
itemList: [
- {
- amount: '',
- fileUploadFlg: '',
- itemChangeFlg: '',
- itemGroup: '',
- itemId: '', //키값??
- itemName: '',
- itemNo: '',
- moduleFlg: '',
- objectNo: '',
- pkgMaterialFlg: '',
- planNo: '',
- pnowW: '',
- salePrice: '',
- saleTotPrice: '',
- specification: '',
- unit: '',
- },
+ // {
+ // amount: '',
+ // fileUploadFlg: '',
+ // itemChangeFlg: '',
+ // itemGroup: '',
+ // itemId: '', //키값??
+ // itemName: '',
+ // itemNo: '',
+ // moduleFlg: '',
+ // objectNo: '',
+ // pkgMaterialFlg: '',
+ // planNo: '',
+ // pnowW: '',
+ // salePrice: '',
+ // saleTotPrice: '',
+ // specification: '',
+ // unit: '',
+ // },
],
fileList: [],
+ fileFlg: '0', //후일 자료 제출 (체크 1 노체크 0)
}
// Helper functions
-// const updateItemInList = (itemList, id, updates) => {
const updateItemInList = (itemList, itemId, updates) => {
- // return itemList.map((item) => (item.id === id ? { ...item, ...updates } : item))
return itemList.map((item) => (item.itemId === itemId ? { ...item, ...updates } : item))
}
@@ -59,6 +58,8 @@ export const useEstimateController = (planNo) => {
const objectRecoil = useRecoilValue(floorPlanObjectState)
const [estimateData, setEstimateData] = useRecoilState(estimateState)
+ const { getMessage } = useMessage()
+
const { get, post, promisePost } = useAxios(globalLocaleState)
const [isLoading, setIsLoading] = useState(false)
@@ -87,20 +88,15 @@ export const useEstimateController = (planNo) => {
}
}
- // const updateItem = (id, updates) => {
const updateItem = (itemId, updates) => {
setState({
- // itemList: updateItemInList(state.itemList, id, updates),
itemList: updateItemInList(state.itemList, itemId, updates),
})
}
const addItem = () => {
- // const newId = Math.max(...state.itemList.map((item) => item.id)) + 1
const newItemId = Math.max(...state.itemList.map((item) => item.itemId)) + 1
setState({
- // itemList: [...state.itemList, { id: newId, name: '' }],
- //셋팅할필요없는거 빼기
itemList: [
...state.itemList,
{
@@ -126,42 +122,56 @@ export const useEstimateController = (planNo) => {
}
useEffect(() => {
- setEstimateData({ ...state, userId: session.userId })
- //sapSalesStoreCd 추가예정 필수값
- // setEstimateData({ ...state, userId: session.userId, sapSalesStoreCd : session.sapSalesStoreCd })
+ setEstimateData({ ...state, userId: session.userId, sapSalesStoreCd: session.custCd })
}, [state])
//견적서 저장
const handleEstimateSubmit = async () => {
+ //0. 필수체크
+ let flag = true
console.log('::담긴 estimateData:::', estimateData)
- //1. 첨부파일 저장
- const formData = new FormData()
- formData.append('file', estimateData.fileList)
- formData.append('objectNo', estimateData.objectNo)
- formData.append('planNo', estimateData.planNo)
- formData.append('category', '10')
- formData.append('userId', estimateData.userId)
- for (const value of formData.values()) {
- console.log('formData::', value)
- }
-
- await promisePost({ url: '/api/file/fileUpload', data: formData }).then((res) => {
- console.log('파일저장::::::::::', res)
- })
-
- //2. 상세데이터 저장
-
- console.log('상세저장시작!!')
- return
- try {
- const result = await promisePost({
- url: ESTIMATE_API_ENDPOINT,
- data: estimateData,
+ //아이템 fileUploadFlg가1(첨부파일 필수)이 1개라도 있는데 후일 자료 제출(fileFlg) 체크안했으면(0) alert 저장안돼
+ if (estimateData.itemList.length > 1) {
+ estimateData.itemList.map((row) => {
+ if (row.fileUploadFlg === '1') {
+ if (estimateData.fileFlg === '0') {
+ alert(getMessage('estimate.detail.save.requiredMsg'))
+ flag = false
+ }
+ }
})
- return result
- } catch (error) {
- console.error('Failed to submit estimate:', error)
- throw error
+ }
+ if (flag) {
+ //1. 첨부파일 저장
+ const formData = new FormData()
+ formData.append('file', estimateData.fileList)
+ formData.append('objectNo', estimateData.objectNo)
+ formData.append('planNo', estimateData.planNo)
+ formData.append('category', '10')
+ formData.append('userId', estimateData.userId)
+ for (const value of formData.values()) {
+ console.log('formData::', value)
+ }
+
+ await promisePost({ url: '/api/file/fileUpload', data: formData }).then((res) => {
+ console.log('파일저장결과::::::::::', res)
+ })
+
+ //2. 상세데이터 저장
+
+ console.log('상세저장시작!!')
+ return
+ try {
+ const result = await promisePost({
+ url: ESTIMATE_API_ENDPOINT,
+ data: estimateData,
+ })
+ alert(getMessage('estimate.detail.save.alertMsg'))
+ return result
+ } catch (error) {
+ console.error('Failed to submit estimate:', error)
+ throw error
+ }
}
}
diff --git a/src/hooks/object/useObjectBatch.js b/src/hooks/object/useObjectBatch.js
index a16ce0f9..1820599b 100644
--- a/src/hooks/object/useObjectBatch.js
+++ b/src/hooks/object/useObjectBatch.js
@@ -374,6 +374,9 @@ export function useObjectBatch({ isHidden, setIsHidden }) {
const trianglePolygon = pointsToTurfPolygon(triangleToPolygon(dormer))
const selectedSurfacePolygon = polygonToTurfPolygon(selectedSurface)
+ console.log('trianglePolygon', trianglePolygon)
+ console.log('selectedSurfacePolygon', selectedSurfacePolygon)
+
//지붕 밖으로 그렸을때
if (!turf.booleanWithin(trianglePolygon, selectedSurfacePolygon)) {
swalFire({ text: '도머를 배치할 수 없습니다.', icon: 'error' })
@@ -496,6 +499,10 @@ export function useObjectBatch({ isHidden, setIsHidden }) {
})
canvas?.add(objectGroup)
+ objectGroup.getObjects().forEach((obj, index) => {
+ console.log(`최초 pathOffset ${index}`, obj.get('pathOffset'))
+ })
+
isDown = false
initEvent()
dbClickEvent()
@@ -917,20 +924,17 @@ export function useObjectBatch({ isHidden, setIsHidden }) {
originY: 'center',
left: changedCoords.x,
top: changedCoords.y,
+ width: width / 10,
+ height: height / 10,
})
- if (target.name === 'roof') {
- //얘는 일단 도머에 적용함
- if (target.type === 'group') {
- target._objects.forEach((obj) => setSurfaceShapePattern(obj))
- } else {
- setSurfaceShapePattern(target)
- target.fire('modified')
- }
+ //얘는 일단 도머에 적용함
+ if (target.type === 'group') {
+ target._objects.forEach((obj) => setSurfaceShapePattern(obj))
}
+
// target.setCoords()
canvas.renderAll()
-
if (target.type === 'group') reGroupObject(target)
}
diff --git a/src/hooks/option/useCanvasSetting.js b/src/hooks/option/useCanvasSetting.js
index 02691887..549cc9a4 100644
--- a/src/hooks/option/useCanvasSetting.js
+++ b/src/hooks/option/useCanvasSetting.js
@@ -5,7 +5,7 @@ import { globalLocaleStore } from '@/store/localeAtom'
import { useMessage } from '@/hooks/useMessage'
import { useAxios } from '@/hooks/useAxios'
import { useSwal } from '@/hooks/useSwal'
-import { settingModalFirstOptionsState, settingModalSecondOptionsState } from '@/store/settingAtom'
+import { corridorDimensionSelector, settingModalFirstOptionsState, settingModalSecondOptionsState } from '@/store/settingAtom'
import { setSurfaceShapePattern } from '@/util/canvas-util'
import { POLYGON_TYPE } from '@/common/common'
@@ -17,6 +17,8 @@ export function useCanvasSetting() {
const { option1, option2, dimensionDisplay } = settingModalFirstOptions
const { option3, option4 } = settingModalSecondOptions
+ const corridorDimension = useRecoilValue(corridorDimensionSelector)
+
const globalLocaleState = useRecoilValue(globalLocaleStore)
const { get, post } = useAxios(globalLocaleState)
const { getMessage } = useMessage()
@@ -27,6 +29,36 @@ export function useCanvasSetting() {
const [objectNo, setObjectNo] = useState('test123240912001') // 이후 삭제 필요
+ useEffect(() => {
+ if (!canvas) {
+ return
+ }
+ const { column } = corridorDimension
+ const lengthTexts = canvas.getObjects().filter((obj) => obj.name === 'lengthText')
+ switch (column) {
+ case 'corridorDimension':
+ lengthTexts.forEach((obj) => {
+ if (obj.planeSize) {
+ obj.set({ text: obj.planeSize.toString() })
+ }
+ })
+ break
+ case 'realDimension':
+ lengthTexts.forEach((obj) => {
+ if (obj.actualSize) {
+ obj.set({ text: obj.actualSize.toString() })
+ }
+ })
+ break
+ case 'noneDimension':
+ lengthTexts.forEach((obj) => {
+ obj.set({ text: '' })
+ })
+ break
+ }
+ canvas.renderAll()
+ }, [corridorDimension])
+
useEffect(() => {
console.log('useCanvasSetting useEffect 실행1')
fetchSettings()
@@ -257,7 +289,7 @@ export function useCanvasSetting() {
optionName = ['7']
break
case 'flowDisplay': //흐름방향 표시
- optionName = ['arrow']
+ optionName = ['arrow', 'flowText']
break
case 'trestleDisplay': //가대 표시
optionName = ['8']
diff --git a/src/hooks/surface/useSurfaceShapeBatch.js b/src/hooks/surface/useSurfaceShapeBatch.js
index 9457169c..d2c6aee7 100644
--- a/src/hooks/surface/useSurfaceShapeBatch.js
+++ b/src/hooks/surface/useSurfaceShapeBatch.js
@@ -657,7 +657,7 @@ export function useSurfaceShapeBatch() {
}
function getAllRelatedObjects(id) {
- const result = []
+ const ult = []
const map = new Map()
// Create a map of objects by their id
@@ -688,52 +688,8 @@ export function useSurfaceShapeBatch() {
const roof = canvas.getActiveObject()
if (roof) {
- let isDragging = false
-
const childrenObjects = canvas.getObjects().filter((obj) => obj.parentId === roof.id)
- console.log('childrenObjects', childrenObjects)
-
- // const groupObjects = canvas.getObjects().filter((obj) => obj.parentId === roof.id && obj.type === 'group')
-
- // const ungroupObjects = [] // 그룹 해제된 객체들
- // const groupChildObjects = []
-
- // groupObjects.forEach((obj) => {
- // obj._restoreObjectsState()
- // obj.getObjects().forEach((o) => {
- // o.set({
- // ungroupYn: true,
- // })
- // canvas.add(o)
- // ungroupObjects.push(o)
- // })
- // canvas.remove(obj)
- // })
-
- // const childObjects = findAllChildren(roof.id)
- // groupObjects.forEach((obj) => {
- // groupChildObjects.push(...obj.getObjects())
- // })
-
- // console.log('ungroupObjects', ungroupObjects)
- // console.log('childObjects', childObjects)
- // console.log('groupChildObjects', groupChildObjects)
-
- // const children = canvas.getObjects().filter((obj) => obj.parentId === roof.id)
- // let grandChildren = []
-
- // children.forEach((child) => {
- // if (child.type === 'group') {
- // child.getObjects().forEach((grandChild) => {
- // const groupObjects = canvas.getObjects().filter((obj) => obj.parentId === grandChild.id)
- // grandChildren.push(...groupObjects)
- // })
- // } else {
- // grandChildren.push(...canvas.getObjects().filter((obj) => obj.parentId === child.id))
- // }
- // })
-
const selectionArray = [roof, ...childrenObjects]
const selection = new fabric.ActiveSelection(selectionArray, {
@@ -748,7 +704,6 @@ export function useSurfaceShapeBatch() {
canvas.setActiveObject(selection)
addCanvasMouseEventListener('mouse:up', (e) => {
- isDragging = false
canvas.selection = true
canvas.discardActiveObject() // 모든 선택 해제
@@ -768,7 +723,6 @@ export function useSurfaceShapeBatch() {
canvas.renderAll()
roof.fire('polygonMoved')
- if (roof.type === 'group') reGroupObject(obj)
drawDirectionArrow(roof)
initEvent()
})
@@ -805,9 +759,74 @@ export function useSurfaceShapeBatch() {
canvas?.remove(groupObj)
}
+ const resizeSurfaceShapeBatch = (side, target, width, height) => {
+ const objectWidth = target.width
+ const objectHeight = target.height
+ const changeWidth = width / 10 / objectWidth
+ const changeHeight = height / 10 / objectHeight
+ let sideX = 'left'
+ let sideY = 'top'
+
+ //그룹 중심점 변경
+ if (side === 2) {
+ sideX = 'right'
+ sideY = 'top'
+ } else if (side === 3) {
+ sideX = 'left'
+ sideY = 'bottom'
+ } else if (side === 4) {
+ sideX = 'right'
+ sideY = 'bottom'
+ }
+
+ //변경 전 좌표
+ const newCoords = target.getPointByOrigin(sideX, sideY)
+
+ target.set({
+ originX: sideX,
+ originY: sideY,
+ left: newCoords.x,
+ top: newCoords.y,
+ })
+
+ target.scaleX = changeWidth
+ target.scaleY = changeHeight
+
+ const currentPoints = target.getCurrentPoints()
+
+ target.set({
+ scaleX: 1,
+ scaleY: 1,
+ width: parseInt((width / 10).toFixed(0)),
+ height: parseInt((height / 10).toFixed(0)),
+ })
+ //크기 변경후 좌표를 재 적용
+ const changedCoords = target.getPointByOrigin('center', 'center')
+
+ target.set({
+ originX: 'center',
+ originY: 'center',
+ left: changedCoords.x,
+ top: changedCoords.y,
+ })
+
+ //면형상 리사이즈시에만
+ target.fire('polygonMoved')
+ target.points = currentPoints
+ target.fire('modified')
+
+ setSurfaceShapePattern(target, roofDisplay.column)
+ if (target.direction) {
+ drawDirectionArrow(target)
+ }
+ target.setCoords()
+ canvas.renderAll()
+ }
+
return {
applySurfaceShape,
deleteAllSurfacesAndObjects,
moveSurfaceShapeBatch,
+ resizeSurfaceShapeBatch,
}
}
diff --git a/src/hooks/usePlan.js b/src/hooks/usePlan.js
index d1887f6f..ab67452e 100644
--- a/src/hooks/usePlan.js
+++ b/src/hooks/usePlan.js
@@ -187,6 +187,8 @@ export function usePlan() {
userId: item.userId,
canvasStatus: dbToCanvasFormat(item.canvasStatus),
isCurrent: false,
+ bgImageName: item.bgImageName,
+ mapPositionAddress: item.mapPositionAddress,
})),
)
}
diff --git a/src/hooks/usePolygon.js b/src/hooks/usePolygon.js
index 9ea8b3b7..699b4f09 100644
--- a/src/hooks/usePolygon.js
+++ b/src/hooks/usePolygon.js
@@ -693,8 +693,7 @@ export const usePolygon = () => {
}
}
})
-
- const direction = newRoofs.length === 1 ? polygon.direction : representLine.direction
+ const direction = polygon.direction ?? representLine.direction
const polygonDirection = polygon.direction
switch (direction) {
@@ -723,7 +722,7 @@ export const usePolygon = () => {
originY: 'center',
selectable: true,
defense: defense,
- direction: newRoofs.length === 1 ? polygonDirection : defense,
+ direction: polygonDirection ?? defense,
pitch: pitch,
})
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 05ab09cf..2d0c2871 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -818,7 +818,7 @@
"estimate.detail.estimateType": "注文分類",
"estimate.detail.roofCns": "屋根材・仕様施工",
"estimate.detail.remarks": "備考",
- "estimate.detail.nextSubmit": "後日資料提出",
+ "estimate.detail.fileFlg": "後日資料提出",
"estimate.detail.header.fileList1": "ファイル添付",
"estimate.detail.fileList.btn": "ファイル選択",
"estimate.detail.header.fileList2": "添付ファイル一覧",
@@ -835,11 +835,60 @@
"estimate.detail.sepcialEstimateProductInfo.calcFormula1": "(モジュール容量 × 数量)÷1000",
"estimate.detail.sepcialEstimateProductInfo.calcFormula2": "PKG単価 (W)×PKG容量(W)",
"estimate.detail.header.showPrice": "価格表示",
- "estimate.detail.showPrice.btn1": "Pricing",
+ "estimate.detail.header.unitPrice": "定価",
+ "estimate.detail.showPrice.pricingBtn": "Pricing",
"estimate.detail.showPrice.description1": "製品価格 OPEN",
"estimate.detail.showPrice.description2": "追加, 変更資材",
"estimate.detail.showPrice.description3": "添付必須",
"estimate.detail.showPrice.description4": "クリックして製品の特異性を確認する",
"estimate.detail.showPrice.btn2": "製品を追加",
- "estimate.detail.showPrice.btn3": "製品削除"
+ "estimate.detail.showPrice.btn3": "製品削除",
+ "estimate.detail.itemTableHeader.col1": "アイテム",
+ "estimate.detail.itemTableHeader.col2": "品番",
+ "estimate.detail.itemTableHeader.col3": "型板",
+ "estimate.detail.itemTableHeader.col4": "数量",
+ "estimate.detail.itemTableHeader.col5": "単位",
+ "estimate.detail.itemTableHeader.col6": "単価",
+ "estimate.detail.itemTableHeader.col7": "金額 (税別別)",
+ "estimate.detail.docPopup.title": "ドキュメントダウンロードオプションの設定",
+ "estimate.detail.docPopup.explane": "ダウンロードする文書のオプションを選択したら、 [文書のダウンロード]ボタンをクリックします.",
+ "estimate.detail.docPopup.schUnitPriceFlg": "ダウンロードファイル",
+ "estimate.detail.docPopup.schUnitPriceFlg.schUnitPriceFlg0": "見積もり Excel",
+ "estimate.detail.docPopup.schUnitPriceFlg.schUnitPriceFlg1": "定価用 Excel",
+ "estimate.detail.docPopup.schUnitPriceFlg.schUnitPriceFlg2": "見積もり PDF",
+ "estimate.detail.docPopup.schUnitPriceFlg.schUnitPriceFlg3": "定価用 PDF",
+ "estimate.detail.docPopup.schDisplayFlg": "見積提出先表示名",
+ "estimate.detail.docPopup.schDisplayFlg.schDisplayFlg0": "販売店名",
+ "estimate.detail.docPopup.schDisplayFlg.schDisplayFlg1": "案件名",
+ "estimate.detail.docPopup.schWeightFlg": "架台重量表を含む",
+ "estimate.detail.docPopup.schWeightFlg.schWeightFlg0": "含む",
+ "estimate.detail.docPopup.schWeightFlg.schWeightFlg1": "含まない",
+ "estimate.detail.docPopup.schDrawingFlg": "図面/シミュレーションファイルを含む",
+ "estimate.detail.docPopup.schDrawingFlg.schDrawingFlg0": "含む",
+ "estimate.detail.docPopup.schDrawingFlg.schDrawingFlg1": "含まない",
+ "estimate.detail.docPopup.close": "閉じる",
+ "estimate.detail.docPopup.docDownload": "文書のダウンロード",
+ "estimate.detail.save.alertMsg": "保存されている見積書で製品を変更した場合、図面や回路には反映されません.",
+ "estimate.detail.save.requiredMsg": "ファイル添付が必須のアイテムがあります。ファイルを添付するか、後日添付をチェックしてください.",
+ "estimate.detail.reset.confirmMsg": "保存した見積書情報が初期化され、図面情報が反映されます。本当に初期化しますか?",
+ "simulator.title.sub1": "物件番号",
+ "simulator.title.sub2": "作成日",
+ "simulator.title.sub3": "システム容量",
+ "simulator.title.sub4": "年間予測発電量",
+ "simulator.title.sub5": "都道府県",
+ "simulator.title.sub6": "日射量観測地点",
+ "simulator.title.sub7": "積雪条件",
+ "simulator.title.sub8": "風速条件",
+ "simulator.title.sub9": "以下",
+ "simulator.table.sub1": "屋根面",
+ "simulator.table.sub2": "傾斜角",
+ "simulator.table.sub3": "方位角（度）",
+ "simulator.table.sub4": "太陽電池モジュール",
+ "simulator.table.sub5": "枚数",
+ "simulator.table.sub6": "合計",
+ "simulator.table.sub7": "パワーコンディショナー",
+ "simulator.table.sub8": "台",
+ "simulator.table.sub9": "予測発電量 (kWh)",
+ "simulator.notice.sub1": "Hanwha Japan 年間発電量",
+ "simulator.notice.sub2": "シミュレーション案内事項"
}
diff --git a/src/locales/ko.json b/src/locales/ko.json
index d8cef240..55e1becb 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -824,7 +824,7 @@
"estimate.detail.estimateType": "주문분류",
"estimate.detail.roofCns": "지붕재・사양시공",
"estimate.detail.remarks": "비고",
- "estimate.detail.nextSubmit": "후일자료제출",
+ "estimate.detail.fileFlg": "후일자료제출",
"estimate.detail.header.fileList1": "파일첨부",
"estimate.detail.fileList.btn": "파일선택",
"estimate.detail.header.fileList2": "첨부파일 목록",
@@ -841,11 +841,60 @@
"estimate.detail.sepcialEstimateProductInfo.calcFormula1": "(모듈수량 * 수량)÷100",
"estimate.detail.sepcialEstimateProductInfo.calcFormula2": "PKG단가(W) * PKG용량(W)",
"estimate.detail.header.showPrice": "가격표시",
- "estimate.detail.showPrice.btn1": "Pricing",
+ "estimate.detail.header.unitPrice": "정가",
+ "estimate.detail.showPrice.pricingBtn": "Pricing",
"estimate.detail.showPrice.description1": "제품 가격 OPEN",
"estimate.detail.showPrice.description2": "추가, 변경 자재",
"estimate.detail.showPrice.description3": "첨부필수",
"estimate.detail.showPrice.description4": "클릭하여 제품 특이사항 확인",
"estimate.detail.showPrice.btn2": "제품추가",
- "estimate.detail.showPrice.btn3": "제품삭제"
+ "estimate.detail.showPrice.btn3": "제품삭제",
+ "estimate.detail.itemTableHeader.col1": "Item",
+ "estimate.detail.itemTableHeader.col2": "품번",
+ "estimate.detail.itemTableHeader.col3": "형명",
+ "estimate.detail.itemTableHeader.col4": "수량",
+ "estimate.detail.itemTableHeader.col5": "단위",
+ "estimate.detail.itemTableHeader.col6": "단가",
+ "estimate.detail.itemTableHeader.col7": "금액(부가세별도)",
+ "estimate.detail.docPopup.title": "문서다운로드 옵션설정",
+ "estimate.detail.docPopup.explane": "다운로드할 문서 옵션을 선택한 후 문서 다운로드 버튼을 클릭합니다.",
+ "estimate.detail.docPopup.schUnitPriceFlg": "다운로드 파일",
+ "estimate.detail.docPopup.schUnitPriceFlg.schUnitPriceFlg0": "견적가 Excel",
+ "estimate.detail.docPopup.schUnitPriceFlg.schUnitPriceFlg1": "정가용 Excel",
+ "estimate.detail.docPopup.schUnitPriceFlg.schUnitPriceFlg2": "견적가 PDF",
+ "estimate.detail.docPopup.schUnitPriceFlg.schUnitPriceFlg3": "정가용 PDF",
+ "estimate.detail.docPopup.schDisplayFlg": "견적제출서 표시명",
+ "estimate.detail.docPopup.schDisplayFlg.schDisplayFlg0": "판매점명",
+ "estimate.detail.docPopup.schDisplayFlg.schDisplayFlg1": "안건명",
+ "estimate.detail.docPopup.schWeightFlg": "가대 중량표 포함",
+ "estimate.detail.docPopup.schWeightFlg.schWeightFlg0": "포함",
+ "estimate.detail.docPopup.schWeightFlg.schWeightFlg1": "미포함",
+ "estimate.detail.docPopup.schDrawingFlg": "도면/시뮬레이션 파일 포함",
+ "estimate.detail.docPopup.schDrawingFlg.schDrawingFlg0": "포함",
+ "estimate.detail.docPopup.schDrawingFlg.schDrawingFlg1": "미포함",
+ "estimate.detail.docPopup.close": "닫기",
+ "estimate.detail.docPopup.docDownload": "문서 다운로드",
+ "estimate.detail.save.alertMsg": "저장되었습니다. 견적서에서 제품을 변경할 경우, 도면 및 회로에 반영되지 않습니다.",
+ "estimate.detail.save.requiredMsg": "파일첨부가 필수인 아이템이 있습니다. 파일을 첨부하거나 후일첨부를 체크해주십시오.",
+ "estimate.detail.reset.confirmMsg": "저장된 견적서 정보가 초기화되고, 도면정보가 반영됩니다. 정말로 초기화 하시겠습니까?",
+ "simulator.title.sub1": "물건번호",
+ "simulator.title.sub2": "작성일",
+ "simulator.title.sub3": "시스템 용량",
+ "simulator.title.sub4": "연간예측발전량",
+ "simulator.title.sub5": "도도부현",
+ "simulator.title.sub6": "일사량 관측지점",
+ "simulator.title.sub7": "적설조건",
+ "simulator.title.sub8": "풍속조건",
+ "simulator.title.sub9": "이하",
+ "simulator.table.sub1": "지붕면",
+ "simulator.table.sub2": "경사각",
+ "simulator.table.sub3": "방위각(도)",
+ "simulator.table.sub4": "태양전지모듈",
+ "simulator.table.sub5": "매수",
+ "simulator.table.sub6": "합계",
+ "simulator.table.sub7": "파워 컨디셔너",
+ "simulator.table.sub8": "대",
+ "simulator.table.sub9": "예측발전량 (kWh)",
+ "simulator.notice.sub1": "Hanwha Japan 연간 발전량",
+ "simulator.notice.sub2": "시뮬레이션 안내사항"
}
diff --git a/src/store/settingAtom.js b/src/store/settingAtom.js
index fede515e..869cc004 100644
--- a/src/store/settingAtom.js
+++ b/src/store/settingAtom.js
@@ -185,6 +185,7 @@ export const corridorDimensionSelector = selector({
const settingModalFirstOptions = get(settingModalFirstOptionsState)
return settingModalFirstOptions.dimensionDisplay.find((option) => option.selected)
},
+ dangerouslyAllowMutability: true,
})
// 디스플레이 설정 - 화면 표시
diff --git a/yarn.lock b/yarn.lock
index a167fa9d..ed2cceda 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -527,6 +527,11 @@
resolved "https://registry.npmjs.org/@js-joda/core/-/core-5.6.3.tgz"
integrity sha512-T1rRxzdqkEXcou0ZprN1q9yDRlvzCPLqmlNt5IIsGBzoEVgLCCYrKEwc84+TvsXuAc95VAZwtWD2zVsKPY4bcA==
+"@kurkle/color@^0.3.0":
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.2.tgz#5acd38242e8bde4f9986e7913c8fdf49d3aa199f"
+ integrity sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==
+
"@mapbox/node-pre-gyp@^1.0.0":
version "1.0.11"
resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz#417db42b7f5323d79e93b34a6d7a2a12c0df43fa"
@@ -4337,6 +4342,13 @@ chalk@^2.4.2:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
+chart.js@^4.4.6:
+ version "4.4.6"
+ resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.4.6.tgz#da39b84ca752298270d4c0519675c7659936abec"
+ integrity sha512-8Y406zevUPbbIBA/HRk33khEmQPk5+cxeflWE/2rx1NJsjVWMPw/9mSP9rxHP5eqi6LNoPBVMfZHxbwLSgldYA==
+ dependencies:
+ "@kurkle/color" "^0.3.0"
+
"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.3:
version "3.6.0"
resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz"
@@ -5832,6 +5844,11 @@ rbush@^3.0.1:
dependencies:
quickselect "^2.0.0"
+react-chartjs-2@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/react-chartjs-2/-/react-chartjs-2-5.2.0.tgz#43c1e3549071c00a1a083ecbd26c1ad34d385f5d"
+ integrity sha512-98iN5aguJyVSxp5U3CblRLH67J8gkfyGNbiK3c+l1QI/G4irHMPQw44aEPmjVag+YKTyQ260NcF82GTQ3bdscA==
+
react-color-palette@^7.2.2:
version "7.2.2"
resolved "https://registry.npmjs.org/react-color-palette/-/react-color-palette-7.2.2.tgz"