qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: qcast3:af627035cd2ba89daaec83f3697d61e7751a43b0
Branches Tags
qcast3:main
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/qcast-1512
qcast3:feature/skeleton-dev
qcast3:feature/design-remake
qcast3:qcast-pub
qcast3:feature/sketon_cha
qcast3:feature/batch-angle
qcast3:feature/module-group
qcast3:feature/dev-yj
qcast3:feature/jimp-test
qcast3:feature/chore-env
qcast3:feature/jaeyoung
qcast3:feature/qcast-1052
qcast3:feature/qcast-1053
qcast3:feature/dev-yj-layout
qcast3:feature/qcast-886
qcast3:feature/module-grouping
qcast3:feature/qcast-944
qcast3:feature/qcast-950
qcast3:feature/qcast-947
qcast3:feature/qcast-925
..
compare: qcast3:dc6989b30397ef48e51556faf5499dcd54dbd4ed
Branches Tags
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/qcast-1512
qcast3:feature/skeleton-dev
qcast3:feature/design-remake
qcast3:qcast-pub
qcast3:feature/sketon_cha
qcast3:feature/batch-angle
qcast3:feature/module-group
qcast3:feature/dev-yj
qcast3:feature/jimp-test
qcast3:feature/chore-env
qcast3:feature/jaeyoung
qcast3:feature/qcast-1052
qcast3:feature/qcast-1053
qcast3:feature/dev-yj-layout
qcast3:feature/qcast-886
qcast3:feature/module-grouping
qcast3:feature/qcast-944
qcast3:feature/qcast-950
qcast3:feature/qcast-947
qcast3:feature/qcast-925
qcast3:main

No commits in common. "af627035cd2ba89daaec83f3697d61e7751a43b0" and "dc6989b30397ef48e51556faf5499dcd54dbd4ed" have entirely different histories.
af627035cd ... dc6989b303

7 changed files with 113 additions and 123 deletions
Show Stats Expand all files Collapse all files

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

