@nocobase/plugin-client 2.2.0-beta.8 → 2.2.0-beta.9

package/dist/externalVersion.js

@@ -10,13 +10,13 @@
 module.exports = {
   "react": "18.2.0",
   "react-i18next": "11.18.6",
-  "@nocobase/client": "2.2.0-beta.8",
+  "@nocobase/client": "2.2.0-beta.9",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
   "@formily/react": "2.3.7",
-  "@nocobase/utils": "2.2.0-beta.8",
+  "@nocobase/utils": "2.2.0-beta.9",
   "lodash": "4.18.1",
-  "@nocobase/database": "2.2.0-beta.8",
-  "@nocobase/client-v2": "2.2.0-beta.8",
-  "@nocobase/server": "2.2.0-beta.8"
+  "@nocobase/database": "2.2.0-beta.9",
+  "@nocobase/client-v2": "2.2.0-beta.9",
+  "@nocobase/server": "2.2.0-beta.9"
 };

package/dist/locale/en-US.json

@@ -907,6 +907,7 @@
   "No blocks to connect": "No blocks to connect",
   "No camera device detected": "No camera device detected",
   "No configuration available.": "No configuration available.",
+  "No configured entries": "No configured entries",
   "No available data currently": "No available data currently",
   "No data": "No data",
   "No event flows": "No event flows",

package/dist/locale/zh-CN.json

@@ -905,6 +905,7 @@
   "No blocks to connect": "没有可连接的区块",
   "No camera device detected": "未检测到摄像头设备",
   "No configuration available.": "无可配置项。",
+  "No configured entries": "未配置入口",
   "No available data currently": "当前无可用数据",
   "No data": "暂无数据",
   "No event flows": "暂无事件流",

package/dist/node_modules/cronstrue/package.json

@@ -1 +1 @@
-{"name":"cronstrue","title":"cRonstrue","version":"2.47.0","description":"Convert cron expressions into human readable descriptions","author":"Brady Holt","license":"MIT","bugs":{"url":"https://github.com/bradymholt/cronstrue/issues"},"homepage":"https://github.com/bradymholt/cronstrue","keywords":["cron","cronjob","crontab","schedule","parser","cron expression","cron description","pretty cron","cron for humans","cron translated","cron english","cron schedule","cron english","cron schedule"],"main":"dist/cronstrue.js","bin":{"cronstrue":"bin/cli.js"},"typings":"dist/cronstrue.d.ts","files":["dist/","locales/","i18n.js","i18n.d.ts"],"repository":{"type":"git","url":"git+https://github.com/bradymholt/cronstrue.git"},"publishConfig":{"access":"public"},"prettier":{"printWidth":120},"devDependencies":{"@types/chai":"^4.2.11","@types/mocha":"^8.0.0","chai":"^4.2.0","handlebars":"^4.7.6","marked":"^4.0.10","mocha":"^10.1.0","pixl-xml":"^1.0.13","prettier":"^2.1.1","terser-webpack-plugin":"^5.3.1","ts-loader":"^9.2.6","ts-node":"^10.5.0","typescript":"^4.6.2","webpack":"^5.69.1","webpack-cli":"^4.9.2","xml2js":"^0.5.0"},"scripts":{"start":"npm run build","build":"npx tsc -p ./src --emitDeclarationOnly","test":"npx mocha --reporter spec --require ts-node/register \"./test/**/*.ts\"","prepublishOnly":"rm -rf ./dist && ./node_modules/webpack-cli/bin/cli.js && git add -A"},"dependencies":{},"_lastModified":"2026-06-29T01:53:22.941Z"}
+{"name":"cronstrue","title":"cRonstrue","version":"2.47.0","description":"Convert cron expressions into human readable descriptions","author":"Brady Holt","license":"MIT","bugs":{"url":"https://github.com/bradymholt/cronstrue/issues"},"homepage":"https://github.com/bradymholt/cronstrue","keywords":["cron","cronjob","crontab","schedule","parser","cron expression","cron description","pretty cron","cron for humans","cron translated","cron english","cron schedule","cron english","cron schedule"],"main":"dist/cronstrue.js","bin":{"cronstrue":"bin/cli.js"},"typings":"dist/cronstrue.d.ts","files":["dist/","locales/","i18n.js","i18n.d.ts"],"repository":{"type":"git","url":"git+https://github.com/bradymholt/cronstrue.git"},"publishConfig":{"access":"public"},"prettier":{"printWidth":120},"devDependencies":{"@types/chai":"^4.2.11","@types/mocha":"^8.0.0","chai":"^4.2.0","handlebars":"^4.7.6","marked":"^4.0.10","mocha":"^10.1.0","pixl-xml":"^1.0.13","prettier":"^2.1.1","terser-webpack-plugin":"^5.3.1","ts-loader":"^9.2.6","ts-node":"^10.5.0","typescript":"^4.6.2","webpack":"^5.69.1","webpack-cli":"^4.9.2","xml2js":"^0.5.0"},"scripts":{"start":"npm run build","build":"npx tsc -p ./src --emitDeclarationOnly","test":"npx mocha --reporter spec --require ts-node/register \"./test/**/*.ts\"","prepublishOnly":"rm -rf ./dist && ./node_modules/webpack-cli/bin/cli.js && git add -A"},"dependencies":{},"_lastModified":"2026-07-06T02:55:10.251Z"}

