修改GetPoint右键时触发的关键字,`确认`or`继续`,与AllowNone关联

pull/351/head
ChenX 5 years ago
parent 7958066c32
commit bb60479aa0

@ -30,6 +30,7 @@ export class DrawSingleBoard implements Command
let ptRes = await app.Editor.GetPoint({ let ptRes = await app.Editor.GetPoint({
Msg: "选择基点", Msg: "选择基点",
AllowNone: true,
Callback: v => Callback: v =>
{ {
let vec = v.clone().sub(board.MinPoint); let vec = v.clone().sub(board.MinPoint);
@ -43,8 +44,6 @@ export class DrawSingleBoard implements Command
board.ApplyMatrix(MoveMatrix(vec)); board.ApplyMatrix(MoveMatrix(vec));
app.Database.ModelSpace.Append(board); app.Database.ModelSpace.Append(board);
} }
JigUtils.End();
} }
} }
} }

@ -14,7 +14,7 @@ export class DrawLine implements Command
async exec() async exec()
{ {
let ptRes = await app.Editor.GetPoint({ Msg: "请输入第一个点:" }); let ptRes = await app.Editor.GetPoint({ Msg: "请输入第一个点:" });
if (ptRes.Status != PromptStatus.OK) if (ptRes.Status !== PromptStatus.OK)
return; return;
let ptLast = ptRes.Point; let ptLast = ptRes.Point;

@ -36,9 +36,9 @@ export class GetPointServices implements EditorService
} }
else if (e.button === MouseKey.Right) else if (e.button === MouseKey.Right)
{ {
if (this._prompt.KeyWordList === undefined) // if (this._prompt.KeyWordList === undefined)
DynamicInputManage.GetManage().HandleInputEvent(""); // DynamicInputManage.GetManage().HandleInputEvent("");
else if (!app.Editor.KeyCtrl.KeyIsDown(KeyCode.ControlLeft)) if (!app.Editor.KeyCtrl.KeyIsDown(KeyCode.ControlLeft))
this.handleRightClick(this._prompt.KeyWordList); this.handleRightClick(this._prompt.KeyWordList);
return true; return true;
} }
@ -96,7 +96,7 @@ export class GetPointServices implements EditorService
private async handleRightClick(keywords: KeyWord[] = []) private async handleRightClick(keywords: KeyWord[] = [])
{ {
let ks: KeyWord[] = [ let ks: KeyWord[] = [
{ key: "ENSURE", msg: `确认` }, { key: "ENSURE", msg: this._prompt.AllowNone ? `确认` : "继续" },
{ key: "CANCEL", msg: `取消` }, { key: "CANCEL", msg: `取消` },
...keywords, ...keywords,
MenuDividerKWD, MenuDividerKWD,
@ -111,11 +111,14 @@ export class GetPointServices implements EditorService
switch (res.StringResult) switch (res.StringResult)
{ {
case "ENSURE"://确认 case "ENSURE"://确认
if (this._prompt.AllowNone)
this.ReturnNone(); this.ReturnNone();
break; break;
case "CANCEL"://取消 case "CANCEL"://取消
this.Cancel(); this.Cancel();
break; break;
case undefined:
break;
default: default:
if (!res.isChild) if (!res.isChild)
this.ReturnKeyword(res.StringResult); this.ReturnKeyword(res.StringResult);

Loading…
Cancel
Save