diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5851c0e8..f0514381 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,12 +25,14 @@ jobs: version: 8 run_install: true + # 安装 Node.js - name: Use Node.js uses: actions/setup-node@v4 with: node-version: 20 cache: 'pnpm' + # 安装 Rust - name: install Rust stable uses: actions-rs/toolchain@v1 with: @@ -44,7 +46,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version + tagName: v__VERSION__ #这个动作会自动将\_\_VERSION\_\_替换为app version releaseName: 'v__VERSION__' releaseBody: 'See the assets to download and install this version.' releaseDraft: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 74d72689..13114dfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.2.9 (2024-03-08) +## 1.2.9-alpha (2024-03-08) * :bug: fix(custom): 修复因为版本号书写问题导致打包失败 ([cd3a078](https://github.com/nongyehong/HuLa-IM-Tauri/commit/cd3a078)) * :construction_worker: ci(custom): 修改ci配置文件 ([d09acb2](https://github.com/nongyehong/HuLa-IM-Tauri/commit/d09acb2)) @@ -6,11 +6,6 @@ * :construction_worker: ci(custom): 修改tauri.conf.json配置 ([a3002c8](https://github.com/nongyehong/HuLa-IM-Tauri/commit/a3002c8)) * :package: build(custom): 提交autoimport组件的文件 ([36bf9d6](https://github.com/nongyehong/HuLa-IM-Tauri/commit/36bf9d6)) * :sunflower: update(custom): 更新mac配置 ([8f8babd](https://github.com/nongyehong/HuLa-IM-Tauri/commit/8f8babd)) - - - -## 1.2.9-alpha (2024-03-08) - * :bug: fix(custom): 修复跨标签页没有判断类型的问题 ([e4acbd5](https://github.com/nongyehong/HuLa-IM-Tauri/commit/e4acbd5)) * :sparkles: feat(custom): 新增聊天页面页脚显示功能 ([ebd7a41](https://github.com/nongyehong/HuLa-IM-Tauri/commit/ebd7a41)) * :sunflower: update(custom): 更新登录界面样式 ([2394aa2](https://github.com/nongyehong/HuLa-IM-Tauri/commit/2394aa2)) @@ -18,11 +13,6 @@ * :sunflower: update(custom): 更新气泡动画 ([e8dc441](https://github.com/nongyehong/HuLa-IM-Tauri/commit/e8dc441)) * :sunflower: update(custom): 更新项目主要依赖版本 ([2a609ff](https://github.com/nongyehong/HuLa-IM-Tauri/commit/2a609ff)) * :sunflower: update(custom): 更新悬浮按钮样式，修复已知的部分问题 ([1f01b7b](https://github.com/nongyehong/HuLa-IM-Tauri/commit/1f01b7b)) - - - -## 1.2.8-alpha (2024-03-06) - * :bug: fix(custom): 回退vite版本5.0.12导致启动不了端口服务的问题 ([ba99bb2](https://github.com/nongyehong/HuLa-IM-Tauri/commit/ba99bb2)) * :bug: fix(custom): 修复新建窗口的问题，修复窗口背景的问题 ([f1010e4](https://github.com/nongyehong/HuLa-IM-Tauri/commit/f1010e4)) * :bug: fix(custom): 修复已知的问题 ([600e224](https://github.com/nongyehong/HuLa-IM-Tauri/commit/600e224)) @@ -58,11 +48,6 @@ * :sunflower: update(custom): 更新主页的样式 ([6a39060](https://github.com/nongyehong/HuLa-IM-Tauri/commit/6a39060)) * :sunflower: update(custom): 更新主页消息列表样式 ([910a6c4](https://github.com/nongyehong/HuLa-IM-Tauri/commit/910a6c4)) * :sunflower: update(custom): 升级vue、vue-tsc、TS、vite版本 ([27e7bd0](https://github.com/nongyehong/HuLa-IM-Tauri/commit/27e7bd0)) - - - -## 1.0.0-alpha (2023-12-16) - * :new: version(custom): 发布v1.0.0-alpha版本 ([d2ac653](https://github.com/nongyehong/HuLa-IM-Tauri/commit/d2ac653)) * :sunflower: update(custom): 更新cz-customizable配置 ([43145e0](https://github.com/nongyehong/HuLa-IM-Tauri/commit/43145e0)) * init 初始化仓库 ([85a59e8](https://github.com/nongyehong/HuLa-IM-Tauri/commit/85a59e8)) diff --git a/package.json b/package.json index 4b9f312e..3c9714ed 100644 --- a/package.json +++ b/package.json @@ -48,16 +48,16 @@ "devDependencies": { "@babel/eslint-parser": "^7.23.3", "@rollup/plugin-terser": "^0.4.4", - "@tauri-apps/cli": "^1.5.7", + "@tauri-apps/cli": "^1.5.11", "@types/lodash-es": "^4.17.12", "@types/node": "^20.10.4", "@typescript-eslint/eslint-plugin": "7.1.0", "@typescript-eslint/parser": "^7.1.0", - "@unocss/preset-uno": "^0.58.4", - "@unocss/reset": "^0.58.4", - "@unocss/transformer-directives": "^0.58.4", - "@unocss/vite": "^0.58.4", - "@vitejs/plugin-vue": "^5.0.3", + "@unocss/preset-uno": "^0.58.5", + "@unocss/reset": "^0.58.5", + "@unocss/transformer-directives": "^0.58.5", + "@unocss/vite": "^0.58.5", + "@vitejs/plugin-vue": "^5.0.4", "@vitejs/plugin-vue-jsx": "^3.1.0", "@vueuse/core": "^10.8.0", "commitizen": "^4.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 731c75a8..c78ace34 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -47,8 +47,8 @@ devDependencies: specifier: ^0.4.4 version: 0.4.4 '@tauri-apps/cli': - specifier: ^1.5.7 - version: 1.5.9 + specifier: ^1.5.11 + version: 1.5.11 '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 @@ -62,20 +62,20 @@ devDependencies: specifier: ^7.1.0 version: 7.1.0(eslint@8.56.0)(typescript@5.4.2) '@unocss/preset-uno': - specifier: ^0.58.4 - version: 0.58.4 + specifier: ^0.58.5 + version: 0.58.5 '@unocss/reset': - specifier: ^0.58.4 - version: 0.58.4 + specifier: ^0.58.5 + version: 0.58.5 '@unocss/transformer-directives': - specifier: ^0.58.4 - version: 0.58.4 + specifier: ^0.58.5 + version: 0.58.5 '@unocss/vite': - specifier: ^0.58.4 - version: 0.58.4(vite@5.1.4) + specifier: ^0.58.5 + version: 0.58.5(vite@5.1.4) '@vitejs/plugin-vue': - specifier: ^5.0.3 - version: 5.0.3(vite@5.1.4)(vue@3.4.21) + specifier: ^5.0.4 + version: 5.0.4(vite@5.1.4)(vue@3.4.21) '@vitejs/plugin-vue-jsx': specifier: ^3.1.0 version: 3.1.0(vite@5.1.4)(vue@3.4.21) @@ -1102,8 +1102,8 @@ packages: engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} dev: true - /@polka/url@1.0.0-next.24: - resolution: {integrity: sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==} + /@polka/url@1.0.0-next.25: + resolution: {integrity: sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==} dev: true /@rollup/plugin-terser@0.4.4: @@ -1248,8 +1248,8 @@ packages: engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} dev: false - /@tauri-apps/cli-darwin-arm64@1.5.9: - resolution: {integrity: sha512-7C2Jf8f0gzv778mLYb7Eszqqv1bm9Wzews81MRTqKrUIcC+eZEtDXLex+JaEkEzFEUrgIafdOvMBVEavF030IA==} + /@tauri-apps/cli-darwin-arm64@1.5.11: + resolution: {integrity: sha512-2NLSglDb5VfvTbMtmOKWyD+oaL/e8Z/ZZGovHtUFyUSFRabdXc6cZOlcD1BhFvYkHqm+TqGaz5qtPR5UbqDs8A==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] @@ -1257,8 +1257,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-darwin-x64@1.5.9: - resolution: {integrity: sha512-LHKytpkofPYgH8RShWvwDa3hD1ws131x7g7zNasJPfOiCWLqYVQFUuQVmjEUt8+dpHe/P/err5h4z+YZru2d0A==} + /@tauri-apps/cli-darwin-x64@1.5.11: + resolution: {integrity: sha512-/RQllHiJRH2fJOCudtZlaUIjofkHzP3zZgxi71ZUm7Fy80smU5TDfwpwOvB0wSVh0g/ciDjMArCSTo0MRvL+ag==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] @@ -1266,8 +1266,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-arm-gnueabihf@1.5.9: - resolution: {integrity: sha512-teGK20IYKx+dVn8wFq/Lg57Q9ce7foq1KHSfyHi464LVt1T0V1rsmULSgZpQPPj/NYPF5BG78PcWYv64yH86jw==} + /@tauri-apps/cli-linux-arm-gnueabihf@1.5.11: + resolution: {integrity: sha512-IlBuBPKmMm+a5LLUEK6a21UGr9ZYd6zKuKLq6IGM4tVweQa8Sf2kP2Nqs74dMGIUrLmMs0vuqdURpykQg+z4NQ==} engines: {node: '>= 10'} cpu: [arm] os: [linux] @@ -1275,8 +1275,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-arm64-gnu@1.5.9: - resolution: {integrity: sha512-onJ/DW5Crw38qVx+wquY4uBbfCxVhzhdJmlCYqnYyXsZZmSiPUfSyhV58y+5TYB0q1hG8eYdB5x8VAwzByhGzw==} + /@tauri-apps/cli-linux-arm64-gnu@1.5.11: + resolution: {integrity: sha512-w+k1bNHCU/GbmXshtAhyTwqosThUDmCEFLU4Zkin1vl2fuAtQry2RN7thfcJFepblUGL/J7yh3Q/0+BCjtspKQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -1285,8 +1285,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-arm64-musl@1.5.9: - resolution: {integrity: sha512-23AYoLD3acakLp9NtheKQDJl8F66eTOflxoPzdJNRy13hUSxb+W9qpz4rRA+CIzkjICFvO2i3UWjeV9QwDVpsQ==} + /@tauri-apps/cli-linux-arm64-musl@1.5.11: + resolution: {integrity: sha512-PN6/dl+OfYQ/qrAy4HRAfksJ2AyWQYn2IA/2Wwpaa7SDRz2+hzwTQkvajuvy0sQ5L2WCG7ymFYRYMbpC6Hk9Pg==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -1295,8 +1295,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-x64-gnu@1.5.9: - resolution: {integrity: sha512-9PQA1rE7gh41W2ylyKd5qOGOds55ymaYPml9KOpM0g+cxmCXa+8Wf9K5NKvACnJldJJ6cekWzIyB4eN6o5T+yQ==} + /@tauri-apps/cli-linux-x64-gnu@1.5.11: + resolution: {integrity: sha512-MTVXLi89Nj7Apcvjezw92m7ZqIDKT5SFKZtVPCg6RoLUBTzko/BQoXYIRWmdoz2pgkHDUHgO2OMJ8oKzzddXbw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -1305,8 +1305,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-x64-musl@1.5.9: - resolution: {integrity: sha512-5hdbNFeDsrJ/pXZ4cSQV4bJwUXPPxXxN3/pAtNUqIph7q+vLcBXOXIMoS64iuyaluJC59lhEwlWZFz+EPv0Hqg==} + /@tauri-apps/cli-linux-x64-musl@1.5.11: + resolution: {integrity: sha512-kwzAjqFpz7rvTs7WGZLy/a5nS5t15QKr3E9FG95MNF0exTl3d29YoAUAe1Mn0mOSrTJ9Z+vYYAcI/QdcsGBP+w==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -1315,8 +1315,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-win32-arm64-msvc@1.5.9: - resolution: {integrity: sha512-O18JufjSB3hSJYu5WWByONouGeX7DraLAtXLErsG1r/VS3zHd/zyuzycrVUaObNXk5bfGlIP0Ypt+RvZJILN2w==} + /@tauri-apps/cli-win32-arm64-msvc@1.5.11: + resolution: {integrity: sha512-L+5NZ/rHrSUrMxjj6YpFYCXp6wHnq8c8SfDTBOX8dO8x+5283/vftb4vvuGIsLS4UwUFXFnLt3XQr44n84E67Q==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] @@ -1324,8 +1324,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-win32-ia32-msvc@1.5.9: - resolution: {integrity: sha512-FQxtxTZu0JVBihfd/lmpxo7jyMOesjWQehfyVUqtgMfm5+Pvvw0Y+ZioeDi1TZkFVrT3QDYy8R4LqDLSZVMQRA==} + /@tauri-apps/cli-win32-ia32-msvc@1.5.11: + resolution: {integrity: sha512-oVlD9IVewrY0lZzTdb71kNXkjdgMqFq+ohb67YsJb4Rf7o8A9DTlFds1XLCe3joqLMm4M+gvBKD7YnGIdxQ9vA==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] @@ -1333,8 +1333,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-win32-x64-msvc@1.5.9: - resolution: {integrity: sha512-EeI1+L518cIBLKw0qUFwnLIySBeSmPQjPLIlNwSukHSro4tAQPHycEVGgKrdToiCWgaZJBA0e5aRSds0Du2TWg==} + /@tauri-apps/cli-win32-x64-msvc@1.5.11: + resolution: {integrity: sha512-1CexcqUFCis5ypUIMOKllxUBrna09McbftWENgvVXMfA+SP+yPDPAVb8fIvUcdTIwR/yHJwcIucmTB4anww4vg==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -1342,21 +1342,21 @@ packages: dev: true optional: true - /@tauri-apps/cli@1.5.9: - resolution: {integrity: sha512-knSt/9AvCTeyfC6wkyeouF9hBW/0Mzuw+5vBKEvzaGPQsfFJo1ZCp5FkdiZpGBBfnm09BhugasGRTGofzatfqQ==} + /@tauri-apps/cli@1.5.11: + resolution: {integrity: sha512-B475D7phZrq5sZ3kDABH4g2mEoUIHtnIO+r4ZGAAfsjMbZCwXxR/jlMGTEL+VO3YzjpF7gQe38IzB4vLBbVppw==} engines: {node: '>= 10'} hasBin: true optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 1.5.9 - '@tauri-apps/cli-darwin-x64': 1.5.9 - '@tauri-apps/cli-linux-arm-gnueabihf': 1.5.9 - '@tauri-apps/cli-linux-arm64-gnu': 1.5.9 - '@tauri-apps/cli-linux-arm64-musl': 1.5.9 - '@tauri-apps/cli-linux-x64-gnu': 1.5.9 - '@tauri-apps/cli-linux-x64-musl': 1.5.9 - '@tauri-apps/cli-win32-arm64-msvc': 1.5.9 - '@tauri-apps/cli-win32-ia32-msvc': 1.5.9 - '@tauri-apps/cli-win32-x64-msvc': 1.5.9 + '@tauri-apps/cli-darwin-arm64': 1.5.11 + '@tauri-apps/cli-darwin-x64': 1.5.11 + '@tauri-apps/cli-linux-arm-gnueabihf': 1.5.11 + '@tauri-apps/cli-linux-arm64-gnu': 1.5.11 + '@tauri-apps/cli-linux-arm64-musl': 1.5.11 + '@tauri-apps/cli-linux-x64-gnu': 1.5.11 + '@tauri-apps/cli-linux-x64-musl': 1.5.11 + '@tauri-apps/cli-win32-arm64-msvc': 1.5.11 + '@tauri-apps/cli-win32-ia32-msvc': 1.5.11 + '@tauri-apps/cli-win32-x64-msvc': 1.5.11 dev: true /@types/conventional-commits-parser@5.0.0: @@ -1549,97 +1549,97 @@ packages: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} dev: true - /@unocss/config@0.58.4: - resolution: {integrity: sha512-b/inDCOnhUPzobhj+SxRI7xeSwoAQU+3D3J5JoWZNPBI4OaJdwpuz40uLXl9VsPz5N6dc8/qa+FrSsgCjUcLTg==} + /@unocss/config@0.58.5: + resolution: {integrity: sha512-O1pLSeNXfG11QHaLSVwS9rJKvE4b9304IQ3UvOdbYN+7SAT4YTZ7JDU4ngO1KWyOFBO6RD0WspCR95pgqOqJiQ==} engines: {node: '>=14'} dependencies: - '@unocss/core': 0.58.4 + '@unocss/core': 0.58.5 unconfig: 0.3.11 dev: true - /@unocss/core@0.58.4: - resolution: {integrity: sha512-wh4pxXUCkhC+C/0ct74PMYeZgX+oWuHj2mnvr09nM0WmvOm1HeeISrDCCBGcxmKbErUk+D1v3JgzXF7b6j2l4g==} + /@unocss/core@0.58.5: + resolution: {integrity: sha512-qbPqL+46hf1/UelQOwUwpAuvm6buoss43DPYHOPdfNJ+NTWkSpATQMF0JKT04QE0QRQbHNSHdMe9ariG+IIlCw==} dev: true - /@unocss/extractor-arbitrary-variants@0.58.4: - resolution: {integrity: sha512-TQlVtSQk8YdBU9KuTA5k6JBJ8d/aPrIsCWjDPfBvAqDvrll/dzwBCLoLTQMdCHFjCXCOYWKPum1ET+Wn9R+XbA==} + /@unocss/extractor-arbitrary-variants@0.58.5: + resolution: {integrity: sha512-KJQX0OJKzy4YjJo09h2la2Q+cn5IJ1JdyPVJJkzovHnv7jSBWzsfct+bj/6a+SJ4p4JBIqEJz3M/qxHv4EPJyA==} dependencies: - '@unocss/core': 0.58.4 + '@unocss/core': 0.58.5 dev: true - /@unocss/inspector@0.58.4: - resolution: {integrity: sha512-BbsaIMqP6dqa3qCfkC0nkvjCg11JRigvFPU4319imTPcTHQNQSg35t2mVFPGZ+QYHlU/3ouBeogUQfJDHBmtVQ==} + /@unocss/inspector@0.58.5: + resolution: {integrity: sha512-cbJlIHEZ14puTtttf7sl+VZFDscV1DJiSseh9sSe0xJ/1NVBT9Bvkm09/1tnpLYAgF5gfa1CaCcjKmURgYzKrA==} dependencies: - '@unocss/core': 0.58.4 - '@unocss/rule-utils': 0.58.4 + '@unocss/core': 0.58.5 + '@unocss/rule-utils': 0.58.5 gzip-size: 6.0.0 sirv: 2.0.4 dev: true - /@unocss/preset-mini@0.58.4: - resolution: {integrity: sha512-cpIWUYxLi4VCkkjxpNJOVqH9D32NX1ebRFaoAVnvCRsoj5TRsZJSdxs0WMN7reHT/CUHh0Wh6d3TfMCFxzbZ4g==} + /@unocss/preset-mini@0.58.5: + resolution: {integrity: sha512-WqD31fKUAN28OCUOyi1uremmLk0eTMqtCizjbbXsY/DP6RKYUT7trFAtppTcHWFhSQcknb4FURfAZppACsTVQQ==} dependencies: - '@unocss/core': 0.58.4 - '@unocss/extractor-arbitrary-variants': 0.58.4 - '@unocss/rule-utils': 0.58.4 + '@unocss/core': 0.58.5 + '@unocss/extractor-arbitrary-variants': 0.58.5 + '@unocss/rule-utils': 0.58.5 dev: true - /@unocss/preset-uno@0.58.4: - resolution: {integrity: sha512-FWBPGIt0UcQHu58l75kvhB4vF2v+s2m0OW9DnIrPm3aY7Qj3q4yA2wdahR37qSsH+6vR3JP4+mV9WBrGjIsjrQ==} + /@unocss/preset-uno@0.58.5: + resolution: {integrity: sha512-vgq/R4f7RDmdROy+pX+PeE38I3SgYKd4LL7Wb1HJUaVwz7PkF0XHCynOTbwrPXnK1kp1cnZYYEww7/RiYp+IQQ==} dependencies: - '@unocss/core': 0.58.4 - '@unocss/preset-mini': 0.58.4 - '@unocss/preset-wind': 0.58.4 - '@unocss/rule-utils': 0.58.4 + '@unocss/core': 0.58.5 + '@unocss/preset-mini': 0.58.5 + '@unocss/preset-wind': 0.58.5 + '@unocss/rule-utils': 0.58.5 dev: true - /@unocss/preset-wind@0.58.4: - resolution: {integrity: sha512-e2F0HsqPXw+nD85MKIZ63mx5yUx5g8iPOtMw9/eEUeK67HrD+jFxeLq0hAM3ou3a4589QIzeg23LXAkM7gCzvg==} + /@unocss/preset-wind@0.58.5: + resolution: {integrity: sha512-54RkjLmlqMUlC8o8nDCVzB25D1zzK4eth+/3uQzt739qU0U92NxuZKY21ADj9Rp/mVhKBV5FKuXPjmYc6yTQRQ==} dependencies: - '@unocss/core': 0.58.4 - '@unocss/preset-mini': 0.58.4 - '@unocss/rule-utils': 0.58.4 + '@unocss/core': 0.58.5 + '@unocss/preset-mini': 0.58.5 + '@unocss/rule-utils': 0.58.5 dev: true - /@unocss/reset@0.58.4: - resolution: {integrity: sha512-ZZTrAdl4WWmMjQdOqcOSWdgFH6kdFKZjPu4c6Ijxk7KvY2BW3nttTTBa7IYeuXFHVfcExUFqlOgRurt+NeWYyQ==} + /@unocss/reset@0.58.5: + resolution: {integrity: sha512-2wMrkCj3SSb5hrx9TKs5jZa34QIRkHv9FotbJutAPo7o8hx+XXn56ogzdoUrcFPJZJUx2R2nyOVbSlGMIjtFtw==} dev: true - /@unocss/rule-utils@0.58.4: - resolution: {integrity: sha512-52Jp4I+joGTaDm7ehB/7uZ2kJL+9BZcYRDUVk4IDacDH5W9yxf1F75LzYT8jJVWXD/HIhiS0r9V6qhcBq2OWZw==} + /@unocss/rule-utils@0.58.5: + resolution: {integrity: sha512-w0sGJoeUGwMWLVFLEE9PDiv/fQcQqZnTIIQLYNCjTdqXDRlwTp9ACW0h47x/hAAIXdOtEOOBuTfjGD79GznUmA==} engines: {node: '>=14'} dependencies: - '@unocss/core': 0.58.4 - magic-string: 0.30.5 + '@unocss/core': 0.58.5 + magic-string: 0.30.8 dev: true - /@unocss/scope@0.58.4: - resolution: {integrity: sha512-JrX98xoYnv0HN41WyzlvCCU1T3jnDOry+V8mm2dB9DvByzxI484X6gtKbOXlJFAPwOlZPU5Bru/XTDaL6yQQww==} + /@unocss/scope@0.58.5: + resolution: {integrity: sha512-vSentagAwYTnThGRCjzZ6eNSSRuzdWBl21L1BbvVNM91Ss/FugQnZ1hd0m3TrVvvStYXnFVHMQ/MjCAEJ4cMYg==} dev: true - /@unocss/transformer-directives@0.58.4: - resolution: {integrity: sha512-5g2XVhwpmu2IrGHqPwxh+S3ZtkC/AwAtLIBLWB1QNhY3HVzAAaOzcif6uarngrCTTDQSDmsjzm8TSAq26LtCmQ==} + /@unocss/transformer-directives@0.58.5: + resolution: {integrity: sha512-allspF5TlT1B2bJSZ1houHScXOTaTPlatLiEmgQKzr/m93rCvktokaO5J6qeN2VXQdpTIsxdA5B8//7UkfTuIA==} dependencies: - '@unocss/core': 0.58.4 - '@unocss/rule-utils': 0.58.4 + '@unocss/core': 0.58.5 + '@unocss/rule-utils': 0.58.5 css-tree: 2.3.1 dev: true - /@unocss/vite@0.58.4(vite@5.1.4): - resolution: {integrity: sha512-TqD5fIXv6NF3v10FFrCII//GRbkou6Dn/OzW+d4T5f0KM5+T6DutljpYUdGo0+2QXKDroUWLAspFUaZUx8iwVw==} + /@unocss/vite@0.58.5(vite@5.1.4): + resolution: {integrity: sha512-p4o1XNX1rvjmoUqSSdua8XyWNg/d+YUChDd2L/xEty+6j2qv0wUaohs3UQ87vWlv632/UmgdX+2MbrgtqthCtw==} peerDependencies: vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 dependencies: '@ampproject/remapping': 2.2.1 '@rollup/pluginutils': 5.1.0 - '@unocss/config': 0.58.4 - '@unocss/core': 0.58.4 - '@unocss/inspector': 0.58.4 - '@unocss/scope': 0.58.4 - '@unocss/transformer-directives': 0.58.4 + '@unocss/config': 0.58.5 + '@unocss/core': 0.58.5 + '@unocss/inspector': 0.58.5 + '@unocss/scope': 0.58.5 + '@unocss/transformer-directives': 0.58.5 chokidar: 3.5.3 fast-glob: 3.3.2 - magic-string: 0.30.5 + magic-string: 0.30.8 vite: 5.1.4(@types/node@20.11.7)(sass@1.71.1) transitivePeerDependencies: - rollup @@ -1661,8 +1661,8 @@ packages: - supports-color dev: true - /@vitejs/plugin-vue@5.0.3(vite@5.1.4)(vue@3.4.21): - resolution: {integrity: sha512-b8S5dVS40rgHdDrw+DQi/xOM9ed+kSRZzfm1T74bMmBDCd8XO87NKlFYInzCtwvtWwXZvo1QxE2OSspTATWrbA==} + /@vitejs/plugin-vue@5.0.4(vite@5.1.4)(vue@3.4.21): + resolution: {integrity: sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.0 @@ -4218,6 +4218,15 @@ packages: ufo: 1.3.2 dev: true + /mlly@1.6.1: + resolution: {integrity: sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==} + dependencies: + acorn: 8.11.3 + pathe: 1.1.2 + pkg-types: 1.0.3 + ufo: 1.4.0 + dev: true + /mrmime@2.0.0: resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==} engines: {node: '>=10'} @@ -4984,7 +4993,7 @@ packages: resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==} engines: {node: '>= 10'} dependencies: - '@polka/url': 1.0.0-next.24 + '@polka/url': 1.0.0-next.25 mrmime: 2.0.0 totalist: 3.0.1 dev: true @@ -5375,6 +5384,10 @@ packages: resolution: {integrity: sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==} dev: true + /ufo@1.4.0: + resolution: {integrity: sha512-Hhy+BhRBleFjpJ2vchUNN40qgkh0366FWJGqVLYBHev0vpHTrXSA0ryT+74UiW6KWsldNurQMKGqCm1M2zBciQ==} + dev: true + /uglify-js@3.17.4: resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==} engines: {node: '>=0.8.0'} @@ -5398,7 +5411,7 @@ packages: '@antfu/utils': 0.7.7 defu: 6.1.4 jiti: 1.21.0 - mlly: 1.5.0 + mlly: 1.6.1 dev: true /undici-types@5.26.5: diff --git a/src/assets/file/apk.svg b/public/file/apk.svg similarity index 100% rename from src/assets/file/apk.svg rename to public/file/apk.svg diff --git a/src/assets/file/cad.svg b/public/file/cad.svg similarity index 100% rename from src/assets/file/cad.svg rename to public/file/cad.svg diff --git a/src/assets/file/css.svg b/public/file/css.svg similarity index 100% rename from src/assets/file/css.svg rename to public/file/css.svg diff --git a/src/assets/file/dmg.svg b/public/file/dmg.svg similarity index 100% rename from src/assets/file/dmg.svg rename to public/file/dmg.svg diff --git a/src/assets/file/doc.svg b/public/file/doc.svg similarity index 100% rename from src/assets/file/doc.svg rename to public/file/doc.svg diff --git a/src/assets/file/docx.svg b/public/file/docx.svg similarity index 100% rename from src/assets/file/docx.svg rename to public/file/docx.svg diff --git a/src/assets/file/exe.svg b/public/file/exe.svg similarity index 100% rename from src/assets/file/exe.svg rename to public/file/exe.svg diff --git a/src/assets/file/gif.svg b/public/file/gif.svg similarity index 100% rename from src/assets/file/gif.svg rename to public/file/gif.svg diff --git a/src/assets/file/gitignore.svg b/public/file/gitignore.svg similarity index 100% rename from src/assets/file/gitignore.svg rename to public/file/gitignore.svg diff --git a/src/assets/file/html.svg b/public/file/html.svg similarity index 100% rename from src/assets/file/html.svg rename to public/file/html.svg diff --git a/src/assets/file/ipa.svg b/public/file/ipa.svg similarity index 100% rename from src/assets/file/ipa.svg rename to public/file/ipa.svg diff --git a/src/assets/file/iso.svg b/public/file/iso.svg similarity index 100% rename from src/assets/file/iso.svg rename to public/file/iso.svg diff --git a/src/assets/file/java.svg b/public/file/java.svg similarity index 100% rename from src/assets/file/java.svg rename to public/file/java.svg diff --git a/src/assets/file/js.svg b/public/file/js.svg similarity index 100% rename from src/assets/file/js.svg rename to public/file/js.svg diff --git a/src/assets/file/json.svg b/public/file/json.svg similarity index 100% rename from src/assets/file/json.svg rename to public/file/json.svg diff --git a/src/assets/file/jsx.svg b/public/file/jsx.svg similarity index 100% rename from src/assets/file/jsx.svg rename to public/file/jsx.svg diff --git a/src/assets/file/less.svg b/public/file/less.svg similarity index 100% rename from src/assets/file/less.svg rename to public/file/less.svg diff --git a/src/assets/file/md.svg b/public/file/md.svg similarity index 100% rename from src/assets/file/md.svg rename to public/file/md.svg diff --git a/src/assets/file/mov.svg b/public/file/mov.svg similarity index 100% rename from src/assets/file/mov.svg rename to public/file/mov.svg diff --git a/src/assets/file/mp3.svg b/public/file/mp3.svg similarity index 100% rename from src/assets/file/mp3.svg rename to public/file/mp3.svg diff --git a/src/assets/file/mp4.svg b/public/file/mp4.svg similarity index 100% rename from src/assets/file/mp4.svg rename to public/file/mp4.svg diff --git a/src/assets/file/other.svg b/public/file/other.svg similarity index 100% rename from src/assets/file/other.svg rename to public/file/other.svg diff --git a/src/assets/file/pdf.svg b/public/file/pdf.svg similarity index 100% rename from src/assets/file/pdf.svg rename to public/file/pdf.svg diff --git a/src/assets/file/ppt.svg b/public/file/ppt.svg similarity index 100% rename from src/assets/file/ppt.svg rename to public/file/ppt.svg diff --git a/src/assets/file/psd.svg b/public/file/psd.svg similarity index 100% rename from src/assets/file/psd.svg rename to public/file/psd.svg diff --git a/src/assets/file/py.svg b/public/file/py.svg similarity index 100% rename from src/assets/file/py.svg rename to public/file/py.svg diff --git a/src/assets/file/scss.svg b/public/file/scss.svg similarity index 100% rename from src/assets/file/scss.svg rename to public/file/scss.svg diff --git a/src/assets/file/sql.svg b/public/file/sql.svg similarity index 100% rename from src/assets/file/sql.svg rename to public/file/sql.svg diff --git a/src/assets/file/stylus.svg b/public/file/stylus.svg similarity index 100% rename from src/assets/file/stylus.svg rename to public/file/stylus.svg diff --git a/src/assets/file/svg.svg b/public/file/svg.svg similarity index 100% rename from src/assets/file/svg.svg rename to public/file/svg.svg diff --git a/src/assets/file/ts.svg b/public/file/ts.svg similarity index 100% rename from src/assets/file/ts.svg rename to public/file/ts.svg diff --git a/src/assets/file/txt.svg b/public/file/txt.svg similarity index 100% rename from src/assets/file/txt.svg rename to public/file/txt.svg diff --git a/src/assets/file/vue.svg b/public/file/vue.svg similarity index 100% rename from src/assets/file/vue.svg rename to public/file/vue.svg diff --git a/src/assets/file/xlxs.svg b/public/file/xlxs.svg similarity index 100% rename from src/assets/file/xlxs.svg rename to public/file/xlxs.svg diff --git a/src/assets/file/zip.svg b/public/file/zip.svg similarity index 100% rename from src/assets/file/zip.svg rename to public/file/zip.svg diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 00000000..b120bfcb Binary files /dev/null and b/public/logo.png differ diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 9e85767f..663a7643 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -3,7 +3,8 @@ "beforeDevCommand": "pnpm dev", "beforeBuildCommand": "pnpm build", "devPath": "http://localhost:6130", - "distDir": "../dist" + "distDir": "../dist", + "withGlobalTauri": true }, "package": { "productName": "HuLa-IM-Tauri", @@ -21,7 +22,7 @@ }, "fs": { "all": true, - "scope": ["*", "$DOWNLOAD/*"] + "scope": ["*/**"] }, "window": { "all": true diff --git a/src/router/index.ts b/src/router/index.ts index fb775190..516f4d75 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,7 +1,8 @@ import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router' +import { Dynamic, About, Mail } from './noLazyRouter.ts' -// const modules = import.meta.glob('../views/page/*.vue') -const { VITE_APP_TITLE, VITE_TITLE_SUFFIX, BASE_URL } = import.meta.env +/*! 创建窗口后再跳转页面就会导致样式没有生效所以不能使用懒加载路由的方式 */ +const { BASE_URL } = import.meta.env const routes: Array = [ { path: '/login', @@ -38,17 +39,17 @@ const routes: Array = [ { path: '/mail', name: 'mail', - component: () => import('@/views/home-window/Mail.vue') + component: Mail }, { path: '/dynamic', name: 'dynamic', - component: () => import('@/views/home-window/Dynamic.vue') + component: Dynamic }, { path: '/about', name: 'about', - component: () => import('@/views/home-window/more/About.vue') + component: About }, { path: '/settings', @@ -74,66 +75,4 @@ const router: any = createRouter({ history: createWebHistory(BASE_URL), routes }) - -// 注意：刷新页面会导致页面路由重置 -// export const setRoutes = (menus?: MenuItem[]) => { -// if (!menus || !menus.length) { -// const manager = localStorage.getItem('localUserInfo') -// if (!manager) { -// return -// } -// menus = JSON.parse(manager).loginInfo.menus -// } -// if (menus?.length) { -// /** -// * 动态添加路由 -// * @param routeItem -// */ -// const addDynamicRoute = (routeItem: MenuItem) => { -// if (routeItem.page) { -// /*添加views文件夹中page文件下面的全部.vue文件*/ -// router.addRoute('page', { -// path: routeItem.path, -// name: routeItem.page, -// meta: { title: routeItem.name, icon: routeItem.icon, requiresAuth: true, dynamicAdded: true }, -// component: () => import(`@/views/page/${routeItem.page}.vue`) -// }) -// } -// } -// menus.forEach((item) => { -// addDynamicRoute(item) -// if (item.children && item.children.length) { -// item.children.forEach((sub) => { -// addDynamicRoute(sub) -// }) -// } -// }) -// } -// } -// setRoutes() - -//重置路由的方法 -export const resetRouter = () => { - // 获得当前路由器所有的路由记录 - const currentRoutes = router.getRoutes() - // 过滤出动态添加的路由记录 - currentRoutes.forEach((route: any) => { - if (route.meta && route.meta.dynamicAdded) { - router.removeRoute(route.name) - } - }) -} - -// 路由前置守卫 -router.beforeEach(async (to: any, _from: any, next: any) => { - /*设置页面标题和标题后缀*/ - document.title = to.meta.title ? to.meta.title + VITE_TITLE_SUFFIX : VITE_APP_TITLE - // 如果要访问的路径不存在(没有匹配的路由记录) - if (!to.matched.length) { - return next('/:catchAll(.*)') // 重定向到捕获所有路径的路由 - } - // 其他情况，继续路由导航 - next() -}) - export default router diff --git a/src/router/noLazyRouter.ts b/src/router/noLazyRouter.ts new file mode 100644 index 00000000..ba9e1b5b --- /dev/null +++ b/src/router/noLazyRouter.ts @@ -0,0 +1,5 @@ +import Dynamic from '@/views/home-window/Dynamic.vue' +import Mail from '@/views/home-window/Mail.vue' +import About from '@/views/home-window/more/About.vue' + +export { Dynamic, Mail, About } diff --git a/src/typings/components.d.ts b/src/typings/components.d.ts index a1596d12..faab9df6 100644 --- a/src/typings/components.d.ts +++ b/src/typings/components.d.ts @@ -29,7 +29,6 @@ declare module 'vue' { NDialogProvider: typeof import('naive-ui')['NDialogProvider'] NDropdown: typeof import('naive-ui')['NDropdown'] NFlex: typeof import('naive-ui')['NFlex'] - NFloatButton: typeof import('naive-ui')['NFloatButton'] NIcon: typeof import('naive-ui')['NIcon'] NIconWrapper: typeof import('naive-ui')['NIconWrapper'] NImage: typeof import('naive-ui')['NImage'] diff --git a/src/utils/CreateDom.ts b/src/utils/CreateDom.ts index cfdbe045..270faed6 100644 --- a/src/utils/CreateDom.ts +++ b/src/utils/CreateDom.ts @@ -18,7 +18,7 @@ export const createFileOrVideoDom = (file: File) => { canvas.width = 225 canvas.height = 85 // 加载SVG文件并绘制到canvas,根据文件类型，设置SVG图标 - loadSVG(`src/assets/file/${file.name.split('.').pop()}.svg`) + loadSVG(`/file/${file.name.split('.').pop()}.svg`) .then((svgImage: any) => { // 圆角矩形的背景和边框，您可以根据需要调整样式 ctx.fillStyle = '#fdfdfd' // 背景颜色 @@ -147,8 +147,8 @@ export const createFileOrVideoDom = (file: File) => { * 加载本地的SVG文件，并在加载完成后回调 * @param {string} path SVG文件的路径 * @example - * loadSVG('src/assets/file/file.svg').then((svgImage) => {} - * 使用时，将SVG文件放在src/assets/file文件夹下，并且使用文件类型做svg名 + * loadSVG('public/file/file.svg').then((svgImage) => {} + * 使用时，将SVG文件放在public/file文件夹下，并且使用文件类型做svg名 */ const loadSVG = (path: string) => { return new Promise((resolve, reject) => {