1
0
mirror of https://github.com/ialley-workshop-open/uni-halo.git synced 2026-11-13 22:11:42 +08:00

refactor(load-status): 重构数据加载状态管理,统一加载更多逻辑

1.  重构useDataLoadingStatus钩子,新增完整加载状态类型
2.  统一首页和动态页面的加载更多状态管理逻辑
3.  移除冗余的加载状态本地变量,复用钩子内置状态
4.  调整分类页面默认分页大小从3改为10
5.  修复加载状态的默认值处理逻辑
This commit is contained in:
小莫唐尼
2026-09-11 23:01:13 +08:00
parent 9c06766f81
commit 424ab538dc
5 changed files with 131 additions and 82 deletions
+2 -2
View File
@@ -1,8 +1,8 @@
import type { Ref } from 'vue'
import { ref } from 'vue'
/** 数据加载四态(取值与旧 DataLoadingStatusEnum 一致,二者可互相兼容) */
export type DataLoadingStatus = 'loading' | 'error' | 'empty' | 'success' |'no-network'
/** 数据加载四态(取值与 DataLoadingStatusEnum 一致,二者可互相兼容) */
export type DataLoadingStatus = 'loading' | 'error' | 'empty' | 'success' | 'noNetwork'
export interface IUseDataLoadingOptions<T> {
/** 自定义判空;默认:数组看长度、对象看键数、空值视为空 */
+33 -27
View File
@@ -18,35 +18,41 @@ const LoadMoreStatusText = {
export type LoadMoreStatus = keyof typeof LoadMoreStatusText
/** 加载更多内部状态(完整形态,区别于可选的 LoadMoreStatusOption) */
export interface LoadMoreStatusState {
active: boolean;
hasNext: boolean;
status: LoadMoreStatus;
text: string;
}
export interface LoadMoreStatusOption {
// 是否激活加载
active?: boolean;
status?: LoadMoreStatus;
text?: string;
hasNext?: boolean;
// 是否激活加载
active?: boolean;
status?: LoadMoreStatus;
text?: string;
hasNext?: boolean;
}
export function useDataLoadingStatus(defaultStatus?: DataLoadingStatus) {
const loadingStatus = ref<DataLoadingStatus>(defaultStatus ?? DataLoadingStatusEnum.Loading);
const loadingStatus = ref<DataLoadingStatus>(defaultStatus ?? DataLoadingStatusEnum.Loading);
const _loadMoreStatus = ref<LoadMoreStatus>({
active: false,
hasNext: false,
status: 'loadMore',
text: ''
});
const _loadMoreStatus = ref<LoadMoreStatusState>({
active: false,
hasNext: false,
status: 'loadMore',
text: ''
});
const loadMoreStatus = computed(() => {
const result = {
..._loadMoreStatus.value
};
if (!_loadMoreStatus.value.text) {
result.text = LoadMoreStatusText[_loadMoreStatus.value.status];
}
console.log('会触发吗?', _loadMoreStatus.value);
console.log('会触发吗 result', result);
return result;
});
const loadMoreStatus = computed(() => {
const result = {
..._loadMoreStatus.value
};
if (!_loadMoreStatus.value.text) {
result.text = LoadMoreStatusText[_loadMoreStatus.value.status];
}
return result;
});
function resetLoadMoreStatus() {
_loadMoreStatus.value.active = false;
@@ -65,10 +71,10 @@ export function useDataLoadingStatus(defaultStatus?: DataLoadingStatus) {
}
function updateLoadMoreStatus(status: LoadMoreStatusOption) {
_loadMoreStatus.value.active = status.active;
_loadMoreStatus.value.status = status.status;
_loadMoreStatus.value.hasNext = status.hasNext;
_loadMoreStatus.value.text = status.text;
_loadMoreStatus.value.active = status.active ?? false;
_loadMoreStatus.value.status = status.status ?? 'loadMore';
_loadMoreStatus.value.hasNext = status.hasNext ?? false;
_loadMoreStatus.value.text = status.text ?? '';
}
return {