@nocobase/flow-engine 2.0.0-beta.9 → 2.0.1

package/src/flowEngine.ts

@@ -119,6 +119,18 @@ export class FlowEngine {
 
   private _resources = new Map<string, typeof FlowResource>();
 
+  /**
+   * Data change registry used to coordinate "refresh on active" across view-scoped engines.
+   *
+   * Keyed by: dataSourceKey -> resourceName -> version.
+   * - mark: increments version
+   * - get: returns current version (default 0)
+   *
+   * NOTE: ViewScopedFlowEngine proxies delegate non-local fields/methods to parents, so this
+   * registry naturally lives on the root engine instance and is shared across the whole view stack.
+   */
+  private _dataSourceDirtyVersions: Map<string, Map<string, number>> = new Map();
+
   /**
    * 引擎事件总线（目前用于模型生命周期等事件）。
    * ViewScopedFlowEngine 持有自己的实例，实现作用域隔离。
@@ -198,6 +210,35 @@ export class FlowEngine {
     }
   }
 
+  /**
+   * Mark a data source resource as "dirty" (changed).
+   * This is used by data blocks to decide whether to refresh when a view becomes active.
+   */
+  public markDataSourceDirty(dataSourceKey: string, resourceName: string): number {
+    const dsKey = String(dataSourceKey || 'main');
+    const resName = String(resourceName || '');
+    if (!resName) return this.getDataSourceDirtyVersion(dsKey, resName);
+
+    const ds = this._dataSourceDirtyVersions.get(dsKey) || new Map<string, number>();
+    if (!this._dataSourceDirtyVersions.has(dsKey)) {
+      this._dataSourceDirtyVersions.set(dsKey, ds);
+    }
+    const next = (ds.get(resName) || 0) + 1;
+    ds.set(resName, next);
+    return next;
+  }
+
+  /**
+   * Get current dirty version for a data source resource.
+   * Returns 0 when no writes have been recorded.
+   */
+  public getDataSourceDirtyVersion(dataSourceKey: string, resourceName: string): number {
+    const dsKey = String(dataSourceKey || 'main');
+    const resName = String(resourceName || '');
+    if (!resName) return 0;
+    return this._dataSourceDirtyVersions.get(dsKey)?.get(resName) || 0;
+  }
+
   /** 在目标模型生命周期达成时执行操作（仅在 View 引擎本地存储计划） */
   public scheduleModelOperation(
     fromModelOrUid: FlowModel | string,
@@ -866,16 +907,26 @@ export class FlowEngine {
    */
   async loadModel<T extends FlowModel = FlowModel>(options): Promise<T | null> {
     if (!this.ensureModelRepository()) return;
-    const model = this.findModelByParentId(options.parentId, options.subKey);
-    if (model) {
-      return model as T;
-    }
-    const hydrated = this.hydrateModelFromPreviousEngines<T>(options);
-    if (hydrated) {
-      return hydrated as T;
+    const refresh = !!options?.refresh;
+    if (!refresh) {
+      const model = this.findModelByParentId(options.parentId, options.subKey);
+      if (model) {
+        return model as T;
+      }
+      const hydrated = this.hydrateModelFromPreviousEngines<T>(options);
+      if (hydrated) {
+        return hydrated as T;
+      }
     }
     const data = await this._modelRepository.findOne(options);
-    return data?.uid ? this.createModel<T>(data as any) : null;
+    if (!data?.uid) return null;
+    if (refresh) {
+      const existing = this.getModel(data.uid);
+      if (existing) {
+        this.removeModelWithSubModels(existing.uid);
+      }
+    }
+    return this.createModel<T>(data as any);
   }
 
   /**

package/src/flowI18n.ts

@@ -33,15 +33,17 @@ export class FlowI18n {
       return keyOrTemplate;
     }
 
-    // 先尝试一次翻译
-    let result = this.translateKey(keyOrTemplate, options);
+    if (options?.compareWith && keyOrTemplate === options.compareWith) {
+      return keyOrTemplate;
+    }
 
     // 检查翻译结果是否包含模板语法，如果有则进行模板编译
-    if (this.isTemplate(result)) {
-      result = this.compileTemplate(result);
+    if (this.isTemplate(keyOrTemplate)) {
+      return this.compileTemplate(keyOrTemplate);
     }
 
-    return result;
+    // 先尝试一次翻译
+    return this.translateKey(keyOrTemplate, options);
   }
 
   /**

package/src/flowSettings.ts

@@ -23,6 +23,7 @@ import type { FlowModel } from './models';
 import { ParamObject, StepSettingsDialogProps, ToolbarItemConfig } from './types';
 import {
   compileUiSchema,
+  FlowCancelSaveException,
   FlowExitException,
   getT,
   resolveDefaultParams,
@@ -31,7 +32,9 @@ import {
   setupRuntimeContextSteps,
   shouldHideStepInSettings,
 } from './utils';
+import { FlowExitAllException } from './utils/exceptions';
 import { FlowStepContext } from './hooks/useFlowStep';
+import { GLOBAL_EMBED_CONTAINER_ID, EMBED_REPLACING_DATA_KEY } from './views';
 
 const Panel = Collapse.Panel;
 
@@ -682,14 +685,10 @@ export class FlowSettings {
       typeof resolvedUiMode === 'object' && resolvedUiMode ? resolvedUiMode.props || {} : {};
 
     if (modeType === 'embed') {
-      const target = document.querySelector<HTMLDivElement>('#nocobase-embed-container');
+      const target = document.querySelector<HTMLDivElement>(`#${GLOBAL_EMBED_CONTAINER_ID}`);
       const onOpen = modeProps.onOpen;
       const onClose = modeProps.onClose;
 
-      if (target) {
-        target.innerHTML = ''; // 清空容器内原有内容
-      }
-
       modeProps = {
         target,
         styles: {
@@ -699,15 +698,19 @@ export class FlowSettings {
         },
         ...modeProps,
         onOpen() {
-          target.style.width = modeProps.width || '33.3%';
-          target.style.maxWidth = modeProps.maxWidth || '800px';
-          target.style.minWidth = modeProps.minWidth || '0px';
+          if (target) {
+            target.style.width = modeProps.width || '33.3%';
+            target.style.maxWidth = modeProps.maxWidth || '800px';
+            target.style.minWidth = modeProps.minWidth || '0px';
+          }
           onOpen?.();
         },
         onClose() {
-          target.style.width = 'auto';
-          target.style.maxWidth = 'none';
-          target.style.minWidth = 'auto';
+          if (target && target.dataset[EMBED_REPLACING_DATA_KEY] !== '1') {
+            target.style.width = 'auto';
+            target.style.maxWidth = 'none';
+            target.style.minWidth = 'auto';
+          }
           onClose?.();
         },
       };
@@ -902,7 +905,10 @@ export class FlowSettings {
               console.error('FlowSettings.open: onSaved callback error', cbErr);
             }
           } catch (err) {
-            if (err instanceof FlowExitException) {
+            if (err instanceof FlowCancelSaveException) {
+              return;
+            }
+            if (err instanceof FlowExitException || err instanceof FlowExitAllException) {
               currentView.close();
               return;
             }

package/src/index.ts

@@ -13,6 +13,8 @@ export * from './types';
 // 工具函数
 export * from './utils';
 export { compileRunJs } from './utils/jsxTransform';
+export { registerRunJSLib } from './runjsLibs';
+export type { RunJSLibCache, RunJSLibLoader } from './runjsLibs';
 
 // 资源类
 export * from './resources';
@@ -39,9 +41,20 @@ export {
 } from './runjs-context/helpers';
 export { RunJSContextRegistry, getModelClassName } from './runjs-context/registry';
 export { setupRunJSContexts } from './runjs-context/setup';
-export { getSnippetBody, listSnippetsForContext } from './runjs-context/snippets';
+export type { RunJSContextContribution, RunJSContextContributionApi } from './runjs-context/contributions';
+export { registerRunJSContextContribution } from './runjs-context/contributions';
+export type { RunJSSnippetLoader } from './runjs-context/snippets';
+export { getSnippetBody, listSnippetsForContext, registerRunJSSnippet } from './runjs-context/snippets';
 
 export * from './views';
+export {
+  DATA_SOURCE_DIRTY_EVENT,
+  ENGINE_SCOPE_KEY,
+  getEmitterViewActivatedVersion,
+  VIEW_ACTIVATED_EVENT,
+  VIEW_ACTIVATED_VERSION,
+  VIEW_ENGINE_SCOPE,
+} from './views/viewEvents';
 
 export * from './FlowDefinition';
 export { createViewScopedEngine } from './ViewScopedFlowEngine';

package/src/locale/en-US.json

@@ -62,6 +62,7 @@
   "This is likely a NocoBase internals bug. Please open an issue at": "This is likely a NocoBase internals bug. Please open an issue at",
   "This step has no configurable parameters": "This step has no configurable parameters",
   "This variable is not available": "This variable is not available",
+  "Use return to output value": "Use return to output value",
   "Try again": "Try again",
   "Template created": "Template created",
   "Template description": "Template description",
@@ -69,5 +70,11 @@
   "Template name is required": "Template name is required",
   "UID copied to clipboard": "UID copied to clipboard",
   "createModelOptions must specify use property": "createModelOptions must specify \"use\" property",
-  "here": "here"
-}
+  "here": "here",
+  "RunJS deprecated warning": "[RunJS][Deprecated] {{api}} is deprecated{{location}}",
+  "RunJS deprecated warning with message": "[RunJS][Deprecated] {{api}} {{message}}{{location}}",
+  "RunJS deprecated separator": "; ",
+  "RunJS deprecated replacedBy": "Use {{replacedBy}} instead",
+  "RunJS deprecated since": "since {{since}}",
+  "RunJS deprecated removedIn": "will be removed in {{removedIn}}"
+}

package/src/locale/zh-CN.json

@@ -66,8 +66,15 @@
   "This is likely a NocoBase internals bug. Please open an issue at": "这可能是 NocoBase 内部错误。请在以下地址提交问题",
   "This step has no configurable parameters": "此步骤没有可配置的参数",
   "This variable is not available": "此变量不可用",
+  "Use return to output value": "使用 return 返回最终值",
   "Try again": "重试",
   "UID copied to clipboard": "UID 已复制到剪贴板",
   "createModelOptions must specify use property": "createModelOptions 必须指定 \"use\" 属性",
-  "here": "这里"
+  "here": "这里",
+  "RunJS deprecated warning": "[RunJS][已废弃] {{api}}{{location}}",
+  "RunJS deprecated warning with message": "[RunJS][已废弃] {{api}} {{message}}{{location}}",
+  "RunJS deprecated separator": "；",
+  "RunJS deprecated replacedBy": "建议使用：{{replacedBy}}",
+  "RunJS deprecated since": "自 {{since}} 起",
+  "RunJS deprecated removedIn": "将在 {{removedIn}} 移除"
 }

package/src/models/CollectionFieldModel.tsx

@@ -190,7 +190,7 @@ export class CollectionFieldModel<T extends DefaultStructure = DefaultStructure>
     }
 
     // Filter the mappings based on the `when` condition
-    const bindings = this.bindings.get(interfaceName);
+    const bindings = this.bindings.get(interfaceName).sort((a, b) => a.order - b.order);
     return bindings.filter(
       (binding) => ctx.engine.getModelClass(binding.modelName) && binding.when(ctx, collectionField),
     );
@@ -261,6 +261,7 @@ export class CollectionFieldModel<T extends DefaultStructure = DefaultStructure>
     interfaceName: string | string[],
     options: {
       isDefault?: boolean;
+      order?: number;
       defaultProps?: object | ((ctx: FlowEngineContext, fieldInstance: CollectionField) => object);
       when?: (ctx: FlowEngineContext, fieldInstance: CollectionField) => boolean;
     } = {},
@@ -281,6 +282,7 @@ export class CollectionFieldModel<T extends DefaultStructure = DefaultStructure>
       isDefault: options.isDefault || false,
       defaultProps: options.defaultProps || null,
       when: options.when || defaultWhen,
+      order: options.order,
     });
 
     // Update the map