Merge branch 'rubickCenter:master' into master

This commit is contained in:
lumozx 2023-10-19 21:33:15 +08:00 committed by GitHub
commit 54ad4ef7b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -14,7 +14,7 @@
:key="index"
>
<a-avatar style="width: 28px; height: 28px;" :src="item.icon" />
<div class="name ellpise">{{item.pluginName || item._name || item.name}}</div>
<div class="name ellpise">{{item.cmd || item.pluginName || item._name || item.name}}</div>
</a-col>
</a-row>
</div>

View File

@ -70,6 +70,9 @@ const createPluginManager = (): any => {
const openPlugin = async (plugin, option) => {
if (plugin.pluginType === 'ui' || plugin.pluginType === 'system') {
if (state.currentPlugin && state.currentPlugin.name === plugin.name) {
ipcRenderer.sendSync('msg-trigger', {
type: 'showMainWindow',
});
return;
}
await loadPlugin(plugin);