From dfe28eb037076298f72efbde7e9ae3282e44b983 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Sun, 22 Sep 2024 14:36:25 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=89=93=E5=8C=85=E8=81=94=E9=80=9A?= =?UTF-8?q?=E6=96=87=E6=9E=A2=E8=AF=BE=E5=A0=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron-builder-lt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron-builder-lt.yml b/electron-builder-lt.yml index f8e0b9a..01f2e2e 100644 --- a/electron-builder-lt.yml +++ b/electron-builder-lt.yml @@ -17,7 +17,7 @@ asarUnpack: nsis: oneClick: false allowToChangeInstallationDirectory: true - artifactName: ${name}-${version}-setup.${ext} + artifactName: ${name}-${version}-setup-lt.${ext} shortcutName: ${productName} uninstallDisplayName: ${productName} createDesktopShortcut: always From 6b9949dfae2adfeb67b490e4154664d485ed154f Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Sun, 22 Sep 2024 16:55:00 +0800 Subject: [PATCH 2/8] =?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 --- package.json | 2 +- src/renderer/src/views/classManage/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 825ea85..2ebac17 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "2.0.6", + "version": "2.0.7", "description": "", "main": "./out/main/index.js", "author": "example.com", diff --git a/src/renderer/src/views/classManage/index.vue b/src/renderer/src/views/classManage/index.vue index c3c25c7..058a0f9 100644 --- a/src/renderer/src/views/classManage/index.vue +++ b/src/renderer/src/views/classManage/index.vue @@ -302,7 +302,7 @@ addClasses({classIds:classids.value.join(','),userId:userStore.userId}).then(res => { if (res.code === 200) { dialogVisible.value = false - ElMessage({x + ElMessage({ message: res.msg, type: 'success', }) From 3b4f463883e9a650eb2956218ddfee25f2a77777 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Mon, 23 Sep 2024 10:31:47 +0800 Subject: [PATCH 3/8] =?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 --- package.json | 2 +- src/renderer/src/views/prepare/container/kj-list-item.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 2ebac17..391f3d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "2.0.7", + "version": "2.0.8", "description": "", "main": "./out/main/index.js", "author": "example.com", 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 090b9b4..51bc479 100644 --- a/src/renderer/src/views/prepare/container/kj-list-item.vue +++ b/src/renderer/src/views/prepare/container/kj-list-item.vue @@ -213,6 +213,7 @@ export default { let configObj = outLink().getBaseData() let fullPath = configObj.fullPath + path fullPath = fullPath.replaceAll('//', '/') + console.log(fullPath) // 通知主进程 ipcRenderer.send('openWindow', { key: path, From 1be00156a8e6cd67d6106fb765f220216119e0ec Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Mon, 23 Sep 2024 11:07:59 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=8E=BB=E9=99=A4console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/prepare/container/kj-list-item.vue | 2 -- 1 file changed, 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 51bc479..99f1da3 100644 --- a/src/renderer/src/views/prepare/container/kj-list-item.vue +++ b/src/renderer/src/views/prepare/container/kj-list-item.vue @@ -207,13 +207,11 @@ export default { }, openFileWin(items) { if (items.fileFlag === 'apt') { - console.log(this.curNode); let curBook = JSON.parse(localStorage.getItem('curBook')) const path="/teaching/aptindex?id="+items.fileId + "&unitId=" + this.curNode.id + "&bookId=" + curBook.id; let configObj = outLink().getBaseData() let fullPath = configObj.fullPath + path fullPath = fullPath.replaceAll('//', '/') - console.log(fullPath) // 通知主进程 ipcRenderer.send('openWindow', { key: path, From 0d71dee801b825f7c16f9896995ae24709942657 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Tue, 24 Sep 2024 11:03:40 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=9B=B4=E5=90=8D=E6=96=87=E6=9E=A2?= =?UTF-8?q?=E8=AF=BE=E5=A0=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.lt => .env.old | 2 +- .env.production | 2 +- electron-builder-lt.yml => electron-builder-old.yml | 6 +++--- electron-builder-prod.yml | 4 ++-- src/main/index.js | 5 +++++ 5 files changed, 12 insertions(+), 7 deletions(-) rename .env.lt => .env.old (93%) rename electron-builder-lt.yml => electron-builder-old.yml (93%) diff --git a/.env.lt b/.env.old similarity index 93% rename from .env.lt rename to .env.old index 79007b1..8640aa3 100644 --- a/.env.lt +++ b/.env.old @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 文枢课堂 +VITE_APP_TITLE = AIX智慧课堂 # 生产环境配置 VITE_APP_ENV = 'production' diff --git a/.env.production b/.env.production index 8640aa3..79007b1 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = AIX智慧课堂 +VITE_APP_TITLE = 文枢课堂 # 生产环境配置 VITE_APP_ENV = 'production' diff --git a/electron-builder-lt.yml b/electron-builder-old.yml similarity index 93% rename from electron-builder-lt.yml rename to electron-builder-old.yml index 01f2e2e..9dfb51e 100644 --- a/electron-builder-lt.yml +++ b/electron-builder-old.yml @@ -1,10 +1,10 @@ appId: com.electron.app -productName: 文枢课堂 +productName: AIx directories: output: dist buildResources: build win: - executableName: 文枢课堂 + executableName: AIx icon: resources/logo2.ico files: - '!**/.vscode/*' @@ -17,7 +17,7 @@ asarUnpack: nsis: oneClick: false allowToChangeInstallationDirectory: true - artifactName: ${name}-${version}-setup-lt.${ext} + artifactName: ${name}-${version}-setup.${ext} shortcutName: ${productName} uninstallDisplayName: ${productName} createDesktopShortcut: always diff --git a/electron-builder-prod.yml b/electron-builder-prod.yml index 9dfb51e..f8e0b9a 100644 --- a/electron-builder-prod.yml +++ b/electron-builder-prod.yml @@ -1,10 +1,10 @@ appId: com.electron.app -productName: AIx +productName: 文枢课堂 directories: output: dist buildResources: build win: - executableName: AIx + executableName: 文枢课堂 icon: resources/logo2.ico files: - '!**/.vscode/*' diff --git a/src/main/index.js b/src/main/index.js index 49433ec..0b84cd4 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -273,9 +273,14 @@ function handleAll() { }) // 用于监听-状态管理变化-同步所有窗口 ipcMain.handle('pinia-state-change', (e, storeName, jsonStr) => { + console.log('pinia-state-change-1', storeName, jsonStr) + for(const curWin of BrowserWindow.getAllWindows()){ const id = curWin.webContents.id const bool = id !== e.sender.id && !curWin.isDestroyed() + if (id === e.sender.id) { + console.log('pinia-state-change-2', 'windows-send', curWin.type) + } if (bool) { // 除了消息发送窗口和销毁的窗口 其他都发送 curWin.webContents.send('pinia-state-set', storeName, jsonStr) } From d46a86e3033944120bbfd6c409e3a7b2f1b54660 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Tue, 24 Sep 2024 16:20:06 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=9B=B4=E5=90=8D=E6=96=87=E6=9E=A2?= =?UTF-8?q?=E8=AF=BE=E5=A0=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/layout/components/Header.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue index 9fc6d6d..b92f4b8 100644 --- a/src/renderer/src/layout/components/Header.vue +++ b/src/renderer/src/layout/components/Header.vue @@ -91,6 +91,7 @@ const handleOutLink = (path, type, name) => { if (type === 'hash') { router.push(path) } else { + // key 对应的 linkConfig.js 外部链接配置 let configObj = outLink().getBaseData() let fullPath = configObj.fullPath + path From da20aecfc6d970e1eb664f13c295b324e2ebcc2b Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Tue, 24 Sep 2024 16:20:20 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=9B=B4=E5=90=8D=E6=96=87=E6=9E=A2?= =?UTF-8?q?=E8=AF=BE=E5=A0=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 391f3d3..f9bca46 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "2.0.8", + "version": "2.1.1", "description": "", "main": "./out/main/index.js", "author": "example.com", From d3a3acdedc92ba0c81a7bb5e188d8a95de868f14 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Tue, 24 Sep 2024 16:22:41 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/layout/components/Header.vue | 188 +++++++++++------- 1 file changed, 121 insertions(+), 67 deletions(-) diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue index a053c01..b92f4b8 100644 --- a/src/renderer/src/layout/components/Header.vue +++ b/src/renderer/src/layout/components/Header.vue @@ -7,16 +7,10 @@
@@ -25,14 +19,9 @@
-
- -
+
+