|
@@ -549,12 +549,14 @@ export default {
|
|
|
if (curSpace.spaceWallInfo.wallN && curSpace.spaceWallInfo.wallS) {
|
|
|
spaceHeight -= 20 + parseFloat(cubeInfo.marginTop) + parseFloat(cubeInfo.marginBottom);
|
|
|
} else if (curSpace.spaceWallInfo.wallN) {
|
|
|
- spaceHeight -= 10 + parseFloat(cubeInfo.marginTop);
|
|
|
+ spaceHeight -= 10 + parseFloat(cubeInfo.marginTop) + parseFloat(cubeInfo.marginBottom);
|
|
|
positionY += 10 / 2;
|
|
|
positionY += parseFloat(cubeInfo.marginTop) / 2;
|
|
|
+ positionY -= parseFloat(cubeInfo.marginBottom) / 2;
|
|
|
} else if (curSpace.spaceWallInfo.wallS) {
|
|
|
- spaceHeight -= 10 + parseFloat(cubeInfo.marginBottom);
|
|
|
+ spaceHeight -= 10 + parseFloat(cubeInfo.marginTop) + parseFloat(cubeInfo.marginBottom);
|
|
|
positionY -= 10 / 2;
|
|
|
+ positionY += parseFloat(cubeInfo.marginTop) / 2 ;
|
|
|
positionY -= parseFloat(cubeInfo.marginBottom) / 2;
|
|
|
}else {
|
|
|
spaceHeight -= parseFloat(cubeInfo.marginTop) + parseFloat(cubeInfo.marginBottom);
|
|
@@ -576,14 +578,16 @@ export default {
|
|
|
positionX = centerX;
|
|
|
|
|
|
if (curSpace.spaceWallInfo.wallW && curSpace.spaceWallInfo.wallE) {
|
|
|
- spaceWidth -= 20 + parseFloat(cubeInfo.marginLeft) + parseFloat(cubeInfo.marginRight);;
|
|
|
+ spaceWidth -= 20 + parseFloat(cubeInfo.marginLeft) + parseFloat(cubeInfo.marginRight);
|
|
|
} else if (curSpace.spaceWallInfo.wallW) {
|
|
|
- spaceWidth -= 10 + parseFloat(cubeInfo.marginLeft);
|
|
|
+ spaceWidth -= 10 + parseFloat(cubeInfo.marginLeft) + parseFloat(cubeInfo.marginRight);
|
|
|
positionX += 10 / 2;
|
|
|
positionX += parseFloat(cubeInfo.marginLeft) / 2;
|
|
|
+ positionX -= parseFloat(cubeInfo.marginRight) / 2;
|
|
|
} else if (curSpace.spaceWallInfo.wallE) {
|
|
|
- spaceWidth -= 10 + parseFloat(cubeInfo.marginRight);
|
|
|
+ spaceWidth -= 10 + parseFloat(cubeInfo.marginLeft) + parseFloat(cubeInfo.marginRight);
|
|
|
positionX -= 10 / 2;
|
|
|
+ positionX += parseFloat(cubeInfo.marginLeft) / 2;
|
|
|
positionX -= parseFloat(cubeInfo.marginRight) / 2;
|
|
|
}else {
|
|
|
spaceWidth -= parseFloat(cubeInfo.marginLeft) + parseFloat(cubeInfo.marginRight);
|