diff --git a/.eslintrc.js b/.eslintrc.js index 2b04712f..b2897179 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -23,6 +23,7 @@ module.exports = { 'no-console': 'off', 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off', 'comma-dangle': 'off', + 'no-unused-expressions': 'off' }, overrides: [ { diff --git a/package.json b/package.json index 39e9049f..f99f673a 100644 --- a/package.json +++ b/package.json @@ -91,6 +91,7 @@ "ts-node": "^10.0.0", "turndown": "^7.0.0", "typescript": "^4.3.2", + "utility-types": "^3.10.0", "vite": "^2.3.7", "vue": "^3.1.1", "vue-router": "^4.0.0-0", diff --git a/src/main/app.ts b/src/main/app.ts index 89afdb1a..1a607b78 100644 --- a/src/main/app.ts +++ b/src/main/app.ts @@ -176,7 +176,7 @@ const showSetting = () => { } showWindow() - win.webContents.executeJavaScript('globalBus.emit("show-setting");', true) + win.webContents.executeJavaScript('window.ctx.action.getAction("status-bar.show-setting")();', true) } const serve = () => { diff --git a/src/renderer/components/ContextMenu.vue b/src/renderer/components/ContextMenu.vue index bf7f2c21..f620779b 100644 --- a/src/renderer/components/ContextMenu.vue +++ b/src/renderer/components/ContextMenu.vue @@ -12,7 +12,7 @@