diff --git a/src/js/quickcommand.js b/src/js/quickcommand.js index 8c65c1b..2217912 100644 --- a/src/js/quickcommand.js +++ b/src/js/quickcommand.js @@ -12,14 +12,15 @@ import inputBox from "../components/InputBox" let showInputBox = (options = [], title = "") => { return new Promise((reslove, reject) => { - let props = {} + let props = { + labels: [], + values: [], + hints: [], + title: title + } if (!(options instanceof Object)) return reject(new TypeError("必须为数组或对象")) if (options instanceof Array) props.labels = options - else props = options - if (!props.labels) return reject(new SyntaxError("缺少必须要的参数")) - if (!props.values) props.values = props.labels.map(() => "") - if (!props.hints) props.hints = props.labels.map(() => "") - props.title = title + else Object.assign(props, options) Dialog.create({ component: inputBox, componentProps: props diff --git a/src/pages/CodeRunner.vue b/src/pages/CodeRunner.vue index da493e5..9f52b05 100644 --- a/src/pages/CodeRunner.vue +++ b/src/pages/CodeRunner.vue @@ -209,9 +209,8 @@ export default { this.routeData.action === "edit" ? this.routeData.data : this.$utools.getDB(this.$utools.DBPRE.CFG + "codeHistory"); - quickCommandInfo = this.fillDefaultKeys(quickCommandInfo); + Object.assign(this.quickcommandInfo, quickCommandInfo) this.$refs.editor.setEditorValue(quickCommandInfo.cmd); - this.quickcommandInfo = quickCommandInfo; // 只有新建或运行时才保存记录 if (this.routeData.action === "edit") return; utools.onPluginOut(() => { @@ -223,15 +222,6 @@ export default { ); }); }, - // 补充没有的键值 - fillDefaultKeys(command) { - let commandKeys = Object.keys(command); - Object.keys(this.quickcommandInfo).forEach((key) => { - if (!commandKeys.includes(key)) - command[key] = this.quickcommandInfo[key]; - }); - return command; - }, // 绑定快捷键 bindKeys() { let that = this; diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue index bf3cccc..e545e6d 100644 --- a/src/pages/ConfigurationPage.vue +++ b/src/pages/ConfigurationPage.vue @@ -332,7 +332,6 @@ export default { ); default: return commands.filter( - // 可选链操作符 (cmd) => cmd.tags?.includes(this.currentTag) ); }