From bb60479aa06f01483bfaf4e1605b920734d76ffa Mon Sep 17 00:00:00 2001
From: ChenX <maple6@vip.qq.com>
Date: Thu, 20 Jun 2019 17:11:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9GetPoint=E5=8F=B3=E9=94=AE?=
 =?UTF-8?q?=E6=97=B6=E8=A7=A6=E5=8F=91=E7=9A=84=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?,`=E7=A1=AE=E8=AE=A4`or`=E7=BB=A7=E7=BB=AD`,=E4=B8=8EAllowNone?=
 =?UTF-8?q?=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Add-on/DrawBoard/DrawSingleBoard.ts |  3 +--
 src/Add-on/DrawLine.ts                  |  2 +-
 src/Editor/GetPointServices.ts          | 13 ++++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Add-on/DrawBoard/DrawSingleBoard.ts b/src/Add-on/DrawBoard/DrawSingleBoard.ts
index 69d2abe58..6adba1f7d 100644
--- a/src/Add-on/DrawBoard/DrawSingleBoard.ts
+++ b/src/Add-on/DrawBoard/DrawSingleBoard.ts
@@ -30,6 +30,7 @@ export class DrawSingleBoard implements Command
 
             let ptRes = await app.Editor.GetPoint({
                 Msg: "选择基点",
+                AllowNone: true,
                 Callback: v =>
                 {
                     let vec = v.clone().sub(board.MinPoint);
@@ -43,8 +44,6 @@ export class DrawSingleBoard implements Command
                 board.ApplyMatrix(MoveMatrix(vec));
                 app.Database.ModelSpace.Append(board);
             }
-
-            JigUtils.End();
         }
     }
 }
diff --git a/src/Add-on/DrawLine.ts b/src/Add-on/DrawLine.ts
index 9de540958..3d5aeaec3 100644
--- a/src/Add-on/DrawLine.ts
+++ b/src/Add-on/DrawLine.ts
@@ -14,7 +14,7 @@ export class DrawLine implements Command
     async exec()
     {
         let ptRes = await app.Editor.GetPoint({ Msg: "请输入第一个点:" });
-        if (ptRes.Status != PromptStatus.OK)
+        if (ptRes.Status !== PromptStatus.OK)
             return;
 
         let ptLast = ptRes.Point;
diff --git a/src/Editor/GetPointServices.ts b/src/Editor/GetPointServices.ts
index 9cc141a7f..6882c39ba 100644
--- a/src/Editor/GetPointServices.ts
+++ b/src/Editor/GetPointServices.ts
@@ -36,9 +36,9 @@ export class GetPointServices implements EditorService
         }
         else if (e.button === MouseKey.Right)
         {
-            if (this._prompt.KeyWordList === undefined)
-                DynamicInputManage.GetManage().HandleInputEvent("");
-            else if (!app.Editor.KeyCtrl.KeyIsDown(KeyCode.ControlLeft))
+            // if (this._prompt.KeyWordList === undefined)
+            //     DynamicInputManage.GetManage().HandleInputEvent("");
+            if (!app.Editor.KeyCtrl.KeyIsDown(KeyCode.ControlLeft))
                 this.handleRightClick(this._prompt.KeyWordList);
             return true;
         }
@@ -96,7 +96,7 @@ export class GetPointServices implements EditorService
     private async handleRightClick(keywords: KeyWord[] = [])
     {
         let ks: KeyWord[] = [
-            { key: "ENSURE", msg: `确认` },
+            { key: "ENSURE", msg: this._prompt.AllowNone ? `确认` : "继续" },
             { key: "CANCEL", msg: `取消` },
             ...keywords,
             MenuDividerKWD,
@@ -111,11 +111,14 @@ export class GetPointServices implements EditorService
         switch (res.StringResult)
         {
             case "ENSURE"://确认
-                this.ReturnNone();
+                if (this._prompt.AllowNone)
+                    this.ReturnNone();
                 break;
             case "CANCEL"://取消
                 this.Cancel();
                 break;
+            case undefined:
+                break;
             default:
                 if (!res.isChild)
                     this.ReturnKeyword(res.StringResult);