diff --git a/package-lock.json b/package-lock.json index f915e38aa..2ff5977d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12346,6 +12346,14 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, + "string_decoder": { + "version": "1.0.3", + "resolved": "http://registry.npm.taobao.org/string_decoder/download/string_decoder-1.0.3.tgz", + "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=", + "requires": { + "safe-buffer": "5.1.1" + } + }, "string-length": { "version": "2.0.0", "resolved": "http://registry.npm.taobao.org/string-length/download/string-length-2.0.0.tgz", @@ -12412,14 +12420,6 @@ } } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "http://registry.npm.taobao.org/string_decoder/download/string_decoder-1.0.3.tgz", - "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=", - "requires": { - "safe-buffer": "5.1.1" - } - }, "stringify": { "version": "5.2.0", "resolved": "http://registry.npm.taobao.org/stringify/download/stringify-5.2.0.tgz", diff --git a/src/UI/Components/commandLineInput/InputHint.tsx b/src/UI/Components/commandLineInput/InputHint.tsx index f5974cbb5..ba3bf1f99 100644 --- a/src/UI/Components/commandLineInput/InputHint.tsx +++ b/src/UI/Components/commandLineInput/InputHint.tsx @@ -98,7 +98,7 @@ export class InputHint extends React.Component } // 动态生成正则表达式 - let searchReg: RegExp = new RegExp(''); + let searchReg: RegExp; // 拼接动态正则表达式 let m_comTmp: string = '^' + inputCmd.toUpperCase().split('').join('\\w*') + '\\w*$'; searchReg = new RegExp(m_comTmp, 'i'); @@ -106,11 +106,30 @@ export class InputHint extends React.Component let intelliSenseCmdList: string[] = []; for (let cmdName of this.props.cmdList) { + if (cmdName.indexOf(inputCmd) !== -1) + { + intelliSenseCmdList.push(cmdName); + return; + } if (searchReg.test(cmdName)) { intelliSenseCmdList.push(cmdName); } } + // while (true) + // { + // console.log(m_comTmp); + // tmpStr = m_comTmp.splice(i, 0, "\\w*").toString() + // if (RegExp(tmpStr, "i").test(cmdName)) + // { + // intelliSenseCmdList.push({ + // level: i, + // cmd: cmdName + // }); + // return; + // } + // i += 2; + // } intelliSenseCmdList.sort((c1, c2) => { return c1.length < c2.length ? -1 : 1;