Merge pull request #1196 from colinin/fix-tenant-cookie

Fix(vben5): tenant cookie

apps/vben5/packages/@abp/account/src/components/MySetting.vue

@@ -103,11 +103,13 @@ const [ChangePhoneNumberModal, changePhoneNumberModalApi] = useVbenModal({
 });
 function onEmailConfirm() {
   if (query?.confirmToken) {
-    emailConfirmModalApi.setData({
+    setTimeout(() => {
-      email: myProfile.value.email,
+      emailConfirmModalApi.setData({
-      ...query,
+        email: myProfile.value.email,
-    });
+        ...query,
-    emailConfirmModalApi.open();
+      });
+      emailConfirmModalApi.open();
+    }, 300);
   }
 }
 async function onGetProfile() {

apps/vben5/packages/@abp/saas/package.json

@@ -34,6 +34,7 @@
     "ant-design-vue": "catalog:",
     "dayjs": "catalog:",
     "lodash.debounce": "catalog:",
+    "universal-cookie": "catalog:",
     "vue": "catalog:*",
     "vxe-table": "catalog:"
   },

apps/vben5/packages/@abp/saas/src/components/tenants/TenantSelectModal.vue

@@ -5,6 +5,7 @@ import { useVbenForm, useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
 import { message } from 'ant-design-vue';
+import Cookies from 'universal-cookie';
 
 import { useMultiTenancyApi } from '../../api/useMultiTenancyApi';
 
@@ -19,6 +20,7 @@ const emits = defineEmits<{
 
 const tenant = ref<Tenant>();
 const { findTenantByNameApi } = useMultiTenancyApi();
+const cookies = new Cookies(null, { path: '/' });
 
 const [Form, formApi] = useVbenForm({
   handleSubmit: onSubmit,
@@ -53,6 +55,7 @@ async function onSubmit(values: Record<string, any>) {
   modalApi.setState({ submitting: true });
   try {
     tenant.value = undefined;
+    cookies.remove('__tenant');
     if (values.name) {
       const result = await findTenantByNameApi(values.name);
       if (!result.success) {