Merge branch 'dev' into dev-yj-layoutSetup

Reviewed-on: #2

src/components/auth/AutoLogin.jsx

@@ -2,15 +2,51 @@
 
 import { useState } from 'react'
 import { useMessage } from '@/hooks/useMessage'
+import { setSession, login } from '@/lib/authActions'
+import { sessionStore } from '@/store/commonAtom'
+import { useRecoilState } from 'recoil'
+import { useAxios } from '@/hooks/useAxios'
+import { globalLocaleStore } from '@/store/localeAtom'
+import { useRouter } from 'next/navigation'
+
 import GlobalSpinner from '@/components/common/spinner/GlobalSpinner'
 
-export default function AutoLoginPage() {
-  const [isLoading, setIsLoading] = useState(true)
+export default function AutoLoginPage({ autoLoginParam }) {
+  const router = useRouter()
+
+  const [isLoading, setIsLoading] = useState(autoLoginParam === 'Y' ? false : true)
+  const [globalLocaleState, setGlbalLocaleState] = useRecoilState(globalLocaleStore)
+
+  const { promisePost } = useAxios(globalLocaleState)
   const { getMessage } = useMessage()
 
+  const [userId, setUserId] = useState('')
+  const [sessionState, setSessionState] = useRecoilState(sessionStore)
+
+  const [idFocus, setIdFocus] = useState(false)
+
+  const loginProcess = async () => {
+    setIsLoading(true)
+    await promisePost({ url: '/api/login/v1.0/user', data: { loginId: userId } }).then((response) => {
+      setIsLoading(false)
+      if (response.data) {
+        const res = response.data
+        const result = { ...res, storeLvl: res.groupId === '60000' ? '1' : '2', pwdInitYn: 'Y' }
+        setSession(result)
+        setSessionState(result)
+        login()
+      } else {
+        alert(getMessage('login.fail'))
+        router.push('/login?autoLoginParam1=Y')
+      }
+    })
+  }
+
   return (
     <>
       {isLoading && <GlobalSpinner />}
+      {autoLoginParam !== 'Y' ? (
+        <>
           <div className="login-input-frame">
             <div className="login-frame-tit ">
               <span>{getMessage('site.name')}</span>
@@ -23,5 +59,54 @@ export default function AutoLoginPage() {
             </div>
           </div>
         </>
+      ) : (
+        <>
+          <div className="login-input-frame">
+            <form
+              onSubmit={(e) => {
+                e.preventDefault()
+                loginProcess()
+              }}
+              className="space-y-6"
+            >
+              <div className="login-frame-tit">
+                <span>{getMessage('site.name')}</span>
+                {getMessage('site.sub_name')}
+              </div>
+              <div className="login-input-wrap">
+                <div className={`login-area id ${idFocus ? 'focus' : ''}`}>
+                  <input
+                    type="text"
+                    className="login-input"
+                    id="userId"
+                    name="id"
+                    required
+                    value={userId}
+                    placeholder={getMessage('login.id.placeholder')}
+                    onChange={(e) => {
+                      setUserId(e.target.value)
+                    }}
+                    onFocus={() => setIdFocus(true)}
+                    onBlur={() => setIdFocus(false)}
+                  />
+                  <button
+                    type="button"
+                    className="id-delete"
+                    onClick={(e) => {
+                      setUserId('')
+                    }}
+                  ></button>
+                </div>
+                <div className="login-btn-box">
+                  <button type="submit" className="login-btn">
+                    {getMessage('login')}
+                  </button>
+                </div>
+              </div>
+            </form>
+          </div>
+        </>
+      )}
+    </>
   )
 }

src/components/auth/Login.jsx

@@ -25,8 +25,10 @@ export default function Login() {
 
   useEffect(() => {
     if (autoLoginParam) {
+      if (autoLoginParam !== 'Y') {
         autoLoginProcess(autoLoginParam)
       }
+    }
 
     // console.log('🚀 ~ checkSession ~ checkSession():', checkSession())
     // checkSession().then((res) => {
@@ -334,7 +336,7 @@ export default function Login() {
               </div>
             </>
           )}
-          {autoLoginParam && <AutoLogin />}
+          {autoLoginParam && <AutoLogin autoLoginParam={autoLoginParam} />}
         </div>
         <div className="login-copyright">COPYRIGHT©2024 Hanwha Japan All Rights Reserved.</div>
       </div>

src/components/estimate/Estimate.jsx

@@ -377,8 +377,8 @@ export default function Estimate({}) {
   useEffect(() => {
     if (estimateContextState.estimateType !== '') {
       const param = {
-        saleStoreId: session.storeId,
-        sapSalesStoreCd: session.custCd,
+        saleStoreId: estimateContextState.sapSaleStoreId,
+        sapSalesStoreCd: estimateContextState.sapSalesStoreCd,
         docTpCd: estimateContextState?.estimateType,
       }
 
@@ -481,8 +481,8 @@ export default function Estimate({}) {
   //Pricing 버튼
   const handlePricing = async (showPriceCd) => {
     const param = {
-      saleStoreId: session.storeId,
-      sapSalesStoreCd: session.custCd,
+      saleStoreId: estimateContextState.sapSaleStoreId,
+      sapSalesStoreCd: estimateContextState.sapSalesStoreCd,
       docTpCd: estimateContextState.estimateType,
       priceCd: showPriceCd,
       itemIdList: estimateContextState.itemList.filter((item) => item.delFlg === '0' && item.paDispOrder === null),
@@ -506,7 +506,6 @@ export default function Estimate({}) {
         })
       }
     }
-
     setIsGlobalLoading(true)
     await promisePost({ url: '/api/estimate/price/item-price-list', data: param }).then((res) => {
       let updateList = []

src/components/floor-plan/modal/object/ObjectSetting.jsx

@@ -100,7 +100,7 @@ export default function ObjectSetting({ id, pos = { x: 50, y: 230 } }) {
   ]
 
   return (
-    <WithDraggable isShow={true} pos={pos} className="lrr" style={{ visibility: isHidden ? 'hidden' : 'visible' }}>
+    <WithDraggable isShow={true} pos={pos} className="lrr" isHidden={isHidden}>
       <WithDraggable.Header title={getMessage('plan.menu.placement.surface.object')} onClose={() => closePopup(id)} />
       <WithDraggable.Body>
         <div className="modal-btn-wrap">

src/hooks/module/useModuleBasicSetting.js

@@ -64,9 +64,7 @@ export function useModuleBasicSetting(tabNum) {
   const { createRoofPolygon, createMarginPolygon, createPaddingPolygon } = useMode()
 
   const { drawDirectionArrow } = usePolygon()
-
   const moduleSetupOption = useRecoilValue(moduleSetupOptionState)
-
   const setManualSetupMode = useSetRecoilState(toggleManualSetupModeState)
 
   useEffect(() => {
@@ -206,13 +204,7 @@ export function useModuleBasicSetting(tabNum) {
       //도머등 오브젝트 객체가 있으면 아웃라인 낸다
       const batchObjects = canvas
         ?.getObjects()
-        .filter(
-          (obj) =>
-            obj.name === BATCH_TYPE.OPENING ||
-            obj.name === BATCH_TYPE.SHADOW ||
-            obj.name === BATCH_TYPE.TRIANGLE_DORMER ||
-            obj.name === BATCH_TYPE.PENTAGON_DORMER,
-        ) //도머s 객체
+        .filter((obj) => obj.name === BATCH_TYPE.OPENING || obj.name === BATCH_TYPE.TRIANGLE_DORMER || obj.name === BATCH_TYPE.PENTAGON_DORMER) //그림자 제외 나머지 오브젝트들
 
       //도머도 외곽을 따야한다
       const batchObjectOptions = {
@@ -446,6 +438,7 @@ export function useModuleBasicSetting(tabNum) {
     //레이아웃 수동설치 토글
 
     const moduleSetupSurfaces = canvas?.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) //모듈설치면를 가져옴
+    const isChidori = moduleSetupOption.isChidori
 
     if (isManualModuleSetup) {
       if (isManualModuleLayoutSetup) {
@@ -623,6 +616,7 @@ export function useModuleBasicSetting(tabNum) {
                       tempModule.left = holdCellCenterX - toFixedWithoutRounding(width / 2, 2)
                     }
 
+                    if (isChidori) {
                       //움직이는 모듈왼쪽 -> 가운데
                       if (Math.abs(smallLeft - holdCellCenterX) < snapDistance) {
                         tempModule.left = holdCellCenterX + intvHor / 2
@@ -631,7 +625,7 @@ export function useModuleBasicSetting(tabNum) {
                       if (Math.abs(smallRight - holdCellCenterX) < snapDistance) {
                         tempModule.left = holdCellCenterX - width - intvHor / 2
                       }
-
+                    }
                     //설치된 셀에 좌측에 스냅
                     if (Math.abs(smallRight - holdCellLeft) < snapDistance) {
                       // console.log('모듈 좌측 스냅')
@@ -665,21 +659,16 @@ export function useModuleBasicSetting(tabNum) {
                       tempModule.top = holdCellCenterY - toFixedWithoutRounding(width / 2, 2)
                     }
 
+                    if (isChidori) {
                       //위쪽 -> 가운데
                       if (Math.abs(smallTop - holdCellCenterY) < snapDistance) {
-                      // console.log('holdCellCenterX', holdCellCenterX)
-                      // console.log('smallLeft', smallLeft)
-
-                      // console.log('모듈 센터에 스냅')
                         tempModule.top = holdCellCenterY + intvHor / 2
-
-                      // console.log('tempModule.left', tempModule.left)
                       }
                       // 밑 -> 가운데
                       if (Math.abs(smallBottom - holdCellCenterY) < snapDistance) {
                         tempModule.top = holdCellCenterY - height - intvHor / 2
                       }
-
+                    }
                     //설치된 셀에 좌측에 스냅
                     if (Math.abs(smallRight - holdCellLeft) < snapDistance) {
                       // console.log('모듈 좌측 스냅')
@@ -850,6 +839,13 @@ export function useModuleBasicSetting(tabNum) {
                 canvas?.add(manualModule)
                 manualDrawModules.push(manualModule)
                 setModuleStatisticsData()
+
+                //그림자는 무조건 가장 앞으로
+                const shadowObj = canvas?.getObjects().find((obj) => obj.name === BATCH_TYPE.SHADOW)
+                if (shadowObj) {
+                  shadowObj.bringToFront()
+                }
+
                 // getModuleStatistics()
               } else {
                 swalFire({ text: getMessage('module.place.overlab') })
@@ -880,8 +876,9 @@ export function useModuleBasicSetting(tabNum) {
   const manualModuleLayoutSetup = (layoutSetupRef) => {
     const moduleSetupSurfaces = canvas?.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) //모듈설치면를 가져옴
 
-    const isChidori = moduleSetupOption.isChidori
-    const setupLocation = moduleSetupOption.setupLocation
+    const isChidori = moduleSetupOption.isChidori //치도리 여부
+    const setupLocation = moduleSetupOption.setupLocation //모듈 설치 위치 처마, 용마루
+    const isMultiModule = checkedModule.length > 1 //멀티 모듈인지 아닌지 여부
 
     if (isManualModuleLayoutSetup) {
       if (isManualModuleSetup) {
@@ -1116,6 +1113,7 @@ export function useModuleBasicSetting(tabNum) {
                       tempModule.left = holdCellCenterX - toFixedWithoutRounding(width / 2, 2)
                     }
 
+                    if (isChidori) {
                       //움직이는 모듈왼쪽 -> 가운데
                       if (Math.abs(smallLeft - holdCellCenterX) < snapDistance) {
                         tempModule.left = holdCellCenterX + intvHor / 2
@@ -1124,7 +1122,7 @@ export function useModuleBasicSetting(tabNum) {
                       if (Math.abs(smallRight - holdCellCenterX) < snapDistance) {
                         tempModule.left = holdCellCenterX - width - intvHor / 2
                       }
-
+                    }
                     //설치된 셀에 좌측에 스냅
                     if (Math.abs(smallRight - holdCellLeft) < snapDistance) {
                       // console.log('모듈 좌측 스냅')
@@ -1158,21 +1156,16 @@ export function useModuleBasicSetting(tabNum) {
                       tempModule.top = holdCellCenterY - toFixedWithoutRounding(width / 2, 2)
                     }
 
+                    if (isChidori) {
                       //위쪽 -> 가운데
                       if (Math.abs(smallTop - holdCellCenterY) < snapDistance) {
-                      // console.log('holdCellCenterX', holdCellCenterX)
-                      // console.log('smallLeft', smallLeft)
-
-                      // console.log('모듈 센터에 스냅')
                         tempModule.top = holdCellCenterY + intvHor / 2
-
-                      // console.log('tempModule.left', tempModule.left)
                       }
                       // 밑 -> 가운데
                       if (Math.abs(smallBottom - holdCellCenterY) < snapDistance) {
                         tempModule.top = holdCellCenterY - height - intvHor / 2
                       }
-
+                    }
                     //설치된 셀에 좌측에 스냅
                     if (Math.abs(smallRight - holdCellLeft) < snapDistance) {
                       // console.log('모듈 좌측 스냅')
@@ -1255,6 +1248,7 @@ export function useModuleBasicSetting(tabNum) {
 
         addCanvasMouseEventListener('mouse:up', (e) => {
           if (!inside) return
+
           if (tempModule) {
             let startX, startY
             let installedLastHeightCoord = 0 //마지막으로 설치된 모듈의 좌표
@@ -1656,6 +1650,10 @@ export function useModuleBasicSetting(tabNum) {
                 }
               }
             })
+            const shadowObj = canvas?.getObjects().find((obj) => obj.name === BATCH_TYPE.SHADOW)
+            if (shadowObj) {
+              shadowObj.bringToFront()
+            }
           }
         })
       }
@@ -2462,6 +2460,12 @@ export function useModuleBasicSetting(tabNum) {
       //   moduleSetupArray: setupedModules,
       // })
       // setModuleIsSetup(moduleArray)
+
+      //그림자는 무조건 가장 앞으로
+      const shadowObj = canvas?.getObjects().find((obj) => obj.name === BATCH_TYPE.SHADOW)
+      if (shadowObj) {
+        shadowObj.bringToFront()
+      }
     })
     // calculateForApi()
   }

src/locales/ja.json

@@ -594,6 +594,7 @@
   "myinfo.message.password.error": "パスワードが間違っています。",
   "login": "ログイン",
   "login.auto.page.text": "自動ログイン中です。",
+  "login.fail": "アカウントが存在しないか、パスワードが間違っています。",
   "login.id.save": "ID保存",
   "login.id.placeholder": "IDを入力してください。",
   "login.password.placeholder": "パスワードを入力してください。",

src/locales/ko.json

@@ -594,6 +594,7 @@
   "myinfo.message.password.error": "비밀번호가 틀렸습니다.",
   "login": "로그인",
   "login.auto.page.text": "자동로그인 중 입니다.",
+  "login.fail": "계정이 없거나 비밀번호가 잘못되었습니다.",
   "login.id.save": "ID Save",
   "login.id.placeholder": "아이디를 입력해주세요.",
   "login.password.placeholder": "비밀번호를 입력해주세요.",