diff --git a/CHANGELOG.md b/CHANGELOG.md index 0024a99..6421612 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,10 @@ ### Bug Fixes +* **common:** :bug: 修复插件下载模块进度问题 ([85bc525](https://github.com/nongyehong/HuLa-IM-Tauri/commit/85bc525c1191d65eee0aef0592bf6a2e47746244)) * **component:** :bug: 修复windows上的样式问题 ([bb6a9d4](https://github.com/nongyehong/HuLa-IM-Tauri/commit/bb6a9d440db4777989d9a922a5135350e2dbf894)) * **component:** :bug: 修复系统托盘功能和一些样式问题 ([18277ef](https://github.com/nongyehong/HuLa-IM-Tauri/commit/18277ef0f1ce286b77b91dbc8c6ea8a628eba7d3)) +* **layout:** :bug: 修复ts类型错误导致打包出差问题 ([0d7f7e0](https://github.com/nongyehong/HuLa-IM-Tauri/commit/0d7f7e024d9404fe5fe6829504594a902c27c501)) * **style:** :bug: 统一修复svg点击时有轮廓问题 ([ce68fa1](https://github.com/nongyehong/HuLa-IM-Tauri/commit/ce68fa134368b34802d5b101a1f98a2493f7120b)) * **system:** :bug: 修复mac端右键菜单透明度问题 ([39d795f](https://github.com/nongyehong/HuLa-IM-Tauri/commit/39d795ff655afd699340d3021a0b471c3060b11c)) * **system:** :bug: 修复win下窗口高度不一致问题 ([30bb3de](https://github.com/nongyehong/HuLa-IM-Tauri/commit/30bb3de5d10ffea949c32b505f6501b3f7d0f573)) diff --git a/index.html b/index.html index d0eb7d1..b489f38 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ HuLa - + diff --git a/package.json b/package.json index cb8829a..8fc89d9 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "prettier": "^3.3.2", "sass": "1.77.6", "sass-loader": "^14.2.1", - "typescript": "^5.5.3", + "typescript": "^5.6.2", "unplugin-auto-import": "^0.18.2", "unplugin-vue-components": "^0.27.4", "vite": "5.4.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a659973..81a4c17 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,32 +43,32 @@ importers: version: 3.0.1 naive-ui: specifier: ^2.39.0 - version: 2.39.0(vue@3.5.4(typescript@5.5.3)) + version: 2.39.0(vue@3.5.4(typescript@5.6.2)) pinia: specifier: ^2.2.1 - version: 2.2.1(typescript@5.5.3)(vue@3.5.4(typescript@5.5.3)) + version: 2.2.1(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)) pinia-plugin-persistedstate: specifier: ^3.2.1 - version: 3.2.1(pinia@2.2.1(typescript@5.5.3)(vue@3.5.4(typescript@5.5.3))) + version: 3.2.1(pinia@2.2.1(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2))) pinia-shared-state: specifier: ^0.5.1 - version: 0.5.1(pinia@2.2.1(typescript@5.5.3)(vue@3.5.4(typescript@5.5.3)))(vue@3.5.4(typescript@5.5.3)) + version: 0.5.1(pinia@2.2.1(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)))(vue@3.5.4(typescript@5.6.2)) vue: specifier: ^3.5.4 - version: 3.5.4(typescript@5.5.3) + version: 3.5.4(typescript@5.6.2) vue-draggable-plus: specifier: ^0.5.3 version: 0.5.3(@types/sortablejs@1.15.8) vue-router: specifier: ^4.4.2 - version: 4.4.3(vue@3.5.4(typescript@5.5.3)) + version: 4.4.3(vue@3.5.4(typescript@5.6.2)) devDependencies: '@babel/eslint-parser': specifier: ^7.24.7 version: 7.25.1(@babel/core@7.25.2)(eslint@8.57.0) '@commitlint/cli': specifier: ^19.3.0 - version: 19.4.0(@types/node@20.14.15)(typescript@5.5.3) + version: 19.4.0(@types/node@20.14.15)(typescript@5.6.2) '@commitlint/config-conventional': specifier: ^19.2.2 version: 19.2.2 @@ -86,10 +86,10 @@ importers: version: 20.14.15 '@typescript-eslint/eslint-plugin': specifier: 7.1.0 - version: 7.1.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.3))(eslint@8.57.0)(typescript@5.5.3) + version: 7.1.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)(typescript@5.6.2) '@typescript-eslint/parser': specifier: ^7.15.0 - version: 7.18.0(eslint@8.57.0)(typescript@5.5.3) + version: 7.18.0(eslint@8.57.0)(typescript@5.6.2) '@unocss/preset-uno': specifier: ^0.62.3 version: 0.62.3 @@ -107,16 +107,16 @@ importers: version: 0.62.3(rollup@4.21.2)(vite@5.4.3(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5)) '@vitejs/plugin-vue': specifier: ^5.1.2 - version: 5.1.2(vite@5.4.3(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.4(typescript@5.5.3)) + version: 5.1.2(vite@5.4.3(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.4(typescript@5.6.2)) '@vitejs/plugin-vue-jsx': specifier: ^4.0.0 - version: 4.0.0(vite@5.4.3(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.4(typescript@5.5.3)) + version: 4.0.0(vite@5.4.3(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.4(typescript@5.6.2)) '@vueuse/core': specifier: ^10.11.0 - version: 10.11.1(vue@3.5.4(typescript@5.5.3)) + version: 10.11.1(vue@3.5.4(typescript@5.6.2)) commitizen: specifier: ^4.3.0 - version: 4.3.0(@types/node@20.14.15)(typescript@5.5.3) + version: 4.3.0(@types/node@20.14.15)(typescript@5.6.2) conventional-changelog: specifier: ^6.0.0 version: 6.0.0(conventional-commits-filter@5.0.0) @@ -134,7 +134,7 @@ importers: version: 9.1.0(eslint@8.57.0) eslint-plugin-import: specifier: ^2.29.1 - version: 2.29.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.3))(eslint@8.57.0) + version: 2.29.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0) eslint-plugin-prettier: specifier: ^5.1.3 version: 5.2.1(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.3) @@ -160,20 +160,20 @@ importers: specifier: ^14.2.1 version: 14.2.1(sass@1.77.6) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.6.2 + version: 5.6.2 unplugin-auto-import: specifier: ^0.18.2 - version: 0.18.2(@nuxt/kit@3.13.1(rollup@4.21.2)(webpack-sources@3.2.3))(@vueuse/core@10.11.1(vue@3.5.4(typescript@5.5.3)))(rollup@4.21.2)(webpack-sources@3.2.3) + version: 0.18.2(@nuxt/kit@3.13.1(rollup@4.21.2)(webpack-sources@3.2.3))(@vueuse/core@10.11.1(vue@3.5.4(typescript@5.6.2)))(rollup@4.21.2)(webpack-sources@3.2.3) unplugin-vue-components: specifier: ^0.27.4 - version: 0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.1(rollup@4.21.2)(webpack-sources@3.2.3))(rollup@4.21.2)(vue@3.5.4(typescript@5.5.3))(webpack-sources@3.2.3) + version: 0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.1(rollup@4.21.2)(webpack-sources@3.2.3))(rollup@4.21.2)(vue@3.5.4(typescript@5.6.2))(webpack-sources@3.2.3) vite: specifier: 5.4.3 version: 5.4.3(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5) vue-tsc: specifier: ^2.1.4 - version: 2.1.4(typescript@5.5.3) + version: 2.1.4(typescript@5.6.2) packages: @@ -3633,8 +3633,8 @@ packages: resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==} engines: {node: '>= 0.4'} - typescript@5.5.3: - resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==} + typescript@5.6.2: + resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} engines: {node: '>=14.17'} hasBin: true @@ -4137,11 +4137,11 @@ snapshots: '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 - '@commitlint/cli@19.4.0(@types/node@20.14.15)(typescript@5.5.3)': + '@commitlint/cli@19.4.0(@types/node@20.14.15)(typescript@5.6.2)': dependencies: '@commitlint/format': 19.3.0 '@commitlint/lint': 19.2.2 - '@commitlint/load': 19.4.0(@types/node@20.14.15)(typescript@5.5.3) + '@commitlint/load': 19.4.0(@types/node@20.14.15)(typescript@5.6.2) '@commitlint/read': 19.4.0 '@commitlint/types': 19.0.3 execa: 8.0.1 @@ -4188,15 +4188,15 @@ snapshots: '@commitlint/rules': 19.0.3 '@commitlint/types': 19.0.3 - '@commitlint/load@19.4.0(@types/node@20.14.15)(typescript@5.5.3)': + '@commitlint/load@19.4.0(@types/node@20.14.15)(typescript@5.6.2)': dependencies: '@commitlint/config-validator': 19.0.3 '@commitlint/execute-rule': 19.0.0 '@commitlint/resolve-extends': 19.1.0 '@commitlint/types': 19.0.3 chalk: 5.3.0 - cosmiconfig: 9.0.0(typescript@5.5.3) - cosmiconfig-typescript-loader: 5.0.0(@types/node@20.14.15)(cosmiconfig@9.0.0(typescript@5.5.3))(typescript@5.5.3) + cosmiconfig: 9.0.0(typescript@5.6.2) + cosmiconfig-typescript-loader: 5.0.0(@types/node@20.14.15)(cosmiconfig@9.0.0(typescript@5.6.2))(typescript@5.6.2) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -4260,9 +4260,9 @@ snapshots: dependencies: css-render: 0.15.14 - '@css-render/vue3-ssr@0.15.14(vue@3.5.4(typescript@5.5.3))': + '@css-render/vue3-ssr@0.15.14(vue@3.5.4(typescript@5.6.2))': dependencies: - vue: 3.5.4(typescript@5.5.3) + vue: 3.5.4(typescript@5.6.2) '@emotion/hash@0.8.0': {} @@ -4723,13 +4723,13 @@ snapshots: '@types/web-bluetooth@0.0.20': {} - '@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.3))(eslint@8.57.0)(typescript@5.5.3)': + '@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)(typescript@5.6.2)': dependencies: '@eslint-community/regexpp': 4.11.0 - '@typescript-eslint/parser': 7.18.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/parser': 7.18.0(eslint@8.57.0)(typescript@5.6.2) '@typescript-eslint/scope-manager': 7.1.0 - '@typescript-eslint/type-utils': 7.1.0(eslint@8.57.0)(typescript@5.5.3) - '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/type-utils': 7.1.0(eslint@8.57.0)(typescript@5.6.2) + '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.6.2) '@typescript-eslint/visitor-keys': 7.1.0 debug: 4.3.6 eslint: 8.57.0 @@ -4737,22 +4737,22 @@ snapshots: ignore: 5.3.1 natural-compare: 1.4.0 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.5.3) + ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: - typescript: 5.5.3 + typescript: 5.6.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.3)': + '@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.6.2)': dependencies: '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/types': 7.18.0 - '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.5.3) + '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) '@typescript-eslint/visitor-keys': 7.18.0 debug: 4.3.6 eslint: 8.57.0 optionalDependencies: - typescript: 5.5.3 + typescript: 5.6.2 transitivePeerDependencies: - supports-color @@ -4766,15 +4766,15 @@ snapshots: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/visitor-keys': 7.18.0 - '@typescript-eslint/type-utils@7.1.0(eslint@8.57.0)(typescript@5.5.3)': + '@typescript-eslint/type-utils@7.1.0(eslint@8.57.0)(typescript@5.6.2)': dependencies: - '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.5.3) - '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.6.2) + '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.6.2) debug: 4.3.6 eslint: 8.57.0 - ts-api-utils: 1.3.0(typescript@5.5.3) + ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: - typescript: 5.5.3 + typescript: 5.6.2 transitivePeerDependencies: - supports-color @@ -4782,7 +4782,7 @@ snapshots: '@typescript-eslint/types@7.18.0': {} - '@typescript-eslint/typescript-estree@7.1.0(typescript@5.5.3)': + '@typescript-eslint/typescript-estree@7.1.0(typescript@5.6.2)': dependencies: '@typescript-eslint/types': 7.1.0 '@typescript-eslint/visitor-keys': 7.1.0 @@ -4791,13 +4791,13 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.3 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.5.3) + ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: - typescript: 5.5.3 + typescript: 5.6.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@7.18.0(typescript@5.5.3)': + '@typescript-eslint/typescript-estree@7.18.0(typescript@5.6.2)': dependencies: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/visitor-keys': 7.18.0 @@ -4806,20 +4806,20 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.5.3) + ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: - typescript: 5.5.3 + typescript: 5.6.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@7.1.0(eslint@8.57.0)(typescript@5.5.3)': + '@typescript-eslint/utils@7.1.0(eslint@8.57.0)(typescript@5.6.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 7.1.0 '@typescript-eslint/types': 7.1.0 - '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.5.3) + '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.6.2) eslint: 8.57.0 semver: 7.6.3 transitivePeerDependencies: @@ -4913,20 +4913,20 @@ snapshots: - rollup - supports-color - '@vitejs/plugin-vue-jsx@4.0.0(vite@5.4.3(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.4(typescript@5.5.3))': + '@vitejs/plugin-vue-jsx@4.0.0(vite@5.4.3(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.4(typescript@5.6.2))': dependencies: '@babel/core': 7.25.2 '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2) '@vue/babel-plugin-jsx': 1.2.2(@babel/core@7.25.2) vite: 5.4.3(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5) - vue: 3.5.4(typescript@5.5.3) + vue: 3.5.4(typescript@5.6.2) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue@5.1.2(vite@5.4.3(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.4(typescript@5.5.3))': + '@vitejs/plugin-vue@5.1.2(vite@5.4.3(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5))(vue@3.5.4(typescript@5.6.2))': dependencies: vite: 5.4.3(@types/node@20.14.15)(sass@1.77.6)(terser@5.31.5) - vue: 3.5.4(typescript@5.5.3) + vue: 3.5.4(typescript@5.6.2) '@volar/language-core@2.4.1': dependencies: @@ -5049,7 +5049,7 @@ snapshots: '@vue/devtools-api@6.6.3': {} - '@vue/language-core@2.1.4(typescript@5.5.3)': + '@vue/language-core@2.1.4(typescript@5.6.2)': dependencies: '@volar/language-core': 2.4.1 '@vue/compiler-dom': 3.4.38 @@ -5060,7 +5060,7 @@ snapshots: muggle-string: 0.4.1 path-browserify: 1.0.1 optionalDependencies: - typescript: 5.5.3 + typescript: 5.6.2 '@vue/reactivity@3.5.4': dependencies: @@ -5078,11 +5078,11 @@ snapshots: '@vue/shared': 3.5.4 csstype: 3.1.3 - '@vue/server-renderer@3.5.4(vue@3.5.4(typescript@5.5.3))': + '@vue/server-renderer@3.5.4(vue@3.5.4(typescript@5.6.2))': dependencies: '@vue/compiler-ssr': 3.5.4 '@vue/shared': 3.5.4 - vue: 3.5.4(typescript@5.5.3) + vue: 3.5.4(typescript@5.6.2) '@vue/shared@3.4.37': {} @@ -5090,21 +5090,21 @@ snapshots: '@vue/shared@3.5.4': {} - '@vueuse/core@10.11.1(vue@3.5.4(typescript@5.5.3))': + '@vueuse/core@10.11.1(vue@3.5.4(typescript@5.6.2))': dependencies: '@types/web-bluetooth': 0.0.20 '@vueuse/metadata': 10.11.1 - '@vueuse/shared': 10.11.1(vue@3.5.4(typescript@5.5.3)) - vue-demi: 0.14.10(vue@3.5.4(typescript@5.5.3)) + '@vueuse/shared': 10.11.1(vue@3.5.4(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue '@vueuse/metadata@10.11.1': {} - '@vueuse/shared@10.11.1(vue@3.5.4(typescript@5.5.3))': + '@vueuse/shared@10.11.1(vue@3.5.4(typescript@5.6.2))': dependencies: - vue-demi: 0.14.10(vue@3.5.4(typescript@5.5.3)) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -5423,10 +5423,10 @@ snapshots: commander@2.20.3: {} - commitizen@4.3.0(@types/node@20.14.15)(typescript@5.5.3): + commitizen@4.3.0(@types/node@20.14.15)(typescript@5.6.2): dependencies: cachedir: 2.3.0 - cz-conventional-changelog: 3.3.0(@types/node@20.14.15)(typescript@5.5.3) + cz-conventional-changelog: 3.3.0(@types/node@20.14.15)(typescript@5.6.2) dedent: 0.7.0 detect-indent: 6.1.0 find-node-modules: 2.1.3 @@ -5561,21 +5561,21 @@ snapshots: core-util-is@1.0.2: {} - cosmiconfig-typescript-loader@5.0.0(@types/node@20.14.15)(cosmiconfig@9.0.0(typescript@5.5.3))(typescript@5.5.3): + cosmiconfig-typescript-loader@5.0.0(@types/node@20.14.15)(cosmiconfig@9.0.0(typescript@5.6.2))(typescript@5.6.2): dependencies: '@types/node': 20.14.15 - cosmiconfig: 9.0.0(typescript@5.5.3) + cosmiconfig: 9.0.0(typescript@5.6.2) jiti: 1.21.6 - typescript: 5.5.3 + typescript: 5.6.2 - cosmiconfig@9.0.0(typescript@5.5.3): + cosmiconfig@9.0.0(typescript@5.6.2): dependencies: env-paths: 2.2.1 import-fresh: 3.3.0 js-yaml: 4.1.0 parse-json: 5.2.0 optionalDependencies: - typescript: 5.5.3 + typescript: 5.6.2 cross-spawn@7.0.3: dependencies: @@ -5603,16 +5603,16 @@ snapshots: dependencies: uniq: 1.0.1 - cz-conventional-changelog@3.3.0(@types/node@20.14.15)(typescript@5.5.3): + cz-conventional-changelog@3.3.0(@types/node@20.14.15)(typescript@5.6.2): dependencies: chalk: 2.4.2 - commitizen: 4.3.0(@types/node@20.14.15)(typescript@5.5.3) + commitizen: 4.3.0(@types/node@20.14.15)(typescript@5.6.2) conventional-commit-types: 3.0.0 lodash.map: 4.6.0 longest: 2.0.1 word-wrap: 1.2.5 optionalDependencies: - '@commitlint/load': 19.4.0(@types/node@20.14.15)(typescript@5.5.3) + '@commitlint/load': 19.4.0(@types/node@20.14.15)(typescript@5.6.2) transitivePeerDependencies: - '@types/node' - typescript @@ -5892,17 +5892,17 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.8.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0): + eslint-module-utils@2.8.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0): dependencies: debug: 3.2.7 optionalDependencies: - '@typescript-eslint/parser': 7.18.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/parser': 7.18.0(eslint@8.57.0)(typescript@5.6.2) eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: - supports-color - eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.3))(eslint@8.57.0): + eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0): dependencies: array-includes: 3.1.8 array.prototype.findlastindex: 1.2.5 @@ -5912,7 +5912,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0) hasown: 2.0.2 is-core-module: 2.15.0 is-glob: 4.0.3 @@ -5923,7 +5923,7 @@ snapshots: semver: 6.3.1 tsconfig-paths: 3.15.0 optionalDependencies: - '@typescript-eslint/parser': 7.18.0(eslint@8.57.0)(typescript@5.5.3) + '@typescript-eslint/parser': 7.18.0(eslint@8.57.0)(typescript@5.6.2) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -6839,10 +6839,10 @@ snapshots: mute-stream@0.0.8: {} - naive-ui@2.39.0(vue@3.5.4(typescript@5.5.3)): + naive-ui@2.39.0(vue@3.5.4(typescript@5.6.2)): dependencies: '@css-render/plugin-bem': 0.15.14(css-render@0.15.14) - '@css-render/vue3-ssr': 0.15.14(vue@3.5.4(typescript@5.5.3)) + '@css-render/vue3-ssr': 0.15.14(vue@3.5.4(typescript@5.6.2)) '@types/katex': 0.16.7 '@types/lodash': 4.17.7 '@types/lodash-es': 4.17.12 @@ -6857,10 +6857,10 @@ snapshots: lodash-es: 4.17.21 seemly: 0.3.8 treemate: 0.3.11 - vdirs: 0.1.8(vue@3.5.4(typescript@5.5.3)) - vooks: 0.2.12(vue@3.5.4(typescript@5.5.3)) - vue: 3.5.4(typescript@5.5.3) - vueuc: 0.4.58(vue@3.5.4(typescript@5.5.3)) + vdirs: 0.1.8(vue@3.5.4(typescript@5.6.2)) + vooks: 0.2.12(vue@3.5.4(typescript@5.6.2)) + vue: 3.5.4(typescript@5.6.2) + vueuc: 0.4.58(vue@3.5.4(typescript@5.6.2)) nanoid@3.3.7: {} @@ -7086,26 +7086,26 @@ snapshots: pidtree@0.6.0: {} - pinia-plugin-persistedstate@3.2.1(pinia@2.2.1(typescript@5.5.3)(vue@3.5.4(typescript@5.5.3))): + pinia-plugin-persistedstate@3.2.1(pinia@2.2.1(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2))): dependencies: - pinia: 2.2.1(typescript@5.5.3)(vue@3.5.4(typescript@5.5.3)) + pinia: 2.2.1(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)) - pinia-shared-state@0.5.1(pinia@2.2.1(typescript@5.5.3)(vue@3.5.4(typescript@5.5.3)))(vue@3.5.4(typescript@5.5.3)): + pinia-shared-state@0.5.1(pinia@2.2.1(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)))(vue@3.5.4(typescript@5.6.2)): dependencies: broadcast-channel: 7.0.0 - pinia: 2.2.1(typescript@5.5.3)(vue@3.5.4(typescript@5.5.3)) - vue-demi: 0.14.10(vue@3.5.4(typescript@5.5.3)) + pinia: 2.2.1(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue - pinia@2.2.1(typescript@5.5.3)(vue@3.5.4(typescript@5.5.3)): + pinia@2.2.1(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)): dependencies: '@vue/devtools-api': 6.6.3 - vue: 3.5.4(typescript@5.5.3) - vue-demi: 0.14.10(vue@3.5.4(typescript@5.5.3)) + vue: 3.5.4(typescript@5.6.2) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) optionalDependencies: - typescript: 5.5.3 + typescript: 5.6.2 pkg-types@1.2.0: dependencies: @@ -7555,9 +7555,9 @@ snapshots: treemate@0.3.11: {} - ts-api-utils@1.3.0(typescript@5.5.3): + ts-api-utils@1.3.0(typescript@5.6.2): dependencies: - typescript: 5.5.3 + typescript: 5.6.2 tsconfig-paths@3.15.0: dependencies: @@ -7623,7 +7623,7 @@ snapshots: is-typed-array: 1.1.13 possible-typed-array-names: 1.0.0 - typescript@5.5.3: {} + typescript@5.6.2: {} ufo@1.5.4: {} @@ -7707,7 +7707,7 @@ snapshots: unload@2.4.1: {} - unplugin-auto-import@0.18.2(@nuxt/kit@3.13.1(rollup@4.21.2)(webpack-sources@3.2.3))(@vueuse/core@10.11.1(vue@3.5.4(typescript@5.5.3)))(rollup@4.21.2)(webpack-sources@3.2.3): + unplugin-auto-import@0.18.2(@nuxt/kit@3.13.1(rollup@4.21.2)(webpack-sources@3.2.3))(@vueuse/core@10.11.1(vue@3.5.4(typescript@5.6.2)))(rollup@4.21.2)(webpack-sources@3.2.3): dependencies: '@antfu/utils': 0.7.10 '@rollup/pluginutils': 5.1.0(rollup@4.21.2) @@ -7719,12 +7719,12 @@ snapshots: unplugin: 1.14.1(webpack-sources@3.2.3) optionalDependencies: '@nuxt/kit': 3.13.1(rollup@4.21.2)(webpack-sources@3.2.3) - '@vueuse/core': 10.11.1(vue@3.5.4(typescript@5.5.3)) + '@vueuse/core': 10.11.1(vue@3.5.4(typescript@5.6.2)) transitivePeerDependencies: - rollup - webpack-sources - unplugin-vue-components@0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.1(rollup@4.21.2)(webpack-sources@3.2.3))(rollup@4.21.2)(vue@3.5.4(typescript@5.5.3))(webpack-sources@3.2.3): + unplugin-vue-components@0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.1(rollup@4.21.2)(webpack-sources@3.2.3))(rollup@4.21.2)(vue@3.5.4(typescript@5.6.2))(webpack-sources@3.2.3): dependencies: '@antfu/utils': 0.7.10 '@rollup/pluginutils': 5.1.0(rollup@4.21.2) @@ -7736,7 +7736,7 @@ snapshots: minimatch: 9.0.5 mlly: 1.7.1 unplugin: 1.14.1(webpack-sources@3.2.3) - vue: 3.5.4(typescript@5.5.3) + vue: 3.5.4(typescript@5.6.2) optionalDependencies: '@babel/parser': 7.25.6 '@nuxt/kit': 3.13.1(rollup@4.21.2)(webpack-sources@3.2.3) @@ -7784,10 +7784,10 @@ snapshots: spdx-correct: 3.2.0 spdx-expression-parse: 3.0.1 - vdirs@0.1.8(vue@3.5.4(typescript@5.5.3)): + vdirs@0.1.8(vue@3.5.4(typescript@5.6.2)): dependencies: evtd: 0.2.4 - vue: 3.5.4(typescript@5.5.3) + vue: 3.5.4(typescript@5.6.2) verror@1.10.0: dependencies: @@ -7806,16 +7806,16 @@ snapshots: sass: 1.77.6 terser: 5.31.5 - vooks@0.2.12(vue@3.5.4(typescript@5.5.3)): + vooks@0.2.12(vue@3.5.4(typescript@5.6.2)): dependencies: evtd: 0.2.4 - vue: 3.5.4(typescript@5.5.3) + vue: 3.5.4(typescript@5.6.2) vscode-uri@3.0.8: {} - vue-demi@0.14.10(vue@3.5.4(typescript@5.5.3)): + vue-demi@0.14.10(vue@3.5.4(typescript@5.6.2)): dependencies: - vue: 3.5.4(typescript@5.5.3) + vue: 3.5.4(typescript@5.6.2) vue-draggable-plus@0.5.3(@types/sortablejs@1.15.8): dependencies: @@ -7834,38 +7834,38 @@ snapshots: transitivePeerDependencies: - supports-color - vue-router@4.4.3(vue@3.5.4(typescript@5.5.3)): + vue-router@4.4.3(vue@3.5.4(typescript@5.6.2)): dependencies: '@vue/devtools-api': 6.6.3 - vue: 3.5.4(typescript@5.5.3) + vue: 3.5.4(typescript@5.6.2) - vue-tsc@2.1.4(typescript@5.5.3): + vue-tsc@2.1.4(typescript@5.6.2): dependencies: '@volar/typescript': 2.4.1 - '@vue/language-core': 2.1.4(typescript@5.5.3) + '@vue/language-core': 2.1.4(typescript@5.6.2) semver: 7.6.3 - typescript: 5.5.3 + typescript: 5.6.2 - vue@3.5.4(typescript@5.5.3): + vue@3.5.4(typescript@5.6.2): dependencies: '@vue/compiler-dom': 3.5.4 '@vue/compiler-sfc': 3.5.4 '@vue/runtime-dom': 3.5.4 - '@vue/server-renderer': 3.5.4(vue@3.5.4(typescript@5.5.3)) + '@vue/server-renderer': 3.5.4(vue@3.5.4(typescript@5.6.2)) '@vue/shared': 3.5.4 optionalDependencies: - typescript: 5.5.3 + typescript: 5.6.2 - vueuc@0.4.58(vue@3.5.4(typescript@5.5.3)): + vueuc@0.4.58(vue@3.5.4(typescript@5.6.2)): dependencies: - '@css-render/vue3-ssr': 0.15.14(vue@3.5.4(typescript@5.5.3)) + '@css-render/vue3-ssr': 0.15.14(vue@3.5.4(typescript@5.6.2)) '@juggle/resize-observer': 3.4.0 css-render: 0.15.14 evtd: 0.2.4 seemly: 0.3.8 - vdirs: 0.1.8(vue@3.5.4(typescript@5.5.3)) - vooks: 0.2.12(vue@3.5.4(typescript@5.5.3)) - vue: 3.5.4(typescript@5.5.3) + vdirs: 0.1.8(vue@3.5.4(typescript@5.6.2)) + vooks: 0.2.12(vue@3.5.4(typescript@5.6.2)) + vue: 3.5.4(typescript@5.6.2) wcwidth@1.0.1: dependencies: diff --git a/public/icon.js b/public/icon.js new file mode 100644 index 0000000..2328aee --- /dev/null +++ b/public/icon.js @@ -0,0 +1 @@ +!function(e){var t,n,d,o,i,a,r='';function c(){i||(i=!0,d())}t=function(){var e,t,n;(n=document.createElement("div")).innerHTML=r,r=null,(t=n.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",e=t,(n=document.body).firstChild?(t=n.firstChild).parentNode.insertBefore(e,t):n.appendChild(e))},document.addEventListener?["complete","loaded","interactive"].indexOf(document.readyState)>-1?setTimeout(t,0):(n=function(){document.removeEventListener("DOMContentLoaded",n,!1),t()},document.addEventListener("DOMContentLoaded",n,!1)):document.attachEvent&&(d=t,o=e.document,i=!1,(a=function(){try{o.documentElement.doScroll("left")}catch(e){return void setTimeout(a,50)}c()})(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,c())})}(window); diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns index 1267aa6..d095eb7 100644 Binary files a/src-tauri/icons/icon.icns and b/src-tauri/icons/icon.icns differ diff --git a/src/assets/fonts/PingFang Medium.ttf b/src/assets/fonts/PingFang Medium.ttf new file mode 100644 index 0000000..982661b Binary files /dev/null and b/src/assets/fonts/PingFang Medium.ttf differ diff --git a/src/components/rightBox/MsgInput.vue b/src/components/rightBox/MsgInput.vue index 1640b62..bab0882 100644 --- a/src/components/rightBox/MsgInput.vue +++ b/src/components/rightBox/MsgInput.vue @@ -5,6 +5,7 @@
发送/ - {{ type() === 'macos' ? MacOsKeyEnum['⌘'] : WinKeyEnum.ctrl }} + {{ type() === 'macos' ? MacOsKeyEnum['⇧'] : WinKeyEnum.SHIFT }} 换行 diff --git a/src/enums/index.ts b/src/enums/index.ts index d8c0f1e..290e2a3 100644 --- a/src/enums/index.ts +++ b/src/enums/index.ts @@ -254,9 +254,10 @@ export enum MacOsKeyEnum { /** Windows键盘映射 */ export enum WinKeyEnum { - ctrl = 'Ctrl', - win = 'Win', - alt = 'Alt' + CTRL = 'Ctrl', + WIN = 'Win', + ALT = 'Alt', + SHIFT = 'Shift' } /** 插件状态 */ diff --git a/src/layout/left/components/definePlugins/Card.vue b/src/layout/left/components/definePlugins/Card.vue index 77aa94c..a72c0c9 100644 --- a/src/layout/left/components/definePlugins/Card.vue +++ b/src/layout/left/components/definePlugins/Card.vue @@ -13,7 +13,7 @@ :size="8" :class="{ 'filter-shadow': page.shadow }" class="box bg-[--info-hover]"> - +

{{ plugin.title }}

@@ -61,8 +61,7 @@ 'filter-shadow': page.shadow } ]"> - - +

