.env.development

@@ -7,7 +7,8 @@ NEXT_PUBLIC_API_HOST_URL="http://1.248.227.176:5000"
 SESSION_SECRET="i3iHH1yp2/2SpQSIySQ4bpyc4g0D+zCF9FAn5xUG0+Y="
 
 # NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_bV5zuYMyyIYFlOb3"
-NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_yAS4QDalL9jgQ7vS"
+# NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_yAS4QDalL9jgQ7vS"
+NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_a0FLEK6M2oTpXInK"
 
 NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="http://q-order-stg.q-cells.jp:8120/eos/login/autoLogin"
 NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="http://q-musubi-stg.q-cells.jp:8120/qm/login/autoLogin"

.env.production

@@ -7,7 +7,8 @@ NEXT_PUBLIC_API_HOST_URL="https://www.hanasys.jp/"
 SESSION_SECRET="i3iHH1yp2/2SpQSIySQ4bpyc4g0D+zCF9FAn5xUG0+Y="
 
 # NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_bV5zuYMyyIYFlOb3"
-NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_yAS4QDalL9jgQ7vS"
+# NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_yAS4QDalL9jgQ7vS"
+NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_a0FLEK6M2oTpXInK"
 
 # NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="https://q-order.q-cells.jp/eos/login/autoLogin"
 # NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="https://q-musubi.q-cells.jp/qm/login/autoLogin"

src/components/floor-plan/CanvasFrame.jsx

@@ -36,34 +36,6 @@ import { hotkeyStore } from '@/store/hotkeyAtom'
 import { usePopup } from '@/hooks/usePopup'
 
 export default function CanvasFrame() {
-  const [roofMaterials, setRoofMaterials] = useRecoilState(roofMaterialsAtom)
-  const { getRoofMaterialList } = useMasterController()
-  useEffect(() => {
-    async function initRoofMaterial() {
-      if (roofMaterials.length !== 0) {
-        return
-      }
-      const { data } = await getRoofMaterialList()
-
-      const roofLists = data.map((item, idx) => ({
-        ...item,
-        id: item.roofMatlCd,
-        name: item.roofMatlNm,
-        selected: idx === 0,
-        index: idx,
-        nameJp: item.roofMatlNmJp,
-        length: item.lenBase && parseInt(item.lenBase),
-        width: item.widBase && parseInt(item.widBase),
-        raft: item.raftBase && parseInt(item.raftBase),
-        layout: ['ROOF_ID_SLATE', 'ROOF_ID_SINGLE'].includes(item.roofMatlCd) ? ROOF_MATERIAL_LAYOUT.STAIRS : ROOF_MATERIAL_LAYOUT.PARALLEL,
-        hajebichi: item.roofPchBase && parseInt(item.roofPchBase),
-        pitch: item.pitch ? parseInt(item.pitch) : 4,
-        angle: item.angle ? parseInt(item.angle) : 21.8,
-      }))
-      setRoofMaterials(roofLists)
-    }
-    initRoofMaterial()
-  }, [])
   const canvasRef = useRef(null)
   const { canvas } = useCanvas('canvas')
   const { canvasLoadInit, gridInit } = useCanvasConfigInitialize()

src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx

@@ -162,6 +162,7 @@ export default function WallLineSetting(props) {
             <></>
           )}
         </div>
+        <div className="normal-font mt10">{getMessage('outerLine.property.info')}</div>
         <div className="grid-btn-wrap">
           <button className="btn-frame modal mr5" onClick={handleRollback}>
             {getMessage('modal.cover.outline.rollback')}

src/components/header/Header.jsx

@@ -22,6 +22,9 @@ import { QcastContext } from '@/app/QcastProvider'
 import { usePopup } from '@/hooks/usePopup'
 import { commonCodeState } from '@/store/commonCodeAtom'
 import { isObjectNotEmpty } from '@/util/common-utils'
