update: 租户切换Select增加loading

This commit is contained in:
dap 2025-04-05 00:49:57 +08:00
parent a2ed3fa48b
commit 63630b17c1
2 changed files with 48 additions and 23 deletions

View File

@ -25,6 +25,7 @@
- **文件上传/图片上传不再支持url用法 强制使用ossId**
- TableSwitch组件重构
- 管理员租户切换不再返回首页 直接刷新当前页(除特殊页面外会回到首页)
- 租户切换Select增加loading
- modalLoading/drawerLoading改为调用内部的lock/unlock方法
- 登录验证码 增加loading
- DictEnum使用const代替enum

View File

@ -11,7 +11,7 @@ import { useAccess } from '@vben/access';
import { useTabs } from '@vben/hooks';
import { $t } from '@vben/locales';
import { message, Select } from 'ant-design-vue';
import { message, Select, Spin } from 'ant-design-vue';
import { storeToRefs } from 'pinia';
import { tenantDynamicClear, tenantDynamicToggle } from '#/api/system/tenant';
@ -35,6 +35,7 @@ const showToggle = computed<boolean>(() => {
});
onMounted(async () => {
//
if (!hasAccessByRoles(['superadmin'])) {
return;
}
@ -42,10 +43,8 @@ onMounted(async () => {
});
const route = useRoute();
const messageInstance = shallowRef<MessageType | null>();
const { closeOtherTabs, refreshTab, closeAllTabs } = useTabs();
async function close(checked: boolean) {
// store
setChecked(checked);
@ -64,6 +63,11 @@ async function close(checked: boolean) {
}
const dictStore = useDictStore();
// message
const messageInstance = shallowRef<MessageType | null>();
// loading
const loading = ref(false);
/**
* 选中租户的处理
* @param tenantId tenantId
@ -74,31 +78,46 @@ const onSelected: SelectHandler = async (tenantId: string, option: any) => {
// createMessage.info('');
return;
}
await tenantDynamicToggle(tenantId);
lastSelected.value = tenantId;
try {
loading.value = true;
// message
messageInstance.value?.();
messageInstance.value = message.success(
`${$t('component.tenantToggle.switch')} ${option.companyName}`,
);
await tenantDynamicToggle(tenantId);
lastSelected.value = tenantId;
close(true);
// (unknown)
setTimeout(() => dictStore.resetCache());
// message
messageInstance.value?.();
messageInstance.value = message.success(
`${$t('component.tenantToggle.switch')} ${option.companyName}`,
);
close(true);
// (unknown)
setTimeout(() => dictStore.resetCache());
} catch (error) {
console.error(error);
} finally {
loading.value = false;
}
};
async function onDeselect() {
await tenantDynamicClear();
try {
loading.value = true;
// message
messageInstance.value?.();
messageInstance.value = message.success($t('component.tenantToggle.reset'));
await tenantDynamicClear();
// message
messageInstance.value?.();
messageInstance.value = message.success($t('component.tenantToggle.reset'));
lastSelected.value = '';
close(false);
// (unknown)
setTimeout(() => dictStore.resetCache());
lastSelected.value = '';
close(false);
// (unknown)
setTimeout(() => dictStore.resetCache());
} catch (error) {
console.error(error);
} finally {
loading.value = false;
}
}
/**
@ -115,6 +134,7 @@ function filterOption(input: string, option: TenantOption) {
<div v-if="showToggle" class="mr-[8px] hidden md:block">
<Select
v-model:value="selected"
:disabled="loading"
:field-names="{ label: 'companyName', value: 'tenantId' }"
:filter-option="filterOption"
:options="tenantList"
@ -124,7 +144,11 @@ function filterOption(input: string, option: TenantOption) {
show-search
@deselect="onDeselect"
@select="onSelected"
/>
>
<template v-if="loading" #suffixIcon>
<Spin size="small" spinning />
</template>
</Select>
</div>
</template>