Merge branch 'dev' into feature/dev-yj-layout

This commit is contained in:
yjnoh 2025-05-02 15:50:37 +09:00
commit f5c098546c

View File

@ -124,6 +124,7 @@ const Trestle = forwardRef((props, ref) => {
useEffect(() => { useEffect(() => {
if (constructionList.length > 0) { if (constructionList.length > 0) {
console.log(constructionList)
setSelectedConstruction(constructionList.find((construction) => construction.constTp === trestleState?.construction?.constTp) ?? null) setSelectedConstruction(constructionList.find((construction) => construction.constTp === trestleState?.construction?.constTp) ?? null)
} else { } else {
setSelectedConstruction(null) setSelectedConstruction(null)
@ -624,19 +625,19 @@ const Trestle = forwardRef((props, ref) => {
<div className="module-flex-item non-flex"> <div className="module-flex-item non-flex">
<div className="flex-item-btn-wrap"> <div className="flex-item-btn-wrap">
<button className={`btn-frame roof ${getConstructionState(0)}`} onClick={() => handleConstruction(0)}> <button className={`btn-frame roof ${getConstructionState(0)}`} onClick={() => handleConstruction(0)}>
{getMessage('modal.module.basic.setting.module.standard.construction')}(I) {constructionList.length > 0 && constructionList[0].constTpJp}
</button> </button>
<button className={`btn-frame roof ${getConstructionState(3)}`} onClick={() => handleConstruction(3)}> <button className={`btn-frame roof ${getConstructionState(3)}`} onClick={() => handleConstruction(3)}>
{getMessage('modal.module.basic.setting.module.multiple.construction')} {constructionList.length > 0 && constructionList[3].constTpJp}
</button> </button>
<button className={`btn-frame roof ${getConstructionState(1)}`} onClick={() => handleConstruction(1)}> <button className={`btn-frame roof ${getConstructionState(1)}`} onClick={() => handleConstruction(1)}>
{getMessage('modal.module.basic.setting.module.standard.construction')} {constructionList.length > 0 && constructionList[1].constTpJp}
</button> </button>
<button className={`btn-frame roof ${getConstructionState(4)}`} onClick={() => handleConstruction(4)}> <button className={`btn-frame roof ${getConstructionState(4)}`} onClick={() => handleConstruction(4)}>
{getMessage('modal.module.basic.setting.module.multiple.construction')}(II) {constructionList.length > 0 && constructionList[4].constTpJp}
</button> </button>
<button className={`btn-frame roof ${getConstructionState(2)}`} onClick={() => handleConstruction(2)}> <button className={`btn-frame roof ${getConstructionState(2)}`} onClick={() => handleConstruction(2)}>
{getMessage('modal.module.basic.setting.module.enforce.construction')} {constructionList.length > 0 && constructionList[2].constTpJp}
</button> </button>
</div> </div>
<div className="grid-check-form-flex"> <div className="grid-check-form-flex">