修改点击事件冲突bug;2.0.560

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@saga-web/cad-engine",
-    "version": "2.0.541",
+    "version": "2.0.559",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -38,9 +38,9 @@
             }
         },
         "@saga-web/graphy": {
-            "version": "2.1.42",
-            "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/@saga-web/graphy/-/graphy-2.1.42.tgz",
-            "integrity": "sha512-tzdmEk9WCB1UfoRVkklVHl7p239wMGkxkYNimL3fkJyyZ+WTYPW8lBN/l4eTXUVssP9sUL1d4zOy385hRx9L6Q==",
+            "version": "2.1.47",
+            "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/@saga-web/graphy/-/graphy-2.1.47.tgz",
+            "integrity": "sha512-Qib9Hx/W+gLzLexCSagtvA1l7eK123jY1utx7Y5ZgZNtkIGoeEdP33UrlZx83T2XqZK93D9glTcrQ+DPJCxKJw==",
             "requires": {
                 "@saga-web/draw": "^2.1.75"
             }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@saga-web/cad-engine",
-    "version": "2.0.548",
+    "version": "2.0.560",
     "description": "上格云 CAD图形引擎。",
     "main": "lib/index.js",
     "types": "lib/index.d.js",
@@ -33,7 +33,7 @@
     "dependencies": {
         "@saga-web/base": "2.1.9",
         "@saga-web/draw": "2.1.75",
-        "@saga-web/graphy": "2.1.42",
+        "@saga-web/graphy": "2.1.47",
         "axios": "^0.18.0",
         "pako": "^1.0.10",
         "poly-decomp": "^0.3.0",

src/DivideFloorScene.ts

@@ -238,7 +238,7 @@ export class DivideFloorScene extends ZoneScene {
                     return true;
                 }
                 if (this.sceneMark) {
-                    this.sceneMark.onMouseDown(event);
+                    return this.sceneMark.onMouseDown(event);
                 } else {
                     let point = new SPoint(event.x, event.y);
                     let sceneMark = new SceneMarkItem(null, point);
@@ -263,7 +263,7 @@ export class DivideFloorScene extends ZoneScene {
                     return true;
                 }
                 if (this.cutItem) {
-                    this.cutItem.onMouseDown(event);
+                    return this.cutItem.onMouseDown(event);
                 } else {
                     let point = new SPoint(event.x, event.y);
                     let cut = new ShadeItem(null, point);
@@ -283,12 +283,10 @@ export class DivideFloorScene extends ZoneScene {
                     this.rectSelectItem = rect;
                 }
             } else {
-                super.onMouseDown(event);
+                return super.onMouseDown(event);
             }
-        } else {
-            super.onMouseDown(event);
         }
-        return false;
+        return super.onMouseDown(event);
     } // Function onMouseDown()
 
     /**

src/items/SpaceItem.ts

@@ -125,7 +125,8 @@ export class SpaceItem extends SGraphyItem {
      * @param	event         事件参数
      * @return	boolean
      */
-    onClick(event: SMouseEvent): boolean {
+    onMouseDown(event: SMouseEvent): boolean {
+        console.log("spaceDown");
         if (this.selectable) {
             this.selected = !this.selected;
         }
@@ -143,6 +144,17 @@ export class SpaceItem extends SGraphyItem {
     } // Function onMouseMove()
 
     /**
+     * 鼠标抬起事件
+     *
+     * @param	event         事件参数
+     * @return	boolean
+     */
+    onMouseUp(event: SMouseEvent): boolean {
+        console.log("spaceUp");
+        return false;
+    } // Function onClick()
+
+    /**
      * 判断点是否在区域内
      *
      * @param x

src/items/ZoneItem.ts

@@ -166,7 +166,7 @@ export class ZoneItem extends SGraphyItem {
      * @param   event   事件参数
      * @return  boolean
      */
-    onClick(event: SMouseEvent): boolean {
+    onMouseDown(event: SMouseEvent): boolean {
         if (this.selectable) {
             this.selected = !this.selected;
             this.clickPoint = new SPoint(event.x, event.y);