Skip to content

Commit

Permalink
fix: typescript lint error
Browse files Browse the repository at this point in the history
  • Loading branch information
badspider7 committed Aug 22, 2024
1 parent 85b2c9f commit 272a8e0
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 18 deletions.
24 changes: 12 additions & 12 deletions electron-builder.json5
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
},
Expand Down
13 changes: 13 additions & 0 deletions electron/const/defaultConfig.d.ts
Original file line number Diff line number Diff line change
@@ -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
20 changes: 19 additions & 1 deletion electron/const/defaultConfig.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default {
const defaultConfig: IConfig = {
version: 1,
common: {
autoLaunch: true,
Expand All @@ -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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "taim",
"type": "module",
"version": "0.0.1-alpha",
"version": "0.0.1-beta",
"private": true,
"description": "Taim!",
"author": "badspider7",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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[],
Expand Down
4 changes: 2 additions & 2 deletions src/pages/overview/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -44,7 +44,7 @@ function tabChange(activeTab: string) {
概览
</div>
<div class="choose-time mt-5">
<TapBar :app-data="appData" @tab-change="tabChange" />
<Tab :app-data="appData" @tab-change="tabChange" />
<AppList :app-data="appData" style="height:calc(100% - 145px)" />
</div>
</div>
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/pages/statistic/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang='ts'>
import TabBar from './TabBar.vue'
import Tab from './Tab.vue'
</script>

<template>
Expand All @@ -8,7 +8,7 @@ import TabBar from './TabBar.vue'
统计
</div>
<div class="app-body mt-5">
<TabBar />
<Tab />
</div>
</div>
</template>
Expand Down

0 comments on commit 272a8e0

Please sign in to comment.