Merge pull request 'dev' (#85) from dev into dev-deploy

Reviewed-on: #85

src/components/Main.jsx

@@ -14,6 +14,7 @@ import { sessionStore } from '@/store/commonAtom'
 import { isObjectNotEmpty } from '@/util/common-utils'
 
 import BoardDetailModal from './community/modal/BoardDetailModal'
+import Config from '@/config/config.export'
 
 export default function MainPage() {
   const [sessionState, setSessionState] = useRecoilState(sessionStore)

src/components/community/modal/QnaRegModal.jsx

@@ -13,6 +13,7 @@ import { QcastContext } from '@/app/QcastProvider'
 import { useAxios } from '@/hooks/useAxios'
 import { globalLocaleStore } from '@/store/localeAtom'
 import { e } from 'mathjs'
+import { set } from 'react-hook-form'
 
 
 export default function QnaRegModal({ setOpen, setReload, searchValue, selectPageBlock }) {
@@ -24,6 +25,7 @@ export default function QnaRegModal({ setOpen, setReload, searchValue, selectPag
   const [qnaData, setQnaData] = useState([])
   const [closeMdFlg, setCloseMdFlg] = useState(true)
   const [closeSmFlg, setCloseSmFlg] = useState(true)
+  const [hideSmFlg, setHideSmFlg] = useState(false)
   const qnaTypeLgCodeRef = useRef(null)
   const qnaTypeMdCodeRef = useRef(null)
   const qnaTypeSmCodeRef = useRef(null)
@@ -71,7 +73,7 @@ let fileCheck = false;
     regUserTelNoRef.current.value = ''
     qnaTypeLgCodeRef.current.setValue();
     qnaTypeMdCodeRef.current.setValue();
-    qnaTypeSmCodeRef.current.setValue();
+    qnaTypeSmCodeRef.current?.setValue();
     titleRef.current.value = ''
     contentsRef.current.value = ''
 
@@ -112,7 +114,7 @@ let fileCheck = false;
       setQnaData({ ...qnaData, qnaClsLrgCd:e.clCode})
       setCloseMdFlg(false)
       qnaTypeMdCodeRef.current.setValue();
-      qnaTypeSmCodeRef.current.setValue();
+      qnaTypeSmCodeRef.current?.setValue();
     }
 
   }
@@ -131,10 +133,20 @@ let fileCheck = false;
 
         }
       })
-      setQnaTypeSmCodeList(codeList)
+
+
       setQnaData({ ...qnaData, qnaClsMidCd: e.clCode })
       setCloseSmFlg(false)
-      qnaTypeSmCodeRef.current.setValue();
+      setQnaTypeSmCodeList(codeList)
+      qnaTypeSmCodeRef.current?.setValue();
+
+      if(codeList.length > 0) {
+        setHideSmFlg(false)
+      }else{
+        setHideSmFlg(true)
+      }
+
+
 
     }
 
@@ -393,6 +405,7 @@ let fileCheck = false;
                     />
                   </div>
                   <div className="select-wrap" >
+                    {!hideSmFlg && (
                     <Select  name="" ref={qnaTypeSmCodeRef}
                             options={qnaTypeSmCodeList}
                             placeholder="Select"
@@ -402,7 +415,7 @@ let fileCheck = false;
                             isClearable={false}
                             isSearchable={false}
                             isDisabled={closeSmFlg}
-                    />
+                    />)}
                   </div>
                 </div>
                 <div className="input-wrap mt5">

src/hooks/common/useCommonUtils.js

