Compare commits

..

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