From 66ff0ae6fdc23bc4159682474cbc59fe191183e7 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Thu, 5 Dec 2024 14:07:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B8=E5=B7=9D=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.old | 19 ------------------- ...builder-old.yml => electron-builder-yc.yml | 12 ++++++------ package.json | 2 +- src/main/index.js | 2 +- .../src/components/window-tools/index.vue | 9 +++++++-- src/renderer/src/views/login/index.vue | 2 +- 6 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 .env.old rename electron-builder-old.yml => electron-builder-yc.yml (84%) diff --git a/.env.old b/.env.old deleted file mode 100644 index 8640aa3..0000000 --- a/.env.old +++ /dev/null @@ -1,19 +0,0 @@ -# 页面标题 -VITE_APP_TITLE = AIX智慧课堂 - -# 生产环境配置 -VITE_APP_ENV = 'production' - -# AIx融合数字管理系统/生产环境 -VITE_APP_BASE_API = 'https://prev.ysaix.com:7868/prod-api' - -VITE_APP_DOMAIN = 'prev.ysaix.com' - -VITE_APP_UPLOAD_API = 'https://prev.ysaix.com:7868/prod-api' - -# 是否在打包时开启压缩,支持 gzip 和 brotli -VITE_BUILD_COMPRESS = gzip - -VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/' - -VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/' diff --git a/electron-builder-old.yml b/electron-builder-yc.yml similarity index 84% rename from electron-builder-old.yml rename to electron-builder-yc.yml index 9dfb51e..c3fddbc 100644 --- a/electron-builder-old.yml +++ b/electron-builder-yc.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/*' @@ -17,7 +17,7 @@ asarUnpack: nsis: oneClick: false allowToChangeInstallationDirectory: true - artifactName: ${name}-${version}-setup.${ext} + artifactName: ${name}-yc-${version}-setup.${ext} shortcutName: ${productName} uninstallDisplayName: ${productName} createDesktopShortcut: always @@ -30,7 +30,7 @@ mac: - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder. notarize: false dmg: - artifactName: ${name}-${version}.${ext} + artifactName: ${name}-yc-${version}.${ext} linux: target: - AppImage @@ -39,11 +39,11 @@ linux: maintainer: electronjs.org category: Utility appImage: - artifactName: ${name}-${version}.${ext} + artifactName: ${name}-yc-${version}.${ext} npmRebuild: false publish: provider: generic - url: https://prev.ysaix.com:7868/src/assets/smarttalk/ + url: https://prev.ysaix.com:7868/src/assets/smarttalkyc/ electronDownload: mirror: https://npmmirror.com/mirrors/electron/ # 额外依赖打包到输出目录 diff --git a/package.json b/package.json index be8d5c6..57803ba 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "build:dev": "npm run build && electron-builder --win --config ./electron-builder-test.yml", "build:test": "electron-vite build --mode test && electron-builder --win --config ./electron-builder.yml", "build:prod": "electron-vite build --mode production && electron-builder --win --config ./electron-builder-prod.yml", - "build:lt": "electron-vite build --mode lt && electron-builder --win --config ./electron-builder-lt.yml", + "build:yc": "electron-vite build --mode yc && electron-builder --win --config ./electron-builder-yc.yml", "build:mac": "electron-vite build --mode production && electron-builder --mac --config ./electron-builder-prod.yml", "build:linux": "npm run build && electron-builder --linux" }, diff --git a/src/main/index.js b/src/main/index.js index 22f49a2..942ff6c 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -46,7 +46,7 @@ if(!gotTheLock){ function createLoginWindow() { if (loginWindow) return loginWindow = new BrowserWindow({ - width: import.meta.env.MODE==='yc'?1160:888, + width: import.meta.env.MODE!=='yc'?1160:888, height: 520, show: false, frame: false, diff --git a/src/renderer/src/components/window-tools/index.vue b/src/renderer/src/components/window-tools/index.vue index da66f80..e915261 100644 --- a/src/renderer/src/components/window-tools/index.vue +++ b/src/renderer/src/components/window-tools/index.vue @@ -37,6 +37,7 @@ const closeWindow = () => { ElMessageBox.confirm('确认退出系统吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', + customClass: 'login-close-tool', type: 'warning' }).then(() => { userStore.logOut().then(() => { @@ -48,7 +49,11 @@ const closeWindow = () => { }).catch(() => { }); } - + \ No newline at end of file + diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue index 7a346e8..563d8f8 100644 --- a/src/renderer/src/views/login/index.vue +++ b/src/renderer/src/views/login/index.vue @@ -1,5 +1,5 @@