Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	blossom-editor/src/renderer/src/views/todo/TodoStat.vue
This commit is contained in:
CY-1 2024-09-22 19:44:08 +08:00
commit fc28dd1111

View File

@ -58,6 +58,7 @@ import {todoStatApi, taskStatApi, completedTodoApi, openTodoApi} from '@renderer
import TodoChartCompleted from './TodoChartCompleted.vue' import TodoChartCompleted from './TodoChartCompleted.vue'
import {useLifecycle} from '@renderer/scripts/lifecycle' import {useLifecycle} from '@renderer/scripts/lifecycle'
import {onTodoChange} from '@renderer/stores/config' import {onTodoChange} from '@renderer/stores/config'
import {getDateFormat} from '@renderer/assets/utils/util'
useLifecycle( useLifecycle(
() => getTaskStat(), () => getTaskStat(),