From f5c6bf2432dc4f4d1243afb256eed12c6bbb058b Mon Sep 17 00:00:00 2001 From: npmrun <1549469775@qq.com> Date: Wed, 9 Apr 2025 00:52:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0vscode-icons-js?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=B9=B6=E5=9C=A8index.vue=E4=B8=AD=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 1 + package.json | 1 + packages/logger/crash-handler.ts | 4 ++-- packages/logger/renderer-error.ts | 2 +- pnpm-lock.yaml | 29 ++++++++++++++++++++++------- src/main/modules/db/index.ts | 2 +- src/renderer/src/main.ts | 2 +- src/renderer/src/pages/index.vue | 4 ++++ 8 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1e2e286 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +src/renderer/public/icons/*.svg filter=lfs diff=lfs merge=lfs -text diff --git a/package.json b/package.json index 9701b9e..014f106 100644 --- a/package.json +++ b/package.json @@ -72,6 +72,7 @@ "vite": "^5.4.14", "vite-plugin-monaco-editor": "^1.1.0", "vite-plugin-vue-layouts": "^0.11.0", + "vscode-icons-js": "^11.6.1", "vue": "^3.5.13", "vue-i18n": "^11.1.1", "vue-router": "^4.5.0", diff --git a/packages/logger/crash-handler.ts b/packages/logger/crash-handler.ts index c8ce008..57bafb3 100644 --- a/packages/logger/crash-handler.ts +++ b/packages/logger/crash-handler.ts @@ -53,7 +53,7 @@ export class CrashHandler { private crashReportDir: string private initialized: boolean = false private startTime: number = Date.now() - private normalShutdown: boolean = false + // private normalShutdown: boolean = false /** * 获取单例实例 @@ -104,7 +104,7 @@ export class CrashHandler { // 设置应用退出处理 app.on("before-quit", () => { - this.normalShutdown = true + // this.normalShutdown = true this.clearStartupMarker() }) diff --git a/packages/logger/renderer-error.ts b/packages/logger/renderer-error.ts index 6d0b6a8..4caea50 100644 --- a/packages/logger/renderer-error.ts +++ b/packages/logger/renderer-error.ts @@ -1,4 +1,4 @@ -import { LogLevel, LogLevelName } from "./common" +import { LogLevel } from "./common" /** * 错误详情接口 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 17effe0..79950b3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -144,6 +144,9 @@ importers: vite-plugin-vue-layouts: specifier: ^0.11.0 version: 0.11.0(vite@5.4.14(@types/node@20.17.19)(sass@1.85.0))(vue-router@4.5.0(vue@3.5.13(typescript@5.7.3)))(vue@3.5.13(typescript@5.7.3)) + vscode-icons-js: + specifier: ^11.6.1 + version: 11.6.1 vue: specifier: ^3.5.13 version: 3.5.13(typescript@5.7.3) @@ -736,8 +739,8 @@ packages: resolution: {integrity: sha512-2kGiWoXaeV8HZlhU/Nml12oTbhv7j2ufsJ5vQaa0VTjzUmZVdd/nmKFRAOJ/FtjO90Qba5AnZDwsrY7ZND5udA==} engines: {node: '>= 16'} - '@intlify/shared@11.1.2': - resolution: {integrity: sha512-dF2iMMy8P9uKVHV/20LA1ulFLL+MKSbfMiixSmn6fpwqzvix38OIc7ebgnFbBqElvghZCW9ACtzKTGKsTGTWGA==} + '@intlify/shared@11.1.3': + resolution: {integrity: sha512-pTFBgqa/99JRA2H1qfyqv97MKWJrYngXBA/I0elZcYxvJgcCw3mApAoPW3mJ7vx3j+Ti0FyKUFZ4hWxdjKaxvA==} engines: {node: '>= 16'} '@intlify/shared@12.0.0-alpha.2': @@ -1120,6 +1123,9 @@ packages: '@types/http-cache-semantics@4.0.4': resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==} + '@types/jasmine@3.10.18': + resolution: {integrity: sha512-jOk52a1Kz+1oU5fNWwAcNe64/GsE7r/Q6ronwDox0D3ETo/cr4ICMQyeXrj7G6FPW1n8YjRoAZA2F0XBr6GicQ==} + '@types/keyv@3.1.4': resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} @@ -3380,6 +3386,9 @@ packages: terser: optional: true + vscode-icons-js@11.6.1: + resolution: {integrity: sha512-rht18IFYv117UlqBn6o9j258SOtwhDBmtVrGwdoLPpSj6Z5LKQIzarQDd/tCRWneU68KEX25+nsh48tAoknKNw==} + vscode-uri@3.0.8: resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==} @@ -4043,7 +4052,7 @@ snapshots: '@intlify/shared@11.1.1': {} - '@intlify/shared@11.1.2': {} + '@intlify/shared@11.1.3': {} '@intlify/shared@12.0.0-alpha.2': {} @@ -4051,8 +4060,8 @@ snapshots: dependencies: '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1) '@intlify/bundle-utils': 10.0.0(vue-i18n@11.1.1(vue@3.5.13(typescript@5.7.3))) - '@intlify/shared': 11.1.2 - '@intlify/vue-i18n-extensions': 8.0.0(@intlify/shared@11.1.2)(@vue/compiler-dom@3.5.13)(vue-i18n@11.1.1(vue@3.5.13(typescript@5.7.3)))(vue@3.5.13(typescript@5.7.3)) + '@intlify/shared': 11.1.3 + '@intlify/vue-i18n-extensions': 8.0.0(@intlify/shared@11.1.3)(@vue/compiler-dom@3.5.13)(vue-i18n@11.1.1(vue@3.5.13(typescript@5.7.3)))(vue@3.5.13(typescript@5.7.3)) '@rollup/pluginutils': 5.1.4(rollup@4.26.0) '@typescript-eslint/scope-manager': 8.25.0 '@typescript-eslint/typescript-estree': 8.25.0(typescript@5.7.3) @@ -4074,11 +4083,11 @@ snapshots: - supports-color - typescript - '@intlify/vue-i18n-extensions@8.0.0(@intlify/shared@11.1.2)(@vue/compiler-dom@3.5.13)(vue-i18n@11.1.1(vue@3.5.13(typescript@5.7.3)))(vue@3.5.13(typescript@5.7.3))': + '@intlify/vue-i18n-extensions@8.0.0(@intlify/shared@11.1.3)(@vue/compiler-dom@3.5.13)(vue-i18n@11.1.1(vue@3.5.13(typescript@5.7.3)))(vue@3.5.13(typescript@5.7.3))': dependencies: '@babel/parser': 7.26.9 optionalDependencies: - '@intlify/shared': 11.1.2 + '@intlify/shared': 11.1.3 '@vue/compiler-dom': 3.5.13 vue: 3.5.13(typescript@5.7.3) vue-i18n: 11.1.1(vue@3.5.13(typescript@5.7.3)) @@ -4361,6 +4370,8 @@ snapshots: '@types/http-cache-semantics@4.0.4': {} + '@types/jasmine@3.10.18': {} + '@types/keyv@3.1.4': dependencies: '@types/node': 20.17.19 @@ -7128,6 +7139,10 @@ snapshots: fsevents: 2.3.3 sass: 1.85.0 + vscode-icons-js@11.6.1: + dependencies: + '@types/jasmine': 3.10.18 + vscode-uri@3.0.8: {} vue-demi@0.13.11(vue@3.5.13(typescript@5.7.3)): diff --git a/src/main/modules/db/index.ts b/src/main/modules/db/index.ts index 4cc077d..ce5db72 100644 --- a/src/main/modules/db/index.ts +++ b/src/main/modules/db/index.ts @@ -1,4 +1,4 @@ -import { inject, injectable } from "inversify" +import { injectable } from "inversify" import Setting from "setting/main" import { CustomAdapter, CustomLow } from "./custom" import path from "node:path" diff --git a/src/renderer/src/main.ts b/src/renderer/src/main.ts index 422f456..a3caf96 100644 --- a/src/renderer/src/main.ts +++ b/src/renderer/src/main.ts @@ -13,7 +13,7 @@ import i18n from "./i18n" const app = createApp(App) // 全局错误处理 -app.config.errorHandler = (err, instance, info) => { +app.config.errorHandler = (err, _, info) => { // console.error("应用错误:", err) // console.info("错误信息:", info) errorHandler.captureError(err) diff --git a/src/renderer/src/pages/index.vue b/src/renderer/src/pages/index.vue index b9adfe3..a4417ca 100644 --- a/src/renderer/src/pages/index.vue +++ b/src/renderer/src/pages/index.vue @@ -1,13 +1,17 @@