This commit is contained in:
yjnoh 2025-05-02 16:16:23 +09:00
parent 7f1ef1ace4
commit e3df21f827
2 changed files with 27 additions and 8 deletions

View File

@ -26,6 +26,7 @@ export default function QSelectBox({
targetKey = '', targetKey = '',
showKey = '', showKey = '',
params = {}, params = {},
tagTitle = '',
}) { }) {
const { getMessage } = useMessage() const { getMessage } = useMessage()
@ -82,6 +83,7 @@ export default function QSelectBox({
className={`sort-select ${openSelect ? 'active' : ''} ${disabled ? 'disabled' : ''}`} className={`sort-select ${openSelect ? 'active' : ''} ${disabled ? 'disabled' : ''}`}
ref={ref} ref={ref}
onClick={disabled ? () => {} : () => setOpenSelect(!openSelect)} onClick={disabled ? () => {} : () => setOpenSelect(!openSelect)}
title={tagTitle}
> >
<p>{selected}</p> <p>{selected}</p>
<ul className="select-item-wrap"> <ul className="select-item-wrap">

View File

@ -548,13 +548,26 @@ export default function CanvasMenu(props) {
{ {
<div className={`vertical-horizontal ${verticalHorizontalMode ? 'on' : ''}`}> <div className={`vertical-horizontal ${verticalHorizontalMode ? 'on' : ''}`}>
<span>{getMessage('plan.mode.vertical.horizontal')}</span> <span>{getMessage('plan.mode.vertical.horizontal')}</span>
<button onClick={() => setVerticalHorizontalMode(!verticalHorizontalMode)}>{verticalHorizontalMode ? 'ON' : 'OFF'}</button> <button
title={`${getMessage('plan.mode.vertical.horizontal')} ${verticalHorizontalMode ? 'ON' : 'OFF'}`}
onClick={() => setVerticalHorizontalMode(!verticalHorizontalMode)}
>
{verticalHorizontalMode ? 'ON' : 'OFF'}
</button>
</div> </div>
} }
<div className="btn-from"> <div className="btn-from">
<button className={`btn01 ${commonUtils.text ? 'active' : ''}`} onClick={() => commonFunctions('text')}></button> <button className={`btn01 ${commonUtils.text ? 'active' : ''}`} onClick={() => commonFunctions('text')} title="文字作成"></button>
<button className={`btn02 ${commonUtils.dimension ? 'active' : ''} `} onClick={() => commonFunctions('dimension')}></button> <button
<button className={`btn03 ${commonUtils.distance ? 'active' : ''} `} onClick={() => commonFunctions('distance')}></button> className={`btn02 ${commonUtils.dimension ? 'active' : ''} `}
onClick={() => commonFunctions('dimension')}
title="寸法作成"
></button>
<button
className={`btn03 ${commonUtils.distance ? 'active' : ''} `}
onClick={() => commonFunctions('distance')}
title="定規"
></button>
</div> </div>
{isObjectNotEmpty(selectedRoofMaterial) && addedRoofs.length > 0 && ( {isObjectNotEmpty(selectedRoofMaterial) && addedRoofs.length > 0 && (
<div className="select-box"> <div className="select-box">
@ -580,6 +593,7 @@ export default function CanvasMenu(props) {
sourceKey={'index'} sourceKey={'index'}
targetKey={'index'} targetKey={'index'}
disabled={+basicSetting.roofSizeSet === 3} disabled={+basicSetting.roofSizeSet === 3}
tagTitle={'屋根材変更'}
/> />
} }
</div> </div>
@ -588,9 +602,10 @@ export default function CanvasMenu(props) {
<button <button
className={`btn10 ${floorPlanState.refFileModalOpen && 'active'}`} className={`btn10 ${floorPlanState.refFileModalOpen && 'active'}`}
onClick={() => setFloorPlanState({ ...floorPlanState, refFileModalOpen: true })} onClick={() => setFloorPlanState({ ...floorPlanState, refFileModalOpen: true })}
title="読込"
></button> ></button>
{/*<button className="btn04" onClick={() => setShowCanvasSettingModal(true)}></button>*/} {/*<button className="btn04" onClick={() => setShowCanvasSettingModal(true)}></button>*/}
<button className="btn04" onClick={handlePopup}></button> <button className="btn04" onClick={handlePopup} title="設定"></button>
</div> </div>
<div className="size-control"> <div className="size-control">
<button <button
@ -599,7 +614,9 @@ export default function CanvasMenu(props) {
handleZoom(false) handleZoom(false)
}} }}
></button> ></button>
<span onClick={handleZoomClear}>{canvasZoom}%</span> <span onClick={handleZoomClear} title="拡大・縮小">
{canvasZoom}%
</span>
<button <button
className="control-btn plus" className="control-btn plus"
onClick={() => { onClick={() => {
@ -608,8 +625,8 @@ export default function CanvasMenu(props) {
></button> ></button>
</div> </div>
<div className="btn-from"> <div className="btn-from">
<button className="btn08" onClick={handleSaveCanvas}></button> <button className="btn08" onClick={handleSaveCanvas} title="保存"></button>
<button className="btn09" onClick={handleLeaveCanvas}></button> <button className="btn09" onClick={handleLeaveCanvas} title="物件検索画面へ移動"></button>
</div> </div>
</> </>
)} )}