diff --git a/src/UI/Components/Board/GangDrillModal.tsx b/src/UI/Components/Board/GangDrillModal.tsx
index 78c55f785..affb21fb3 100644
--- a/src/UI/Components/Board/GangDrillModal.tsx
+++ b/src/UI/Components/Board/GangDrillModal.tsx
@@ -115,6 +115,7 @@ export class DrillModal extends React.Component<{ store?: DrillStore; }, {}> {
                         <Button
                             className={Classes.INTENT_DANGER}
                             text="取消"
+                            onClick={this.cancel}
                         />
                     </>
                 }
diff --git a/src/UI/Components/RightPanel/BoardPropsComponent.tsx b/src/UI/Components/RightPanel/BoardPropsComponent.tsx
index 63b94a323..9401fc54b 100644
--- a/src/UI/Components/RightPanel/BoardPropsComponent.tsx
+++ b/src/UI/Components/RightPanel/BoardPropsComponent.tsx
@@ -28,6 +28,7 @@ export class BoardPropsComponent extends React.Component<{ board: Board; }, {}>
     private m_IsSpecialBoard = observable.box(false);
     private canDrawSpecial = observable.box(true);
     private canModeling = observable.box(true);
+    @observable otherBoardData = { isChaiDan: true };
     constructor(props)
     {
         super(props);
@@ -84,7 +85,7 @@ export class BoardPropsComponent extends React.Component<{ board: Board; }, {}>
         }
         else
             Object.assign(this.m_ProcessOption, boardProcessOption);
-
+        this.otherBoardData.isChaiDan = this.m_CurrentBoard.IsChaiDan;
     };
     UNSAFE_componentWillReceiveProps(nextProps)
     {
@@ -154,7 +155,7 @@ export class BoardPropsComponent extends React.Component<{ board: Board; }, {}>
         //取消勾选异型，板件回复正常形状
         if (!this.canDrawSpecial.get() && board.IsSpecialShape)
             board.InitBoard(board.Height, board.Width, board.Thickness, board.BoardType);
-
+        board.IsChaiDan = this.otherBoardData.isChaiDan;
         board.AutoUpdate = oldAutoUpdate;
         board.DeferUpdate();
 
@@ -181,6 +182,7 @@ export class BoardPropsComponent extends React.Component<{ board: Board; }, {}>
                             opt={this.m_ProcessOption}
                             br={this.m_CurrentBoard}
                             isSpecial={this.m_IsSpecialBoard}
+                            otherBoardData={this.otherBoardData}
                         />
                     </div>
                     {/* <div>