diff --git a/dev-app-update.yml b/dev-app-update.yml index 0a21494..0083a29 100644 --- a/dev-app-update.yml +++ b/dev-app-update.yml @@ -1,3 +1,3 @@ provider: generic -url: https://example.com/auto-updates +url: http://localhost:3000/ updaterCacheDirName: electron-app-updater diff --git a/electron-builder-test.yml b/electron-builder-test.yml new file mode 100644 index 0000000..61fba8f --- /dev/null +++ b/electron-builder-test.yml @@ -0,0 +1,47 @@ +appId: com.electron.app +productName: AIx +directories: + buildResources: build +files: + - '!**/.vscode/*' + - '!src/*' + - '!electron.vite.config.{js,ts,mjs,cjs}' + - '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}' + - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}' +asarUnpack: + - resources/** +win: + executableName: AIx + icon: resources/logo.ico +nsis: + oneClick: false + allowToChangeInstallationDirectory: true + artifactName: ${name}-${version}-setup.${ext} + shortcutName: ${productName} + uninstallDisplayName: ${productName} + createDesktopShortcut: always +mac: + entitlementsInherit: build/entitlements.mac.plist + extendInfo: + - NSCameraUsageDescription: Application requests access to the device's camera. + - NSMicrophoneUsageDescription: Application requests access to the device's microphone. + - NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder. + - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder. + notarize: false +dmg: + artifactName: ${name}-${version}.${ext} +linux: + target: + - AppImage + - snap + - deb + maintainer: electronjs.org + category: Utility +appImage: + artifactName: ${name}-${version}.${ext} +npmRebuild: false +publish: + provider: generic + url: http://localhost:3000 +electronDownload: + mirror: https://npmmirror.com/mirrors/electron/ diff --git a/electron-builder.yml b/electron-builder.yml index 52741c5..cb2cf97 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -12,6 +12,7 @@ asarUnpack: - resources/** win: executableName: AIx + icon: resources/logo.ico nsis: oneClick: false allowToChangeInstallationDirectory: true @@ -41,6 +42,6 @@ appImage: npmRebuild: false publish: provider: generic - url: https://example.com/auto-updates + url: https://file.ysaix.com:7868/src/assets/smarttalk/ electronDownload: mirror: https://npmmirror.com/mirrors/electron/ diff --git a/package.json b/package.json index c92e305..31fd129 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "build": "electron-vite build", "postinstall": "electron-builder install-app-deps", "build:unpack": "npm run build && electron-builder --dir", - "build:win": "npm run build && electron-builder --win", + "build:test": "npm run build && electron-builder --win --config ./electron-builder-test.yml", + "build:prod": "npm run build && electron-builder --win --config ./electron-builder.yml", "build:mac": "npm run build && electron-builder --mac", "build:linux": "npm run build && electron-builder --linux" }, @@ -24,6 +25,7 @@ "@vueuse/core": "^10.11.0", "crypto-js": "^4.2.0", "electron-dl-manager": "^3.0.0", + "electron-log": "^5.1.7", "electron-updater": "^6.1.7", "element-plus": "^2.7.6", "js-cookie": "^3.0.5", diff --git a/resources/logo.ico b/resources/logo.ico new file mode 100644 index 0000000..4c33239 Binary files /dev/null and b/resources/logo.ico differ diff --git a/src/main/index.js b/src/main/index.js index 12395b8..7acd4ca 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -3,6 +3,7 @@ import { join } from 'path' import { electronApp, optimizer, is } from '@electron-toolkit/utils' import icon from '../../resources/icon.png?asset' import File from './file' +import updateInit from './update' File({ app, shell, BrowserWindow, ipcMain }) process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true' @@ -31,13 +32,14 @@ function createLoginWindow() { loginWindow.loadURL('http://localhost:5173/#/login') } else { loginWindow.loadFile(join(__dirname, '../renderer/index.html'), {hash: 'login'}) + updateInit(loginWindow) } - loginWindow.webContents.openDevTools() + // loginWindow.webContents.openDevTools() loginWindow.once('ready-to-show', () => { loginWindow.show() }) - + loginWindow.on('closed', () => { loginWindow = null }) @@ -114,7 +116,6 @@ async function createLinkWin(data) { // 初始化完成 app.on('ready', () => { - // 设置应用程序用户模型标识符 electronApp.setAppUserModelId('com.electron') diff --git a/src/main/update.js b/src/main/update.js new file mode 100644 index 0000000..d59d155 --- /dev/null +++ b/src/main/update.js @@ -0,0 +1,61 @@ +import { dialog } from 'electron' +import logger from 'electron-log' +const updateURL = 'http://27.128.240.72:3000/zhuhao/AIx_Smarttalk/releases/tag/V1.0.0%28%E6%B5%8B%E8%AF%95%E7%89%88%29/' + +// 主进程中的更新检查 +const { autoUpdater } = require('electron-updater') + +const updateInit = (win) => { + logger.info('进来了') + // 检查更新 + autoUpdater.checkForUpdates() + // 自动下载 + autoUpdater.autoDownload = false + // 设置版本更新服务器地址 + // autoUpdater.setFeedURL(updateURL) + + //监听更新事件 + autoUpdater.on('update-available', (info) => { + logger.info('发现新版本') + dialog + .showMessageBox(win,{ + type: 'info', + title: '新版本可用', + message: '有一个可用的新版本,要更新吗', + buttons: ['是', '否'] + }) + .then((result) => { + if (result.response === 0) { + // 用户选择更新,触发下载和安装 + autoUpdater.downloadUpdate() + } + }) + }) + + // 没有新版本 + autoUpdater.on('update-not-available', () => { + logger.info('没有新版本') + }) + + // 更新发生错误 + autoUpdater.on('error', () => { + logger.error('检查更新失败') + }) + + // 跟新下载完毕 + autoUpdater.on('update-downloaded', () => { + dialog + .showMessageBox({ + type: 'info', + title: '更新下载完成', + message: '点击确定重启获取最新内容', + buttons: ['确定'] + }) + .then(() => { + // 调用 quitAndInstall 来安装更新 + autoUpdater.quitAndInstall() + }) + }) +} + +export default updateInit \ No newline at end of file diff --git a/src/renderer/src/components/upload-dialog/index.vue b/src/renderer/src/components/upload-dialog/index.vue index 9d73b35..4615780 100644 --- a/src/renderer/src/components/upload-dialog/index.vue +++ b/src/renderer/src/components/upload-dialog/index.vue @@ -4,11 +4,12 @@
- 选择文件 - 说明:一次最多上传5个文件,单个文件大小不能大于100M + 说明:一次最多上传{{ limit }}个文件,单个文件大小不能大于100M + 仅支持图片、音频、视频、word、ppt、pdf、txt、zip文件
@@ -16,14 +17,15 @@
标题: - - + + .{{ getFileSuffix(item.name) }}
类别: - +
@@ -58,6 +60,7 @@ const props = defineProps({ }, }) const dialogValue = ref(false) +const limit = ref(5) // 定义要发送的emit事件 const emit = defineEmits(['update:modelValue', 'submitFile']) // 文件列表 @@ -68,7 +71,7 @@ watch(() => props.modelValue, (newVal) => { }) const hanleFileChange = (file) => { - console.log(file) + console.log(file) //音频 类型 const audioTypes = ['audio/mpeg', 'audio/wav', 'audio/ogg', 'audio/aac'] @@ -81,9 +84,9 @@ const hanleFileChange = (file) => { // pdf 类型 const pdfTypes = ['application/pdf'] // zip 类型 - const zipTypes = ['application/x-zip-compressed','application/x-compressed'] + const zipTypes = ['application/x-zip-compressed', 'application/x-compressed'] // 图片 类型 - const imgTypes = ['image/jpeg','image/gif', 'image/png'] + const imgTypes = ['image/jpeg', 'image/gif', 'image/png'] // text 类型 const textTypes = ['text/plain'] @@ -93,22 +96,39 @@ const hanleFileChange = (file) => { return false } // 验证文件大小 + // B < KB < MB < GB + // file.raw.size 单位是B const fileSize = file.raw.size / 1024 / 1024 > 100 if (fileSize) { ElMessage.error('文件大小错误! 请上传小于100M的文件!') return false } if (file.status === 'ready') { - + // 给一个默认的fileData file.fileData = { - fileFlag: '课件', + fileFlag: '素材', name: getFileName(file.name), } fileList.value.push(file) + console.log(fileList.value) } } +// 检查文件类型 +const checkFile = (item, file) => { + const type = file.raw.type + const pptTypes = ['application/vnd.ms-powerpoint', 'application/vnd.openxmlformats-officedocument.presentationml.presentation'] + let isPpt = pptTypes.includes(type) + if(!isPpt && item.value == '教案'){ + return true + } + else{ + return false + } + +} + // 删除 const delFile = (index) => { fileList.value.splice(index, 1) @@ -133,7 +153,7 @@ const submitFile = () => { item.fileData.fileShowName = item.fileData.name + '.' + suffix delete item.fileData.name }) - emit('submitFile',fileList.value) + emit('submitFile', fileList.value) closeDialog() } @@ -203,24 +223,28 @@ const submitFile = () => { } } } + .file-input { border-bottom: solid #dfdfdf 1px; + &:hover { border-color: #409EFF; } - &:focus{ + + &:focus { border-color: #409EFF; } } -:deep(.el-input__wrapper){ - box-shadow: none -} -:deep(.el-input__wrapper.is-focus){ - box-shadow: none -} -:deep(.el-input__wrapper:hover){ +:deep(.el-input__wrapper) { box-shadow: none } +:deep(.el-input__wrapper.is-focus) { + box-shadow: none +} + +:deep(.el-input__wrapper:hover) { + box-shadow: none +} diff --git a/src/renderer/src/views/resource/index.vue b/src/renderer/src/views/resource/index.vue index 8550e42..6720e26 100644 --- a/src/renderer/src/views/resource/index.vue +++ b/src/renderer/src/views/resource/index.vue @@ -71,7 +71,6 @@ const submitFile = (data) => { item.fileData = fileData item.callback = fileCallBack }) - // console.log(fileList) uploaderState().pushFile(fileList) }