fix: appid

opentiny · Nov 6, 2024 · 861511d · 861511d
1 parent 4f090aa
commit 861511d
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/packages/configurator/src/collection-configurator/CollectionConfigurator.vue b/packages/configurator/src/collection-configurator/CollectionConfigurator.vue
@@ -47,7 +47,7 @@ export default {
 
     const fetchDataSourceList = (appId) => getMetaApi(META_SERVICE.Http).get(`/app-center/api/sources/list/${appId}`)
 
-    const appId = getMetaApi(META_SERVICE.GlobalService).getState().appInfo.id
+    const appId = getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id
     fetchDataSourceList(appId).then((data) => {
       options.value = data
     })

diff --git a/packages/configurator/src/variable-configurator/VariableConfigurator.vue b/packages/configurator/src/variable-configurator/VariableConfigurator.vue
@@ -486,7 +486,7 @@ export default {
       } else if (item.id === 'datasource') {
         state.bindPrefix = CONSTANTS.DATASOUCEPREFIX
         const url = new URLSearchParams(location.search)
-        const appId = getMetaApi(META_SERVICE.GlobalService).getState().appInfo.id
+        const appId = getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id
         const selectedId = appId || url.get('id')
 
         // 实时请求数据源列表数据，保证数据源获取最新的数据源数据

diff --git a/packages/plugins/bridge/src/BridgeSetting.vue b/packages/plugins/bridge/src/BridgeSetting.vue
@@ -209,7 +209,7 @@ export default {
         category: getType(),
         type: getCategory(),
         name: state.name,
-        app: getMetaApi(META_SERVICE.GlobalService).getState().appInfo.id,
+        app: getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id,
         content: state.category
           ? state.content
           : {

diff --git a/packages/plugins/datasource/src/DataSourceGlobalDataHandler.vue b/packages/plugins/datasource/src/DataSourceGlobalDataHandler.vue
@@ -55,7 +55,7 @@ export default {
     })
 
     const saveGlobalDataHandle = () => {
-      const id = getMetaApi(META_SERVICE.GlobalService).getState().appInfo.id
+      const id = getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id
 
       const handler = {
         dataHandler: { type: 'JSFunction', value: state.dataHandlerValue || DEFAULT_INTERCEPTOR.dataHandler.value },

diff --git a/packages/plugins/datasource/src/DataSourceList.vue b/packages/plugins/datasource/src/DataSourceList.vue
@@ -53,7 +53,7 @@ const activeIndex = ref(-1)
 
 export const refresh = () => {
   const url = new URLSearchParams(location.search)
-  const selectedId = getMetaApi(META_SERVICE.GlobalService).getState().appInfo.id || url.get('id')
+  const selectedId = getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id || url.get('id')
   fetchDataSourceList(selectedId).then((data) => {
     dataSourceList.value = data
     useCanvas().canvasApi.value.setDataSourceMap(data)

diff --git a/packages/plugins/i18n/src/Main.vue b/packages/plugins/i18n/src/Main.vue
@@ -360,7 +360,7 @@ export default {
       })
     }
     const handleChange = (data) => {
-      const appId = getMetaApi(META_SERVICE.GlobalService).getState().appInfo.id
+      const appId = getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id
       const action = `/app-center/api/apps/${appId}/i18n/entries/update`
 
       const loadingTarget = notEmpty.value ? '#boxeight' : '#empty-loading-box'

diff --git a/packages/plugins/materials/src/meta/block/src/BlockDetail.vue b/packages/plugins/materials/src/meta/block/src/BlockDetail.vue
@@ -82,7 +82,7 @@ export default {
               .filter((item) => item.id !== blockId)
               .map((item) => ({ id: item.id, version: item.current_version }))
 
-            const appId = getMetaApi(META_SERVICE.GlobalService).getState().appInfo.id
+            const appId = getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id
             requestUpdateGroup({ id: groupId, blocks, app: appId }).then(() => {
               isRefresh.value = true
               emit('close')

diff --git a/packages/plugins/materials/src/meta/block/src/http.js b/packages/plugins/materials/src/meta/block/src/http.js
@@ -93,7 +93,7 @@ export const requestUpdateGroup = ({ id, name, app, blocks }) =>
 
 // 更新区块版本
 export const requestGroupBlockVersion = async ({ groupId, blockId, blockVersion }) => {
-  const app = getMetaApi(META_SERVICE.GlobalService).getState().appInfo.id
+  const app = getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id
   let blocks = await fetchGroupBlocksById({ groupId })
 
   blocks = blocks.map((block) => ({

diff --git a/packages/plugins/page/src/PageFolderSetting.vue b/packages/plugins/page/src/PageFolderSetting.vue
@@ -105,7 +105,7 @@ export default {
       const data = pageSettingState.currentPageData
       const createParams = {
         ...data,
-        app: getMetaApi(META_SERVICE.GlobalService).getState().appInfo.id,
+        app: getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id,
         isPage: false
       }
 

diff --git a/packages/plugins/page/src/PageSetting.vue b/packages/plugins/page/src/PageSetting.vue
@@ -171,7 +171,7 @@ export default {
           ...page_content_state,
           fileName: pageSettingState.currentPageData.name
         },
-        app: getMetaApi(META_SERVICE.GlobalService).getState().appInfo.id,
+        app: getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id,
         isPage: true
       }
 

diff --git a/packages/plugins/robot/src/js/robotSetting.js b/packages/plugins/robot/src/js/robotSetting.js
@@ -58,7 +58,7 @@ export const initBlockList = async () => {
   if (state.blockList?.length) {
     return
   }
-  const appId = getMetaApi(META_SERVICE.GlobalService).getState().appInfo.id
+  const appId = getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id
   try {
     const list = await getMetaApi(META_SERVICE.Http).get('/material-center/api/blocks', { params: { appId } })
     setBlocks(list)