Browse Source

选择器对齐修改;基础空间itemname修改

haojianlong 5 years ago
parent
commit
b5faac54fa

+ 2 - 2
saga-web-big/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@saga-web/big",
-    "version": "1.0.57",
+    "version": "1.0.59",
     "description": "上格云建筑信息化库",
     "main": "lib/index.js",
     "types": "lib/index.d.js",
@@ -42,6 +42,6 @@
         "typescript": "^3.9.3"
     },
     "dependencies": {
-        "@saga-web/graph": "2.1.95"
+        "@saga-web/graph": "2.1.96"
     }
 }

+ 3 - 2
saga-web-big/src/items/floor/SSpaceItem.ts

@@ -82,6 +82,7 @@ export class SSpaceItem extends SGraphItem {
         this.data = data;
         this.zOrder = ItemOrder.spaceOrder;
         let tempArr = this.data.OutLine;
+        this.name = data.Name || "";
         if (tempArr && tempArr.length) {
             this.minX = tempArr[0][0].X;
             this.maxX = this.minX;
@@ -197,13 +198,13 @@ export class SSpaceItem extends SGraphItem {
         painter.drawPath(this.path);
 
         if (this.showBaseName) {
-            if (this.data.Name && this.data.Name != "null") {
+            if (this.name && this.name != "null") {
                 painter.brush.color = SColor.Black;
                 painter.font.size = painter.toPx(10);
                 // painter.font.size = 500;
                 painter.font.textAlign = STextAlign.Center;
                 painter.drawText(
-                    this.data.Name,
+                    this.name,
                     this.data.Location.Points[0].X,
                     -this.data.Location.Points[0].Y
                 );

+ 1 - 1
saga-web-graph/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@saga-web/graph",
-    "version": "2.1.95",
+    "version": "2.1.96",
     "description": "上格云二维图形引擎。",
     "main": "lib/index.js",
     "types": "lib/index.d.js",

+ 26 - 8
saga-web-graph/src/SGraphSelectContainer.ts

@@ -147,7 +147,9 @@ export class SGraphSelectContainer extends SObject {
                 // 将p转换为当前item中的坐标
                 let p1 = curItem.mapFromScene(p.x, p.y);
                 // 根据等式差值相等 newboundx - oldboundx = newposx - oldposx => newposx = newboundx - oldboundx + oldposx
-                curItem.x = p1.x - curItem.boundingRect().x + curItem.x;
+                curItem.x =
+                    (p1.x - curItem.boundingRect().x) * curItem.inverseScale +
+                    curItem.x;
             }
         }
     } // Function alignLeft()
@@ -166,7 +168,9 @@ export class SGraphSelectContainer extends SObject {
             let curItem = this.itemList[i];
             if (curItem.moveable) {
                 let p1 = curItem.mapFromScene(p.x, p.y);
-                curItem.y = p1.y - curItem.boundingRect().y + curItem.y;
+                curItem.y =
+                    (p1.y - curItem.boundingRect().y) * curItem.inverseScale +
+                    curItem.y;
             }
         }
     } // Function alignTop()
@@ -185,7 +189,10 @@ export class SGraphSelectContainer extends SObject {
             let curItem = this.itemList[i];
             if (curItem.moveable) {
                 let p1 = curItem.mapFromScene(p.x, p.y);
-                curItem.x = p1.x - curItem.boundingRect().right + curItem.x;
+                curItem.x =
+                    (p1.x - curItem.boundingRect().right) *
+                        curItem.inverseScale +
+                    curItem.x;
             }
         }
     } // Function alignRight()
@@ -204,7 +211,10 @@ export class SGraphSelectContainer extends SObject {
             let curItem = this.itemList[i];
             if (curItem.moveable) {
                 let p1 = curItem.mapFromScene(p.x, p.y);
-                curItem.y = p1.y - curItem.boundingRect().bottom + curItem.y;
+                curItem.y =
+                    (p1.y - curItem.boundingRect().bottom) *
+                        curItem.inverseScale +
+                    curItem.y;
             }
         }
     } // Function alignBottom()
@@ -226,7 +236,9 @@ export class SGraphSelectContainer extends SObject {
                 let p1 = curItem.mapFromScene(p.x, p.y);
                 // 根据等式差值相等 newcenterx - oldcenterx = newposx - oldposx => newposx = newcenterx - oldcenterx + oldposx
                 curItem.x =
-                    p1.x - curItem.boundingRect().center().x + curItem.x;
+                    (p1.x - curItem.boundingRect().center().x) *
+                        curItem.inverseScale +
+                    curItem.x;
             }
         }
     } // Function alignCenter()
@@ -247,7 +259,9 @@ export class SGraphSelectContainer extends SObject {
             if (curItem.moveable) {
                 let p1 = curItem.mapFromScene(p.x, p.y);
                 curItem.y =
-                    p1.y - curItem.boundingRect().center().y + curItem.y;
+                    (p1.y - curItem.boundingRect().center().y) *
+                        curItem.inverseScale +
+                    curItem.y;
             }
         }
     } // Function alignMiddle()
@@ -302,7 +316,9 @@ export class SGraphSelectContainer extends SObject {
                 );
                 let p2 = curItem.mapFromScene(p1.x, p1.y + average * k);
                 curItem.y =
-                    p2.y - curItem.boundingRect().center().y + curItem.y;
+                    (p2.y - curItem.boundingRect().center().y) *
+                        curItem.inverseScale +
+                    curItem.y;
             }
         }
     } // Function alignVertical()
@@ -358,7 +374,9 @@ export class SGraphSelectContainer extends SObject {
                 let p2 = curItem.mapFromScene(p1.x + average * k, p1.y);
                 // 根据等式 newposx - oldposx = newcenterx - oldcenterx
                 curItem.x =
-                    p2.x - curItem.boundingRect().center().x + curItem.x;
+                    (p2.x - curItem.boundingRect().center().x) *
+                        curItem.inverseScale +
+                    curItem.x;
             }
         }
     } // Function alignHorizontal()