From 1b1953b435e3187243102c794d29b56acb0dba5a Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 03 十一月 2023 16:44:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into wn
---
src/stores/tasks.ts | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/src/stores/tasks.ts b/src/stores/tasks.ts
index 02f2694..3a97ead 100644
--- a/src/stores/tasks.ts
+++ b/src/stores/tasks.ts
@@ -28,11 +28,29 @@
return getTaskList(params)
.then((res) => {
channels.value = res.data
+
+ // 棣栨鑾峰彇閫氶亾鏁版嵁鏃惰嚜鍔ㄩ�変腑绗竴涓换鍔�
+ if (!activeTask?.value) {
+ selectFirstTask(channels.value)
+ }
})
.catch((err) => {
console.error(err)
channels.value = []
})
+ }
+
+ function selectFirstTask(channels: TasksGroupByChannel) {
+ const firstNotEmptyChannel = Object.entries(channels).find((ele) => {
+ const taskList = (ele[1] as TasksResponse)?.Tasks
+
+ return !!taskList.length
+ })
+
+ if (firstNotEmptyChannel) {
+ const channelNumber = +firstNotEmptyChannel[0]
+ activeTask.value = channels[channelNumber].Tasks[0]
+ }
}
/**
@@ -105,22 +123,6 @@
activeTask.value = task
}
- const requestParamsMap = ref<{
- [channel: number]: TaskListParams
- }>({})
- function getParamsByChannel(channel: number) {
- return (
- requestParamsMap.value[channel] ?? {
- type: 1,
- offset: 0,
- limit: 3
- }
- )
- }
-
- function setParamsByChannel(channel: number, params: TaskListParams) {
- requestParamsMap.value[channel] = params
- }
return {
channels,
getChannels,
@@ -128,9 +130,6 @@
activeTask,
reload,
setActiveTask,
- requestParamsMap,
- getParamsByChannel,
- setParamsByChannel,
moreChannelTasksBtn,
foldChannelTasksBtn
}
--
Gitblit v1.8.0