Merge branch 'develop' of http://39.106.78.171:3000/shaojiahao/AX.Angular9DataCollection into develop

debug.log

@@ -8,3 +8,4 @@
 [0104/090356.225:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [0108/092244.401:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [0108/100658.746:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[0109/083452.962:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

src/app/working-area/model/axArrowConnector.ts

@@ -2,6 +2,7 @@ import { WorkingAreaComponent } from '../working-area.component';
 import * as PIXI from 'pixi.js';
 import { AxShape } from './axShape';
 import { Sprite } from 'pixi.js';
+import { GameMode } from './gameMode';
 
 /**
  * 连接箭头
@@ -116,11 +117,16 @@ export class AxArrowConnector extends AxShape {
     }
         // 设置缩放
     public setItemScale(scale: number) {
-        this.text.scale.set(scale);
+        // this.text.scale.set(scale);
         this.pointSprites.forEach(point => {
             point.scale.set(scale);
         });
     }
+    public setNameVisible(value: boolean, mode: GameMode) {
+        if (this.assetData.GameMode === mode) {
+            this.text.visible = value;
+        }
+    }
     /**
      * 刷新形状
      */

src/app/working-area/model/axImageShape.ts

@@ -186,7 +186,7 @@ export class AxImageShape extends AxShape {
         if (this.assetData.FixedSize) {
             this.scale.set(scale);
         } else {
-            this.text.scale.set(scale);
+            // this.text.scale.set(scale);
             this.upLeft.scale.set(scale);
             this.upRight.scale.set(scale);
             this.downLeft.scale.set(scale);

src/app/working-area/model/axPreviewImageShape.ts

@@ -33,4 +33,7 @@ export class AxPreviewImageShape extends AxShape {
    */
     public drawBorder(scale: number) {
     }
+    public refresh() {
+        this.angle = -this.workingArea.backgroundImage.angle;
+    }
 }

src/app/working-area/model/multipointIcon.ts

@@ -185,7 +185,7 @@ export class MultipointIcon extends AxShape {
     }
     // 设置缩放
     public setItemScale(scale: number) {
-        this.text.scale.set(scale);
+        // this.text.scale.set(scale);
         this.pointsGraphics.forEach((item, index, array) => {
             item.scale.set(scale);
         });

src/app/working-area/model/polygonIcon.ts

@@ -157,7 +157,7 @@ export class PolygonIcon extends AxShape {
     }
     // 设置缩放
     public setItemScale(scale: number) {
-        this.text.scale.set(scale);
+        // this.text.scale.set(scale);
         this.pointsGraphics.forEach(point => {
             point.scale.set(scale);
         });

src/app/working-area/working-area.component.ts

@@ -141,7 +141,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
   // Beta版: 该版本相对于α版已有了很大的改进，消除了严重的错误，但还是存在着一些缺陷，需要经过多次测试来进一步消除，此版本主要的修改对像是软件的UI。
   // RC版: 该版本已经相当成熟了，基本上不存在导致错误的BUG，与即将发行的正式版相差无几。
   // Release版: 该版本意味“最终版本”，在前面版本的一系列测试版之后，终归会有一个正式版本，是最终交付用户使用的一个版本。该版本有时也称为标准版。一般情况下，Release不会以单词形式出现在软件封面上，取而代之的是符号®。
-  public VERSION = '1.0.2.20210108_beta';
+  public VERSION = '1.0.3.20210109_beta';
   /**
    * 数据初始化
    */
@@ -442,6 +442,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
         item.setNameVisible(value, mode);
       } else if (item instanceof PolygonIcon) {
         item.setNameVisible(value, mode);
+      } else if (item instanceof AxArrowConnector) {
+        item.setNameVisible(value, mode);
       }
     });
   }
@@ -594,6 +596,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     this.backgroundImage.sortableChildren = true;
     this.backgroundImage
       .on('pointerdown', event => {
+        if (event.data.button !== 0) return;
         if (!event.currentTarget.dragging && this.selection.isMultiselection === false) {
           this.selection.deselectAll();
           event.currentTarget.data = event.data;
@@ -651,6 +654,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
               if (this.paintPoints.length >= 2) {
                 this.enterPaintEndButton.position = this.circleShadow.position;
                 this.enterPaintEndButton.visible = true;
+                this.enterPaintEndButton.zIndex = this.backgroundImage.children.length;
               }
 
               if (this.paintingIcon !== null) {
@@ -708,6 +712,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
                 this.enterPaintEndButton.position = this.circleShadow.position;
               } else if (this.paintPoints.length >= 3) {
                 this.enterPaintEndButton.visible = true;
+                this.enterPaintEndButton.zIndex = this.backgroundImage.children.length;
               }
               this.paintPoints.forEach((value, index, array) => {
                 if (index === 0) {
@@ -736,6 +741,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
                 this.previewLineSegment.visible = true;
                 this.enterPaintEndButton.position = this.circleShadow.position;
                 this.enterPaintEndButton.visible = true;
+                this.enterPaintEndButton.zIndex = this.backgroundImage.children.length;
                 this.currentClickPoint.position = new PIXI.Point(this.circleShadow.x, this.circleShadow.y);
                 this.paintPoints.push(new PIXI.Point(this.circleShadow.x, this.circleShadow.y));
                 if (this.paintPoints.length < 2) {