fix(tenant): 加入租户信息选择修改

Authing · Jan 8, 2024 · 60cce39 · 60cce39
1 parent 74df67e
commit 60cce39
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/guard-core-v4/src/TenantPortalSelect/core/JoinTenant.tsx b/packages/guard-core-v4/src/TenantPortalSelect/core/JoinTenant.tsx
@@ -40,16 +40,18 @@ export const JoinTenantView: React.FC<JoinTenantProps> = ({ onBack }) => {
   const [sent, setSent] = useState(false)
   const [enterpriseEmail, setEnterpriseEmail] = useState('')
 
-  const handelJoinTenant = async (tenantId: string, passCode?: string) => {
+  const handelJoinTenant = async (tenantInfo: any, passCode?: string) => {
     try {
       const { isFlowEnd, data, onGuardHandling } = await authFlow(
         TenantBusinessAction.JoinTenant,
         {
-          tenantId,
+          tenantId: tenantInfo.tenantId,
           email: enterpriseEmail || undefined,
           passCode
         }
       )
+      console.log('tenantInfo: ', tenantInfo)
+
       events?.onTenantSelect?.(tenantInfo)
       if (tenantInfo?.host) {
         http.setBaseUrl(tenantInfo?.host)
@@ -93,7 +95,7 @@ export const JoinTenantView: React.FC<JoinTenantProps> = ({ onBack }) => {
             setCurrStepKey(JoinTenantStepEnum.NoEnterpriseDomain)
           }
         } else {
-          await handelJoinTenant(data.tenantId)
+          await handelJoinTenant(data)
         }
       } else {
         message.error(tips)
@@ -205,7 +207,7 @@ export const JoinTenantView: React.FC<JoinTenantProps> = ({ onBack }) => {
                 setSent={setSent}
                 onFinish={() => {
                   handelJoinTenant(
-                    tenantInfo.tenantId,
+                    tenantInfo,
                     form.getFieldValue('emailCode')?.join('')
                   )
                 }}

diff --git a/packages/guard-core-v4/src/TenantPortalSelect/styles.less b/packages/guard-core-v4/src/TenantPortalSelect/styles.less
@@ -195,6 +195,7 @@
   bottom: -38px;
   width: 100%;
   left: 0;
+  z-index: 9999;
   span {
     cursor: pointer;
     color: #215AE5;