fix: 优化

electron/main/index.ts

@@ -7,6 +7,7 @@ import { setupHandle } from '../handle'
 import { clearAllTimer, isComputerSleep, startRecord } from '../utils'
 import logger from '../logger'
 import { initDb } from '../db'
+// import { initConfig } from '../utils/config'
 
 const VUEJS3_DEVTOOLS = 'nhdogjmejiglipccpnnnanhbledajbpd'
 const require = createRequire(import.meta.url)
@@ -86,16 +87,16 @@ export async function createWindow() {
 
   win.once('ready-to-show', () => {
     win?.show()
-    win.setMinimumSize(800, 600)
+    win?.setMinimumSize(800, 600)
   })
 
   win.webContents.on('did-finish-load', () => {
-    win.on('resized', () => {
+    win?.on('resized', () => {
       win?.webContents.send('refresh-chart', '')
     })
     // 开始统计应用时间
     startRecord()
-    isComputerSleep(win)
+    isComputerSleep(win!)
   })
 
   // Make all links open with the browser, not with the application
@@ -122,9 +123,10 @@ ipcMain.on('open-url', (e, args) => {
   void shell.openExternal(args)
 })
 app.whenReady().then(async () => {
+  // initConfig()
   initDb()
   void createWindow()
-  setupHandle(win)
+  setupHandle(win!)
   // if (process.env.VITE_DEV_SERVER_URL) {
   //   installExtension(VUEJS3_DEVTOOLS, { loadExtensionOptions: { allowFileAccess: true } })
   //     .then(name => logger.debug(`Added Extension:  ${name}`))

electron/utils/config.ts

@@ -0,0 +1,56 @@
+// import path from 'node:path'
+// import fs from 'node:fs'
+// import { Conf } from 'electron-conf/main'
+// import { app } from 'electron'
+// import defaultConfigForAnyPlatform from '../const/defaultConfig'
+
+// const schema = {
+//   type: 'object',
+//   properties: {
+//     version: {
+//       type: 'number',
+//       nullable: true,
+//     },
+//     common: {
+//       type: 'object',
+//       properties: {
+//         autoLaunch: {
+//           type: 'boolean',
+//           default: false,
+//         },
+//         keepWindowSize: {
+//           type: 'boolean',
+//           default: false,
+//         },
+//         lang: {
+//           type: 'string',
+//           default: 'zh-CN',
+//         },
+//         theme: {
+//           type: 'string',
+//           default: 'light',
+//         },
+//       },
+//     },
+//     actions: {
+//       type: 'object',
+//       properties: {},
+//     },
+//     data: {
+//       type: 'object',
+//       properties: {},
+//     },
+//   },
+// }
+
+// const configPath = path.join(app.getPath('userData'), 'config.json')
+// const cofigObj = fs.readFileSync(configPath, 'utf-8')
+// export function initConfig() {
+//   const conf = new Conf({ schema })
+
+//   if (!fs.existsSync(configPath) || conf.store.size === 0 || !conf.has('version')) {
+//     // 如果文件不存在或conf实例为空，则设置默认配置
+//     conf.set(defaultConfigForAnyPlatform)
+//   }
+//   conf.registerRendererListener()
+// }

package.json

@@ -25,6 +25,7 @@
     "release:win": "vue-tsc --noEmit && vite build && electron-builder --win",
     "rebuild": "electron rebuild.js",
     "postinstall": "electron-builder install-app-deps",
+    "typecheck": "vue-tsc --noEmit",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "prepare": "husky",

src/components/CardGroup.vue

@@ -12,6 +12,7 @@ function formatTime(second: number) {
 }
 
 // 当前的累计使用时间
+// TODO: 优化 对小于1小时的显示分钟
 const currentTotalTime = ref(0)
 const currentAppCount = ref(0)
 const mostTimeUsageApp = ref<AppData>({} as AppData)

src/hooks/useAppDetail.ts

@@ -10,16 +10,16 @@ export function useAppDetail(TimeList: Array<DailyLogModels | HoursLogModels>) {
     return map
   }, {})
 
-  console.log('appInfo', appInfo)
-  console.log('appInfoMap===', appInfoMap)
+  // console.log('appInfo', appInfo)
+  // console.log('appInfoMap===', appInfoMap)
 
   const appDataList: Array<AppData> = []
-  TimeList.forEach((item) => {
+  TimeList.forEach(async (item) => {
     let appModel = appInfoMap[item.appModelId]
     if (!appModel) {
       // 如果当前appModelId不在appInfoMap中，则尝试从appStore中获取
-      const updatedAppInfo: any = appStore.getAppInfo()
-      console.log('updatedAppInfo===', updatedAppInfo)
+      const updatedAppInfo: any = await appStore.getAppInfo()
+      // console.log('updatedAppInfo===', updatedAppInfo)
       // TODO: 这里会出现bug
       // 更新appInfoMap
       const updatedAppInfoMap = updatedAppInfo.reduce((map: Record<number, AppModel>, app: AppModel) => {

src/pages/setting/components/Common.vue

@@ -1,6 +1,7 @@
 <script setup lang='ts'>
 import { reactive } from 'vue'
 import defaultConfig from '@@/const/defaultConfig'
+import type { IConfig } from '@@/const/defaultConfig'
 import { Switch } from '@/components/ui/switch'
 import {
   Select,
@@ -11,6 +12,10 @@ import {
 } from '@/components/ui/select'
 
 const config = reactive(defaultConfig)
+
+async function changeConfig<K extends keyof IConfig['common']>(key: K, value: IConfig['common'][K]) {
+  config.common[key] = value
+}
 </script>
 
 <template>
@@ -26,8 +31,9 @@ const config = reactive(defaultConfig)
           </div>
           <Select
             v-model="config.common.lang"
+            @update:model-value="changeConfig('lang', config.common.lang)"
           >
-            <SelectTrigger class="w-[100px]">
+            <SelectTrigger class="w-[100px] h-[35px] p-2">
               <SelectValue placeholder="选择语言" />
             </SelectTrigger>
             <SelectContent>
@@ -48,7 +54,7 @@ const config = reactive(defaultConfig)
             <Switch
               class="mr-2"
               :checked="config.common.autoLaunch"
-              @update:checked="config.common.autoLaunch = !config.common.autoLaunch"
+              @update:checked="changeConfig('autoLaunch', !config.common.autoLaunch)"
             />
             <span>{{ config.common.autoLaunch ? '开' : '关' }}</span>
           </div>
@@ -61,7 +67,7 @@ const config = reactive(defaultConfig)
             <Switch
               class="mr-2"
               :checked="config.common.keepWindowSize"
-              @update:checked="config.common.keepWindowSize = !config.common.keepWindowSize"
+              @update:checked="changeConfig('keepWindowSize', !config.common.keepWindowSize)"
             />
             <span>{{ config.common.keepWindowSize ? '开' : '关' }}</span>
           </div>
@@ -79,8 +85,9 @@ const config = reactive(defaultConfig)
           </div>
           <Select
             v-model="config.common.theme"
+            @update:checked="changeConfig('theme', config.common.theme)"
           >
-            <SelectTrigger class="w-[100px]">
+            <SelectTrigger class="w-[100px] h-[35px] p-2">
               <SelectValue placeholder="选择主题" />
             </SelectTrigger>
             <SelectContent>

tsconfig.json

@@ -21,6 +21,7 @@
     "resolveJsonModule": true,
     "strict": true,
     "noEmit": true,
+    "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
     "isolatedModules": true,
     "skipLibCheck": true

tsconfig.node.json

@@ -9,6 +9,7 @@
       ]
     },
     "resolveJsonModule": true,
+    "strictNullChecks": true,
     "allowSyntheticDefaultImports": true
   },
   "include": [