package/dist/server/appPortals.d.ts

@@ -0,0 +1,33 @@
+/**
+ * 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.
+ */
+import type { AppStatus } from '@nocobase/server';
+export type AppPortalAppStatus = AppStatus | Record<string, AppStatus> | null;
+export type AppPortalAppItem = {
+    name: string;
+    title?: string | null;
+    icon?: string | null;
+    cname?: string | null;
+    ssoEnabled?: boolean;
+    target?: string;
+    status?: AppPortalAppStatus;
+};
+export type AppPortalItem = {
+    uid?: string | null;
+    appName: string;
+    title?: string | null;
+    icon?: string | null;
+    routePath: string;
+    layout?: string | null;
+    defaultPortal?: boolean;
+};
+export type StoredAppPortalItem = Omit<AppPortalItem, 'appName' | 'defaultPortal'>;
+export declare function listAppPortals(currentAppName?: string | null): Promise<{
+    apps: AppPortalAppItem[];
+    portals: AppPortalItem[];
+}>;

package/dist/server/appPortals.js

@@ -0,0 +1,168 @@
+/**
+ * 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 appPortals_exports = {};
+__export(appPortals_exports, {
+  listAppPortals: () => listAppPortals
+});
+module.exports = __toCommonJS(appPortals_exports);
+var import_server = require("@nocobase/server");
+const MAIN_APP_NAME = "main";
+const MULTI_PORTAL_MANIFEST_NAMESPACE = "multi-portal";
+const DEFAULT_PORTALS = [
+  {
+    uid: "__default_admin__",
+    title: "Admin",
+    icon: "DesktopOutlined",
+    routePath: "/admin",
+    layout: "desktop",
+    defaultPortal: true
+  },
+  {
+    uid: "__default_mobile__",
+    title: "Mobile",
+    icon: "MobileOutlined",
+    routePath: "/mobile",
+    layout: "mobile",
+    defaultPortal: true
+  }
+];
+function getCname(cname) {
+  const trimmed = cname == null ? void 0 : cname.trim();
+  return trimmed || null;
+}
+function getAppName(appModel) {
+  return typeof appModel.name === "string" && appModel.name ? appModel.name : null;
+}
+function getAppStatus(appName, statuses) {
+  return statuses[appName] ?? null;
+}
+function shouldUseCnameVisitUrl(options) {
+  const { cname, ssoEnabled, ssoCnameEnabled } = options;
+  return Boolean(cname && (!ssoEnabled || ssoCnameEnabled));
+}
+function toAppPortalAppItem(appModel, appSsoIssuer, target) {
+  var _a, _b, _c, _d;
+  const name = getAppName(appModel);
+  if (!name || name === MAIN_APP_NAME) {
+    return null;
+  }
+  const cname = getCname(appModel.cname);
+  const ssoEnabled = ((_b = (_a = appModel.options) == null ? void 0 : _a.sso) == null ? void 0 : _b.enabled) === true;
+  const ssoCnameEnabled = Boolean(((_d = (_c = appModel.options) == null ? void 0 : _c.sso) == null ? void 0 : _d.issuer) || appSsoIssuer);
+  return {
+    name,
+    title: appModel.title || name,
+    icon: appModel.icon || null,
+    cname: shouldUseCnameVisitUrl({ cname, ssoEnabled, ssoCnameEnabled }) ? cname : null,
+    ssoEnabled,
+    target
+  };
+}
+function getPortalKey(item) {
+  return item.uid ? `${item.appName}:${item.uid}` : `${item.appName}:${item.routePath}`;
+}
+function addPortal(portals, item) {
+  if (!item.appName || !item.routePath) {
+    return;
+  }
+  portals.set(getPortalKey(item), item);
+}
+function addDefaultPortals(portals, appNames) {
+  for (const appName of appNames) {
+    for (const portal of DEFAULT_PORTALS) {
+      addPortal(portals, {
+        ...portal,
+        appName
+      });
+    }
+  }
+}
+function addStoredPortals(portals, appName, storedPortals) {
+  if (!Array.isArray(storedPortals)) {
+    return;
+  }
+  for (const portal of storedPortals) {
+    if (!portal || typeof portal.routePath !== "string" || !portal.routePath) {
+      continue;
+    }
+    addPortal(portals, {
+      uid: typeof portal.uid === "string" ? portal.uid : null,
+      appName,
+      title: typeof portal.title === "string" ? portal.title : null,
+      icon: typeof portal.icon === "string" ? portal.icon : null,
+      routePath: portal.routePath,
+      layout: typeof portal.layout === "string" ? portal.layout : null
+    });
+  }
+}
+async function listAppPortals(currentAppName) {
+  const supervisor = import_server.AppSupervisor.getInstance();
+  const appModels = await supervisor.listAppModels();
+  const apps = /* @__PURE__ */ new Map();
+  const appNames = /* @__PURE__ */ new Set([MAIN_APP_NAME]);
+  const target = currentAppName === MAIN_APP_NAME ? "_blank" : void 0;
+  const appSsoIssuer = supervisor.getAppSsoIssuer();
+  const appItems = appModels.map((appModel) => toAppPortalAppItem(appModel, appSsoIssuer, target));
+  if (currentAppName) {
+    appNames.add(currentAppName);
+  }
+  for (const app of appItems) {
+    if (!app) {
+      continue;
+    }
+    apps.set(app.name, app);
+    appNames.add(app.name);
+  }
+  if (appNames.size > 1 && !apps.has(MAIN_APP_NAME)) {
+    apps.set(MAIN_APP_NAME, {
+      name: MAIN_APP_NAME,
+      title: "Main",
+      icon: null
+    });
+  }
+  const appStatuses = await supervisor.getAppsStatuses(Array.from(appNames));
+  for (const app of apps.values()) {
+    app.status = getAppStatus(app.name, appStatuses);
+  }
+  const manifests = await supervisor.getAppManifests(
+    MULTI_PORTAL_MANIFEST_NAMESPACE,
+    Array.from(appNames)
+  );
+  const portals = /* @__PURE__ */ new Map();
+  addDefaultPortals(portals, appNames);
+  for (const appName of appNames) {
+    addStoredPortals(portals, appName, manifests[appName]);
+  }
+  return {
+    apps: [...apps.values()],
+    portals: [...portals.values()]
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  listAppPortals
+});

