清理代码

src/Editor/Editor.ts

@@ -68,9 +68,6 @@ export class Editor
 
     /**
      * 在命令行输出一行提示信息.
-     *
-     * @param {string} msg
-     * @memberof Editor
      */
     Prompt(msg: string)
     {
@@ -92,10 +89,8 @@ export class Editor
     {
         [this.m_GetpointServices, this.m_GetDistanceServices, this.m_GetEntitytServices, this.m_SsgetServices, this.m_KeywordsServices].forEach(ser =>
         {
-            if (ser.IsReady)
+            ser.Cancel();
-                ser.Cancel()
         })
-
     }
     GetPoint(prompt?: GetPointPrompt): Promise<PromptPointResult>
     {
@@ -103,12 +98,21 @@ export class Editor
     }
     GetDistance(prompt?: GetDistendPrompt): Promise<PromptDistendResult>
     {
-        return this.m_GetDistanceServices.Doit(prompt);
+        return this.m_GetDistanceServices.Start(prompt);
     }
     GetKeyWords(prompt: GetKeyWordPrommpt): Promise<PromptResult>
     {
         return this.m_KeywordsServices.Start(prompt);
     }
+    GetEntity(prompt?: GetEntityPrompt): Promise<PromptEntityResult>
+    {
+        return this.m_GetEntitytServices.Start(prompt);
+    }
+    async GetSelection(prompt?: GetSelectionPrompt): Promise<PromptSsgetResult>
+    {
+        return this.m_SsgetServices.Start(prompt);
+    }
+
     AddNoSnapEntity(e: Entity)
     {
         this.m_GetpointServices.snapServices.notSnapEntity.add(e);
@@ -126,15 +130,6 @@ export class Editor
     {
         return null;
     }
-
-    GetEntity(prompt?: GetEntityPrompt): Promise<PromptEntityResult>
-    {
-        return this.m_GetEntitytServices.Start(prompt);
-    }
-    async GetSelection(prompt?: GetSelectionPrompt): Promise<PromptSsgetResult>
-    {
-        return this.m_SsgetServices.Start(prompt);
-    }
     SelectWindow(p1: THREE.Vector3, p2: THREE.Vector3): Array<Entity>
     {
         return [];

src/Editor/GetDistanceServices.ts

@@ -7,16 +7,13 @@ import { GetDistancePromptBlock } from '../UI/DynamicPrompt/GetDistancePromptBlo
 import { HandleKeyword, InitKeyWord } from './InitKeyword';
 import { PromptDistendResult, PromptStatus } from './PromptResult';
 
-
 export class GetDistanceServices
 {
-    IsReady = false;
     private removeCalls: Function[] = [];
     private promisResolve: (PromptDistendResult) => void;
 
-    Doit(prompt?: GetDistendPrompt): Promise<PromptDistendResult>
+    Start(prompt?: GetDistendPrompt): Promise<PromptDistendResult>
     {
-        this.IsReady = true;
         prompt = prompt || {};
         let dynInput = this.initDynInput(prompt);
         this.removeCalls.push(InitKeyWord(prompt));
@@ -138,18 +135,12 @@ export class GetDistanceServices
     private RestState()
     {
         app.m_Editor.m_InputState &= ~InputState.GetDist;
-        this.IsReady = false;
         this.removeCalls.forEach(f => f());
         this.removeCalls.length = 0;
     }
     Cancel()
     {
-        let res = new PromptDistendResult();
+        this._return(undefined);
-        res.Status = PromptStatus.Cancel;
-        this.RestState();
-        this.promisResolve(res);
-        this.promisResolve = undefined;
-        app.m_Editor.m_GetpointServices.Cancel();//取消掉点选服务.
     }
     protected _return(v?: number | string)
     {