레이어 팝업 수정
This commit is contained in:
parent
dc8f033e9f
commit
0ec917b09f
@ -878,7 +878,6 @@ export function useModuleBasicSetting(tabNum) {
|
|||||||
|
|
||||||
const isChidori = moduleSetupOption.isChidori //치도리 여부
|
const isChidori = moduleSetupOption.isChidori //치도리 여부
|
||||||
const setupLocation = moduleSetupOption.setupLocation //모듈 설치 위치 처마, 용마루
|
const setupLocation = moduleSetupOption.setupLocation //모듈 설치 위치 처마, 용마루
|
||||||
const isMultiModule = checkedModule.length > 1 //멀티 모듈인지 아닌지 여부
|
|
||||||
|
|
||||||
if (isManualModuleLayoutSetup) {
|
if (isManualModuleLayoutSetup) {
|
||||||
if (isManualModuleSetup) {
|
if (isManualModuleSetup) {
|
||||||
@ -943,8 +942,8 @@ export function useModuleBasicSetting(tabNum) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (moduleSetupSurfaces.length !== 0) {
|
if (moduleSetupSurfaces.length !== 0) {
|
||||||
// const col = layoutSetupRef.current[0].col
|
// const col = layoutSetupRef.reduce((acc, cur) => acc + cur.col, 0)
|
||||||
// const row = layoutSetupRef.current[0].row
|
// const row = layoutSetupRef.reduce((acc, cur) => acc + cur.row, 0)
|
||||||
|
|
||||||
let tempModule
|
let tempModule
|
||||||
let manualDrawModules = []
|
let manualDrawModules = []
|
||||||
@ -991,9 +990,30 @@ export function useModuleBasicSetting(tabNum) {
|
|||||||
? moduleSetupSurfaces[i].trestleDetail.moduleIntvlVer / 10
|
? moduleSetupSurfaces[i].trestleDetail.moduleIntvlVer / 10
|
||||||
: moduleSetupSurfaces[i].trestleDetail.moduleIntvlHor / 10
|
: moduleSetupSurfaces[i].trestleDetail.moduleIntvlHor / 10
|
||||||
|
|
||||||
|
//큰버전용 계산
|
||||||
// let calcHalfWidth = (Number((width * col).toFixed(1)) + Number((intvHor * (col - 1)).toFixed(1))) / 2
|
// let calcHalfWidth = (Number((width * col).toFixed(1)) + Number((intvHor * (col - 1)).toFixed(1))) / 2
|
||||||
// let calcHalfHeight = (Number((height * row).toFixed(1)) + Number((intvVer * (row - 1)).toFixed(1))) / 2
|
// let calcHalfHeight = (Number((height * row).toFixed(1)) + Number((intvVer * (row - 1)).toFixed(1))) / 2
|
||||||
|
|
||||||
|
//작은버전용
|
||||||
|
const points = [
|
||||||
|
{
|
||||||
|
x: toFixedWithoutRounding(mousePoint.x, 2) + toFixedWithoutRounding(width / 2, 2),
|
||||||
|
y: toFixedWithoutRounding(mousePoint.y, 2) - toFixedWithoutRounding(height / 2, 2),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
x: toFixedWithoutRounding(mousePoint.x, 2) + toFixedWithoutRounding(width / 2, 2),
|
||||||
|
y: toFixedWithoutRounding(mousePoint.y, 2) + toFixedWithoutRounding(height / 2, 2),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
x: toFixedWithoutRounding(mousePoint.x, 2) - toFixedWithoutRounding(width / 2, 2),
|
||||||
|
y: toFixedWithoutRounding(mousePoint.y, 2) - toFixedWithoutRounding(height / 2, 2),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
x: toFixedWithoutRounding(mousePoint.x, 2) - toFixedWithoutRounding(width / 2, 2),
|
||||||
|
y: toFixedWithoutRounding(mousePoint.y, 2) + toFixedWithoutRounding(height / 2, 2),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
//아래래
|
//아래래
|
||||||
// let points = [
|
// let points = [
|
||||||
// {
|
// {
|
||||||
@ -1014,25 +1034,6 @@ export function useModuleBasicSetting(tabNum) {
|
|||||||
// },
|
// },
|
||||||
// ]
|
// ]
|
||||||
|
|
||||||
const points = [
|
|
||||||
{
|
|
||||||
x: toFixedWithoutRounding(mousePoint.x, 2) + toFixedWithoutRounding(width / 2, 2),
|
|
||||||
y: toFixedWithoutRounding(mousePoint.y, 2) - toFixedWithoutRounding(height / 2, 2),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
x: toFixedWithoutRounding(mousePoint.x, 2) + toFixedWithoutRounding(width / 2, 2),
|
|
||||||
y: toFixedWithoutRounding(mousePoint.y, 2) + toFixedWithoutRounding(height / 2, 2),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
x: toFixedWithoutRounding(mousePoint.x, 2) - toFixedWithoutRounding(width / 2, 2),
|
|
||||||
y: toFixedWithoutRounding(mousePoint.y, 2) - toFixedWithoutRounding(height / 2, 2),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
x: toFixedWithoutRounding(mousePoint.x, 2) - toFixedWithoutRounding(width / 2, 2),
|
|
||||||
y: toFixedWithoutRounding(mousePoint.y, 2) + toFixedWithoutRounding(height / 2, 2),
|
|
||||||
},
|
|
||||||
]
|
|
||||||
|
|
||||||
const turfPoints = coordToTurfPolygon(points)
|
const turfPoints = coordToTurfPolygon(points)
|
||||||
|
|
||||||
if (turf.booleanWithin(turfPoints, turfPolygon)) {
|
if (turf.booleanWithin(turfPoints, turfPolygon)) {
|
||||||
@ -1050,7 +1051,7 @@ export function useModuleBasicSetting(tabNum) {
|
|||||||
height: toFixedWithoutRounding(height, 2), //작은버전
|
height: toFixedWithoutRounding(height, 2), //작은버전
|
||||||
left: toFixedWithoutRounding(mousePoint.x, 2) - toFixedWithoutRounding(width / 2, 2), //작은버전
|
left: toFixedWithoutRounding(mousePoint.x, 2) - toFixedWithoutRounding(width / 2, 2), //작은버전
|
||||||
top: toFixedWithoutRounding(mousePoint.y, 2) - toFixedWithoutRounding(height / 2, 2), //작은버전
|
top: toFixedWithoutRounding(mousePoint.y, 2) - toFixedWithoutRounding(height / 2, 2), //작은버전
|
||||||
// // width: Number((width * col).toFixed(1)) + Number((intvHor * (col - 1)).toFixed(1)), //큰버전
|
// width: Number((width * col).toFixed(1)) + Number((intvHor * (col - 1)).toFixed(1)), //큰버전
|
||||||
// height: Number((height * row).toFixed(1)) + Number((intvVer * (row - 1)).toFixed(1)), //큰버전
|
// height: Number((height * row).toFixed(1)) + Number((intvVer * (row - 1)).toFixed(1)), //큰버전
|
||||||
// left: Number(mousePoint.x.toFixed(1)) - calcHalfWidth.toFixed(1), //큰버전
|
// left: Number(mousePoint.x.toFixed(1)) - calcHalfWidth.toFixed(1), //큰버전
|
||||||
// top: Number(mousePoint.y.toFixed(1)) - calcHalfHeight.toFixed(1), //큰버전
|
// top: Number(mousePoint.y.toFixed(1)) - calcHalfHeight.toFixed(1), //큰버전
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user