package/dist/server/server.js

@@ -45,6 +45,7 @@ var import_utils = require("@nocobase/utils");
 var import_lodash = __toESM(require("lodash"));
 var process = __toESM(require("node:process"));
 var import_path = require("path");
+var import_appPortals = require("./appPortals");
 var import_antd = require("./antd");
 var import_cron = require("./cron");
 var import_cronstrue = require("./cronstrue");
@@ -80,6 +81,7 @@ class PluginClientServer extends import_server.Plugin {
     });
     this.app.acl.allow("app", "getLang");
     this.app.acl.allow("app", "getInfo");
+    this.app.acl.allow("app", "getPortals", "loggedIn");
     this.app.acl.registerSnippet({
       name: "app",
       actions: ["app:restart", "app:refresh", "app:clearCache", "app:publishEvent"]
@@ -128,6 +130,11 @@ class PluginClientServer extends import_server.Plugin {
           };
           await next();
         },
+        getPortals: async (ctx, next) => {
+          var _a;
+          ctx.body = await (0, import_appPortals.listAppPortals)((_a = ctx.app) == null ? void 0 : _a.name);
+          await next();
+        },
         async clearCache(ctx, next) {
           await ctx.cache.reset();
           await next();
@@ -153,7 +160,7 @@ class PluginClientServer extends import_server.Plugin {
           }
           const { id, username } = ((_c = ctx.auth) == null ? void 0 : _c.user) ?? {};
           const user = id ? { id, username } : void 0;
-          const eventName = `${command}@${plugin}`;
+          const eventName = `${command.replaceAll(":", ".")}.${plugin}`;
           try {
             await ctx.app.eventQueue.publish(eventName, {
               plugin,

package/package.json

@@ -6,7 +6,7 @@
   "description": "Provides a client interface for the NocoBase server",
   "description.ru-RU": "Предоставляет клиентский интерфейс для сервера NocoBase",
   "description.zh-CN": "为 NocoBase 服务端提供客户端界面",
-  "version": "2.2.0-beta.8",
+  "version": "2.2.0-beta.9",
   "main": "./dist/server/index.js",
   "license": "Apache-2.0",
   "devDependencies": {
@@ -23,5 +23,5 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "fa2502c1e9faf6d74b3f51b42dbc6546638d46af"
+  "gitHead": "60e3d7abbaa0c7cead76f71a4f3d5eedb6b8acdb"
 }