@nocobase/plugin-multi-portal 3.0.0-alpha.1 → 3.0.0-alpha.3

package/dist/externalVersion.js

@@ -8,19 +8,19 @@
  */
 
 module.exports = {
-  "@nocobase/flow-engine": "3.0.0-alpha.1",
-  "@nocobase/client": "3.0.0-alpha.1",
-  "@nocobase/client-v2": "3.0.0-alpha.1",
+  "@nocobase/flow-engine": "3.0.0-alpha.3",
+  "@nocobase/client": "3.0.0-alpha.3",
+  "@nocobase/client-v2": "3.0.0-alpha.3",
   "antd": "5.24.2",
   "react": "18.2.0",
   "react-router-dom": "6.30.1",
-  "@nocobase/database": "3.0.0-alpha.1",
-  "@nocobase/server": "3.0.0-alpha.1",
-  "@nocobase/resourcer": "3.0.0-alpha.1",
-  "@nocobase/utils": "3.0.0-alpha.1",
+  "@nocobase/database": "3.0.0-alpha.3",
+  "@nocobase/server": "3.0.0-alpha.3",
+  "@nocobase/resourcer": "3.0.0-alpha.3",
+  "@nocobase/utils": "3.0.0-alpha.3",
   "ahooks": "3.7.8",
   "antd-style": "3.7.1",
-  "@nocobase/plugin-ui-layout": "3.0.0-alpha.1",
+  "@nocobase/plugin-ui-layout": "3.0.0-alpha.3",
   "@ant-design/icons": "5.6.1",
   "sequelize": "6.35.2"
 };

package/dist/node_modules/tar/package.json

