From b4dcd201ea3de65933f8a47d32837a6dc554765f Mon Sep 17 00:00:00 2001
From: ZoeLeeFZ <lizhou1021@qq.com>
Date: Thu, 22 Oct 2020 21:59:02 +0800
Subject: [PATCH] =?UTF-8?q?!1249=20=E4=BF=AE=E5=A4=8D:=E9=98=B5=E5=88=97?=
 =?UTF-8?q?=E6=A8=A1=E6=80=81=E6=A1=86=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Add-on/Array.ts | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Add-on/Array.ts b/src/Add-on/Array.ts
index 0d9cd6ee0..bd322870c 100644
--- a/src/Add-on/Array.ts
+++ b/src/Add-on/Array.ts
@@ -16,6 +16,7 @@ import { ModalPosition, ModalState } from '../UI/Components/Modal/ModalInterface
 import { AppToaster } from '../UI/Components/Toaster';
 import { IBaseOption, IUiOption } from '../UI/Store/BoardInterface';
 import { Hole } from '../DatabaseServices/3DSolid/Hole';
+import { FixedNotZero } from '../Common/Utils';
 
 export enum ArrayType
 {
@@ -109,11 +110,12 @@ export class ArrayStore extends Singleton
 }
 export class Command_Array implements Command
 {
-    arrayStore = ArrayStore.GetInstance();
+    arrayStore: ArrayStore = ArrayStore.GetInstance();
 
     async exec()
     {
         let option = this.arrayStore.m_Option;
+        let uiOption = this.arrayStore.UIOption;
 
         let ssRes = await app.Editor.GetSelection({
             Msg: "请选择阵列对象:",
@@ -152,7 +154,9 @@ export class Command_Array implements Command
                     {
                         let pt1Ucs = ptRes1.Point.applyMatrix4(ucsInv);
                         option.x = pt1Ucs.x;
+                        uiOption.x = FixedNotZero(pt1Ucs.x, 2);
                         option.y = pt1Ucs.y;
+                        uiOption.y = FixedNotZero(pt1Ucs.y, 2);
                     }
                     break;
 
@@ -165,7 +169,10 @@ export class Command_Array implements Command
                         },
                     });
                     if (disRes1.Status === PromptStatus.OK)
+                    {
                         option.rowOffset = (Math.round(disRes1.Distance * 100) / 100);
+                        uiOption.rowOffset = FixedNotZero(option.rowOffset, 2);
+                    }
                     break;
 
                 case Pick.colOffset:
@@ -177,13 +184,19 @@ export class Command_Array implements Command
                         },
                     });
                     if (disRes2.Status === PromptStatus.OK)
+                    {
                         option.colOffset = (Math.round(disRes2.Distance * 100) / 100);
+                        uiOption.colOffset = FixedNotZero(option.colOffset, 2);
+                    }
                     break;
 
                 case Pick.arrayAngle:
                     let ptRes4 = await app.Editor.GetAngle({ Msg: "请指定阵列角度:" });
                     if (ptRes4.Status === PromptStatus.OK)
-                        option.arrayAngle = Math.round(ptRes4.Distance);
+                    {
+                        option.arrayAngle = ptRes4.Distance;
+                        uiOption.arrayAngle = FixedNotZero(option.arrayAngle, 6);
+                    }
                     break;
 
                 case Pick.fillAngle:
@@ -298,7 +311,9 @@ export class Command_Array implements Command
                     {
                         updateRect(p1, ptRes.Point);
                         option.rowOffset = row;
+                        uiOption.rowOffset = FixedNotZero(row, 2);
                         option.colOffset = col;
+                        uiOption.colOffset = FixedNotZero(col, 2);
                     }
                     JigUtils.End();
                     break;
@@ -310,8 +325,11 @@ export class Command_Array implements Command
                 break;
             //数据提交
             option.itemTotal = itemTotal;
+            uiOption.itemTotal = FixedNotZero(itemTotal, 2);
             option.fillAngle = fillAngle;
+            uiOption.fillAngle = FixedNotZero(fillAngle, 2);
             option.betweenAngle = betweenAngle;
+            uiOption.betweenAngle = FixedNotZero(betweenAngle, 2);
             //呼出模态框
             app.Editor.ModalManage.RenderModal(ArrayModal, { store: this.arrayStore }, { position: ModalPosition.Old });
         }