@nocobase/flow-engine 2.1.0-alpha.4 → 2.1.0-alpha.45

package/lib/runjs-context/setup.js

@@ -67,19 +67,27 @@ async function setupRunJSContexts() {
     import("./contexts/JSRecordActionRunJSContext"),
     import("./contexts/JSCollectionActionRunJSContext")
   ]);
-  const v1 = "v1";
-  import_registry.RunJSContextRegistry.register(v1, "*", import_flowContext.FlowRunJSContext);
-  import_registry.RunJSContextRegistry.register(v1, "JSBlockModel", JSBlockRunJSContext, { scenes: ["block"] });
-  import_registry.RunJSContextRegistry.register(v1, "JSFieldModel", JSFieldRunJSContext, { scenes: ["detail"] });
-  import_registry.RunJSContextRegistry.register(v1, "JSEditableFieldModel", JSEditableFieldRunJSContext, { scenes: ["form"] });
-  import_registry.RunJSContextRegistry.register(v1, "JSItemModel", JSItemRunJSContext, { scenes: ["form"] });
-  import_registry.RunJSContextRegistry.register(v1, "JSColumnModel", JSColumnRunJSContext, { scenes: ["table"] });
-  import_registry.RunJSContextRegistry.register(v1, "FormJSFieldItemModel", FormJSFieldItemRunJSContext, { scenes: ["form"] });
-  import_registry.RunJSContextRegistry.register(v1, "JSRecordActionModel", JSRecordActionRunJSContext, { scenes: ["table"] });
-  import_registry.RunJSContextRegistry.register(v1, "JSCollectionActionModel", JSCollectionActionRunJSContext, { scenes: ["table"] });
-  await (0, import_contributions.applyRunJSContextContributions)(v1);
+  const registerBuiltins = /* @__PURE__ */ __name((version) => {
+    import_registry.RunJSContextRegistry.register(version, "*", import_flowContext.FlowRunJSContext);
+    import_registry.RunJSContextRegistry.register(version, "JSBlockModel", JSBlockRunJSContext, { scenes: ["block"] });
+    import_registry.RunJSContextRegistry.register(version, "JSFieldModel", JSFieldRunJSContext, { scenes: ["detail"] });
+    import_registry.RunJSContextRegistry.register(version, "JSEditableFieldModel", JSEditableFieldRunJSContext, { scenes: ["form"] });
+    import_registry.RunJSContextRegistry.register(version, "JSItemModel", JSItemRunJSContext, { scenes: ["form"] });
+    import_registry.RunJSContextRegistry.register(version, "JSItemActionModel", JSItemRunJSContext, { scenes: ["table"] });
+    import_registry.RunJSContextRegistry.register(version, "JSColumnModel", JSColumnRunJSContext, { scenes: ["table"] });
+    import_registry.RunJSContextRegistry.register(version, "FormJSFieldItemModel", FormJSFieldItemRunJSContext, { scenes: ["form"] });
+    import_registry.RunJSContextRegistry.register(version, "JSRecordActionModel", JSRecordActionRunJSContext, { scenes: ["table"] });
+    import_registry.RunJSContextRegistry.register(version, "JSCollectionActionModel", JSCollectionActionRunJSContext, {
+      scenes: ["table"]
+    });
+  }, "registerBuiltins");
+  const versions = ["v1", "v2"];
+  for (const version of versions) {
+    registerBuiltins(version);
+    await (0, import_contributions.applyRunJSContextContributions)(version);
+    (0, import_contributions.markRunJSContextsSetupDone)(version);
+  }
   done = true;
-  (0, import_contributions.markRunJSContextsSetupDone)(v1);
 }
 __name(setupRunJSContexts, "setupRunJSContexts");
 // Annotate the CommonJS export names for ESM import in node:

package/lib/runjs-context/snippets/index.js