@@ -1 +1 @@
-{"author":"Isaac Z. Schlueter","name":"tar","description":"tar for node","version":"7.5.15","repository":{"type":"git","url":"https://github.com/isaacs/node-tar.git"},"scripts":{"genparse":"node scripts/generate-parse-fixtures.js","snap":"tap","test":"tap","pretest":"npm run prepare","presnap":"npm run prepare","prepare":"tshy && bash scripts/build.sh","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write . --log-level warn","typedoc":"typedoc --tsconfig .tshy/esm.json ./src/*.ts","lint":"oxlint --fix src test","postsnap":"npm run lint","postlint":"npm run format"},"dependencies":{"@isaacs/fs-minipass":"^4.0.0","chownr":"^3.0.0","minipass":"^7.1.2","minizlib":"^3.1.0","yallist":"^5.0.0"},"devDependencies":{"@types/node":"^25.5.0","chmodr":"^2.0.2","end-of-stream":"^1.4.3","esbuild":"^0.27.4","events-to-array":"^2.0.3","mutate-fs":"^2.1.1","nock":"^13.5.4","oxlint":"^1.57.0","oxlint-tsgolint":"^0.17.3","prettier":"^3.8.1","rimraf":"^6.1.2","tap":"^21.6.2","tshy":"^3.3.2","typedoc":"^0.28.18"},"license":"BlueOak-1.0.0","engines":{"node":">=18"},"files":["dist"],"tshy":{"exports":{"./package.json":"./package.json",".":{"import":{"types":"./dist/esm/index.d.ts","default":"./dist/esm/index.min.js"},"require":{"types":"./dist/commonjs/index.d.ts","default":"./dist/commonjs/index.min.js"}},"./raw":"./src/index.ts","./c":"./src/create.ts","./create":"./src/create.ts","./replace":"./src/create.ts","./r":"./src/create.ts","./list":"./src/list.ts","./t":"./src/list.ts","./update":"./src/update.ts","./u":"./src/update.ts","./extract":"./src/extract.ts","./x":"./src/extract.ts","./pack":"./src/pack.ts","./unpack":"./src/unpack.ts","./parse":"./src/parse.ts","./read-entry":"./src/read-entry.ts","./write-entry":"./src/write-entry.ts","./header":"./src/header.ts","./pax":"./src/pax.ts","./types":"./src/types.ts"}},"exports":{"./package.json":"./package.json",".":{"import":{"types":"./dist/esm/index.d.ts","default":"./dist/esm/index.min.js"},"require":{"types":"./dist/commonjs/index.d.ts","default":"./dist/commonjs/index.min.js"}},"./raw":{"import":{"types":"./dist/esm/index.d.ts","default":"./dist/esm/index.js"},"require":{"types":"./dist/commonjs/index.d.ts","default":"./dist/commonjs/index.js"}},"./c":{"import":{"types":"./dist/esm/create.d.ts","default":"./dist/esm/create.js"},"require":{"types":"./dist/commonjs/create.d.ts","default":"./dist/commonjs/create.js"}},"./create":{"import":{"types":"./dist/esm/create.d.ts","default":"./dist/esm/create.js"},"require":{"types":"./dist/commonjs/create.d.ts","default":"./dist/commonjs/create.js"}},"./replace":{"import":{"types":"./dist/esm/create.d.ts","default":"./dist/esm/create.js"},"require":{"types":"./dist/commonjs/create.d.ts","default":"./dist/commonjs/create.js"}},"./r":{"import":{"types":"./dist/esm/create.d.ts","default":"./dist/esm/create.js"},"require":{"types":"./dist/commonjs/create.d.ts","default":"./dist/commonjs/create.js"}},"./list":{"import":{"types":"./dist/esm/list.d.ts","default":"./dist/esm/list.js"},"require":{"types":"./dist/commonjs/list.d.ts","default":"./dist/commonjs/list.js"}},"./t":{"import":{"types":"./dist/esm/list.d.ts","default":"./dist/esm/list.js"},"require":{"types":"./dist/commonjs/list.d.ts","default":"./dist/commonjs/list.js"}},"./update":{"import":{"types":"./dist/esm/update.d.ts","default":"./dist/esm/update.js"},"require":{"types":"./dist/commonjs/update.d.ts","default":"./dist/commonjs/update.js"}},"./u":{"import":{"types":"./dist/esm/update.d.ts","default":"./dist/esm/update.js"},"require":{"types":"./dist/commonjs/update.d.ts","default":"./dist/commonjs/update.js"}},"./extract":{"import":{"types":"./dist/esm/extract.d.ts","default":"./dist/esm/extract.js"},"require":{"types":"./dist/commonjs/extract.d.ts","default":"./dist/commonjs/extract.js"}},"./x":{"import":{"types":"./dist/esm/extract.d.ts","default":"./dist/esm/extract.js"},"require":{"types":"./dist/commonjs/extract.d.ts","default":"./dist/commonjs/extract.js"}},"./pack":{"import":{"types":"./dist/esm/pack.d.ts","default":"./dist/esm/pack.js"},"require":{"types":"./dist/commonjs/pack.d.ts","default":"./dist/commonjs/pack.js"}},"./unpack":{"import":{"types":"./dist/esm/unpack.d.ts","default":"./dist/esm/unpack.js"},"require":{"types":"./dist/commonjs/unpack.d.ts","default":"./dist/commonjs/unpack.js"}},"./parse":{"import":{"types":"./dist/esm/parse.d.ts","default":"./dist/esm/parse.js"},"require":{"types":"./dist/commonjs/parse.d.ts","default":"./dist/commonjs/parse.js"}},"./read-entry":{"import":{"types":"./dist/esm/read-entry.d.ts","default":"./dist/esm/read-entry.js"},"require":{"types":"./dist/commonjs/read-entry.d.ts","default":"./dist/commonjs/read-entry.js"}},"./write-entry":{"import":{"types":"./dist/esm/write-entry.d.ts","default":"./dist/esm/write-entry.js"},"require":{"types":"./dist/commonjs/write-entry.d.ts","default":"./dist/commonjs/write-entry.js"}},"./header":{"import":{"types":"./dist/esm/header.d.ts","default":"./dist/esm/header.js"},"require":{"types":"./dist/commonjs/header.d.ts","default":"./dist/commonjs/header.js"}},"./pax":{"import":{"types":"./dist/esm/pax.d.ts","default":"./dist/esm/pax.js"},"require":{"types":"./dist/commonjs/pax.d.ts","default":"./dist/commonjs/pax.js"}},"./types":{"import":{"types":"./dist/esm/types.d.ts","default":"./dist/esm/types.js"},"require":{"types":"./dist/commonjs/types.d.ts","default":"./dist/commonjs/types.js"}}},"type":"module","main":"./dist/commonjs/index.min.js","types":"./dist/commonjs/index.d.ts","module":"./dist/esm/index.min.js","_lastModified":"2026-07-30T03:55:55.733Z"}
+{"author":"Isaac Z. Schlueter","name":"tar","description":"tar for node","version":"7.5.15","repository":{"type":"git","url":"https://github.com/isaacs/node-tar.git"},"scripts":{"genparse":"node scripts/generate-parse-fixtures.js","snap":"tap","test":"tap","pretest":"npm run prepare","presnap":"npm run prepare","prepare":"tshy && bash scripts/build.sh","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write . --log-level warn","typedoc":"typedoc --tsconfig .tshy/esm.json ./src/*.ts","lint":"oxlint --fix src test","postsnap":"npm run lint","postlint":"npm run format"},"dependencies":{"@isaacs/fs-minipass":"^4.0.0","chownr":"^3.0.0","minipass":"^7.1.2","minizlib":"^3.1.0","yallist":"^5.0.0"},"devDependencies":{"@types/node":"^25.5.0","chmodr":"^2.0.2","end-of-stream":"^1.4.3","esbuild":"^0.27.4","events-to-array":"^2.0.3","mutate-fs":"^2.1.1","nock":"^13.5.4","oxlint":"^1.57.0","oxlint-tsgolint":"^0.17.3","prettier":"^3.8.1","rimraf":"^6.1.2","tap":"^21.6.2","tshy":"^3.3.2","typedoc":"^0.28.18"},"license":"BlueOak-1.0.0","engines":{"node":">=18"},"files":["dist"],"tshy":{"exports":{"./package.json":"./package.json",".":{"import":{"types":"./dist/esm/index.d.ts","default":"./dist/esm/index.min.js"},"require":{"types":"./dist/commonjs/index.d.ts","default":"./dist/commonjs/index.min.js"}},"./raw":"./src/index.ts","./c":"./src/create.ts","./create":"./src/create.ts","./replace":"./src/create.ts","./r":"./src/create.ts","./list":"./src/list.ts","./t":"./src/list.ts","./update":"./src/update.ts","./u":"./src/update.ts","./extract":"./src/extract.ts","./x":"./src/extract.ts","./pack":"./src/pack.ts","./unpack":"./src/unpack.ts","./parse":"./src/parse.ts","./read-entry":"./src/read-entry.ts","./write-entry":"./src/write-entry.ts","./header":"./src/header.ts","./pax":"./src/pax.ts","./types":"./src/types.ts"}},"exports":{"./package.json":"./package.json",".":{"import":{"types":"./dist/esm/index.d.ts","default":"./dist/esm/index.min.js"},"require":{"types":"./dist/commonjs/index.d.ts","default":"./dist/commonjs/index.min.js"}},"./raw":{"import":{"types":"./dist/esm/index.d.ts","default":"./dist/esm/index.js"},"require":{"types":"./dist/commonjs/index.d.ts","default":"./dist/commonjs/index.js"}},"./c":{"import":{"types":"./dist/esm/create.d.ts","default":"./dist/esm/create.js"},"require":{"types":"./dist/commonjs/create.d.ts","default":"./dist/commonjs/create.js"}},"./create":{"import":{"types":"./dist/esm/create.d.ts","default":"./dist/esm/create.js"},"require":{"types":"./dist/commonjs/create.d.ts","default":"./dist/commonjs/create.js"}},"./replace":{"import":{"types":"./dist/esm/create.d.ts","default":"./dist/esm/create.js"},"require":{"types":"./dist/commonjs/create.d.ts","default":"./dist/commonjs/create.js"}},"./r":{"import":{"types":"./dist/esm/create.d.ts","default":"./dist/esm/create.js"},"require":{"types":"./dist/commonjs/create.d.ts","default":"./dist/commonjs/create.js"}},"./list":{"import":{"types":"./dist/esm/list.d.ts","default":"./dist/esm/list.js"},"require":{"types":"./dist/commonjs/list.d.ts","default":"./dist/commonjs/list.js"}},"./t":{"import":{"types":"./dist/esm/list.d.ts","default":"./dist/esm/list.js"},"require":{"types":"./dist/commonjs/list.d.ts","default":"./dist/commonjs/list.js"}},"./update":{"import":{"types":"./dist/esm/update.d.ts","default":"./dist/esm/update.js"},"require":{"types":"./dist/commonjs/update.d.ts","default":"./dist/commonjs/update.js"}},"./u":{"import":{"types":"./dist/esm/update.d.ts","default":"./dist/esm/update.js"},"require":{"types":"./dist/commonjs/update.d.ts","default":"./dist/commonjs/update.js"}},"./extract":{"import":{"types":"./dist/esm/extract.d.ts","default":"./dist/esm/extract.js"},"require":{"types":"./dist/commonjs/extract.d.ts","default":"./dist/commonjs/extract.js"}},"./x":{"import":{"types":"./dist/esm/extract.d.ts","default":"./dist/esm/extract.js"},"require":{"types":"./dist/commonjs/extract.d.ts","default":"./dist/commonjs/extract.js"}},"./pack":{"import":{"types":"./dist/esm/pack.d.ts","default":"./dist/esm/pack.js"},"require":{"types":"./dist/commonjs/pack.d.ts","default":"./dist/commonjs/pack.js"}},"./unpack":{"import":{"types":"./dist/esm/unpack.d.ts","default":"./dist/esm/unpack.js"},"require":{"types":"./dist/commonjs/unpack.d.ts","default":"./dist/commonjs/unpack.js"}},"./parse":{"import":{"types":"./dist/esm/parse.d.ts","default":"./dist/esm/parse.js"},"require":{"types":"./dist/commonjs/parse.d.ts","default":"./dist/commonjs/parse.js"}},"./read-entry":{"import":{"types":"./dist/esm/read-entry.d.ts","default":"./dist/esm/read-entry.js"},"require":{"types":"./dist/commonjs/read-entry.d.ts","default":"./dist/commonjs/read-entry.js"}},"./write-entry":{"import":{"types":"./dist/esm/write-entry.d.ts","default":"./dist/esm/write-entry.js"},"require":{"types":"./dist/commonjs/write-entry.d.ts","default":"./dist/commonjs/write-entry.js"}},"./header":{"import":{"types":"./dist/esm/header.d.ts","default":"./dist/esm/header.js"},"require":{"types":"./dist/commonjs/header.d.ts","default":"./dist/commonjs/header.js"}},"./pax":{"import":{"types":"./dist/esm/pax.d.ts","default":"./dist/esm/pax.js"},"require":{"types":"./dist/commonjs/pax.d.ts","default":"./dist/commonjs/pax.js"}},"./types":{"import":{"types":"./dist/esm/types.d.ts","default":"./dist/esm/types.js"},"require":{"types":"./dist/commonjs/types.d.ts","default":"./dist/commonjs/types.js"}}},"type":"module","main":"./dist/commonjs/index.min.js","types":"./dist/commonjs/index.d.ts","module":"./dist/esm/index.min.js","_lastModified":"2026-07-30T10:32:21.491Z"}

