Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

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

@@ -154,20 +154,22 @@ export class AxArrowConnector extends AxShape {
             + this.assetData.PropertyInfos?.find(item => item.PropertyName === '名称/编号')?.PropertyValue;
         const strokeWidth = 1;
 
-        const edgeWidth = this.assetData.Thickness === 0 ? 5 : this.assetData.Thickness;  // 宽度
+        const edgeWidth = this.assetData.Thickness === 0 ? 1 : this.assetData.Thickness;  // 宽度
 
-        const startWidth = edgeWidth * 2 + strokeWidth;
+        const startScale = this.assetData.Thickness <= 5 ? 5 : 2;  // 宽度
-        const endWidth = edgeWidth * 2 + strokeWidth;
+
+        const startWidth = edgeWidth * startScale + strokeWidth;
+        const endWidth = edgeWidth * startScale + strokeWidth;
 
         const openEnded = false;
 
         const spacing = (openEnded) ? 0 : 0 + strokeWidth / 2;
 
-        const startSize = edgeWidth * 2 + strokeWidth;
+        const startSize = edgeWidth * startScale + strokeWidth;
-        const endSize = edgeWidth * 2 + strokeWidth;
+        const endSize = edgeWidth * startScale + strokeWidth;
 
         const isRounded = true;
-        const lineColor = 0x000000;
+        const lineColor : number = this.assetData.Color.substring(0, 7).replace('#', '0x');
         const fillColor: number = this.assetData.Color.substring(0, 7).replace('#', '0x');
 
         const pe = pts[pts.length - 1];