@@ -81,6 +81,7 @@ const snippets = {
   "scene/detail/status-tag": /* @__PURE__ */ __name(() => import("./scene/detail/status-tag.snippet"), "scene/detail/status-tag"),
   "scene/detail/relative-time": /* @__PURE__ */ __name(() => import("./scene/detail/relative-time.snippet"), "scene/detail/relative-time"),
   "scene/detail/percentage-bar": /* @__PURE__ */ __name(() => import("./scene/detail/percentage-bar.snippet"), "scene/detail/percentage-bar"),
+  "scene/detail/set-field-style": /* @__PURE__ */ __name(() => import("./scene/detail/set-field-style.snippet"), "scene/detail/set-field-style"),
   // scene/form
   "scene/form/render-basic": /* @__PURE__ */ __name(() => import("./scene/form/render-basic.snippet"), "scene/form/render-basic"),
   "scene/form/set-field-value": /* @__PURE__ */ __name(() => import("./scene/form/set-field-value.snippet"), "scene/form/set-field-value"),
@@ -98,7 +99,8 @@ const snippets = {
   "scene/table/collection-selected-count": /* @__PURE__ */ __name(() => import("./scene/table/collection-selected-count.snippet"), "scene/table/collection-selected-count"),
   "scene/table/iterate-selected-rows": /* @__PURE__ */ __name(() => import("./scene/table/iterate-selected-rows.snippet"), "scene/table/iterate-selected-rows"),
   "scene/table/destroy-selected": /* @__PURE__ */ __name(() => import("./scene/table/destroy-selected.snippet"), "scene/table/destroy-selected"),
-  "scene/table/export-selected-json": /* @__PURE__ */ __name(() => import("./scene/table/export-selected-json.snippet"), "scene/table/export-selected-json")
+  "scene/table/export-selected-json": /* @__PURE__ */ __name(() => import("./scene/table/export-selected-json.snippet"), "scene/table/export-selected-json"),
+  "scene/table/set-cell-style": /* @__PURE__ */ __name(() => import("./scene/table/set-cell-style.snippet"), "scene/table/set-cell-style")
 };
 var snippets_default = snippets;
 function registerRunJSSnippet(ref, loader, options) {
@@ -131,10 +133,19 @@ function normalizeScenes(def, key) {
   return [];
 }
 __name(normalizeScenes, "normalizeScenes");
+function normalizeSceneGroup(scene) {
+  const mapping = {
+    detailFieldEvent: "detail",
+    tableFieldEvent: "table",
+    formFieldEvent: "form"
+  };
+  return mapping[scene] || scene;
+}
+__name(normalizeSceneGroup, "normalizeSceneGroup");
 function computeGroups(def, key) {
   const scenes = normalizeScenes(def, key);
   if (scenes.length) {
-    return scenes.map((scene) => `scene/${scene}`);
+    return Array.from(new Set(scenes.map((scene) => `scene/${normalizeSceneGroup(scene)}`)));
   }
   const parts = key.split("/");
   if (!parts.length) return [];

package/lib/runjs-context/snippets/scene/detail/set-field-style.snippet.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 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 { SnippetModule } from '../../types';
+declare const snippet: SnippetModule;
+export default snippet;

package/lib/runjs-context/snippets/scene/detail/set-field-style.snippet.js

@@ -0,0 +1,50 @@
+/**
+ * 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 set_field_style_snippet_exports = {};
+__export(set_field_style_snippet_exports, {
+  default: () => set_field_style_snippet_default
+});
+module.exports = __toCommonJS(set_field_style_snippet_exports);
+const snippet = {
+  contexts: ["*"],
+  scenes: ["detailFieldEvent", "formFieldEvent"],
+  prefix: "sn-item-style",
+  label: "Set form item/details item style",
+  description: "Customize form item and details item container styles",
+  locales: {
+    "zh-CN": {
+      label: "\u8BBE\u7F6E\u8868\u5355\u9879/\u8BE6\u60C5\u9879\u6837\u5F0F",
+      description: "\u81EA\u5B9A\u4E49\u8868\u5355\u9879\u548C\u8BE6\u60C5\u9879\u5BB9\u5668\u6837\u5F0F"
+    }
+  },
+  content: `
+ctx.model.props.style = {
+  background: 'red',
+};
+`
+};
+var set_field_style_snippet_default = snippet;

package/lib/runjs-context/snippets/scene/table/set-cell-style.snippet.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 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 { SnippetModule } from '../../types';
+declare const snippet: SnippetModule;
+export default snippet;

package/lib/runjs-context/snippets/scene/table/set-cell-style.snippet.js

@@ -0,0 +1,54 @@
+/**
+ * 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 set_cell_style_snippet_exports = {};
+__export(set_cell_style_snippet_exports, {
+  default: () => set_cell_style_snippet_default
+});
+module.exports = __toCommonJS(set_cell_style_snippet_exports);
+const snippet = {
+  contexts: ["*"],
+  scenes: ["tableFieldEvent"],
+  prefix: "sn-table-cell-style",
+  label: "Set table cell style",
+  description: "Customize table field cell styles with onCell",
+  locales: {
+    "zh-CN": {
+      label: "\u8868\u683C\u5B57\u6BB5\u6837\u5F0F\u8BBE\u7F6E",
+      description: "\u901A\u8FC7 onCell \u81EA\u5B9A\u4E49\u8868\u683C\u5B57\u6BB5\u5355\u5143\u683C\u6837\u5F0F"
+    }
+  },
+  content: `
+ctx.model.props.onCell = (record, rowIndex) => {
+  return {
+    style: {
+      background: 'red',
+    },
+  };
+};
+`
+};
+var set_cell_style_snippet_default = snippet;

package/lib/scheduler/ModelOperationScheduler.d.ts

@@ -9,7 +9,10 @@
 import type { FlowEngine } from '../flowEngine';
 import type { FlowModel } from '../models/flowModel';
 type LifecycleType = 'created' | 'mounted' | 'unmounted' | 'destroyed' | `event:${string}:start` | `event:${string}:end` | `event:${string}:error`;
-export type ScheduleWhen = LifecycleType | ((e: LifecycleEvent) => boolean);
+type EventPredicateWhen = ((e: LifecycleEvent) => boolean) & {
+    __eventType?: string;
+};
+export type ScheduleWhen = LifecycleType | EventPredicateWhen;
 export interface ScheduleOptions {
     when?: ScheduleWhen;
 }
@@ -22,6 +25,7 @@ export interface LifecycleEvent {
     error?: any;
     inputArgs?: Record<string, any>;
     result?: any;
+    aborted?: boolean;
     flowKey?: string;
     stepKey?: string;
 }

package/lib/scheduler/ModelOperationScheduler.js

@@ -171,8 +171,9 @@ const _ModelOperationScheduler = class _ModelOperationScheduler {
     this.unbindHandlers.push(() => emitter.off("model:destroyed", onDestroyed));
   }
   ensureEventSubscriptionIfNeeded(when) {
-    if (!when || typeof when !== "string") return;
-    const parsed = this.parseEventWhen(when);
+    const eventType = typeof when === "string" ? when : typeof when === "function" ? when.__eventType : void 0;
+    if (!eventType) return;
+    const parsed = this.parseEventWhen(eventType);
     if (!parsed) return;
     const { name } = parsed;
     if (this.subscribedEventNames.has(name)) return;

package/lib/types.d.ts

@@ -120,7 +120,9 @@ export declare enum ActionScene {
     /** 按钮级联动规则可用 */
     ACTION_LINKAGE_RULES = 5,
     /** 动态事件流可用 */
-    DYNAMIC_EVENT_FLOW = 6
+    DYNAMIC_EVENT_FLOW = 6,
+    /** 菜单项联动规则可用 */
+    MENU_LINKAGE_RULES = 7
 }
 /**
  * Defines a reusable action with generic model type support.
@@ -177,7 +179,7 @@ export interface ActionDefinition<TModel extends FlowModel = FlowModel, TCtx ext
  * - 收录内置常用事件，便于智能提示；
  * - 允许扩展字符串以保持向后兼容。
  */
-export type FlowEventName = 'click' | 'submit' | 'reset' | 'remove' | 'openView' | 'dropdownOpen' | 'popupScroll' | 'search' | 'customRequest' | 'collapseToggle' | (string & {});
+export type FlowEventName = 'click' | 'close' | 'submit' | 'reset' | 'remove' | 'openView' | 'dropdownOpen' | 'popupScroll' | 'search' | 'customRequest' | 'collapseToggle' | (string & {});
 /**
  * 事件流的执行时机（phase）。
  *
@@ -303,6 +305,52 @@ export interface CreateModelOptions {
     delegateToParent?: boolean;
     [key: string]: any;
 }
+/**
+ * FlowModel loader result.
+ * Supports returning the model constructor directly, a default export, or a module object containing the named export.
+ */
+export type FlowModelLoaderResult = ModelConstructor | {
+    default?: ModelConstructor;
+    [key: string]: unknown;
+} | Record<string, unknown>;
+/**
+ * FlowModel loader function.
+ */
+export type FlowModelLoader = () => Promise<FlowModelLoaderResult>;
+/**
+ * FlowModel loader entry (normalized internal form).
+ */
+export interface FlowModelLoaderEntry {
+    loader: FlowModelLoader;
+    extends?: string[];
+}
+/**
+ * FlowModel loader input (user-facing form for registerModelLoaders).
+ * The `extends` field accepts flexible formats that will be normalized to `string[]` at registration time.
+ */
+export interface FlowModelLoaderInput {
+    loader: FlowModelLoader;
+    extends?: string | ModelConstructor | (string | ModelConstructor)[];
+}
+/**
+ * FlowModel loader entry map (normalized internal form).
+ */
+export type FlowModelLoaderMap = Record<string, FlowModelLoaderEntry>;
+/**
+ * FlowModel loader input map (user-facing form for registerModelLoaders).
+ */
+export type FlowModelLoaderInputMap = Record<string, FlowModelLoaderInput>;
+/**
+ * Batch ensure result.
+ */
+export interface EnsureBatchResult {
+    requested: string[];
+    loaded: string[];
+    failed: Array<{
+        name: string;
+        error?: unknown;
+    }>;
+}
 export interface IFlowModelRepository<T extends FlowModel = FlowModel> {
     findOne(query: Record<string, any>): Promise<Record<string, any> | null>;
     save(model: T, options?: {

package/lib/types.js

@@ -36,6 +36,7 @@ var ActionScene = /* @__PURE__ */ ((ActionScene2) => {
   ActionScene2[ActionScene2["DETAILS_FIELD_LINKAGE_RULES"] = 4] = "DETAILS_FIELD_LINKAGE_RULES";
   ActionScene2[ActionScene2["ACTION_LINKAGE_RULES"] = 5] = "ACTION_LINKAGE_RULES";
   ActionScene2[ActionScene2["DYNAMIC_EVENT_FLOW"] = 6] = "DYNAMIC_EVENT_FLOW";
+  ActionScene2[ActionScene2["MENU_LINKAGE_RULES"] = 7] = "MENU_LINKAGE_RULES";
   return ActionScene2;
 })(ActionScene || {});
 // Annotate the CommonJS export names for ESM import in node:

package/lib/utils/createCollectionContextMeta.js

@@ -32,6 +32,10 @@ __export(createCollectionContextMeta_exports, {
 module.exports = __toCommonJS(createCollectionContextMeta_exports);
 const RELATION_FIELD_TYPES = ["belongsTo", "hasOne", "hasMany", "belongsToMany", "belongsToArray"];
 const NUMERIC_FIELD_TYPES = ["integer", "float", "double", "decimal"];
+function shouldShowFieldInMeta(field, includeNonFilterable) {
+  return Boolean(field.interface && (includeNonFilterable || field.filterable));
+}
+__name(shouldShowFieldInMeta, "shouldShowFieldInMeta");
 function createFieldMetadata(field, includeNonFilterable) {
   const baseProperties = createMetaBaseProperties(field);
   if (field.isAssociationField()) {
@@ -49,7 +53,7 @@ function createFieldMetadata(field, includeNonFilterable) {
       properties: /* @__PURE__ */ __name(async () => {
         const subProperties = {};
         targetCollection.fields.forEach((subField) => {
-          if (includeNonFilterable || subField.filterable) {
+          if (shouldShowFieldInMeta(subField, includeNonFilterable)) {
             subProperties[subField.name] = createFieldMetadata(subField, includeNonFilterable);
           }
         });
@@ -104,7 +108,7 @@ function createCollectionContextMeta(collectionOrFactory, title, includeNonFilte
       properties: /* @__PURE__ */ __name(async () => {
         const properties = {};
         collection.fields.forEach((field) => {
-          if (includeNonFilterable || field.filterable) {
+          if (shouldShowFieldInMeta(field, includeNonFilterable)) {
             properties[field.name] = createFieldMetadata(field, includeNonFilterable);
           }
         });

package/lib/utils/index.d.ts

@@ -8,11 +8,11 @@
  */
 export { BLOCK_GROUP_CONFIGS, BLOCK_TYPES, FLOW_ENGINE_NAMESPACE, MENU_KEYS, type BlockBuilderConfig, } from './constants';
 export { escapeT, getT, tExpr } from './translation';
-export { FlowCancelSaveException, FlowExitException } from './exceptions';
+export { FlowCancelSaveException, FlowExitAllException, FlowExitException } from './exceptions';
 export { defineAction } from './flow-definitions';
 export { isInheritedFrom } from './inheritance';
 export { resolveCreateModelOptions, resolveDefaultParams, resolveExpressions } from './params-resolvers';
-export { compileUiSchema, resolveStepUiSchema, resolveStepDisabledInSettings, resolveUiMode, shouldHideStepInSettings, } from './schema-utils';
+export { compileUiSchema, resolveStepUiSchema, resolveStepDisabledInSettings, resolveUiMode, shouldHideEventInSettings, shouldHideStepInSettings, } from './schema-utils';
 export { setupRuntimeContextSteps } from './setupRuntimeContextSteps';
 export { createCollectionContextMeta } from './createCollectionContextMeta';
 export { createAssociationAwareObjectMetaFactory, createAssociationSubpathResolver } from './associationObjectVariable';
@@ -29,3 +29,4 @@ export { createEphemeralContext } from './createEphemeralContext';
 export { pruneFilter } from './pruneFilter';
 export { isBeforeRenderFlow } from './flows';
 export { resolveModuleUrl, isCssFile } from './resolveModuleUrl';
+export { randomId } from './randomId';

package/lib/utils/index.js

@@ -30,6 +30,7 @@ __export(utils_exports, {
   BLOCK_TYPES: () => import_constants.BLOCK_TYPES,
   FLOW_ENGINE_NAMESPACE: () => import_constants.FLOW_ENGINE_NAMESPACE,
   FlowCancelSaveException: () => import_exceptions.FlowCancelSaveException,
+  FlowExitAllException: () => import_exceptions.FlowExitAllException,
   FlowExitException: () => import_exceptions.FlowExitException,
   MENU_KEYS: () => import_constants.MENU_KEYS,
   buildRecordMeta: () => import_variablesParams.buildRecordMeta,
@@ -73,6 +74,7 @@ __export(utils_exports, {
   prepareRunJsCode: () => import_runjsTemplateCompat.prepareRunJsCode,
   preprocessRunJsTemplates: () => import_runjsTemplateCompat.preprocessRunJsTemplates,
   pruneFilter: () => import_pruneFilter.pruneFilter,
+  randomId: () => import_randomId.randomId,
   resolveCreateModelOptions: () => import_params_resolvers.resolveCreateModelOptions,
   resolveCtxDatePath: () => import_dateVariable.resolveCtxDatePath,
   resolveDefaultParams: () => import_params_resolvers.resolveDefaultParams,
@@ -86,6 +88,7 @@ __export(utils_exports, {
   serializeCtxDateValue: () => import_dateVariable.serializeCtxDateValue,
   setAutoFlowError: () => import_autoFlowError.setAutoFlowError,
   setupRuntimeContextSteps: () => import_setupRuntimeContextSteps.setupRuntimeContextSteps,
+  shouldHideEventInSettings: () => import_schema_utils.shouldHideEventInSettings,
   shouldHideStepInSettings: () => import_schema_utils.shouldHideStepInSettings,
   tExpr: () => import_translation.tExpr
 });
@@ -113,12 +116,14 @@ var import_createEphemeralContext = require("./createEphemeralContext");
 var import_pruneFilter = require("./pruneFilter");
 var import_flows = require("./flows");
 var import_resolveModuleUrl = require("./resolveModuleUrl");
+var import_randomId = require("./randomId");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BLOCK_GROUP_CONFIGS,
   BLOCK_TYPES,
   FLOW_ENGINE_NAMESPACE,
   FlowCancelSaveException,
+  FlowExitAllException,
   FlowExitException,
   MENU_KEYS,
   buildRecordMeta,
@@ -162,6 +167,7 @@ var import_resolveModuleUrl = require("./resolveModuleUrl");
   prepareRunJsCode,
   preprocessRunJsTemplates,
   pruneFilter,
+  randomId,
   resolveCreateModelOptions,
   resolveCtxDatePath,
   resolveDefaultParams,
@@ -175,6 +181,7 @@ var import_resolveModuleUrl = require("./resolveModuleUrl");
   serializeCtxDateValue,
   setAutoFlowError,
   setupRuntimeContextSteps,
+  shouldHideEventInSettings,
   shouldHideStepInSettings,
   tExpr
 });

package/lib/utils/parsePathnameToViewParams.d.ts

@@ -16,6 +16,10 @@ export interface ViewParam {
     /** source Id */
     sourceId?: string;
 }
+export interface ParsePathnameToViewParamsOptions {
+    rootPrefix?: string;
+    basePath?: string;
+}
 /**
  * 解析路径名为视图参数数组
  *
@@ -31,4 +35,4 @@ export interface ViewParam {
  * parsePathnameToViewParams('/admin/xxx/view/yyy') // [{ viewUid: 'xxx' }, { viewUid: 'yyy' }]
  * ```
  */
-export declare const parsePathnameToViewParams: (pathname: string) => ViewParam[];
+export declare const parsePathnameToViewParams: (pathname: string, options?: ParsePathnameToViewParamsOptions) => ViewParam[];

package/lib/utils/parsePathnameToViewParams.js

@@ -30,20 +30,44 @@ __export(parsePathnameToViewParams_exports, {
   parsePathnameToViewParams: () => parsePathnameToViewParams
 });
 module.exports = __toCommonJS(parsePathnameToViewParams_exports);
-const parsePathnameToViewParams = /* @__PURE__ */ __name((pathname) => {
+const normalizePathname = /* @__PURE__ */ __name((pathname) => {
+  if (!pathname || pathname === "/") {
+    return "/";
+  }
+  return `/${pathname.replace(/^\/+/, "").replace(/\/+$/, "")}`;
+}, "normalizePathname");
+const normalizeBasePath = /* @__PURE__ */ __name((basePath) => `/${basePath.replace(/^\/+/, "").replace(/\/+$/, "")}`, "normalizeBasePath");
+const stripBasePath = /* @__PURE__ */ __name((pathname, basePath) => {
+  const normalizedPathname = normalizePathname(pathname);
+  const normalizedBasePath = normalizeBasePath(basePath);
+  if (normalizedPathname === normalizedBasePath) {
+    return "";
+  }
+  if (normalizedPathname.startsWith(`${normalizedBasePath}/`)) {
+    return normalizedPathname.slice(normalizedBasePath.length + 1);
+  }
+  return "";
+}, "stripBasePath");
+const parsePathnameToViewParams = /* @__PURE__ */ __name((pathname, options = {}) => {
   if (!pathname || pathname === "/") {
     return [];
   }
-  const segments = pathname.replace(/^\/+/, "").split("/").filter(Boolean);
-  if (segments.length < 2) {
+  const rootPrefix = options.rootPrefix || "admin";
+  const relativePath = options.basePath ? stripBasePath(pathname, options.basePath) : "";
+  const segments = (options.basePath ? relativePath : pathname).replace(/^\/+/, "").split("/").filter(Boolean);
+  if (segments.length < (options.basePath ? 1 : 2)) {
     return [];
   }
   const result = [];
   let currentView = null;
   let i = 0;
+  if (options.basePath) {
+    currentView = { viewUid: segments[0] };
+    i = 1;
+  }
   while (i < segments.length) {
     const segment = segments[i];
-    if (segment === "admin" || segment === "view") {
+    if (segment === rootPrefix || segment === "view") {
       if (currentView) {
         result.push(currentView);
       }
@@ -92,7 +116,7 @@ const parsePathnameToViewParams = /* @__PURE__ */ __name((pathname) => {
             } catch (_) {
               parsed = decoded;
             }
-          } else if (decoded && decoded.includes("=") && decoded.includes("&")) {
+          } else if (decoded && /^[^=&]+=[^=&]*(?:&[^=&]+=[^=&]*)*$/.test(decoded)) {
             parsed = parseKeyValuePairs(decoded);
           }
           currentView.filterByTk = parsed;

package/lib/utils/randomId.d.ts

@@ -0,0 +1,39 @@
+/**
+ * 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.
+ */
+/**
+ * Generate a random base36 identifier with an optional semantic prefix.
+ *
+ * Equivalent in shape to v1's `uid()` from `@formily/shared` (11 chars
+ * of `[0-9a-z]`), with an opt-in prefix appended at the front. v2 forbids
+ * direct `@formily/*` imports in `src/client-v2/`, so this helper is the
+ * single substitute the rest of the codebase should reach for.
+ *
+ * Common semantic prefixes observed across the codebase — pass the one
+ * that matches your domain rather than relying on a default, so the
+ * intent is explicit at the call site:
+ *
+ *   - `s_` — service / settings record (authenticators, channels, …)
+ *   - `v_` — verifier / variable / LLM service
+ *   - `f_` — field
+ *   - `t_` — through table
+ *
+ * Example:
+ *
+ * ```ts
+ * import { randomId } from '@nocobase/flow-engine';
+ *
+ * name: randomId('s_'),  // → 's_keeoaui1ubi'
+ * name: randomId('v_'),  // → 'v_a8f3kp2x9qm'
+ * name: randomId(),      // → 'a8f3kp2x9qm'
+ * ```
+ *
+ * Not cryptographically secure — uses `Math.random()`. Good enough for
+ * unique form names / schema keys, NOT for security tokens.
+ */
+export declare function randomId(prefix?: string, length?: number): string;

package/lib/utils/randomId.js

@@ -0,0 +1,45 @@
+/**
+ * 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 __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+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 randomId_exports = {};
+__export(randomId_exports, {
+  randomId: () => randomId
+});
+module.exports = __toCommonJS(randomId_exports);
+const CHARSET = "0123456789abcdefghijklmnopqrstuvwxyz";
+function randomId(prefix = "", length = 11) {
+  let id = "";
+  for (let i = 0; i < length; i++) {
+    id += CHARSET[Math.random() * CHARSET.length | 0];
+  }
+  return `${prefix}${id}`;
+}
+__name(randomId, "randomId");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  randomId
+});

package/lib/utils/runjsTemplateCompat.js

@@ -527,8 +527,8 @@ function extractUsedCtxLibKeys(code) {
 }
 __name(extractUsedCtxLibKeys, "extractUsedCtxLibKeys");
 function injectEnsureLibsPreamble(code) {
-  if (!CTX_LIBS_MARKER_RE.test(code)) return code;
   if (ENSURE_LIBS_MARKER_RE.test(code)) return code;
+  if (!CTX_LIBS_MARKER_RE.test(code)) return code;
   const keys = extractUsedCtxLibKeys(code);
   if (!keys.length) return code;
   return `/* __runjs_ensure_libs */