src/components/community/Qna.jsx

@@ -195,7 +195,9 @@ export default function Qna() {
                   ))
                 ) : (
                   <tr>
-                    <td className="al-c no-data" colSpan={5}>{getMessage('common.message.no.data')}</td>
+                    <td colSpan={4} className="al-c">
+                      {getMessage('common.message.no.data')}
+                    </td>
                   </tr>
                 )}
                 </tbody>

src/components/community/modal/QnaRegModal.jsx

@@ -27,7 +27,6 @@ export default function QnaRegModal({ setOpen, setReload, searchValue, selectPag
   const qnaTypeLgCodeRef = useRef(null)
   const qnaTypeMdCodeRef = useRef(null)
   const qnaTypeSmCodeRef = useRef(null)
-  const qstMail = useRef(null);
   const regUserNmRef = useRef(null)
   const regUserTelNoRef = useRef(null)
   const titleRef = useRef(null)
@@ -66,7 +65,6 @@ let fileCheck = false;
   const initQnaReg = async () => {
 
 
-    qstMail.current.value = ''
     regUserNmRef.current.value = ''
     regUserTelNoRef.current.value = ''
     qnaTypeLgCodeRef.current.setValue();
@@ -150,7 +148,7 @@ let fileCheck = false;
     if(!fileCheck) return;
 
     fileUploadProps.uploadFiles.forEach((file) => {
-      //console.log("file::::::::",file)
+      console.log("file::::::::",file)
       formData.push(file)
 
     })
@@ -158,16 +156,6 @@ let fileCheck = false;
     fileCheck = false;
   }
 
-  const isValidEmail = (email) => {
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    return emailRegex.test(email);
-  };
-
-  const isEmpty = (value) => {
-    return value === null || value === undefined || value.trim() === "";
-  };
-
-
   const handleQnaSubmit = async () => {
     //필수 체크
 
@@ -176,22 +164,13 @@ let fileCheck = false;
 
      let regUserNm = qnaData?.regUserNm??'';
 
-    if (!isValidEmail(qnaData.qstMail)) {
+      if (regUserNm.trim().length === 0) {
-      qstMail.current.focus();
-      swalFire({
-        title: getMessage('qna.reg.alert.require.qstMail'),
-        icon: 'warning',
-      });
-      return;
-    }
 
-
-    if (isEmpty(regUserNm)) {
         regUserNmRef.current.value = '';
         regUserNmRef.current.focus()
         swalFire({
-          title: getMessage('qna.reg.alert.require.regUserNm'),
+          text: getMessage('qna.reg.alert.require.regUserNm'),
-          icon: 'warning',
+          type: 'alert',
         })
         return false
       }
@@ -199,35 +178,35 @@ let fileCheck = false;
       let qnaClsLrgCd = qnaData?.qnaClsLrgCd??'';
       let qnaClsMidCd = qnaData?.qnaClsMidCd??'';
 
-      if (isEmpty(qnaClsLrgCd) || isEmpty(qnaClsMidCd) ) {
+      if (qnaClsLrgCd.trim().length === 0 || qnaClsMidCd.trim().length === 0 ) {
-        (isEmpty(qnaClsLrgCd))?qnaTypeLgCodeRef.current.focus():qnaTypeMdCodeRef.current.focus()
+        (qnaClsLrgCd.trim().length === 0)?qnaTypeLgCodeRef.current.focus():qnaTypeMdCodeRef.current.focus()
         swalFire({
-          title: getMessage('qna.reg.alert.select.type'),
+          text: getMessage('qna.reg.alert.select.type'),
-          icon: 'warning',
+          type: 'alert',
         })
         return false
       }
 
      let title = qnaData?.title??'';
 
-     if (isEmpty(title)) {
+     if (title.trim().length === 0) {
        titleRef.current.value = '';
        titleRef.current.focus()
        swalFire({
-         title: getMessage('qna.reg.alert.require.title'),
+         text: getMessage('qna.reg.alert.require.title'),
-         icon: 'warning',
+         type: 'alert',
        })
        return false
      }
     //console.log("5::::",qnaData)
     let contents = qnaData?.contents??'';
 
-    if (isEmpty(contents)) {
+    if (contents.trim().length === 0) {
       contentsRef.current.value = '';
       contentsRef.current.focus()
       swalFire({
-        title: getMessage('qna.reg.alert.require.contents'),
+        text: getMessage('qna.reg.alert.require.contents'),
-        icon: 'warning',
+        type: 'alert',
       })
       return false
     }
@@ -331,13 +310,7 @@ let fileCheck = false;
                       <th>{getMessage('qna.list.header.regNm')}</th>
                       <td><input type="text" className="input-light" value={sessionState?.userNm || ''} readOnly  /></td>
                       <th>E-Mail<span className="red">*</span></th>
-                      <td ><input type="text" className="input-light"  required
+                      <td ><input type="text" className="input-light" value={sessionState?.email || ''} readOnly /></td>
-                                  ref={qstMail}
-                                  value={qnaData?.qstMail || ''}
-                                  onChange={(e) => setQnaData({...qnaData, qstMail: e.target.value })}
-                                  onBlur={(e) => setQnaData({ ...qnaData, qstMail: e.target.value })} />
-                      </td>
-
                       <th>{getMessage('qna.reg.header.regDt')}</th>
                       <td>{dayjs(new Date()).format('YYYY-MM-DD')}</td>
                     </tr>

src/components/floor-plan/modal/movement/type/FlowLine.jsx

@@ -32,19 +32,15 @@ export default function FlowLine({ FLOW_LINE_REF }) {
     <>
       <div className="outline-wrap">
         <div className="guide">{getMessage('modal.movement.flow.line.info')}</div>
-        <div className="outline-form">
+        <div className="eaves-keraba-table">
-          <span>{getMessage('modal.movement.flow.line.position')}</span>
+          <div className="eaves-keraba-item">
-          <div className="input-grid mr5">
+            <div className="eaves-keraba-th">
-            <input type="text" className="input-origin block" defaultValue={100} readOnly={true} ref={FLOW_LINE_REF.POINTER_INPUT_REF} />
-          </div>
-        </div>
-        <div className="moving-tab-content">
-          <div className="moving-tab-radio-wrap">
               <div className="d-check-radio pop">
                 <input
                   type="radio"
                   name="radio01"
                   id="ra01"
+                  defaultChecked={true}
                   ref={FLOW_LINE_REF.DOWN_LEFT_RADIO_REF}
                   onChange={() => {
                     setType(FLOW_LINE_TYPE.DOWN_LEFT)
@@ -52,6 +48,17 @@ export default function FlowLine({ FLOW_LINE_REF }) {
                 />
                 <label htmlFor="ra01">{getMessage('modal.movement.flow.line.bottom.left')}</label>
               </div>
+            </div>
+            <div className="eaves-keraba-td">
+              <div className="outline-form">
+                <div className="input-grid mr5" style={{ width: '100px' }}>
+                  {<input type="text" className="input-origin block" readOnly={true} ref={FLOW_LINE_REF.POINTER_INPUT_REF} />}
+                </div>
+              </div>
+            </div>
+          </div>
+          <div className="eaves-keraba-item">
+            <div className="eaves-keraba-th">
               <div className="d-check-radio pop">
                 <input
                   type="radio"
@@ -65,13 +72,12 @@ export default function FlowLine({ FLOW_LINE_REF }) {
                 <label htmlFor="ra02">{getMessage('modal.movement.flow.line.top.right')}</label>
               </div>
             </div>
+            <div className="eaves-keraba-td">
               <div className="outline-form">
-            <span>{getMessage('modal.movement.flow.line.movement')}</span>
+                <div className="input-grid mr5" style={{ width: '100px' }}>
-            <div className="input-grid mr5">
                   <input
                     type="text"
                     className="input-origin block"
-                defaultValue={100}
                     ref={FLOW_LINE_REF.FILLED_INPUT_REF}
                     value={filledInput}
                     onFocus={handleFocus}
@@ -82,6 +88,8 @@ export default function FlowLine({ FLOW_LINE_REF }) {
               </div>
             </div>
           </div>
+        </div>
+      </div>
     </>
   )
 }

src/components/floor-plan/modal/movement/type/Updown.jsx

@@ -29,14 +29,9 @@ export default function Updown({ UP_DOWN_REF }) {
     <>
       <div className="outline-wrap">
         <div className="guide">{getMessage('modal.movement.flow.line.updown.info')}</div>
-        <div className="outline-form">
+        <div className="eaves-keraba-table">
-          <span>{getMessage('modal.movement.flow.line.position')}</span>
+          <div className="eaves-keraba-item">
-          <div className="input-grid mr5">
+            <div className="eaves-keraba-th">
-            <input type="text" className="input-origin block" defaultValue={100} readOnly={true} ref={UP_DOWN_REF.POINTER_INPUT_REF} />
-          </div>
-        </div>
-        <div className="moving-tab-content">
-          <div className="moving-tab-radio-wrap">
               <div className="d-check-radio pop">
                 <input
                   type="radio"
@@ -50,6 +45,17 @@ export default function Updown({ UP_DOWN_REF }) {
                 />
                 <label htmlFor="ra01">{getMessage('modal.movement.flow.line.updown.up')}</label>
               </div>
+            </div>
+            <div className="eaves-keraba-td">
+              <div className="outline-form">
+                <div className="input-grid mr5" style={{ width: '100px' }}>
+                  {<input type="text" className="input-origin block" readOnly={true} ref={UP_DOWN_REF.POINTER_INPUT_REF} />}
+                </div>
+              </div>
+            </div>
+          </div>
+          <div className="eaves-keraba-item">
+            <div className="eaves-keraba-th">
               <div className="d-check-radio pop">
                 <input
                   type="radio"
@@ -63,13 +69,12 @@ export default function Updown({ UP_DOWN_REF }) {
                 <label htmlFor="ra02">{getMessage('modal.movement.flow.line.updown.down')}</label>
               </div>
             </div>
+            <div className="eaves-keraba-td">
               <div className="outline-form">
-            <span>{getMessage('modal.movement.flow.line.movement')}</span>
+                <div className="input-grid mr5" style={{ width: '100px' }}>
-            <div className="input-grid mr5">
                   <input
                     type="text"
                     className="input-origin block"
-                defaultValue={100}
                     ref={UP_DOWN_REF.FILLED_INPUT_REF}
                     value={filledInput}
                     onFocus={handleFocus}
@@ -80,6 +85,8 @@ export default function Updown({ UP_DOWN_REF }) {
               </div>
             </div>
           </div>
+        </div>
+      </div>
     </>
   )
 }

src/hooks/option/useCanvasSetting.js

@@ -199,11 +199,7 @@ export function useCanvasSetting(executeEffect = true) {
     if (!executeEffect) {
       return
     }
-    if (roofMaterials.length === 0) {
-      return
-    }
     const selectedRoofMaterial = roofMaterials[0]
-    console.log('selectedRoofMaterial', selectedRoofMaterial)
 
     if (addedRoofs.length === 0) {
       const newAddedRoofs = []

src/locales/ja.json

@@ -43,16 +43,14 @@
   "plan.menu.roof.cover.roof.shape.setting": "屋根形状の設定",
   "plan.menu.roof.cover.roof.shape.passivity.setting": "屋根形状の手動設定",
   "plan.menu.roof.cover.eaves.kerava.edit": "軒・ケラバ変更",
-  "plan.menu.roof.cover.movement.shape.updown": "棟線移動・桁上げ下げ",
+  "plan.menu.roof.cover.movement.shape.updown": "軒線移動・桁上げ下り",
-  "modal.movement.flow.line.move": "棟線移動",
+  "modal.movement.flow.line.move": "軒線の移動",
   "modal.movement.flow.line.move.alert": "移動する数ない。",
-  "modal.movement.flow.line.updown": "桁上げ・下げ",
+  "modal.movement.flow.line.updown": "桁上げ・下り",
-  "modal.movement.flow.line.updown.info": "桁高の違う辺を選択し、 幅を指定してください",
+  "modal.movement.flow.line.updown.info": "桁の異なる辺を選択し、幅を指定します。",
   "modal.movement.flow.line.updown.up": "桁を上げる",
   "modal.movement.flow.line.updown.down": "桁数を下げる",
-  "modal.movement.flow.line.info": "棟線を選択し、 移動幅を指定してください。",
+  "modal.movement.flow.line.info": "軒線を選択して移動幅を指定します",
-  "modal.movement.flow.line.position": "位置値",
-  "modal.movement.flow.line.movement": "動き値",
   "modal.movement.flow.line.bottom.left": "高さ変更：下、左",
   "modal.movement.flow.line.top.right": "高さ変更：上、右",
   "plan.menu.roof.cover.outline.edit.offset": "外壁の編集とオフセット",
@@ -612,7 +610,6 @@
   "qna.reg.header.contents": "お問い合わせ内容",
   "qna.reg.header.fileList": "ファイル添付",
   "qna.reg.header.save": "保存",
-  "qna.reg.alert.require.qstMail": "無効なメール形式です。",
   "qna.reg.alert.require.regUserNm": "名前を入力してください。",
   "qna.reg.alert.select.type": "お問い合わせ区分を選択してください。",
   "qna.reg.alert.require.title": "タイトルを入力してください。",

src/locales/ko.json

@@ -51,8 +51,6 @@
   "modal.movement.flow.line.updown.up": "자릿수를 올리다",
   "modal.movement.flow.line.updown.down": "자릿수를 낮추다",
   "modal.movement.flow.line.info": "동선을 선택하고 이동 폭을 지정하십시오",
-  "modal.movement.flow.line.position": "위치값",
-  "modal.movement.flow.line.movement": "이동 수치",
   "modal.movement.flow.line.bottom.left": "높이변경 : 아래, 왼쪽",
   "modal.movement.flow.line.top.right": "높이변경 : 위, 오른쪽",
   "plan.menu.roof.cover.outline.edit.offset": "외벽선 편집 및 오프셋",
@@ -612,7 +610,6 @@
   "qna.reg.header.contents": "문의정보",
   "qna.reg.header.fileList": "파일첨부",
   "qna.reg.header.save": "저장",
-  "qna.reg.alert.require.qstMail": "올바르지 않은 이메일 형식입니다.",
   "qna.reg.alert.require.regUserNm": "이름을 입력하세요.",
   "qna.reg.alert.select.type": "문의구분을 선택하세요.",
   "qna.reg.alert.require.title": "제목을 입력하세요.",

src/styles/_modal.scss

@@ -2437,23 +2437,3 @@ $alert-color: #101010;
         }
     }
 }
-
-// 2025-05-26 동선이동∙형 올림 내림
-
-.moving-tab-radio-wrap{
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    margin-bottom: 10px;
-}
-.moving-tab-content{
-    padding: 10px;
-    border: 1px solid #3D3D3D;
-    margin-top: 15px;
-    .outline-form{
-        span{
-            width: auto;
-            margin-right: 23px;
-        }
-    }
-}

src/styles/_submodal.scss

@@ -374,7 +374,10 @@
 // 1:1문의
 .one-on-one{
     .select-wrap{
-        flex: 1;
+        width: 250px;
+    }
+    .input-wrap{
+        flex: 1 1 auto;
     }
     &.btn-area{
         padding-bottom: 0;
@@ -385,7 +388,7 @@
         border: 1px solid #eee;
         .drag-file-area{
             margin-top: 0;
-            .file-list{
+            .file-list {
                 overflow-y: auto;
                 max-height: 100px;
             }

src/styles/_table.scss

@@ -400,10 +400,6 @@ table{
                         font-weight: 400;
                     }
                 }
-                &.no-data{
-                    padding: 70px 0;
-                    font-size: 14px;
-                }
             }
             tr{
                 background-color: transparent;