From 272a8e0b70cfa7997d03b0bf6ff34c6303eb1b58 Mon Sep 17 00:00:00 2001 From: badspider7 <54093230+badspider7@users.noreply.github.com> Date: Fri, 23 Aug 2024 00:16:57 +0800 Subject: [PATCH] fix: typescript lint error --- electron-builder.json5 | 24 ++++++++++----------- electron/const/defaultConfig.d.ts | 13 +++++++++++ electron/const/defaultConfig.ts | 20 ++++++++++++++++- package.json | 2 +- src/pages/overview/{tabBar.vue => Tab.vue} | 1 + src/pages/overview/index.vue | 4 ++-- src/pages/statistic/{tabBar.vue => Tab.vue} | 0 src/pages/statistic/index.vue | 4 ++-- 8 files changed, 50 insertions(+), 18 deletions(-) create mode 100644 electron/const/defaultConfig.d.ts rename src/pages/overview/{tabBar.vue => Tab.vue} (99%) rename src/pages/statistic/{tabBar.vue => Tab.vue} (100%) diff --git a/electron-builder.json5 b/electron-builder.json5 index efdf7c0..d146ed5 100644 --- a/electron-builder.json5 +++ b/electron-builder.json5 @@ -5,18 +5,18 @@ "asar": true, "productName": "TaiM", // 更新服务器信息 - "publish": [ - { - "provider": "github", - "owner": "badspider7", - "repo": "Taim" - } - ], - // 更新日志 - "releaseInfo": { - "releaseName": "normal", // normal 弹窗 / major 强制更新 - "releaseNotesFile": "./release/releaseNotes.md" - }, + // "publish": [ + // { + // "provider": "github", + // "owner": "badspider7", + // "repo": "Taim" + // } + // ], + // // 更新日志 + // "releaseInfo": { + // "releaseName": "normal", // normal 弹窗 / major 强制更新 + // "releaseNotesFile": "./release/releaseNotes.md" + // }, "directories": { "output": "release/${version}" }, diff --git a/electron/const/defaultConfig.d.ts b/electron/const/defaultConfig.d.ts new file mode 100644 index 0000000..4ce2c6b --- /dev/null +++ b/electron/const/defaultConfig.d.ts @@ -0,0 +1,13 @@ +declare const defaultConfig: IConfig +export interface IConfig { + version: number + common: { + autoLaunch: boolean + keepWindowSize: boolean + lang: string + theme: string + } + actions: {} + data: {} +} +export default defaultConfig diff --git a/electron/const/defaultConfig.ts b/electron/const/defaultConfig.ts index 9f8bcc8..3080625 100644 --- a/electron/const/defaultConfig.ts +++ b/electron/const/defaultConfig.ts @@ -1,4 +1,4 @@ -export default { +const defaultConfig: IConfig = { version: 1, common: { autoLaunch: true, @@ -13,3 +13,21 @@ export default { }, } + +export interface IConfig { + version: number + common: { + autoLaunch: boolean + keepWindowSize: boolean + lang: string + theme: string + } + actions: { + + } + data: { + + } +} + +export default defaultConfig diff --git a/package.json b/package.json index aaad3b8..7ac399e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "taim", "type": "module", - "version": "0.0.1-alpha", + "version": "0.0.1-beta", "private": true, "description": "Taim!", "author": "badspider7", diff --git a/src/pages/overview/tabBar.vue b/src/pages/overview/Tab.vue similarity index 99% rename from src/pages/overview/tabBar.vue rename to src/pages/overview/Tab.vue index 0f5edd0..f33e713 100644 --- a/src/pages/overview/tabBar.vue +++ b/src/pages/overview/Tab.vue @@ -7,6 +7,7 @@ import getUsageTimeApi from '@/api/getUsageTime' import { handleTimeRangeData } from '@/utils' import CardGroup from '@/components/CardGroup.vue' +// update file const props = defineProps({ appData: { type: Array as () => AppData[], diff --git a/src/pages/overview/index.vue b/src/pages/overview/index.vue index 76235e3..cd8ca60 100644 --- a/src/pages/overview/index.vue +++ b/src/pages/overview/index.vue @@ -2,7 +2,7 @@ import { onMounted, ref } from 'vue' import type { AppData, DailyLogModels } from '@@/type/types' import type { Ref } from 'vue' -import TapBar from './TabBar.vue' +import Tab from './Tab.vue' import AppList from './FrequentApp.vue' import getUsageTimeApi from '@/api/getUsageTime' import { formatDateTime, handleTimeRangeData } from '@/utils' @@ -44,7 +44,7 @@ function tabChange(activeTab: string) { 概览
- +
diff --git a/src/pages/statistic/tabBar.vue b/src/pages/statistic/Tab.vue similarity index 100% rename from src/pages/statistic/tabBar.vue rename to src/pages/statistic/Tab.vue diff --git a/src/pages/statistic/index.vue b/src/pages/statistic/index.vue index fd9e26f..956f816 100644 --- a/src/pages/statistic/index.vue +++ b/src/pages/statistic/index.vue @@ -1,5 +1,5 @@