+import { roofMaterialsAtom } from '@/store/settingAtom'
+import { useMasterController } from '@/hooks/common/useMasterController'
+import { ROOF_MATERIAL_LAYOUT } from '@/components/floor-plan/modal/placementShape/PlacementShapeSetting'
 
 export const ToggleonMouse = (e, act, target) => {
   const listWrap = e.target.closest(target)
@@ -72,6 +75,38 @@ export default function Header(props) {
   const [commonCode, setCommonCode] = useRecoilState(commonCodeState)
   const { promiseGet } = useAxios()
 
+  /**
+   * 지붕재 목록 Header에서 조회
+   */
+  const [roofMaterials, setRoofMaterials] = useRecoilState(roofMaterialsAtom)
+  const { getRoofMaterialList } = useMasterController()
+  useEffect(() => {
+    async function initRoofMaterial() {
+      if (roofMaterials.length !== 0) {
+        return
+      }
+      const { data } = await getRoofMaterialList()
+
+      const roofLists = data.map((item, idx) => ({
+        ...item,
+        id: item.roofMatlCd,
+        name: item.roofMatlNm,
+        selected: idx === 0,
+        index: idx,
+        nameJp: item.roofMatlNmJp,
+        length: item.lenBase && parseInt(item.lenBase),
+        width: item.widBase && parseInt(item.widBase),
+        raft: item.raftBase && parseInt(item.raftBase),
+        layout: ['ROOF_ID_SLATE', 'ROOF_ID_SINGLE'].includes(item.roofMatlCd) ? ROOF_MATERIAL_LAYOUT.STAIRS : ROOF_MATERIAL_LAYOUT.PARALLEL,
+        hajebichi: item.roofPchBase && parseInt(item.roofPchBase),
+        pitch: item.pitch ? parseInt(item.pitch) : 4,
+        angle: item.angle ? parseInt(item.angle) : 21.8,
+      }))
+      setRoofMaterials(roofLists)
+    }
+    initRoofMaterial()
+  }, [])
+
   useEffect(() => {
     const getCommonCode = async () => {
       await promiseGet({ url: '/api/commcode/qc-comm-code' }).then((res) => {

src/hooks/roofcover/useMovementSetting.js

@@ -90,6 +90,7 @@ export function useMovementSetting(id) {
       wall.baseLines.forEach((line) => {
         if (type === TYPE.UP_DOWN) {
           line.set({ selectable: true, visible: true, stroke: '#1083E3', strokeWidth: 5 })
+          line.setCoords()
           line.bringToFront()
         } else {
           line.set({ selectable: false, visible: false })

src/locales/ja.json

@@ -1090,6 +1090,7 @@
   "roof.exceed.count": "屋根材は4つまで選択可能です。",
   "outerLine.property.fix": "外壁線の属性設定 を完了しますか？",
   "outerLine.property.close": "外壁線の属性設定 を終了しますか？",
+  "outerLine.property.info": "外壁線は反時計回りで作成してください。",
   "want.to.complete.auxiliary.creation": "補助線の作成を完了しますか?",
   "module.layout.setup.has.zero.value": "モジュールの列数、段数を入力して下さい。",
   "modal.placement.initial.setting.plan.drawing.only.number": "(※数字は[半角]入力のみ可能です。)",

src/locales/ko.json

@@ -1091,6 +1091,7 @@
   "roof.exceed.count": "지붕재는 4개까지 선택 가능합니다.",
   "outerLine.property.fix": "외벽선 속성 설정을 완료하시겠습니까?",
   "outerLine.property.close": "외벽선 속성 설정을 종료하시겠습니까?",
+  "outerLine.property.info": "외벽선은 반시계 방향으로 작성해 주세요.",
   "want.to.complete.auxiliary.creation": "보조선 작성을 완료하시겠습니까?",
   "module.layout.setup.has.zero.value": "모듈의 열수, 단수를 입력해 주세요.",
   "modal.placement.initial.setting.plan.drawing.only.number": "(※ 숫자는 [반각]입력만 가능합니다.)",