diff --git a/electron/main.js b/electron/main.js
index 79f5e5c2..14d6b94d 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -104,6 +104,7 @@ function createRouter(arg) {
parent: mainWindow,
webPreferences: {
preload: path.join(__dirname, 'preload.js'),
+ devTools: arg.devTools !== false,
nodeIntegration: true,
contextIsolation: false
}
@@ -133,41 +134,82 @@ function createRouter(arg) {
app.whenReady().then(() => {
createWindow()
- app.on('activate', function () {
+ app.on('activate', () => {
if (BrowserWindow.getAllWindows().length === 0) createWindow()
})
})
-app.on('window-all-closed', function () {
- if (process.platform !== 'darwin') app.quit()
+app.on('window-all-closed', () => {
+ if (process.platform !== 'darwin') {
+ app.quit()
+ }
})
app.on('before-quit', () => {
willQuitApp = true
})
-ipcMain.on('inheritClose', () => {
+ipcMain.on('inheritClose', (event) => {
inheritClose = true
+ event.returnValue = "ok"
})
ipcMain.on('windowRouter', (event, arg) => {
createRouter(arg)
+ event.returnValue = "ok"
})
-ipcMain.on('windowHidden', () => {
+ipcMain.on('windowHidden', (event) => {
app.hide();
+ event.returnValue = "ok"
})
-ipcMain.on('windowClose', () => {
- mainWindow.close()
+ipcMain.on('windowClose', (event) => {
+ const win = BrowserWindow.fromWebContents(event.sender);
+ win.close()
+ event.returnValue = "ok"
})
-ipcMain.on('windowMax', function () {
- if (mainWindow.isMaximized()) {
- mainWindow.restore();
- } else {
- mainWindow.maximize();
+ipcMain.on('windowSize', (event, arg) => {
+ const win = BrowserWindow.fromWebContents(event.sender);
+ if (win) {
+ if (arg.width || arg.height) {
+ win.setSize(arg.width || win.getSize()[0], arg.height || win.getSize()[1])
+ }
+ if (arg.minWidth || arg.minHeight) {
+ win.setMinimumSize(arg.minWidth || win.getMinimumSize()[0], arg.minHeight || win.getMinimumSize()[1])
+ }
+ if (arg.maxWidth || arg.maxHeight) {
+ win.setMaximumSize(arg.maxWidth || win.getMaximumSize()[0], arg.maxHeight || win.getMaximumSize()[1])
+ }
}
+ event.returnValue = "ok"
+})
+
+ipcMain.on('windowMinSize', (event, arg) => {
+ const win = BrowserWindow.fromWebContents(event.sender);
+ if (win) {
+ win.setMinimumSize(arg.width || win.getMinimumSize()[0], arg.height || win.getMinimumSize()[1])
+ }
+ event.returnValue = "ok"
+})
+
+ipcMain.on('windowMaxSize', (event, arg) => {
+ const win = BrowserWindow.fromWebContents(event.sender);
+ if (win) {
+ win.setMaximumSize(arg.width || win.getMaximumSize()[0], arg.height || win.getMaximumSize()[1])
+ }
+ event.returnValue = "ok"
+})
+
+ipcMain.on('windowMax', (event) => {
+ const win = BrowserWindow.fromWebContents(event.sender);
+ if (win.isMaximized()) {
+ win.restore();
+ } else {
+ win.maximize();
+ }
+ event.returnValue = "ok"
})
ipcMain.on('setDockBadge', (event, arg) => {
@@ -180,6 +222,7 @@ ipcMain.on('setDockBadge', (event, arg) => {
} else {
app.dock.setBadge("")
}
+ event.returnValue = "ok"
})
ipcMain.on('saveSheet', (event, data, filename, opts) => {
@@ -194,4 +237,5 @@ ipcMain.on('saveSheet', (event, data, filename, opts) => {
}).then(o => {
XLSX.writeFile(data, o.filePath, opts);
});
+ event.returnValue = "ok"
})
diff --git a/electron/package.json b/electron/package.json
index feb703b5..0d4b0a58 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -35,8 +35,9 @@
"@electron-forge/maker-zip": "^6.0.0-beta.61",
"dmg-license": "^1.0.10",
"dotenv": "^10.0.0",
- "electron": "^16.0.4",
- "electron-builder": "^22.14.5"
+ "electron": "^16.0.5",
+ "electron-builder": "^22.14.5",
+ "electron-log": "^4.4.3"
},
"dependencies": {
"electron-squirrel-startup": "^1.0.0",
diff --git a/package.json b/package.json
index 2ba407ec..b54e04fe 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
"cross-env": "^7.0.3",
"css-loader": "^6.5.1",
"echarts": "^5.2.2",
+ "electron": "^16.0.5",
"element-ui": "^2.15.6",
"file-loader": "^6.2.0",
"inquirer": "^8.2.0",
diff --git a/public/css/fonts/taskfont.ttf b/public/css/fonts/taskfont.ttf
index 6171e4f5..ff626ae4 100644
Binary files a/public/css/fonts/taskfont.ttf and b/public/css/fonts/taskfont.ttf differ
diff --git a/public/css/fonts/taskfont.woff b/public/css/fonts/taskfont.woff
index e12c275b..46762a51 100644
Binary files a/public/css/fonts/taskfont.woff and b/public/css/fonts/taskfont.woff differ
diff --git a/public/css/fonts/taskfont.woff2 b/public/css/fonts/taskfont.woff2
index 8e00c93b..c8a7d91c 100644
Binary files a/public/css/fonts/taskfont.woff2 and b/public/css/fonts/taskfont.woff2 differ
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 93f8fb39..9c980ce1 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -145,7 +145,7 @@
}"
@on-visible-change="taskVisibleChange"
footer-hide>
-
{{columnName}}
{{taskDetail.id}}
-