package/dist/server/plugin.d.ts

@@ -28,9 +28,10 @@ export declare class PluginMultiPortalServer extends Plugin {
     private getAppName;
     private getMultiPortalStorageItem;
     private warnPortalStorageSyncFailed;
+    private logPortalBuildHtml;
     private getPortalStorageTaskKey;
     private runPortalStorageTask;
-    private removePortalStorageDist;
+    private removePortalStorageIndexHtml;
     private waitForPortalStorageTasks;
     private schedulePortalTemplateCopyAndBuild;
     private ensurePortalStorageItem;

package/dist/server/plugin.js

@@ -597,12 +597,14 @@ async function buildPortalStorageItem(portalDir, item) {
   const buildEnv = getPortalStorageCommandEnv({
     NOCOBASE_API_URL: getPortalStorageApiUrl(item.appName),
     NOCOBASE_PORTAL_BASE: getPortalDeployBasePath(item.appName, item.portalName),
+    SKIP_YARN_COREPACK_CHECK: "1",
+    COREPACK_ENABLE_STRICT: "0",
     COREPACK_ENABLE_PROJECT_SPEC: "0"
   });
   await appendPortalStorageLog(logPath, `Building portal ${item.appName}/${item.portalName}.`);
   await appendPortalStorageLog(
     logPath,
-    `Build environment: NOCOBASE_API_URL=${buildEnv.NOCOBASE_API_URL || ""} NOCOBASE_PORTAL_BASE=${buildEnv.NOCOBASE_PORTAL_BASE || ""} APP_PUBLIC_PATH=${buildEnv.APP_PUBLIC_PATH || ""}`
+    `Build environment: NOCOBASE_API_URL=${buildEnv.NOCOBASE_API_URL || ""} NOCOBASE_PORTAL_BASE=${buildEnv.NOCOBASE_PORTAL_BASE || ""} APP_PUBLIC_PATH=${buildEnv.APP_PUBLIC_PATH || ""} SKIP_YARN_COREPACK_CHECK=${buildEnv.SKIP_YARN_COREPACK_CHECK || ""} COREPACK_ENABLE_STRICT=${buildEnv.COREPACK_ENABLE_STRICT || ""} COREPACK_ENABLE_PROJECT_SPEC=${buildEnv.COREPACK_ENABLE_PROJECT_SPEC || ""}`
   );
   await runPortalStorageCommandOnce("yarn", ["build:html"], {
     cwd: portalDir,
@@ -1095,39 +1097,6 @@ async function seedHistoricalMultiPortals(db) {
   }
   await repairFixedLayoutMultiPortalRecords(db);
 }
-async function preventUiLayoutRouteNameConflict(ctx, next) {
-  const targets = await getMultiPortalWriteTargets(ctx, ["uid", "portalName", "uiLayoutUid"]);
-  for (const { existing, values } of targets) {
-    const existingUid = trimString(existing == null ? void 0 : existing.get("uid"));
-    const uid = trimString(values.uid ?? existingUid);
-    const portalName = trimString(values.portalName ?? (existing == null ? void 0 : existing.get("portalName")));
-    const uiLayoutUid = trimString(values.uiLayoutUid ?? (existing == null ? void 0 : existing.get("uiLayoutUid")));
-    const fixedPortal = getFixedLayoutMultiPortalRecord(existingUid) || getFixedLayoutMultiPortalRecord(uid);
-    const canonicalPortal = (fixedPortal == null ? void 0 : fixedPortal.uid) === uid && (!existingUid || fixedPortal.uid === existingUid) && fixedPortal.portalName === portalName && fixedPortal.uiLayoutUid === uiLayoutUid;
-    if (fixedPortal && !canonicalPortal) {
-      ctx.throw(400, "Reserved Portal UID must match its canonical route and UI layout");
-      return;
-    }
-    if (!portalName) {
-      continue;
-    }
-    if (portalName === "admin" || portalName === "mobile") {
-      continue;
-    }
-    const existingInitPortal = (existing == null ? void 0 : existing.get("uid")) === DEFAULT_MULTI_PORTAL_UID && existing.get("portalName") === portalName;
-    const uiLayout = await ctx.db.getRepository("uiLayouts").findOne({
-      filter: {
-        routeName: portalName
-      },
-      fields: ["uid"]
-    });
-    if (uiLayout && !existingInitPortal) {
-      ctx.throw(400, "Portal route name conflicts with an existing UI layout");
-      return;
-    }
-  }
-  await next();
-}
 async function preventMultiPortalBackingLayoutChange(ctx, next) {
   const targets = await getMultiPortalWriteTargets(ctx, ["uiLayoutUid"]);
   for (const { existing, values } of targets) {
@@ -1242,7 +1211,6 @@ async function assertDesktopRouteParentsBelongToScope(ctx, scope, values = ((_a)
       id: parentIds,
       ...scope.filter
     },
-    ...transaction ? { lock: transaction.LOCK.UPDATE } : {},
     transaction
   });
   if (new Set(normalizeDesktopRouteTargetIds(parents)).size !== new Set(parentIds.map(String)).size) {
@@ -1276,7 +1244,6 @@ async function assertDesktopRouteUpsertMatchesBelongToScope(ctx, scope, values =
         ...filter,
         ...scope.filter
       },
-      ...transaction ? { lock: transaction.LOCK.UPDATE } : {},
       transaction
     });
     const allMatchIds = normalizeDesktopRouteTargetIds(allMatches);
@@ -1691,7 +1658,7 @@ async function findDesktopRouteMutationTargets(ctx, scopeFilter, transaction, se
       ...filter ?? {},
       ...scopeFilter ?? {}
     },
-    ...transaction ? { lock: transaction.LOCK.UPDATE } : {},
+    ...transaction && !scopeFilter ? { lock: transaction.LOCK.UPDATE } : {},
     transaction
   });
 }
