Compare commits

..

No commits in common. "1393422a4a0cf2894a489afd6dcd3716461b9e00" and "e4c7ab291357e3601cda802393363f2d190fd9c3" have entirely different histories.

View File

@ -71,11 +71,6 @@ export const Orientation = forwardRef((props, ref) => {
],
}
const allOption = {
moduleSerCd: 'ALL',
moduleSerNm: getMessage("board.sub.total") || 'ALL'
};
useEffect(() => {
if (basicSetting.roofSizeSet == '3') {
restoreModuleInstArea()
@ -100,8 +95,6 @@ export const Orientation = forwardRef((props, ref) => {
if (currentSeries && (!selectedModuleSeries || selectedModuleSeries.moduleSerCd !== currentSeries.moduleSerCd)) {
setSelectedModuleSeries(currentSeries)
}
}else{
setSelectedModuleSeries(allOption)
}
}
}
@ -242,8 +235,7 @@ export const Orientation = forwardRef((props, ref) => {
filtered = moduleList
} else {
//
//filtered = moduleList.filter(module => module.moduleSerCd === e.moduleSerCd)
filtered = moduleList.filter(module => module && module.moduleSerCd && module.moduleSerCd === e.moduleSerCd)
filtered = moduleList.filter(module => module.moduleSerCd === e.moduleSerCd)
}
setFilteredModuleList(filtered)
@ -332,6 +324,11 @@ export const Orientation = forwardRef((props, ref) => {
})
// ""
const allOption = {
moduleSerCd: 'ALL',
moduleSerNm: getMessage("board.sub.total") || 'ALL'
}
const seriesList = [allOption, ...mappedSeries]
setModuleSeriesList(seriesList)
@ -439,16 +436,16 @@ export const Orientation = forwardRef((props, ref) => {
<div className="outline-form mb10">
<span>{getMessage('modal.module.basic.setting.module.series.setting')}</span>
<div className="grid-select">
<div className="grid-select">
{moduleSeriesList.length > 0 && (
<QSelectBox
options={moduleSeriesList.length > 0 ? moduleSeriesList : [allOption]}
options={moduleSeriesList}
value={selectedModuleSeries}
targetKey={'moduleSerCd'}
sourceKey={'moduleSerCd'}
showKey={'moduleSerNm'}
onChange={(e) => handleChangeModuleSeries(e)}
/>
</div>
)}
</div>
</div>
<div className="outline-form mb10">