From c3d1b9c9c42a77039c94cc83b53377f5f7b79537 Mon Sep 17 00:00:00 2001
From: ZoeLeeFZ <lizhou1021@qq.com>
Date: Wed, 11 Sep 2019 15:43:42 +0800
Subject: [PATCH] =?UTF-8?q?!492=20fix=20#I10ICU=20=E6=94=B6=E5=8F=A3?=
 =?UTF-8?q?=E6=9D=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Add-on/DrawBoard/DrawClosingStrip.ts      | 14 +++++++++-----
 src/UI/Components/Board/ClosingStripModal.tsx |  5 +++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/Add-on/DrawBoard/DrawClosingStrip.ts b/src/Add-on/DrawBoard/DrawClosingStrip.ts
index 585ae510d..5edad2f1f 100644
--- a/src/Add-on/DrawBoard/DrawClosingStrip.ts
+++ b/src/Add-on/DrawBoard/DrawClosingStrip.ts
@@ -8,7 +8,7 @@ import { TotalSpaceParse } from '../../Geometry/SpaceParse/TotalSpaceParse';
 import { BoardModal, BoardModalType } from '../../UI/Components/Board/BoardModal';
 import { ModalPosition, ModalState } from '../../UI/Components/Modal/ModalsManage';
 import { AppToaster } from '../../UI/Components/Toaster';
-import { BrRelativePos, StripType } from '../../UI/Store/BoardInterface';
+import { BrRelativePos, StripType, LinesType } from '../../UI/Store/BoardInterface';
 import { ClosingStripStore } from '../../UI/Store/BoardStore';
 import { EBoardKeyList } from '../../Common/BoardKeyList';
 import { begin } from 'xaop';
@@ -105,6 +105,8 @@ export class DrawClosingStrip implements Command
                 br2.Name = "上收口条";
             }
             br.Name = "上收口条";
+            br.BoardProcessOption = this.store.BoardProcessOption;
+            br.BoardProcessOption.lines = LinesType.Reverse;
         }
         else
         {
@@ -146,19 +148,21 @@ export class DrawClosingStrip implements Command
                 }
                 br.Name = "右收口条";
             }
+            br.BoardProcessOption = this.store.BoardProcessOption;
         }
 
         let brs = [br];
-        br2 && brs.push(br2);
-
+        if (br2)
+        {
+            brs.push(br2);
+            br2.BoardProcessOption = this.store.BoardProcessOption;
+        }
         br.Position = pos;
         //更新总空间
         totalSpace.union(br.BoundingBox);
 
         for (let b of brs)
         {
-            b.Name = opt.name;
-            b.BoardProcessOption = this.store.BoardProcessOption;
             //收口条颜色
             b.ColorIndex = 4;
             b.ApplyMatrix(rot);
diff --git a/src/UI/Components/Board/ClosingStripModal.tsx b/src/UI/Components/Board/ClosingStripModal.tsx
index 41763f9ab..5879a38b6 100644
--- a/src/UI/Components/Board/ClosingStripModal.tsx
+++ b/src/UI/Components/Board/ClosingStripModal.tsx
@@ -32,6 +32,11 @@ export const ClosingStripModal =
                                 processOption[EBoardKeyList.CabinetName] =
                                     processOption[EBoardKeyList.CabinetName].replace(ClosingStripReg, title + "收口")
                             }
+                            if (opt.frontShrink < 0)
+                            {
+                                opt.frontShrink = 0;
+                                uiOption.frontShrink = "0";
+                            }
                         }}
                         selectedValue={opt.boardRelative}
                     >