@@ -1843,7 +1810,6 @@ async function guardDesktopRouteMoveScope(ctx, next) {
         id: routeIds,
         ...scope.filter
       },
-      lock: transaction.LOCK.UPDATE,
       transaction
     });
     if (normalizeDesktopRouteTargetIds(allRoutes).join(",") !== normalizeDesktopRouteTargetIds(scopedRoutes).join(",") || scopedRoutes.length !== routeIds.length) {
@@ -1873,7 +1839,6 @@ async function guardDesktopRouteMoveScope(ctx, next) {
           id: parentIds,
           ...scope.filter
         },
-        lock: transaction.LOCK.UPDATE,
         transaction
       });
       if (normalizeDesktopRouteTargetIds(parents).join(",") !== parentIds.map(String).sort().join(",")) {
@@ -1921,7 +1886,6 @@ async function guardDesktopRouteMoveScope(ctx, next) {
             $gte: targetSort
           }
         },
-        lock: transaction.LOCK.UPDATE,
         transaction
       });
       const affectedRouteIds = affectedRoutes.map((route) => route.get("id"));
@@ -2019,7 +1983,7 @@ async function findDesktopRouteDestroyRoots(ctx, transaction, scopeFilter) {
       ...scopeFilter ?? {},
       ...filterByTk.length ? { id: filterByTk } : {}
     },