{{ plugin.title }}

) => { } else { clearInterval(interval) plugin.state = PluginEnum.INSTALLED + plugin.progress = 0 updatePlugins(plugin) } }, 500) @@ -165,6 +165,7 @@ const handleUnload = (plugin: STO.Plugins) => { handleDelete(plugin) plugin.isAdd = false plugin.state = PluginEnum.NOT_INSTALLED + plugin.progress = 0 updatePlugins(plugin) }, 2000) } diff --git a/src/layout/left/components/definePlugins/List.vue b/src/layout/left/components/definePlugins/List.vue index bddfd6f..708648b 100644 --- a/src/layout/left/components/definePlugins/List.vue +++ b/src/layout/left/components/definePlugins/List.vue @@ -9,13 +9,11 @@ + class="size-34px color-#999"> @@ -151,6 +149,7 @@ const handleState = (plugin: STO.Plugins) => { } else { clearInterval(interval) plugin.state = PluginEnum.INSTALLED + plugin.progress = 0 updatePlugins(plugin) } }, 500) @@ -162,6 +161,7 @@ const handleUnload = (plugin: STO.Plugins) => { handleDelete(plugin) plugin.isAdd = false plugin.state = PluginEnum.NOT_INSTALLED + plugin.progress = 0 updatePlugins(plugin) }, 2000) } diff --git a/src/layout/left/config.tsx b/src/layout/left/config.tsx index cfef726..86a3748 100644 --- a/src/layout/left/config.tsx +++ b/src/layout/left/config.tsx @@ -14,7 +14,7 @@ const itemsBottom: OPT.L.Common[] = [ title: '邮件', url: 'mail', icon: 'mail', - iconAction: 'mail-action2', + iconAction: 'mail-action', size: { width: 840, height: 600 @@ -27,7 +27,7 @@ const itemsBottom: OPT.L.Common[] = [ title: '文件管理器', url: 'mail', icon: 'file', - iconAction: 'file-action2', + iconAction: 'file-action', size: { width: 840, height: 600 @@ -40,7 +40,7 @@ const itemsBottom: OPT.L.Common[] = [ title: '收藏', url: 'mail', icon: 'collect', - iconAction: 'heart', + iconAction: 'collect-action', size: { width: 840, height: 600 @@ -97,8 +97,7 @@ const pluginsList = ref[]>([ url: 'dynamic', icon: 'fire', title: '动态', - isAnimate: true, - iconAction: 'fire-action2', + iconAction: 'fire-action', state: PluginEnum.BUILTIN, isAdd: true, dot: false, @@ -113,10 +112,9 @@ const pluginsList = ref[]>([ }, { icon: 'robot', - iconAction: 'robot-action', + iconAction: 'GPT', url: 'robot', title: 'ChatBot', - isAnimate: true, tip: 'ChatBot新应用上线', state: PluginEnum.NOT_INSTALLED, version: 'v2.0.0-Bate', diff --git a/src/layout/left/model.tsx b/src/layout/left/model.tsx index 20c7235..36b3219 100644 --- a/src/layout/left/model.tsx +++ b/src/layout/left/model.tsx @@ -107,15 +107,25 @@ export const LockScreen = defineComponent(() => { ) }) -/** 检查更新弹窗 */ +/** + * 检查更新弹窗 + * 需要按照版本号次版本号不能超过40 + * @example v2.0.0 -> v2.39.0 -> v3.0.0 + */ export const CheckUpdate = defineComponent(() => { - const url = `https://gitee.com/api/v5/repos/nongyehong/HuLa-IM-Tauri/releases/tags/v${pkg.version}?access_token=${import.meta.env.VITE_GITEE_TOKEN}` + const url = ref( + `https://gitee.com/api/v5/repos/nongyehong/HuLa-IM-Tauri/releases/tags/v${pkg.version}?access_token=${import.meta.env.VITE_GITEE_TOKEN}` + ) /** 项目提交日志记录 */ const commitLog = ref<{ message: string; icon: string }[]>([]) + const newCommitLog = ref<{ message: string; icon: string }[]>([]) + const text = ref('检查更新') + const newVersion = ref() const loading = ref(false) const checkLoading = ref(false) /** 版本更新日期 */ const versionTime = ref('') + const newVersionTime = ref('') // const commitTypeMap: { [key: string]: string } = { // feat: 'feat', @@ -156,6 +166,44 @@ export const CheckUpdate = defineComponent(() => { /* 记录检测更新的版本 */ let lastVersion: string | null = null + const getCommitLog = (url: string, isNew = false) => { + fetch(url).then((res) => { + if (!res.ok) { + commitLog.value = [{ message: '获取更新日志失败，请配置token后再试', icon: 'cloudError' }] + loading.value = false + return + } + res.json().then(async (data) => { + isNew ? (newVersionTime.value = data.created_at) : (versionTime.value = data.created_at) + await nextTick(() => { + // 使用正则表达式提取 * 号后面的内容 + const regex = /\* (.+)/g + let match + const logs = [] + while ((match = regex.exec(data.body)) !== null) { + logs.push(match[1]) + } + const processedLogs = logs.map((commit) => { + // 获取最后一个 : 号的位置 + const lastColonIndex = commit.lastIndexOf(':') + // 截取最后一个 : 号后的内容 + const message = lastColonIndex !== -1 ? commit.substring(lastColonIndex + 1).trim() : commit + return { + message: message, + icon: mapCommitType(commit) || 'alien-monster' + } + }) + isNew ? (newCommitLog.value = processedLogs) : (commitLog.value = processedLogs) + loading.value = false + }) + }) + }) + } + + const handleUpdate = () => { + window.$message.warning('更新功能暂未开放，敬请期待, 请到github或gitee下载最新版本') + } + const checkUpdate = () => { const url = `https://gitee.com/api/v5/repos/nongyehong/HuLa-IM-Tauri/tags?access_token=${import.meta.env.VITE_GITEE_TOKEN}&sort=name&direction=desc&page=1&per_page=1` if (lastVersion && lastVersion === `v${pkg.version}`) { @@ -174,7 +222,25 @@ export const CheckUpdate = defineComponent(() => { checkLoading.value = false }, 600) } else { - // TODO 获取最新版本的提交日志，并且更换按钮文字为下载最新版本 (nyh -> 2024-07-11 22:20:33) + setTimeout(() => { + let url = `https://gitee.com/api/v5/repos/nongyehong/HuLa-IM-Tauri/tags?access_token=${import.meta.env.VITE_GITEE_TOKEN}&sort=name&direction=asc&page=1` + fetch(url).then((res) => { + res.json().then(async (data) => { + const allVersion = [] as number[] + data.forEach((item: any) => { + // 只获取item.name中[1,4]的内容 + allVersion.push(Number(item.name.slice(1, 4))) + }) + newVersion.value = `v${Math.max(...allVersion)}.0` + url = `https://gitee.com/api/v5/repos/nongyehong/HuLa-IM-Tauri/releases/tags/${newVersion.value}?access_token=${import.meta.env.VITE_GITEE_TOKEN}` + getCommitLog(url, true) + text.value = '立即更新' + checkLoading.value = false + }) + }) + window.$message.success('有新版本发布，请下载最新版本') + // TODO 获取最新版本的提交日志，并且更换按钮文字为下载最新版本 (nyh -> 2024-07-11 22:20:33) + }, 1200) } }) .catch(() => { @@ -186,40 +252,11 @@ export const CheckUpdate = defineComponent(() => { const init = () => { loading.value = true - fetch(url).then((res) => { - if (!res.ok) { - commitLog.value = [{ message: '获取更新日志失败，请配置token后再试', icon: 'cloudError' }] - loading.value = false - return - } - res.json().then(async (data) => { - versionTime.value = data.created_at - await nextTick(() => { - // 使用正则表达式提取 * 号后面的内容 - const regex = /\* (.+)/g - let match - const logs = [] - while ((match = regex.exec(data.body)) !== null) { - logs.push(match[1]) - } - commitLog.value = logs.map((commit) => { - // 获取最后一个 : 号的位置 - const lastColonIndex = commit.lastIndexOf(':') - // 截取最后一个 : 号后的内容 - const message = lastColonIndex !== -1 ? commit.substring(lastColonIndex + 1).trim() : commit - return { - message: message, - icon: mapCommitType(commit) || 'alien-monster' - } - }) - loading.value = false - }) - }) - }) } onMounted(() => { init() + getCommitLog(url.value) }) return () => ( @@ -245,18 +282,75 @@ export const CheckUpdate = defineComponent(() => { ) : ( - + -

当前版本:

-

v{pkg.version}

+ +

当前版本:

+

v{pkg.version}

+ + + {newVersion.value ? ( + + + + + +

{newVersion.value}

+ + + new + + + ) : null} -

版本发布日期:

-

{handRelativeTime(versionTime.value)}

+ {newVersionTime.value ? ( + <> +

新版本发布日期:

+

{handRelativeTime(newVersionTime.value)}

+ + ) : ( + <> +

版本发布日期:

+

{handRelativeTime(versionTime.value)}

+ + )}

版本更新日志

+ {newCommitLog.value.length > 0 ? ( + <> + + {newVersion.value} + + + + {newCommitLog.value.map((log, index) => ( + + {{ + icon: () => ( + + + + ) + }} + + ))} + + + + + + + + + v{pkg.version} + + + + ) : null} + {commitLog.value.map((log, index) => ( @@ -275,9 +369,15 @@ export const CheckUpdate = defineComponent(() => { - - 检查更新 - + {text.value === '立即更新' ? ( + + {text.value} + + ) : ( + + {text.value} + + )} )} diff --git a/src/stores/setting.ts b/src/stores/setting.ts index 912fbe2..d3f62b4 100644 --- a/src/stores/setting.ts +++ b/src/stores/setting.ts @@ -40,7 +40,7 @@ export const setting = defineStore(StoresEnum.SETTING, { }, page: { shadow: true, - fonts: 'AliFangYuan' + fonts: 'PingFang' } }), actions: { diff --git a/src/styles/scss/global/fonts.scss b/src/styles/scss/global/fonts.scss index 96891cd..600a8fb 100644 --- a/src/styles/scss/global/fonts.scss +++ b/src/styles/scss/global/fonts.scss @@ -15,3 +15,9 @@ src: url('/src/assets/fonts/AlimamaDongFangDaKai-Regular.ttf'); font-display: swap; } + +@font-face { + font-family: 'PingFang'; + src: url('/src/assets/fonts/PingFang Regular.ttf'); + font-display: swap; +} diff --git a/src/styles/scss/global/variable.scss b/src/styles/scss/global/variable.scss index f6695f9..c4910b7 100644 --- a/src/styles/scss/global/variable.scss +++ b/src/styles/scss/global/variable.scss @@ -14,7 +14,7 @@ html, body, svg { // 是否启用阴影 --shadow-enabled: 1; // 字体 - --font-family: 'AliFangYuan'; + --font-family: 'PingFang'; // 整体布局背景 --left-bg-color: rgba(241, 241, 241, 1); diff --git a/src/typings/stores.d.ts b/src/typings/stores.d.ts index 69d184d..d63b8ab 100644 --- a/src/typings/stores.d.ts +++ b/src/typings/stores.d.ts @@ -99,7 +99,6 @@ declare namespace STO { state: T version?: string isAdd: boolean - isAnimate?: boolean dot?: boolean progress: number } & OPT.L.Common diff --git a/src/views/homeWindow/more/About.vue b/src/views/homeWindow/more/About.vue index 9b1b237..18dbcbb 100644 --- a/src/views/homeWindow/more/About.vue +++ b/src/views/homeWindow/more/About.vue @@ -1,5 +1,5 @@