fix: The x-lowcode-org request header is deleted from the me interface (#1739)

Author: xuanlid

packages/common/composable/defaultGlobalService.ts

@@ -49,32 +49,30 @@ const userState = reactive({
     username: '',
     token: null,
     expireTime: null,
-    tenantId: ''
+    tenantId: '',
+    tenant: []
   },
   needToLogin: false
 })
 
 const getLoginStatus = () => userState.needToLogin
 
-const setNeedToLogin = (value: boolean, tenantId: any) => {
+const setNeedToLogin = (value: boolean) => {
   userState.needToLogin = value
   if (!value) {
-    const baseUrl = `${window.location.origin}${window.location.pathname}?type=app&`
-    const id = getBaseInfo().id
-    const baseTenantId = getBaseInfo().tenantId
-
-    // 浏览器Url没有组织id，都默认公共组织，应用id默认为公共组织的应用1
-    if (!baseTenantId) {
-      window.location.href = `${baseUrl}id=1&tenant=${tenantId}`
-    }
-
-    if (baseTenantId && !id) {
-      window.location.href = `${baseUrl}tenant=${baseTenantId}`
-    }
-
-    if (baseTenantId && id) {
-      window.location = window.location
+    const defaultTenantId = userState.userInfo.tenant?.[0]?.id
+    if (defaultTenantId) {
+      const currentUrl = new URL(window.location.href)
+      const currentTenant = getBaseInfo().tenantId
+
+      const filterList = userState.userInfo.tenant.filter((item) => item.id === currentTenant) || []
+      // 只有当tenant值不存在时才更新
+      if (!filterList?.length) {
+        currentUrl.searchParams.set('tenant', String(defaultTenantId))
+        window.history.replaceState(window.history.state, '', currentUrl.href)
+      }
     }
+    window.location.reload()
   }
 }
 
@@ -86,7 +84,12 @@ const setUserInfo = (data: any) => {
 
 const fetchUserInfo = () => {
   // 获取登录用户信息
-  return getMetaApi(META_SERVICE.Http).get('/platform-center/api/user/me')
+  return getMetaApi(META_SERVICE.Http).get('/platform-center/api/user/me', {
+    transformRequest: (data: any, headers: any) => {
+      delete headers['x-lowcode-org']
+      return data
+    }
+  })
 }
 
 const setTenantInfo = (id: any) => {

packages/common/composable/http/index.ts

@@ -117,7 +117,7 @@ const createAbortController = (config) => {
 
 // 取消所有进行中的请求
 const abortAllRequests = (message = '用户未登录，请求已取消') => {
-  abortControllers.forEach((controller, key) => {
+  abortControllers.forEach((controller) => {
     controller.abort(message)
   })
   abortControllers.clear()

packages/design-core/src/login/Login.vue

@@ -43,7 +43,7 @@ export default {
   },
   emits: ['changeStatus'],
   setup(props, { emit }) {
-    const { fetchUserInfo, setUserInfo, setNeedToLogin, getBaseInfo } = getMetaApi(META_SERVICE.GlobalService)
+    const { fetchUserInfo, setUserInfo, setNeedToLogin } = getMetaApi(META_SERVICE.GlobalService)
     const state = reactive({
       loginData: {
         username: '',
@@ -61,12 +61,14 @@ export default {
           localStorage.setItem('engineToken', data.token)
           fetchUserInfo().then((infoData: any) => {
             if (infoData) {
-              const tenantId = getBaseInfo().tenantId ? getBaseInfo().tenantId : infoData.tenant[0]?.id
               setUserInfo({ ...data, ...infoData })
-              setNeedToLogin(false, tenantId)
+              setNeedToLogin(false)
             }
           })
         })
+        .catch(() => {
+          setNeedToLogin(true)
+        })
     }
 
     const toRegister = () => {

packages/design-core/src/login/js/useLogin.ts

@@ -1,6 +1,6 @@
 import { reactive } from 'vue'
 
-const characters = `!@#$%^&*()_+-=[};":\|,'<>?。`
+const characters = `!@#$%^&*()_+-=[};":|,'<>?。`
 const passwordRules = [
   {
     content: ['密码长度8-20个字符。', '密码必须包含：大写字母、小写字母、数字。'],
@@ -9,7 +9,7 @@ const passwordRules = [
   },
   {
     content: [`密码必须包含特殊字符：${characters}`],
-    rule: /^(?=.*[!@#$%^&*()_+\-=[\}\]{;":|,.'<>?]).+$/,
+    rule: /^(?=.*[!@#$%^&*()_+\-=[}\]{;":|,.'<>?]).+$/,
     pass: false
   },
   {

packages/layout/src/DesignWorkspace.vue

@@ -113,7 +113,9 @@ export default {
     })
     const tenantValue = computed(() =>
       enableLogin
-        ? tenantList.value.find((item) => item.id === getBaseInfo().tenantId) || tenantList.value[0]
+        ? getBaseInfo().tenantId
+          ? tenantList.value.find((item) => item.id === getBaseInfo().tenantId) || { id: '', label: '请选择组织' }
+          : tenantList.value[0]
         : { ...getBaseInfo(), label: 'Public' }
     )