From 2b898356a4fad789c25b268a5e6afebd49075afd Mon Sep 17 00:00:00 2001
From: ZoeLeeFZ <lizhou1021@qq.com>
Date: Tue, 29 Oct 2019 16:42:44 +0800
Subject: [PATCH] =?UTF-8?q?!558=20=E4=BC=98=E5=8C=96=E6=8E=92=E9=92=BB?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA=20fixes=20#I13JM3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UI/Components/Board/BoardCommon.tsx | 11 +++++++----
 src/UI/Store/BoardInterface.ts          |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/UI/Components/Board/BoardCommon.tsx b/src/UI/Components/Board/BoardCommon.tsx
index bb896c648..3042eecb0 100644
--- a/src/UI/Components/Board/BoardCommon.tsx
+++ b/src/UI/Components/Board/BoardCommon.tsx
@@ -11,6 +11,7 @@ import { RightTabId } from '../RightPanel/RightPanel';
 import { ToasterInput } from '../Toaster';
 import { GetEntity } from '../../../Common/Utils';
 import { safeEval } from '../../../Common/eval';
+import { EBoardKeyList } from '../../../Common/BoardKeyList';
 
 type OptionType = BoardOption | DrillingOption;
 
@@ -482,10 +483,10 @@ export class DrillTypeSelectCom extends React.Component<IDrillTypeSelect, { isDa
         {
             options.unshift(DrillType.More);
         }
-        if (!options.includes(this.props.opt.drillType))
+        if (!options.includes(this.props.opt.drillType) || this.props.opt.highDrill.some(t => !options.includes(t)))
         {
             if (this.props.br)
-                options.unshift("无效配置");
+                options.unshift(DrillType.Invail);
         }
         return options;
     }
@@ -529,11 +530,13 @@ export class DrillTypeSelectCom extends React.Component<IDrillTypeSelect, { isDa
     UNSAFE_componentWillMount()
     {
         const options = this.Options;
-        if (!options.includes(this.props.opt.drillType))
+        if (options[0] === DrillType.Invail || !options.includes(this.props.opt.drillType))
         {
-
             if (this.props.br)
+            {
+                this.props.opt[EBoardKeyList.DrillType] = DrillType.Invail;
                 this.setState({ isDanger: true });
+            }
             else
                 this.props.opt.drillType = options[0];
         }
diff --git a/src/UI/Store/BoardInterface.ts b/src/UI/Store/BoardInterface.ts
index 3bd0a6d33..f25b34acd 100644
--- a/src/UI/Store/BoardInterface.ts
+++ b/src/UI/Store/BoardInterface.ts
@@ -19,6 +19,7 @@ export enum DrillType
     Yes = "排",
     None = "不排",
     More = "**多种**",
+    Invail = "无效配置",
 }
 //偏心轮类型
 export enum FaceDirection