From 39864dcc835f1e75efd3f20a99d50a7edae4a94f Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 06 十一月 2023 17:59:51 +0800
Subject: [PATCH] Merge branch 'wn' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into dev
---
src/stores/tasks.ts | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/stores/tasks.ts b/src/stores/tasks.ts
index 02f2694..e115738 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]
+ }
}
/**
@@ -59,10 +77,14 @@
/**
* 鍒锋柊鎵�鏈夋暟鎹�
*/
- function reload(channel: number) {
+ function reloadChannel(channel: number) {
getChannels(currentType.value).then(() => {
autoSelectTask(channel)
})
+ }
+
+ function reloadAllData() {
+ getChannels(currentType.value)
}
function moreChannelTasksBtn(channelNumber: number) {
@@ -105,33 +127,15 @@
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,
moreBtnStatus,
activeTask,
- reload,
+ reloadChannel,
setActiveTask,
- requestParamsMap,
- getParamsByChannel,
- setParamsByChannel,
moreChannelTasksBtn,
- foldChannelTasksBtn
+ foldChannelTasksBtn,
+ reloadAllData
}
})
--
Gitblit v1.8.0