@cloudbase/lowcode-builder 1.8.43-alpha.0 → 1.8.44-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.43-alpha.0",
+  "version": "1.8.44-alpha.0",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/mp/common/util.js

@@ -419,8 +419,8 @@ export async function getAuthConfig() {
 
 let _AUTH_CACHE_MAP = {};
 
-async function getAccessPermission(app, appId, pageId) {
-  const cacheKey = `${appId}-${pageId}`;
+async function getAccessPermission(app, appId, subAppId = "", pageId) {
+  const cacheKey = subAppId ? `${appId}-${subAppId}-${pageId}` : `${appId}-${pageId}`;
   if (_AUTH_CACHE_MAP[cacheKey] !== undefined) {
     return _AUTH_CACHE_MAP[cacheKey];
   }
@@ -482,7 +482,19 @@ export async function checkAuth(app, appId, $page) {
     return true;
   }
   wx.showNavigationBarLoading();
-  const requestList = [getAccessPermission(app, appId, $page.id)];
+  let subAppId = '';
+  if ($page.packageName) {
+    if ($page.__internal__.subAppId) {
+      subAppId = $page.__internal__.subAppId
+    } else {
+      const matched = $page.packageName.match(/packages\/(.*)$/);
+      if (matched?.[1]) {
+        subAppId = `sub-${matched[1]}`
+      }
+    }
+  }
+
+  const requestList = [getAccessPermission(app, appId, subAppId, $page.id)];
   // 暂时先认为有登录页则自定义登录功能开启且生效
   if (loginPage) {
     requestList.push(getAuthConfig(app));
@@ -541,6 +553,7 @@ export function redirectToLogin(currentPage) {
     app.redirectTo({
       pageId: loginPage.id,
       params: {
+        packageName: currentPage.packageName || undefined,
         sourcePageId: currentPage.id,
         sourcePageParams: currentPage.params || currentPage.dataset?.params,
       },

package/template/mp/page/api.js

@@ -2,8 +2,10 @@ import { $w as baseAPI } from '<%= subLevelPath %>../../app/weapps-api'
 
 export const $page = {
   __internal__: {
-    active: false
+    active: false,
+    subAppId: '<%= subAppId %>',
   },
+  packageName: '<%= packageName %>',
   uuid: '<%= uuid %>',
   label: '<%= label %>',