@ -32,53 +32,61 @@ export default function FlowLine({ FLOW_LINE_REF }) {
<> <>
<div className="outline-wrap"> <div className="outline-wrap">
<div className="guide">{getMessage('modal.movement.flow.line.info')}</div> <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 className="d-check-radio pop">
</div> <input
</div> type="radio"
<div className="moving-tab-content"> name="radio01"
<div className="moving-tab-radio-wrap"> id="ra01"
<div className="d-check-radio pop"> defaultChecked={true}
<input ref={FLOW_LINE_REF.DOWN_LEFT_RADIO_REF}
type="radio" onChange={() => {
name="radio01" setType(FLOW_LINE_TYPE.DOWN_LEFT)
id="ra01" }}
ref={FLOW_LINE_REF.DOWN_LEFT_RADIO_REF} />
onChange={() => { <label htmlFor="ra01">{getMessage('modal.movement.flow.line.bottom.left')}</label>
setType(FLOW_LINE_TYPE.DOWN_LEFT) </div>
}}
/>
<label htmlFor="ra01">{getMessage('modal.movement.flow.line.bottom.left')}</label>
</div> </div>
<div className="d-check-radio pop"> <div className="eaves-keraba-td">
<input <div className="outline-form">
type="radio" <div className="input-grid mr5" style={{ width: '100px' }}>
name="radio01" {<input type="text" className="input-origin block" readOnly={true} ref={FLOW_LINE_REF.POINTER_INPUT_REF} />}
id="ra02" </div>
ref={FLOW_LINE_REF.UP_RIGHT_RADIO_REF} </div>
onChange={() => {
setType(FLOW_LINE_TYPE.UP_RIGHT)
}}
/>
<label htmlFor="ra02">{getMessage('modal.movement.flow.line.top.right')}</label>
</div> </div>
</div> </div>
<div className="outline-form"> <div className="eaves-keraba-item">
<span>{getMessage('modal.movement.flow.line.movement')}</span> <div className="eaves-keraba-th">
<div className="input-grid mr5"> <div className="d-check-radio pop">
<input <input
type="text" type="radio"
className="input-origin block" name="radio01"
defaultValue={100} id="ra02"
ref={FLOW_LINE_REF.FILLED_INPUT_REF} ref={FLOW_LINE_REF.UP_RIGHT_RADIO_REF}
value={filledInput} onChange={() => {
onFocus={handleFocus} setType(FLOW_LINE_TYPE.UP_RIGHT)
onChange={handleInput} }}
/> />
<label htmlFor="ra02">{getMessage('modal.movement.flow.line.top.right')}</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"
ref={FLOW_LINE_REF.FILLED_INPUT_REF}
value={filledInput}
onFocus={handleFocus}
onChange={handleInput}
/>
</div>
<span className="thin">mm</span>
</div>
</div> </div>
<span className="thin">mm</span>
</div> </div>
</div> </div>
</div> </div>

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

@ -29,54 +29,61 @@ export default function Updown({ UP_DOWN_REF }) {
<> <>
<div className="outline-wrap"> <div className="outline-wrap">
<div className="guide">{getMessage('modal.movement.flow.line.updown.info')}</div> <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 className="d-check-radio pop">
</div> <input
</div> type="radio"
<div className="moving-tab-content"> name="radio01"
<div className="moving-tab-radio-wrap"> id="ra01"
<div className="d-check-radio pop"> ref={UP_DOWN_REF.UP_RADIO_REF}
<input defaultChecked={true}
type="radio" onChange={() => {
name="radio01" setType(UP_DOWN_TYPE.UP)
id="ra01" }}
ref={UP_DOWN_REF.UP_RADIO_REF} />
defaultChecked={true} <label htmlFor="ra01">{getMessage('modal.movement.flow.line.updown.up')}</label>
onChange={() => { </div>
setType(UP_DOWN_TYPE.UP)
}}
/>
<label htmlFor="ra01">{getMessage('modal.movement.flow.line.updown.up')}</label>
</div> </div>
<div className="d-check-radio pop"> <div className="eaves-keraba-td">
<input <div className="outline-form">
type="radio" <div className="input-grid mr5" style={{ width: '100px' }}>
name="radio01" {<input type="text" className="input-origin block" readOnly={true} ref={UP_DOWN_REF.POINTER_INPUT_REF} />}
id="ra02" </div>
ref={UP_DOWN_REF.DOWN_RADIO_REF} </div>
onChange={() => {
setType(UP_DOWN_TYPE.DOWN)
}}
/>
<label htmlFor="ra02">{getMessage('modal.movement.flow.line.updown.down')}</label>
</div> </div>
</div> </div>
<div className="outline-form"> <div className="eaves-keraba-item">
<span>{getMessage('modal.movement.flow.line.movement')}</span> <div className="eaves-keraba-th">
<div className="input-grid mr5"> <div className="d-check-radio pop">
<input <input
type="text" type="radio"
className="input-origin block" name="radio01"
defaultValue={100} id="ra02"
ref={UP_DOWN_REF.FILLED_INPUT_REF} ref={UP_DOWN_REF.DOWN_RADIO_REF}
value={filledInput} onChange={() => {
onFocus={handleFocus} setType(UP_DOWN_TYPE.DOWN)
onChange={handleInput} }}
/> />
<label htmlFor="ra02">{getMessage('modal.movement.flow.line.updown.down')}</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"
ref={UP_DOWN_REF.FILLED_INPUT_REF}
value={filledInput}
onFocus={handleFocus}
onChange={handleInput}
/>
</div>
<span className="thin">mm</span>
</div>
</div> </div>
<span className="thin">mm</span>
</div> </div>
</div> </div>
</div> </div>

12
src/locales/ja.json
View File

@ -43,16 +43,14 @@
"plan.menu.roof.cover.roof.shape.setting": "屋根形状の設定", "plan.menu.roof.cover.roof.shape.setting": "屋根形状の設定",
"plan.menu.roof.cover.roof.shape.passivity.setting": "屋根形状の手動設定", "plan.menu.roof.cover.roof.shape.passivity.setting": "屋根形状の手動設定",
"plan.menu.roof.cover.eaves.kerava.edit": "軒・ケラバ変更", "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.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.up": "桁を上げる",
"modal.movement.flow.line.updown.down": "桁数を下げる", "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.bottom.left": "高さ変更：下、左",
"modal.movement.flow.line.top.right": "高さ変更：上、右", "modal.movement.flow.line.top.right": "高さ変更：上、右",
"plan.menu.roof.cover.outline.edit.offset": "外壁の編集とオフセット", "plan.menu.roof.cover.outline.edit.offset": "外壁の編集とオフセット",

2
src/locales/ko.json
View File

@ -51,8 +51,6 @@
"modal.movement.flow.line.updown.up": "자릿수를 올리다", "modal.movement.flow.line.updown.up": "자릿수를 올리다",
"modal.movement.flow.line.updown.down": "자릿수를 낮추다", "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.bottom.left": "높이변경 : 아래, 왼쪽",
"modal.movement.flow.line.top.right": "높이변경 : 위, 오른쪽", "modal.movement.flow.line.top.right": "높이변경 : 위, 오른쪽",
"plan.menu.roof.cover.outline.edit.offset": "외벽선 편집 및 오프셋", "plan.menu.roof.cover.outline.edit.offset": "외벽선 편집 및 오프셋",

22
src/styles/_modal.scss
View File

@ -2436,24 +2436,4 @@ $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;
}
}
}

7
src/styles/_submodal.scss
View File

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

4
src/styles/_table.scss
View File

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