-    lock: transaction.LOCK.UPDATE,
+    ...scopeFilter ? {} : { lock: transaction.LOCK.UPDATE },
     transaction
   });
   return collectDesktopRouteIds(records);
@@ -2085,13 +2049,20 @@ async function detachDesktopRouteTreeOwner(ctx, routeIds, scope, transaction) {
 }
 async function detachOwnerAndFindDestroyRoots(ctx, routeIds, scope, transaction) {
   var _a;
+  await ctx.db.getRepository("desktopRoutes").find({
+    fields: ["id"],
+    filter: {
+      id: routeIds
+    },
+    lock: transaction.LOCK.UPDATE,
+    transaction
+  });
   const routes = await ctx.db.getRepository("desktopRoutes").find({
     fields: ["id", "parentId"],
     appends: ["multiPortals", "uiLayouts"],
     filter: {
       id: routeIds
     },
-    lock: transaction.LOCK.UPDATE,
     transaction
   });
   const routesById = new Map(routes.map((route) => [String(route.get("id")), route]));
@@ -2373,6 +2344,14 @@ class PluginMultiPortalServer extends import_server.Plugin {
       error
     });
   }
+  logPortalBuildHtml(item, status, reason) {
+    var _a, _b;
+    (_b = (_a = this.app.logger) == null ? void 0 : _a.info) == null ? void 0 : _b.call(_a, `Portal yarn build:html ${status} for ${item.appName}/${item.portalName}`, {
+      appName: item.appName,
+      portalName: item.portalName,
+      reason
+    });
+  }
   getPortalStorageTaskKey(item) {
     return `${item.appName}/${item.portalName}`;
   }
