From ef9fe838a388c6bb9c0b5f3262cf8473b5fc6441 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Fri, 20 Sep 2024 16:56:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron.vite.config.mjs | 9 ++++++++- package.json | 4 +++- src/main/index.js | 25 +++++++++++++++++++++++-- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/electron.vite.config.mjs b/electron.vite.config.mjs index d5d6421..cc1eedc 100644 --- a/electron.vite.config.mjs +++ b/electron.vite.config.mjs @@ -3,7 +3,14 @@ import path from 'path' import { defineConfig, externalizeDepsPlugin } from 'electron-vite' import vue from '@vitejs/plugin-vue' import WindiCSS from "vite-plugin-windicss" - +/*import electron from 'vite-plugin-electron' +plugins: [electron({ + main: { + builderOptions: { + asar: false + } + } +})],*/ export default defineConfig({ main: { plugins: [externalizeDepsPlugin()] diff --git a/package.json b/package.json index bc6282a..8bc6d8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "2.0.2", + "version": "2.0.4", "description": "An Electron application with Vue", "main": "./out/main/index.js", "author": "example.com", @@ -45,10 +45,12 @@ "jsencrypt": "^3.3.2", "jsondiffpatch": "0.6.0", "lodash": "^4.17.21", + "node-addon-api": "^8.1.0", "pdfjs-dist": "4.4.168", "pinia": "^2.1.7", "pinia-plugin-persistedstate": "^3.2.1", "spark-md5": "^3.0.2", + "vite-plugin-electron": "^0.28.8", "vue-qr": "^4.0.9", "vue-router": "^4.4.0", "xgplayer": "^3.0.19", diff --git a/src/main/index.js b/src/main/index.js index ac96916..49433ec 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -21,6 +21,27 @@ File({ app, shell, BrowserWindow, ipcMain }) process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true' let mainWindow, loginWindow +const additionalData = {myKey:'ys_axi_smarttalk'} +const gotTheLock = app.requestSingleInstanceLock(additionalData) + +if(!gotTheLock){ + app.quit() +}else{ + app.on('second-instance',(event,commandLine,workingDirectory,additionalData)=>{ + //输入从第二个实例中接收到的数据 + console.log(additionalData) + //有人试图运行第二个实例，我们应该关注我们的窗口 + if(mainWindow){ + if(mainWindow.isMinimized()) mainWindow.restore() + mainWindow.focus() + } + if(loginWindow){ + if(loginWindow.isMinimized()) loginWindow.restore() + loginWindow.focus() + } + }) +} + //登录窗口 function createLoginWindow() { if (loginWindow) return @@ -53,7 +74,7 @@ function createLoginWindow() { updateInit(loginWindow) } - loginWindow.webContents.openDevTools() + // loginWindow.webContents.openDevTools() loginWindow.once('ready-to-show', () => { loginWindow.show() }) @@ -101,7 +122,7 @@ function createMainWindow() { shell.openExternal(details.url) return { action: 'deny' } }) - mainWindow.webContents.openDevTools() + // mainWindow.webContents.openDevTools() if (is.dev && process.env['ELECTRON_RENDERER_URL']) { mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL']) -- 2.44.0.windows.1 From 78b795bf4f8b55f596793b64bdeae05df3340dcf Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Sun, 22 Sep 2024 10:53:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=20#801,V2.0.3=20?= =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=AE=9E=E8=B7=B5-=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=EF=BC=8C=E7=BA=A2=E6=A1=86=E9=83=A8=E5=88=86=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/prepare/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 09e9abd..4ea167c 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -115,13 +115,13 @@ -
+
Date: Sun, 22 Sep 2024 11:14:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=20#811,V2.0.3=20APT?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1-=E6=B7=BB=E5=8A=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=EF=BC=8C=E4=B8=8E=E5=BD=93=E5=89=8D=E9=80=89=E6=8B=A9=E7=9A=84?= =?UTF-8?q?=E7=AB=A0=E8=8A=82=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/prepare/container/kj-list-item.vue | 10 ++++++++-- src/renderer/src/views/prepare/index.vue | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/renderer/src/views/prepare/container/kj-list-item.vue b/src/renderer/src/views/prepare/container/kj-list-item.vue index 7841e07..4cd468b 100644 --- a/src/renderer/src/views/prepare/container/kj-list-item.vue +++ b/src/renderer/src/views/prepare/container/kj-list-item.vue @@ -108,6 +108,12 @@ export default { name: 'FileListItem', components: { FileImage }, props: { + curNode: { + type: Object, + default: function () { + return {} + } + }, item: { type: Object, default: function () { @@ -201,8 +207,8 @@ export default { }, openFileWin(items) { if (items.fileFlag === 'apt') { - console.log(items); - const path="/teaching/aptindex?id="+items.fileId + console.log(this.curNode); + const path="/teaching/aptindex?id="+items.fileId + "&cataId=" + this.curNode.id; let configObj = outLink().getBaseData() let fullPath = configObj.fullPath + path fullPath = fullPath.replaceAll('//', '/') diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 4ea167c..d675bcb 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -20,6 +20,7 @@ :key="index" :item="item" :index="index" + :curNode="currentNode" @on-delete="deleteTalk" @on-start-class="startClass" > -- 2.44.0.windows.1