Merge pull request 'dev' (#351) from dev into dev-deploy

Reviewed-on: #351
This commit is contained in:
ysCha 2025-09-24 10:10:04 +09:00
commit d0fa7d7ea9
2 changed files with 457 additions and 499 deletions

View File

@ -77,7 +77,7 @@ export const Orientation = forwardRef((props, ref) => {
}; };
useEffect(() => { useEffect(() => {
if (basicSetting.roofSizeSet == '3') { if (basicSetting.roofSizeSet === '3') {
restoreModuleInstArea() restoreModuleInstArea()
} }
}, []) }, [])
@ -187,7 +187,7 @@ export const Orientation = forwardRef((props, ref) => {
title: getMessage('module.not.found'), title: getMessage('module.not.found'),
icon: 'warning', icon: 'warning',
}) })
return
} }
} }
} }
@ -250,8 +250,17 @@ export const Orientation = forwardRef((props, ref) => {
// //
if (filtered.length > 0) { if (filtered.length > 0) {
setSelectedModules(filtered[0]) const firstModule = filtered[0]
setSelectedModules(firstModule)
// handleChangeModule
if (handleChangeModule) {
handleChangeModule(firstModule)
}
} }
} else {
//
setFilteredModuleList([])
setSelectedModules(null)
} }
} }
@ -342,10 +351,14 @@ export const Orientation = forwardRef((props, ref) => {
setSelectedModuleSeries(currentSeries) setSelectedModuleSeries(currentSeries)
} else { } else {
setSelectedModuleSeries(allOption) setSelectedModuleSeries(allOption)
// "ALL"
setTimeout(() => handleChangeModuleSeries(allOption), 0)
} }
} else { } else {
// "" // ""
setSelectedModuleSeries(allOption) setSelectedModuleSeries(allOption)
// "ALL"
setTimeout(() => handleChangeModuleSeries(allOption), 0)
} }
} }
} }
@ -369,6 +382,9 @@ export const Orientation = forwardRef((props, ref) => {
if (filtered.length > 0 && !selectedModules) { if (filtered.length > 0 && !selectedModules) {
setSelectedModules(filtered[0]) setSelectedModules(filtered[0])
} }
} else if (moduleList.length === 0 && filteredModuleList.length === 0 && selectedModuleSeries) {
//
setFilteredModuleList([])
} }
}, [moduleList, selectedModuleSeries]); }, [moduleList, selectedModuleSeries]);
return ( return (
@ -462,6 +478,7 @@ export const Orientation = forwardRef((props, ref) => {
sourceKey={'itemId'} sourceKey={'itemId'}
showKey={'itemNm'} showKey={'itemNm'}
onChange={(e) => handleChangeModule(e)} onChange={(e) => handleChangeModule(e)}
showFirstOptionWhenEmpty = {true}
/> />
)} )}
</div> </div>
@ -512,7 +529,7 @@ export const Orientation = forwardRef((props, ref) => {
</tbody> </tbody>
</table> </table>
</div> </div>
{basicSetting && basicSetting.roofSizeSet == '3' && ( {basicSetting && basicSetting.roofSizeSet === '3' && (
<div className="outline-form mt15"> <div className="outline-form mt15">
<span>{getMessage('modal.module.basic.setting.module.placement.area')}</span> <span>{getMessage('modal.module.basic.setting.module.placement.area')}</span>
<div className="input-grid mr10" style={{ width: '60px' }}> <div className="input-grid mr10" style={{ width: '60px' }}>
@ -523,7 +540,7 @@ export const Orientation = forwardRef((props, ref) => {
)} )}
</div> </div>
{basicSetting && basicSetting.roofSizeSet != '3' && ( {basicSetting && basicSetting.roofSizeSet !== '3' && (
<div className="compas-table-box"> <div className="compas-table-box">
<div className="compas-grid-table"> <div className="compas-grid-table">
<div className="outline-form"> <div className="outline-form">

File diff suppressed because it is too large Load Diff