@@ -22,7 +22,7 @@ export function useCommonUtils() {
   const lengthTextFont = useRecoilValue(fontSelector('lengthText'))
   const commonTextFont = useRecoilValue(fontSelector('commonText'))
   const [commonUtils, setCommonUtilsState] = useRecoilState(commonUtilsState)
-  const { addPopup, closeAll } = usePopup()
+  const { addPopup, closeAll, targetClose } = usePopup()
   const { drawDirectionArrow, addLengthText } = usePolygon()
   const { applyDormers } = useObjectBatch({})
 
@@ -38,8 +38,9 @@ export function useCommonUtils() {
 
   const commonTextMode = () => {
     let textbox
-    closeAll()
+
     if (commonUtils.text) {
+      targetClose('other')
       setTimeout(() => {
         commonTextKeyEvent()
         addCanvasMouseEventListener('mouse:down', (event) => {

src/hooks/floorPlan/useImgLoader.js

@@ -5,6 +5,7 @@ import { usePlan } from '../usePlan'
 import { POLYGON_TYPE } from '@/common/common'
 import { QcastContext } from '@/app/QcastProvider'
 import { useContext } from 'react'
+import Config from '@/config/config.export'
 
 /**
  * 이미지 로더 hook
@@ -80,7 +81,7 @@ export function useImgLoader() {
       /** 이미지 크롭 요청 */
       const result = await post({
         // url: `${process.env.NEXT_PUBLIC_API_HOST_URL}/image/canvas`,
-        url: `${process.env.NEXT_PUBLIC_API_HOST_URL}/api/image/canvas`,
+        url: `${Config().baseUrl}/api/image/canvas`,
         data: formData,
       })
       console.log('🚀 ~ handleCanvasToPng ~ result:', result)

src/hooks/usePolygon.js

@@ -1100,7 +1100,7 @@ export const usePolygon = () => {
       })
 
       // blue로 생성된 것들은 대표라인이 될 수 없음.
-      // representLines = representLines.filter((line) => line.stroke !== 'blue')
+      representLines = representLines.filter((line) => line.stroke !== 'blue')
       // representLines중 가장 긴 line을 찾는다.
       representLines.forEach((line) => {
         if (!representLine) {

src/hooks/usePopup.js

@@ -128,11 +128,17 @@ export function usePopup() {
     }
   }
 
+  const targetClose = (type) => {
+    popup[type] = []
+    setPopup({ ...popup, [type]: [] })
+  }
+
   return {
     popup,
     addPopup,
     closePopup,
     closePopups,
     closeAll,
+    targetClose,
   }
 }

src/locales/ja.json

@@ -617,7 +617,7 @@
   "qna.reg.alert.select.type": "お問い合わせ区分を選択してください。",
   "qna.reg.alert.require.title": "タイトルを入力してください。",
   "qna.reg.alert.require.contents": "内容を入力してください。",
-  "qna.reg.confirm.save": "1:1お問い合わせを登録しますか? <br/>Hanwha Japan 担当者にお問い合わせメールが送信されます。",
+  "qna.reg.confirm.save": "お問い合わせを登録しますか? <br/>Hanwha Japan 担当者にお問い合わせメールが送信されます。",
   "qna.reg.alert.save": "保存されました。",
   "qna.reg.alert.saveFail": "保存に失敗しました。",
   "qna.list.header.regNm": "登録者",

src/store/menuAtom.js

@@ -37,11 +37,11 @@ export const subMenusState = atom({
       // 지붕덮개
       { id: 0, name: 'plan.menu.roof.cover.outline.drawing', menu: MENU.ROOF_COVERING.EXTERIOR_WALL_LINE },
       { id: 1, name: 'plan.menu.roof.cover.roof.shape.setting', menu: MENU.ROOF_COVERING.ROOF_SHAPE_SETTINGS },
-      {
+      // {
-        id: 2,
+      //   id: 2,
-        name: 'plan.menu.roof.cover.roof.shape.passivity.setting',
+      //   name: 'plan.menu.roof.cover.roof.shape.passivity.setting',
-        menu: MENU.ROOF_COVERING.ROOF_SHAPE_PASSIVITY_SETTINGS,
+      //   menu: MENU.ROOF_COVERING.ROOF_SHAPE_PASSIVITY_SETTINGS,
-      },
+      // },
       { id: 3, name: 'plan.menu.roof.cover.auxiliary.line.drawing', menu: MENU.ROOF_COVERING.HELP_LINE_DRAWING },
       { id: 4, name: 'plan.menu.roof.cover.eaves.kerava.edit', menu: MENU.ROOF_COVERING.EAVES_KERAVA_EDIT },
       { id: 5, name: 'plan.menu.roof.cover.movement.shape.updown', menu: MENU.ROOF_COVERING.MOVEMENT_SHAPE_UPDOWN },

startscript.js

@@ -1,2 +1,2 @@
 var exec = require('child_process').exec
-exec('yarn dev -p 5000', { windowsHide: true })
+exec('yarn local:dev -p 5000', { windowsHide: true })