!1809 修复:f1面板搜索结果异常问题

pull/1795/MERGE
林三 3 years ago committed by ChenX
parent a86a06743f
commit 77cdd66e8a

@ -4,7 +4,7 @@ import { PostJson, RequestStatus } from "../Common/Request";
import { GetIndexDBID } from "../Common/Utils"; import { GetIndexDBID } from "../Common/Utils";
import { commandMachine } from "../Editor/CommandMachine"; import { commandMachine } from "../Editor/CommandMachine";
import { IndexedDbStore, StoreName } from "../IndexedDb/IndexedDbStore"; import { IndexedDbStore, StoreName } from "../IndexedDb/IndexedDbStore";
import { CommandList, ICommand } from "../UI/Components/CommandPanel/CommandList"; import { CommandList, ICommand, SYSTEM_COMMAND_NAME_START } from "../UI/Components/CommandPanel/CommandList";
import { userConfigStore } from "../UI/Store/UserConfigStore"; import { userConfigStore } from "../UI/Store/UserConfigStore";
/** /**
@ -128,7 +128,7 @@ export class CommandServer
this.RegistCustomCommand(cmd.customize, cmd.command); this.RegistCustomCommand(cmd.customize, cmd.command);
//组合键 //组合键
if (cmd.systemHotkeys)//系统 一定注册 if (cmd.systemHotkeys && !cmd.command.startsWith(SYSTEM_COMMAND_NAME_START))//系统 一定注册 SYSTEMXXXXX 命令不需要注册
this.RegistHotkey(cmd.systemHotkeys, cmd.command); this.RegistHotkey(cmd.systemHotkeys, cmd.command);
else if (cmd.hotkeysCustomize) else if (cmd.hotkeysCustomize)
this.RegistHotkey(cmd.hotkeysCustomize, cmd.command); this.RegistHotkey(cmd.hotkeysCustomize, cmd.command);

@ -2,6 +2,9 @@ import { CommandNames } from "../../../Common/CommandNames";
import { HotkeyList } from "../../../Common/HotKeyList"; import { HotkeyList } from "../../../Common/HotKeyList";
import { IconEnum } from "../../IconEnum"; import { IconEnum } from "../../IconEnum";
//系统命令前缀 使用这个前缀的命令不注册命令
export const SYSTEM_COMMAND_NAME_START = "SYSTEMCMD_";
/** /**
* *
* ,, * ,,
@ -1841,17 +1844,6 @@ export const CommandList: ICommand[] = [
// enName: "Offset", // enName: "Offset",
chDes: "创建同心圆、平行线和平行曲线", chDes: "创建同心圆、平行线和平行曲线",
}, },
{
icon: IconEnum.Length,
typeId: "util",
link: `#`,
defaultCustom: "LENGTH",
command: "LENGTH",
type: "工具",
chName: "长度",
// enName: "Length",
chDes: "测量长度",
},
{ {
icon: IconEnum.EditPolyLine, icon: IconEnum.EditPolyLine,
typeId: "util", typeId: "util",
@ -2318,7 +2310,7 @@ export const CommandList: ICommand[] = [
icon: IconEnum.Print, icon: IconEnum.Print,
typeId: "file", typeId: "file",
link: `#`, link: `#`,
defaultCustom: "PRINT", defaultCustom: CommandNames.Print,
command: CommandNames.Print, command: CommandNames.Print,
type: "文件", type: "文件",
chName: "打印", chName: "打印",
@ -2649,7 +2641,7 @@ export const CommandList: ICommand[] = [
{ {
typeId: "", typeId: "",
defaultCustom: "", defaultCustom: "",
command: "", command: SYSTEM_COMMAND_NAME_START + "PRINT",
type: "内置", type: "内置",
chName: "打印", chName: "打印",
chDes: "系统命令", chDes: "系统命令",
@ -2683,7 +2675,7 @@ export const CommandList: ICommand[] = [
{ {
typeId: "", typeId: "",
defaultCustom: "", defaultCustom: "",
command: "", command: SYSTEM_COMMAND_NAME_START + "FORCE_END_CMD",
type: "内置", type: "内置",
chName: "命令强制结束", chName: "命令强制结束",
chDes: "系统命令", chDes: "系统命令",

Loading…
Cancel
Save