Merge branch 'develop' of https://github.com/betterdancing/tiny-engine into fix/model-driven-bugs

Author: betterdancing

packages/common/composable/defaultGlobalService.ts

@@ -1,4 +1,11 @@
-import { useMessage, defineService, getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
+import {
+  useCanvas,
+  useResource,
+  useMessage,
+  defineService,
+  getMetaApi,
+  META_SERVICE
+} from '@opentiny/tiny-engine-meta-register'
 import { reactive, watch } from 'vue'
 
 const getBaseInfo = () => {
@@ -55,24 +62,25 @@ const userState = reactive({
   needToLogin: false
 })
 
+const { subscribe, publish } = useMessage()
+
 const getLoginStatus = () => userState.needToLogin
 
 const setNeedToLogin = (value: boolean) => {
   userState.needToLogin = value
+
   if (!value) {
-    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)
+    watch(
+      useCanvas().isCanvasApiReady,
+      (ready) => {
+        if (ready) {
+          useResource().fetchResource()
+        }
+      },
+      {
+        immediate: true
       }
-    }
-    window.location.reload()
+    )
   }
 }
 
@@ -104,8 +112,6 @@ const fetchAppInfo = (appId: string) => getMetaApi(META_SERVICE.Http).get(`/app-
 const fetchAppList = (platformId: string) =>
   getMetaApi(META_SERVICE.Http).get(`/app-center/api/apps/list/${platformId}`)
 
-const { subscribe, publish } = useMessage()
-
 const postLocationHistoryChanged = (data: any) => publish({ topic: 'locationHistoryChanged', data })
 
 /**

packages/common/composable/http/index.ts

@@ -108,6 +108,12 @@ const whiteList = [
 const notAuthList = ['app-center/api/chat/completions', 'app-center/api/ai/chat', 'app-center/api/ai/search']
 const LoginErrorCode = ['CM004', 'CM005', 'CM006', 'CM007', 'CM336', 'CM339']
 
+// 新增：重置认证状态的函数
+const resetAuthState = () => {
+  isUnauthorized = false
+  abortControllers.clear()
+}
+
 // 创建 AbortController 并关联到请求
 const createAbortController = (config) => {
   const controller = new AbortController()
@@ -191,6 +197,10 @@ const requestHandler = (config) => {
       return new Promise(() => {})
     }
   } else {
+    // 有 token 时重置认证状态
+    if (isUnauthorized) {
+      resetAuthState()
+    }
     if (!notAuthList.some((url) => config.url.includes(url))) {
       config.headers.Authorization = `Bearer ${token}`
     }

packages/common/js/canvas.ts

@@ -26,7 +26,7 @@ interface CanvasStatus {
 }
 
 export const getCanvasStatus = (data: Occupier | undefined): CanvasStatus => {
-  const globalState = getMetaApi(META_SERVICE.GlobalService).getState()
+  const userInfo = getMetaApi(META_SERVICE.GlobalService).getUserInfo()
   const isDemo = useResource().appSchemaState.isDemo
   let state = ''
 
@@ -35,7 +35,7 @@ export const getCanvasStatus = (data: Occupier | undefined): CanvasStatus => {
   } else if (!data) {
     state = PAGE_STATUS.Release
   } else {
-    state = globalState.userInfo.id === data.id ? PAGE_STATUS.Occupy : PAGE_STATUS.Lock
+    state = userInfo.id === data.id ? PAGE_STATUS.Occupy : PAGE_STATUS.Lock
   }
 
   return {

packages/plugins/materials/src/composable/useResource.ts

@@ -119,7 +119,7 @@ const initBlock = async (blockId: string) => {
 const initPageOrBlock = async () => {
   const { pageId, blockId } = getMetaApi(META_SERVICE.GlobalService).getBaseInfo()
   const pagePluginApi = getMetaApi(META_APP.AppManage)
-  const globalState = getMetaApi(META_SERVICE.GlobalService).getState()
+  const userInfo = getMetaApi(META_SERVICE.GlobalService).getUserInfo()
 
   if (pageId) {
     const data = await pagePluginApi.getPageById(pageId)
@@ -137,7 +137,7 @@ const initPageOrBlock = async () => {
   const getPageInfo = () => {
     // 页面是否被他人锁定 (被锁定 且 非当前用户锁定)
     const isPageOccupierdByOthers = (page) => {
-      return page.meta?.occupier && page.meta.occupier.id !== globalState.userInfo.id
+      return page.meta?.occupier && page.meta.occupier.id !== userInfo.id
     }
     // 首页
     const homePage = appSchemaState.pageTree.find((page) => page?.meta?.isHome)