引入lodash

This commit is contained in:
fofolee 2022-04-07 15:51:26 +08:00
parent 147fae0bae
commit 9ea88e9286
3 changed files with 26 additions and 25 deletions

View File

@ -105,7 +105,7 @@
flat flat
v-if="!isRunCodePage" v-if="!isRunCodePage"
:disable="!canCommandSave" :disable="!canCommandSave"
color="primary" :color="canCommandSave ? 'primary' : 'grey'"
icon="save" icon="save"
@click="saveCurrentCommand()" @click="saveCurrentCommand()"
><q-tooltip>保存 {{ commandString }}+s</q-tooltip></q-btn ><q-tooltip>保存 {{ commandString }}+s</q-tooltip></q-btn
@ -216,10 +216,7 @@ export default {
this.action.type === "run" this.action.type === "run"
? this.$utools.getDB(this.$utools.DBPRE.CFG + "codeHistory") ? this.$utools.getDB(this.$utools.DBPRE.CFG + "codeHistory")
: this.action.data; : this.action.data;
Object.assign( _.merge(this.quickcommandInfo, quickCommandInfo);
this.quickcommandInfo,
JSON.parse(JSON.stringify(quickCommandInfo))
);
// monoca // monoca
this.$refs.editor.setEditorValue(this.quickcommandInfo.cmd); this.$refs.editor.setEditorValue(this.quickcommandInfo.cmd);
this.setLanguage(this.quickcommandInfo.program); this.setLanguage(this.quickcommandInfo.program);
@ -233,7 +230,7 @@ export default {
this.quickcommandInfo.cmd = this.$refs.editor.getEditorValue(); this.quickcommandInfo.cmd = this.$refs.editor.getEditorValue();
// //
this.$utools.putDB( this.$utools.putDB(
JSON.parse(JSON.stringify(this.quickcommandInfo)), _.cloneDeep(this.quickcommandInfo),
this.$utools.DBPRE.CFG + "codeHistory" this.$utools.DBPRE.CFG + "codeHistory"
); );
}); });
@ -409,7 +406,11 @@ export default {
}); });
}, },
// //
saveCurrentCommand() {}, saveCurrentCommand() {
let updatedData = this.$refs.editor.SaveMenuData();
if (!updatedData) return;
_.merge(this.quickcommandInfo, updatedData);
},
}, },
}; };
</script> </script>

View File

@ -278,9 +278,9 @@ export default {
let currentQuickCommandCmds = this.getCommandType(); let currentQuickCommandCmds = this.getCommandType();
this.cmdType = this.commandTypes[currentQuickCommandCmds.type]; this.cmdType = this.commandTypes[currentQuickCommandCmds.type];
this.cmdMatch = currentQuickCommandCmds.match; this.cmdMatch = currentQuickCommandCmds.match;
Object.assign( _.merge(
this.currentCommand, this.currentCommand,
JSON.parse(JSON.stringify(this.quickcommandInfo)) _.pick(this.quickcommandInfo, "tags", "output", "features")
); );
this.setIcon(this.currentCommand.program); this.setIcon(this.currentCommand.program);
this.platformVerify(); this.platformVerify();
@ -362,6 +362,13 @@ export default {
"error" "error"
); );
} }
//
if (updateData.cmd.includes("{{subinput")) {
updateData.hasSubInput = true;
} else {
updateData.hasSubInput = false;
}
return updateData; return updateData;
}, },
}, },

View File

@ -238,9 +238,7 @@ export default {
computed: { computed: {
// //
currentTagQuickCommands() { currentTagQuickCommands() {
let commands = Object.values( let commands = Object.values(_.cloneDeep(this.allQuickCommands));
JSON.parse(JSON.stringify(this.allQuickCommands))
);
switch (this.currentTag) { switch (this.currentTag) {
case "未分类": case "未分类":
return commands.filter((cmd) => !cmd.tags || cmd.tags.length === 0); return commands.filter((cmd) => !cmd.tags || cmd.tags.length === 0);
@ -273,17 +271,12 @@ export default {
}, },
// //
allQuickCommandTags() { allQuickCommandTags() {
return [ return _.union(
...new Set( ..._.concat(
// "默认",
Array.prototype.concat
.apply(
["默认"],
Object.values(this.allQuickCommands).map((x) => x.tags) Object.values(this.allQuickCommands).map((x) => x.tags)
) )
.concat(["未分类", "搜索结果"]) ).concat(["未分类", "搜索结果"]);
),
].filter((x) => x);
}, },
// //
tabBarWidth() { tabBarWidth() {
@ -352,7 +345,7 @@ export default {
// //
enableCommand(code) { enableCommand(code) {
this.$utools.whole.setFeature( this.$utools.whole.setFeature(
JSON.parse(JSON.stringify(this.allQuickCommands[code].features)) _.cloneDeep(this.allQuickCommands[code].features)
); );
this.activatedQuickCommandFeatureCodes.push(code); this.activatedQuickCommandFeatureCodes.push(code);
}, },
@ -449,7 +442,7 @@ export default {
}, },
], ],
}; };
let commandsToExport = JSON.parse(JSON.stringify(this.allQuickCommands)); let commandsToExport = _.cloneDeep(this.allQuickCommands);
// //
if (!utools.isDev()) if (!utools.isDev())
Object.keys(commandsToExport).forEach((code) => { Object.keys(commandsToExport).forEach((code) => {