From 206fc12a937f65e4b58fbb10a5dc916cecef7625 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期一, 15 九月 2025 17:36:26 +0800 Subject: [PATCH] fix: bug --- src/views/EnterpriseManage/EnterpriseManageList.vue | 45 ++++++--------------------------------------- 1 files changed, 6 insertions(+), 39 deletions(-) diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue index 3ea8079..1c28138 100644 --- a/src/views/EnterpriseManage/EnterpriseManageList.vue +++ b/src/views/EnterpriseManage/EnterpriseManageList.vue @@ -1,5 +1,5 @@ <template> - <LoadingLayout :loading="state.loading"> + <LoadingLayout :loading="isInitialLoading"> <AppContainer> <ProTableQueryFilterBar @on-reset="reset"> <template #query> @@ -9,7 +9,6 @@ :value-enum="IsConfiguredText" buttonStyle showAllBtn - @change="getList()" /> </QueryFilterItem> <QueryFilterItem> @@ -18,7 +17,6 @@ style="width: 300px" placeholder="浼佷笟鍚嶇О/娉曚汉/鑱旂郴浜�" @on-click-search="getList" - @keyup.enter="getList()" > </SearchInput> </QueryFilterItem> @@ -53,6 +51,7 @@ useFormDialog, FieldRadio, UploadUserFile, + useTableV2, } from '@bole-core/components'; import { useAccess, useGlobalEventContext } from '@/hooks'; import { EnterpriseConfigureType, IsConfiguredText } from '@/constants'; @@ -88,40 +87,7 @@ const router = useRouter(); -const BaseState = { - loading: true, -}; - -const state = reactive({ ...BaseState }); - const { invalidateQueries } = useEnabledElectronSignSettings(); - -onMounted(async () => { - await getList(); - state.loading = false; -}); - -onMounted(() => { - if (typeof window !== 'undefined' && window.addEventListener) { - console.log('onMounted'); - window.addEventListener('visibilitychange', handleFocus); - // window.addEventListener('focus', handleFocus2); - } -}); - -onUnmounted(() => { - console.log('onUnmounted'); - window.removeEventListener('visibilitychange', handleFocus); - // window.removeEventListener('focus', handleFocus2); -}); - -function handleFocus() { - console.log('handleFocus1'); -} - -function handleFocus2() { - console.log('handleFocus2'); -} const { getDataSource: getList, @@ -129,8 +95,9 @@ paginationState, extraParamState, reset, -} = useTable( - async ({ pageIndex, pageSize }, extraParamState) => { + isInitialLoading, +} = useTableV2( + async ({ pageIndex, pageSize, isInitialLoading }, extraParamState) => { try { let params: API.GetEnterprisesQuery = { pageModel: { @@ -143,7 +110,7 @@ }; let res = await enterpriseServices.getEnterprises(params, { - showLoading: !state.loading, + showLoading: !isInitialLoading, }); return res; } catch (error) { -- Gitblit v1.9.1