qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature/ysCha #23

Closed
ysCha wants to merge 259 commits from feature/ysCha into main
pull from: feature/ysCha
merge into: qcast3:main
Conversation 0 Commits 259 Files Changed 73 +12 -21
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 943fd16e4b - Show all commits

1
src/components/floor-plan/modal/basic/BasicSetting.jsx
View File

@ -168,6 +168,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
useEffect(() => {
setIsManualModuleSetup(false)
setIsManualModuleLayoutSetup(false)
setManualSetupMode(`off`)
}, [checkedModules])
return (

32
src/hooks/module/useModuleBasicSetting.js
View File

@ -1250,31 +1250,21 @@ export function useModuleBasicSetting(tabNum) {
if (!inside) return
//입력받은 값의 합
let sumRowCount = layoutSetupRef.reduce((acc, cur) => acc + cur.row, 0)
let sumColCount = layoutSetupRef.reduce((acc, cur) => acc + cur.col, 0)
let maxRow = 0
let maxCol = trestlePolygon.trestleDetail.moduleMaxCols
if (checkedModule.length > 1) {
//모듈이 여러개일때
maxRow = trestlePolygon.trestleDetail.moduleMaxRows
const isMultipleModules = checkedModule.length > 1
const maxRow = isMultipleModules
? trestlePolygon.trestleDetail.moduleMaxRows
: trestlePolygon.trestleDetail.module.find((item) => item.moduleTpCd === checkedModule[0].moduleTpCd).moduleMaxRows
if (sumRowCount > maxRow || sumColCount > maxCol) {
swalFire({ text: getMessage('module.layout.setup.max.count', [maxRow, maxCol]) })
return
}
} else {
//모듈이 하나일때는 module에 list를 조회
const checkModuleId = checkedModule[0].itemId
const targetModuleRows = trestlePolygon.trestleDetail.module.find((item) => item.itemId === checkModuleId).modulemaxRows
const refOption = layoutSetupRef.find((item) => item.moduleId === checkModuleId)
const sumRowCount = isMultipleModules
? layoutSetupRef.reduce((acc, cur) => acc + cur.row, 0)
: layoutSetupRef.find((item) => item.moduleId === checkedModule[0].itemId).row
sumRowCount = refOption.row
if (sumRowCount > targetModuleRows || sumColCount > maxCol) {
swalFire({ text: getMessage('module.layout.setup.max.count', [targetModuleRows, maxCol]) })
return
}
if (sumRowCount > maxRow || sumColCount > trestlePolygon.trestleDetail.moduleMaxCols) {
swalFire({ text: getMessage('module.layout.setup.max.count', [maxRow, trestlePolygon.trestleDetail.moduleMaxCols]) })
return
}
if (tempModule) {