Merge branch 'develop' of http://39.106.8.246:3003/web/persagy_topo_editer into develop

src/components/editClass/edit/items/SBaseIconTextEdit.ts

@@ -269,6 +269,9 @@ export class SBaseIconTextEdit extends SGraphEdit {
     /** 文本数组 */
     textItemList: SBaseTextEdit[] = [];
 
+    /** 当前选中的文本item */
+    curTextItem: SBaseTextEdit | null = null;
+
     /**
      * 构造体
      *
@@ -326,6 +329,7 @@ export class SBaseIconTextEdit extends SGraphEdit {
                     obj.isTransform = false;
                     obj.showSelect = false;
                     obj.color = new SColor(item.color);
+                    obj.connect('textSelect', this, this.textSelectChange)
                     textItemList.push(obj)
                 })
                 this.textItemList = textItemList;                
@@ -380,19 +384,26 @@ export class SBaseIconTextEdit extends SGraphEdit {
     } // Function changeAnchorPoint()
 
     /**
+     * 选中的文本item变化
+    */
+    textSelectChange(item: SBaseTextEdit): void {
+        this.curTextItem = item;
+    } // Function textSelectChange()
+
+    /**
      * 鼠标按下事件
      *
      * @param event   事件对象
      * @return  是否处理事件
     */
     onMouseDown(event: SMouseEvent): boolean {
+        this.curTextItem = null;
         if (this.status == SItemStatus.Normal) {
             super.onMouseDown(event)
             return true;
         } else if (this.status == SItemStatus.Edit) {
             return super.onMouseDown(event);
         }
-
         return true;
     } // Function onMouseDown()
 

src/components/editClass/edit/items/SBaseTextEdit.ts

@@ -285,6 +285,7 @@ export class SBaseTextEdit extends SGraphEdit {
      * @return 是否处理事件
      */
     onMouseDown(event: SMouseEvent): boolean {
+        this.$emit('textSelect')
         super.onMouseDown(event);
         return this.moveable;
     } // Function onMouseDown()
@@ -296,8 +297,6 @@ export class SBaseTextEdit extends SGraphEdit {
      * @return 是否处理事件
      */
     onMouseUp(event: SMouseEvent): boolean {
-        console.log('text up');
-        
         super.onMouseUp(event);
         return this.moveable;
     } // Function onMouseUp()