Skip to content

Commit

Permalink
commit - 103
Browse files Browse the repository at this point in the history
  • Loading branch information
nanmenyu committed Mar 31, 2022
1 parent 9d432e1 commit 9db27b1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 13 deletions.
12 changes: 3 additions & 9 deletions electron/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ const {
// protocol,
BrowserWindow,
session,
// Menu,
Menu,
ipcMain,
dialog
} = require('electron');
const path = require('path');
const fs = require('fs');
// const fs = require('fs');
const jschardet = require("jschardet");
const fontList = require('./nodelib/getFontList');
const b64toFile = require('./nodelib/b64toFile');
Expand Down Expand Up @@ -44,14 +44,8 @@ async function createWindow() {
} else {
// 不在开发模式时加载 index.html
win.loadURL(`file://${path.join(__dirname, '../dist/index.html')}`);

win.webContents.openDevTools();
Menu.setApplicationMenu(null);
}
// // 打开开发工具
// if (NODE_ENV === "development") {
// win.webContents.openDevTools()
// }
// updateHandle();
}

app.commandLine.appendSwitch('ignore-certificate-errors'); //忽略ssl证书的检测
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "inking",
"version": "0.1.4",
"version": "1.0.0",
"main": "electron/main.js",
"private": true,
"description": "墨迹写作, 深度、简洁、直观的文字创作工具",
Expand Down
4 changes: 2 additions & 2 deletions src/components/SidebarLeft.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
</a-tooltip>
</router-link>
</div>
<div @click="openWithBrowser('https://fanyi.baidu.com/translate')">
<a-tooltip content="官网" mini>
<div @click="openWithBrowser('https://inkingapp.cn/')">
<a-tooltip content="官网 inkingapp.cn" mini>
<icon-public />
</a-tooltip>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/toupdate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function toupdate(proxy: Record<string, any>, haveMsg: boolean, c
// 发现新版本
$modal.info({
title: '发现新版本',
content: `发现新版本v${res.data.version},是否开启下载更新?`,
content: res.data.msg,
onOk: () => {
window.$API.ipcSend('checkForUpdate', res.data.upDateUrl);
window.$API.ipcOn('get-updateMsg', (data: { msg: number, data: any }) => {
Expand Down

0 comments on commit 9db27b1

Please sign in to comment.