|
@@ -1261,10 +1261,20 @@
|
|
|
break;
|
|
|
}
|
|
|
}else{
|
|
|
+ console.log("排查右边空间",newWidth, element.spaceWidthMax,newWidth, element.spaceWidthMin);
|
|
|
if(newWidth > element.spaceWidthMax || newWidth < element.spaceWidthMin){
|
|
|
result = false;
|
|
|
space = element;
|
|
|
- const newWidthValue = newWidth > element.spaceWidthMax ? element.spaceWidthMax : element.spaceWidthMin
|
|
|
+ let newWidthValue = newWidth > element.spaceWidthMax ? element.spaceWidthMax : element.spaceWidthMin
|
|
|
+ if(isZoomIn){ // 放大
|
|
|
+ if(newWidth>element.spaceWidthMax){ // 关联空间放大时已经是最大,则变化值为0
|
|
|
+ newValue = 0
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ newWidthValue = newWidth < element.spaceWidthMin ? element.spaceWidthMin : newWidth;
|
|
|
+ console.log("排查右边空间2",newWidth, element.spaceWidthMax, element.spaceWidthMin);
|
|
|
+ }
|
|
|
newWidth = newWidthValue - newWidth;
|
|
|
const newChangeValue = changeValue - newWidth;
|
|
|
if(newValue > newChangeValue){
|
|
@@ -1274,6 +1284,7 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
if(!result){
|
|
|
this.$message.warning(`关联空间[${ space && space.spaceName || ''}]达到极限值`);
|
|
|
}
|
|
@@ -2101,6 +2112,10 @@
|
|
|
// return
|
|
|
// }
|
|
|
// 隐藏变化空间的家具模型,空间动画结束后显示
|
|
|
+ if(moveValue<= 0){ // 无需变化
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
this.changeLayoutModelState();
|
|
|
console.log("关联空间XXXXX", this.leftSpaces, this.rightSpaces)
|
|
|
for (let index = 0; index < this.leftSpaces.length; index++) {
|