@@ -2391,10 +2370,9 @@ class PluginMultiPortalServer extends import_server.Plugin {
     }
     await run();
   }
-  async removePortalStorageDist(item) {
-    await import_fs.default.promises.rm((0, import_utils.storagePathJoin)("portals", item.appName, item.portalName, "dist"), {
-      force: true,
-      recursive: true
+  async removePortalStorageIndexHtml(item) {
+    await import_fs.default.promises.rm((0, import_utils.storagePathJoin)("portals", item.appName, item.portalName, "dist", "index.html"), {
+      force: true
     });
   }
   waitForPortalStorageTasks() {
@@ -2408,6 +2386,7 @@ class PluginMultiPortalServer extends import_server.Plugin {
     var _a;
     const taskKey = this.getPortalStorageTaskKey(item);
     if (this.portalStorageTaskKeys.has(taskKey)) {
+      this.logPortalBuildHtml(item, "skipped", "a storage task is already running");
       await ((_a = template.cleanup) == null ? void 0 : _a.call(template));
       return;
     }
@@ -2431,11 +2410,14 @@ class PluginMultiPortalServer extends import_server.Plugin {
         await ensurePortalStorageConfigFiles(portalDir, item);
         await appendPortalStorageLog(logPath, `Portal configuration files updated in ${portalDir}.`);
         if (item.enabled) {
+          this.logPortalBuildHtml(item, "requested", "storage directory was initialized");
           await buildPortalStorageItem(portalDir, item);
+          this.logPortalBuildHtml(item, "completed", "yarn build:html finished successfully");
           return;
         }
-        await this.removePortalStorageDist(item);
-        await appendPortalStorageLog(logPath, `Portal dist directory removed for ${item.appName}/${item.portalName}.`);
+        this.logPortalBuildHtml(item, "skipped", "the portal is disabled");
+        await this.removePortalStorageIndexHtml(item);
+        await appendPortalStorageLog(logPath, `Portal index.html removed for ${item.appName}/${item.portalName}.`);
       } catch (error) {
         await appendPortalStorageLog(
           logPath,
@@ -2451,32 +2433,44 @@ class PluginMultiPortalServer extends import_server.Plugin {
     this.portalStorageTasks.set(taskKey, task);
     await task;
   }
-  async ensurePortalStorageItem(item) {
+  async ensurePortalStorageItem(item, options = {}) {
     const portalDir = (0, import_utils.storagePathJoin)("portals", item.appName, item.portalName);
     const portalIndex = import_path.default.join(portalDir, "dist", "index.html");
+    const logPath = getPortalStorageLogPath(item);
     if (!await pathExists(portalDir)) {
-      const template = await resolvePortalTemplate(getInitPortalTemplate(), getPortalStorageLogPath(item));
+      const template = await resolvePortalTemplate(getInitPortalTemplate(), logPath);
       await this.schedulePortalTemplateCopyAndBuild(item, template, portalDir);
       return;
     }
     await ensurePortalStorageConfigFiles(portalDir, item);
     if (item.enabled) {
-      if (!await pathExists(portalIndex)) {
+      const hasPortalIndex = await pathExists(portalIndex);
+      if (options.forceBuild || !hasPortalIndex) {
+        this.logPortalBuildHtml(
+          item,
+          "requested",
+          options.forceBuild ? "forceBuild is enabled" : "dist/index.html does not exist"
+        );
         await buildPortalStorageItem(portalDir, item);
+        this.logPortalBuildHtml(item, "completed", "yarn build:html finished successfully");
+      } else {
+        this.logPortalBuildHtml(item, "skipped", "dist/index.html already exists");
       }
       return;
     }
-    await this.removePortalStorageDist(item);
+    this.logPortalBuildHtml(item, "skipped", "the portal is disabled");
+    await this.removePortalStorageIndexHtml(item);
+    await appendPortalStorageLog(logPath, `Portal index.html removed for ${item.appName}/${item.portalName}.`);
   }
-  async syncMultiPortalStorageItem(multiPortal, options, syncPrevious = false) {
+  async syncMultiPortalStorageItem(multiPortal, options, syncPrevious = false, forceBuild = false) {
     const currentItem = this.getMultiPortalStorageItem(multiPortal);
     const previousItem = syncPrevious ? this.getMultiPortalStorageItem(multiPortal, true) : null;
     await this.runPortalStorageTask(async () => {
       if (previousItem && (!currentItem || previousItem.appName !== currentItem.appName || previousItem.portalName !== currentItem.portalName || !currentItem.enabled)) {
-        await this.removePortalStorageDist(previousItem);
+        await this.removePortalStorageIndexHtml(previousItem);
       }
       if (currentItem) {
-        await this.ensurePortalStorageItem(currentItem);
+        await this.ensurePortalStorageItem(currentItem, { forceBuild });
       }
     }, options);
   }
@@ -2825,24 +2819,20 @@ class PluginMultiPortalServer extends import_server.Plugin {
     );
     this.app.resourceManager.registerPreActionHandler("multiPortals:create", captureSkipCreatePortalDirectory);
     this.app.resourceManager.registerPreActionHandler("multiPortals:create", normalizeMultiPortalSlugValues);
-    this.app.resourceManager.registerPreActionHandler("multiPortals:create", preventUiLayoutRouteNameConflict);
     this.app.resourceManager.registerPreActionHandler("multiPortals:update", preventMultiPortalBackingLayoutChange);
     this.app.resourceManager.registerPreActionHandler("multiPortals:update", normalizeMultiPortalSlugValues);
-    this.app.resourceManager.registerPreActionHandler("multiPortals:update", preventUiLayoutRouteNameConflict);
     this.app.resourceManager.registerPreActionHandler(
       "multiPortals:firstOrCreate",
       preventMultiPortalBackingLayoutChange
     );
     this.app.resourceManager.registerPreActionHandler("multiPortals:firstOrCreate", captureSkipCreatePortalDirectory);
     this.app.resourceManager.registerPreActionHandler("multiPortals:firstOrCreate", normalizeMultiPortalSlugValues);
-    this.app.resourceManager.registerPreActionHandler("multiPortals:firstOrCreate", preventUiLayoutRouteNameConflict);
     this.app.resourceManager.registerPreActionHandler(
       "multiPortals:updateOrCreate",
       preventMultiPortalBackingLayoutChange
     );
     this.app.resourceManager.registerPreActionHandler("multiPortals:updateOrCreate", captureSkipCreatePortalDirectory);
     this.app.resourceManager.registerPreActionHandler("multiPortals:updateOrCreate", normalizeMultiPortalSlugValues);
-    this.app.resourceManager.registerPreActionHandler("multiPortals:updateOrCreate", preventUiLayoutRouteNameConflict);
     this.app.resourceManager.registerPreActionHandler("desktopRoutes:create", addDesktopRouteCreateMultiPortal, {
       after: UI_LAYOUT_DESKTOP_ROUTE_WRITE_LAYOUT_HANDLER_TAG
     });
@@ -2903,7 +2893,7 @@ class PluginMultiPortalServer extends import_server.Plugin {
       if (shouldSkipCreatePortalDirectory(options)) {
         return;
       }
-      await this.syncMultiPortalStorageItem(multiPortal, options);
+      await this.syncMultiPortalStorageItem(multiPortal, options, false, true);
     });
     this.app.db.on("multiPortals.afterUpdate", async (multiPortal, options) => {
       await this.publishAppManifestItem(multiPortal, options);

package/dist/swagger/index.d.ts

@@ -0,0 +1,152 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+declare const _default: {
+    openapi: string;
+    info: {
+        title: string;
+        version: string;
+    };
+    paths: {
+        '/roles/{roleName}/multiPortals:list': {
+            get: {
+                tags: string[];
+                summary: string;
+                description: string;
+                parameters: {
+                    $ref: string;
+                }[];
+                responses: {
+                    200: {
+                        description: string;
+                        content: {
+                            'application/json': {
+                                schema: {
+                                    type: string;
+                                    properties: {
+                                        data: {
+                                            type: string;
+                                            items: {
+                                                $ref: string;
+                                            };
+                                        };
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        };
+        '/roles/{roleName}/multiPortals:add': {
+            post: {
+                tags: string[];
+                summary: string;
+                description: string;
+                parameters: {
+                    $ref: string;
+                }[];
+                requestBody: {
+                    required: boolean;
+                    content: {
+                        'application/json': {
+                            schema: {
+                                $ref: string;
+                            };
+                        };
+                    };
+                };
+                responses: {
+                    200: {
+                        description: string;
+                    };
+                };
+            };
+        };
+        '/roles/{roleName}/multiPortals:remove': {
+            post: {
+                tags: string[];
+                summary: string;
+                description: string;
+                parameters: {
+                    $ref: string;
+                }[];
+                requestBody: {
+                    required: boolean;
+                    content: {
+                        'application/json': {
+                            schema: {
+                                $ref: string;
+                            };
+                        };
+                    };
+                };
+                responses: {
+                    200: {
+                        description: string;
+                    };
+                };
+            };
+        };
+    };
+    components: {
+        parameters: {
+            RoleNamePath: {
+                name: string;
+                in: string;
+                description: string;
+                required: boolean;
+                schema: {
+                    type: string;
+                };
+            };
+        };
+        schemas: {
+            PortalAccessWrite: {
+                type: string;
+                properties: {
+                    values: {
+                        type: string;
+                        description: string;
+                        items: {
+                            type: string;
+                        };
+                        minItems: number;
+                        uniqueItems: boolean;
+                    };
+                };
+                required: string[];
+            };
+            PortalAccessTarget: {
+                type: string;
+                additionalProperties: boolean;
+                properties: {
+                    uid: {
+                        type: string;
+                    };
+                    title: {
+                        type: string;
+                    };
+                    portalName: {
+                        type: string;
+                    };
+                    routePath: {
+                        type: string;
+                    };
+                    portalType: {
+                        type: string;
+                    };
+                    enabled: {
+                        type: string;
+                    };
+                };
+            };
+        };
+    };
+};
+export default _default;

package/dist/swagger/index.js

@@ -0,0 +1,142 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var swagger_exports = {};
+__export(swagger_exports, {
+  default: () => swagger_default
+});
+module.exports = __toCommonJS(swagger_exports);
+var swagger_default = {
+  openapi: "3.0.2",
+  info: {
+    title: "NocoBase API - Multi-portal plugin",
+    version: "1.0.0"
+  },
+  paths: {
+    "/roles/{roleName}/multiPortals:list": {
+      get: {
+        tags: ["roles.multiPortals"],
+        summary: "List Portals granted to a role",
+        description: "List existing custom Portals that the role is explicitly allowed to enter.",
+        parameters: [{ $ref: "#/components/parameters/RoleNamePath" }],
+        responses: {
+          200: {
+            description: "OK",
+            content: {
+              "application/json": {
+                schema: {
+                  type: "object",
+                  properties: {
+                    data: {
+                      type: "array",
+                      items: { $ref: "#/components/schemas/PortalAccessTarget" }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/roles/{roleName}/multiPortals:add": {
+      post: {
+        tags: ["roles.multiPortals"],
+        summary: "Grant Portal entry access to a role",
+        description: "Allow the role to enter one or more existing custom Portals by uid.",
+        parameters: [{ $ref: "#/components/parameters/RoleNamePath" }],
+        requestBody: {
+          required: true,
+          content: {
+            "application/json": {
+              schema: { $ref: "#/components/schemas/PortalAccessWrite" }
+            }
+          }
+        },
+        responses: {
+          200: { description: "OK" }
+        }
+      }
+    },
+    "/roles/{roleName}/multiPortals:remove": {
+      post: {
+        tags: ["roles.multiPortals"],
+        summary: "Revoke Portal entry access from a role",
+        description: "Prevent the role from entering one or more existing custom Portals by uid.",
+        parameters: [{ $ref: "#/components/parameters/RoleNamePath" }],
+        requestBody: {
+          required: true,
+          content: {
+            "application/json": {
+              schema: { $ref: "#/components/schemas/PortalAccessWrite" }
+            }
+          }
+        },
+        responses: {
+          200: { description: "OK" }
+        }
+      }
+    }
+  },
+  components: {
+    parameters: {
+      RoleNamePath: {
+        name: "roleName",
+        in: "path",
+        description: "Role name.",
+        required: true,
+        schema: { type: "string" }
+      }
+    },
+    schemas: {
+      PortalAccessWrite: {
+        type: "object",
+        properties: {
+          values: {
+            type: "array",
+            description: "Portal uids.",
+            items: { type: "string" },
+            minItems: 1,
+            uniqueItems: true
+          }
+        },
+        required: ["values"]
+      },
+      PortalAccessTarget: {
+        type: "object",
+        additionalProperties: true,
+        properties: {
+          uid: { type: "string" },
+          title: { type: "string" },
+          portalName: { type: "string" },
+          routePath: { type: "string" },
+          portalType: { type: "string" },
+          enabled: { type: "boolean" }
+        }
+      }
+    }
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-multi-portal",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.3",
   "main": "dist/server/index.js",
   "nocobase": {
     "supportedVersions": [
@@ -13,7 +13,7 @@
   "description.zh-CN": "为 Client V2 提供内置 Portal 注册、入口访问与路由权限管理。",
   "devDependencies": {
     "@ant-design/icons": "5.x",
-    "@nocobase/plugin-ui-layout": "3.0.0-alpha.1",
+    "@nocobase/plugin-ui-layout": "3.0.0-alpha.3",
     "ahooks": "3.x",
     "antd": "5.x",
     "react": "^18.2.0",
@@ -29,5 +29,5 @@
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x"
   },
-  "gitHead": "22d8be8ece179cfa5c8a4ebb2c896c92bd418e03"
+  "gitHead": "9899cd799c070c7bd85140148ea5b100b046bdc7"
 }