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

Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into dev

Browse Source
This commit is contained in:
hyojun.choi 2025-12-16 17:52:48 +09:00
commit 1ad47291f2
8 changed files with 66 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/layout.js
View File

@ -58,7 +58,8 @@ export default async function RootLayout({ children }) {
pwdInitYn: session.pwdInitYn,
custCd: session.custCd,
isLoggedIn: session.isLoggedIn,
builderNo: session.builderNo
builderNo: session.builderNo,
custNm: session.custNm
}
}
if (!headerPathname.includes('/login') && !session.isLoggedIn) {

2
src/components/community/modal/QnaRegModal.jsx
View File

@ -349,7 +349,7 @@ let fileCheck = false;
<tbody>
<tr>
<th>{getMessage('qna.list.header.regNm')}</th>
<td><input type="text" className="input-light" value={sessionState?.userNm || ''} readOnly /></td>
<td><input type="text" className="input-light" value={sessionState?.custNm || ''} readOnly /></td>
<th>E-Mail<span className="red">*</span></th>
<td ><input type="text" className="input-light" required
ref={qstMail}

2
src/components/fabric/QPolygon.js
View File

@ -336,7 +336,7 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
if (types.every((type) => type === LINE_TYPE.WALLLINE.EAVES)) {
// 용마루 -- straight-skeleton
console.log('용마루 지붕')
//drawRidgeRoof(this.id, this.canvas, textMode)
///drawRidgeRoof(this.id, this.canvas, textMode)
drawSkeletonRidgeRoof(this.id, this.canvas, textMode);
} else if (isGableRoof(types)) {
// A형, B형 박공 지붕

21
src/components/floor-plan/modal/object/DormerOffset.jsx
View File

@ -59,10 +59,10 @@ export default function DormerOffset(props) {
name=""
label=""
className="input-origin block"
value={arrow1LengthRef.current.value ?? 0}
value={arrow1LengthRef.current?.value ?? 0}
ref={arrow1LengthRef}
onChange={(value) => setArrow1Length(value)}
options={{
onChange={() => {}} // No-op function to prevent error
options={{
allowNegative: false,
allowDecimal: false,
}}
@ -86,7 +86,20 @@ export default function DormerOffset(props) {
</div>
<div className="input-move-wrap">
<div className="input-move">
<input type="text" className="input-origin" ref={arrow2LengthRef} placeholder="0" />
{/*<input type="text" className="input-origin" ref={arrow2LengthRef} placeholder="0" />*/}
<CalculatorInput
id=""
name=""
label=""
className="input-origin block"
value={arrow2LengthRef.current?.value ?? 0}
ref={arrow2LengthRef}
onChange={() => {}} // No-op function to prevent error
options={{
allowNegative: false,
allowDecimal: false,
}}
/>
</div>
<span>mm</span>
<div className="direction-move-wrap">

15
src/components/floor-plan/modal/roofShape/passivity/Eaves.jsx
View File

@ -43,7 +43,20 @@ export default function Eaves({ offsetRef, pitchRef, pitchText }) {
{getMessage('eaves.offset')}
</span>
<div className="input-grid mr5">
<input type="text" className="input-origin block" defaultValue={500} ref={offsetRef} />
{/*<input type="text" className="input-origin block" defaultValue={500} ref={offsetRef} />*/}
<CalculatorInput
id=""
name=""
label=""
className="input-origin block"
value={offsetRef.current?.value ?? 500} // Set default value to 500
ref={offsetRef}
onChange={() => {}}
options={{
allowNegative: false,
allowDecimal: false
}}
/>
</div>
<span className="thin">mm</span>
</div>

16
src/components/floor-plan/modal/roofShape/passivity/Gable.jsx
View File

@ -1,6 +1,7 @@
import { useMessage } from '@/hooks/useMessage'
import { useRecoilValue } from 'recoil'
import { currentAngleTypeSelector } from '@/store/canvasAtom'
import { CalculatorInput } from '@/components/common/input/CalcInput'
export default function Gable({ offsetRef }) {
const { getMessage } = useMessage()
@ -12,7 +13,20 @@ export default function Gable({ offsetRef }) {
{getMessage('gable.offset')}
</span>
<div className="input-grid mr5">
<input type="text" className="input-origin block" defaultValue={300} ref={offsetRef} />
{/*<input type="text" className="input-origin block" defaultValue={300} ref={offsetRef} />*/}
<CalculatorInput
id=""
name=""
label=""
className="input-origin block"
value={offsetRef.current?.value ?? 300} // Set default value to 500
ref={offsetRef}
onChange={() => {}}
options={{
allowNegative: false,
allowDecimal: false
}}
/>
</div>
<span className="thin">mm</span>
</div>

16
src/components/floor-plan/modal/roofShape/passivity/Shed.jsx
View File

@ -1,4 +1,5 @@
import { useMessage } from '@/hooks/useMessage'
import { CalculatorInput } from '@/components/common/input/CalcInput'
export default function Shed({ offsetRef }) {
const { getMessage } = useMessage()
@ -9,7 +10,20 @@ export default function Shed({ offsetRef }) {
{getMessage('shed.width')}
</span>
<div className="input-grid mr5">
<input type="text" className="input-origin block" defaultValue={300} ref={offsetRef} />
{/*<input type="text" className="input-origin block" defaultValue={300} ref={offsetRef} />*/}
<CalculatorInput
id=""
name=""
label=""
className="input-origin block"
value={offsetRef.current?.value ?? 300} // Set default value to 500
ref={offsetRef}
onChange={() => {}}
options={{
allowNegative: false,
allowDecimal: false
}}
/>
</div>
<span className="thin">mm</span>
</div>

1
src/lib/authActions.js
View File

@ -49,6 +49,7 @@ export async function setSession(data) {
session.custCd = data.custCd
session.isLoggedIn = true
session.builderNo = data.builderNo
session.custNm = data.custNm
await session.save()
}