@nocobase/flow-engine 2.1.0-beta.42 → 2.1.0-beta.44

package/lib/components/settings/wrappers/contextual/DefaultSettingsIcon.js

@@ -207,8 +207,17 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
   const [visible, setVisible] = (0, import_react.useState)(false);
   const [refreshTick, setRefreshTick] = (0, import_react.useState)(0);
   const [extraMenuItems, setExtraMenuItems] = (0, import_react.useState)([]);
+  const [extraMenuItemsLoaded, setExtraMenuItemsLoaded] = (0, import_react.useState)(false);
   const [configurableFlowsAndSteps, setConfigurableFlowsAndSteps] = (0, import_react.useState)([]);
   const [isLoading, setIsLoading] = (0, import_react.useState)(true);
+  const commonExtras = (0, import_react.useMemo)(
+    () => extraMenuItems.filter((it) => it.group === "common-actions").sort((a, b) => (a.sort ?? 0) - (b.sort ?? 0)),
+    [extraMenuItems]
+  );
+  const hasCommonActions = showCopyUidButton || showDeleteButton || commonExtras.length > 0;
+  const shouldDeferConfigLoading = flattenSubMenus && menuLevels > 1 && hasCommonActions;
+  const shouldWaitForCommonActionProbe = flattenSubMenus && menuLevels > 1 && !showCopyUidButton && !showDeleteButton && !extraMenuItemsLoaded;
+  const canRenderIcon = hasCommonActions || !isLoading && configurableFlowsAndSteps.length > 0;
   const closeDropdown = (0, import_react.useCallback)(() => {
     setVisible(false);
     onDropdownVisibleChange == null ? void 0 : onDropdownVisibleChange(false);
@@ -240,24 +249,28 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
     let mounted = true;
     const loadExtras = /* @__PURE__ */ __name(async () => {
       var _a;
-      const allExtras = [];
-      const modelsToProcess = [];
-      walkSubModels(model, { maxDepth: menuLevels, arrayLimit: 50, mode: "stack" }, (targetModel, { modelKey }) => {
-        modelsToProcess.push({ model: targetModel, modelKey });
-      });
-      for (const { model: targetModel, modelKey } of modelsToProcess) {
-        const Cls = targetModel.constructor;
-        const extras = await ((_a = Cls.getExtraMenuItems) == null ? void 0 : _a.call(Cls, targetModel, t));
-        if (extras == null ? void 0 : extras.length) {
-          allExtras.push(
-            ...extras.map((item) => ({
-              ...item,
-              key: modelKey ? `${modelKey}:${item.key}` : item.key
-            }))
-          );
+      setExtraMenuItemsLoaded(false);
+      try {
+        const allExtras = [];
+        const modelsToProcess = [];
+        walkSubModels(model, { maxDepth: menuLevels, arrayLimit: 50, mode: "stack" }, (targetModel, { modelKey }) => {
+          modelsToProcess.push({ model: targetModel, modelKey });
+        });
+        for (const { model: targetModel, modelKey } of modelsToProcess) {
+          const Cls = targetModel.constructor;
+          const extras = await ((_a = Cls.getExtraMenuItems) == null ? void 0 : _a.call(Cls, targetModel, t));
+          if (extras == null ? void 0 : extras.length) {
+            allExtras.push(
+              ...extras.map((item) => ({
+                ...item,
+                key: modelKey ? `${modelKey}:${item.key}` : item.key
+              }))
+            );
+          }
+        }
+        if (!mounted) {
+          return;
         }
-      }
-      if (mounted) {
         const seen = /* @__PURE__ */ new Set();
         const dedupedExtras = allExtras.filter((item) => {
           if (seen.has(`${item.key}`)) {
@@ -267,15 +280,22 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
           return true;
         });
         setExtraMenuItems(dedupedExtras);
+      } catch (error) {
+        console.error("Failed to load extra menu items:", error);
+        if (mounted) {
+          setExtraMenuItems([]);
+        }
+      } finally {
+        if (mounted) {
+          setExtraMenuItemsLoaded(true);
+        }
       }
     }, "loadExtras");
-    if (visible) {
-      loadExtras();
-    }
+    loadExtras();
     return () => {
       mounted = false;
     };
-  }, [model, menuLevels, t, refreshTick, visible]);
+  }, [model, menuLevels, t, refreshTick]);
   const copyUidToClipboard = (0, import_react.useCallback)(
     async (uid) => {
       var _a;
@@ -520,7 +540,7 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
         return [];
       }
     },
-    []
+    [t]
   );
   const getConfigurableFlowsAndSteps = (0, import_react.useCallback)(async () => {
     const result = [];
@@ -558,20 +578,47 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
     };
   }, [model, menuLevels, refreshTick]);
   (0, import_react.useEffect)(() => {
+    let mounted = true;
     const loadConfigurableFlowsAndSteps = /* @__PURE__ */ __name(async () => {
       setIsLoading(true);
+      if (shouldDeferConfigLoading) {
+        setConfigurableFlowsAndSteps([]);
+      }
       try {
         const flows = await getConfigurableFlowsAndSteps();
-        setConfigurableFlowsAndSteps(flows);
+        if (mounted) {
+          setConfigurableFlowsAndSteps(flows);
+        }
       } catch (error) {
         console.error("Failed to load configurable flows and steps:", error);
-        setConfigurableFlowsAndSteps([]);
+        if (mounted) {
+          setConfigurableFlowsAndSteps([]);
+        }
       } finally {
-        setIsLoading(false);
+        if (mounted) {
+          setIsLoading(false);
+        }
       }
     }, "loadConfigurableFlowsAndSteps");
+    if (shouldWaitForCommonActionProbe) {
+      setConfigurableFlowsAndSteps([]);
+      setIsLoading(false);
+      return () => {
+        mounted = false;
+      };
+    }
+    if (!visible && shouldDeferConfigLoading) {
+      setConfigurableFlowsAndSteps([]);
+      setIsLoading(false);
+      return () => {
+        mounted = false;
+      };
+    }
     loadConfigurableFlowsAndSteps();
-  }, [getConfigurableFlowsAndSteps, refreshTick]);
+    return () => {
+      mounted = false;
+    };
+  }, [getConfigurableFlowsAndSteps, refreshTick, shouldDeferConfigLoading, shouldWaitForCommonActionProbe, visible]);
   const menuItems = (0, import_react.useMemo)(() => {
     const items = [];
     const keyCounter = /* @__PURE__ */ new Map();
@@ -696,10 +743,9 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
       }
     }
     return items;
-  }, [configurableFlowsAndSteps, disabledIconColor, flattenSubMenus, t]);
+  }, [configurableFlowsAndSteps, disabledIconColor, flattenSubMenus, message, model, t]);
   const finalMenuItems = (0, import_react.useMemo)(() => {
     const items = [...menuItems];
-    const commonExtras = extraMenuItems.filter((it) => it.group === "common-actions").sort((a, b) => (a.sort ?? 0) - (b.sort ?? 0));
     if (showCopyUidButton || showDeleteButton || commonExtras.length > 0) {
       items.push({
         type: "divider"
@@ -721,9 +767,8 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
       }
     }
     return items;
-  }, [menuItems, showCopyUidButton, showDeleteButton, model.uid, model.destroy, t, extraMenuItems]);
-  const hasExtras = extraMenuItems.some((it) => it.group === "common-actions");
-  if (isLoading || configurableFlowsAndSteps.length === 0 && !showDeleteButton && !showCopyUidButton && !hasExtras) {
+  }, [menuItems, showCopyUidButton, showDeleteButton, commonExtras, model.uid, model.destroy, t]);
+  if (!canRenderIcon) {
     return null;
   }
   if (!model || !model.uid) {

package/lib/components/subModel/LazyDropdown.js

@@ -332,7 +332,7 @@ const getLabelSearchText = /* @__PURE__ */ __name((label) => {
   }
   return "";
 }, "getLabelSearchText");
-const createSearchItem = /* @__PURE__ */ __name((item, searchKey, currentSearchValue, menuVisible, t, searchHandlers, activateSearchSubmenu, deactivateSearchSubmenu) => ({
+const createSearchItem = /* @__PURE__ */ __name((item, searchKey, currentSearchValue, menuVisible, t, searchHandlers, activateSearchSubmenu, deactivateSearchSubmenu, shouldActivateSearchSubmenu) => ({
   key: `${searchKey}-search`,
   type: "group",
   label: /* @__PURE__ */ import_react.default.createElement("div", { onMouseDown: (e) => e.stopPropagation(), onClick: (e) => e.stopPropagation() }, /* @__PURE__ */ import_react.default.createElement(
@@ -350,28 +350,34 @@ const createSearchItem = /* @__PURE__ */ __name((item, searchKey, currentSearchV
         var _a;
         e.stopPropagation();
         const value = e.target.value;
-        activateSearchSubmenu(searchKey);
+        if (shouldActivateSearchSubmenu) {
+          activateSearchSubmenu(searchKey);
+        }
         if (((_a = e.nativeEvent) == null ? void 0 : _a.isComposing) || searchHandlers.isComposing(searchKey)) {
           searchHandlers.updateInputValue(searchKey, value);
           return;
         }
-        if (!value) {
+        if (!value && shouldActivateSearchSubmenu) {
           deactivateSearchSubmenu(searchKey);
         }
         searchHandlers.updateSearchValue(searchKey, value);
       },
       onCompositionStart: (e) => {
         e.stopPropagation();
-        activateSearchSubmenu(searchKey);
+        if (shouldActivateSearchSubmenu) {
+          activateSearchSubmenu(searchKey);
+        }
         searchHandlers.startComposition(searchKey);
       },
       onCompositionEnd: (e) => {
         e.stopPropagation();
         const value = e.currentTarget.value;
-        if (value) {
-          activateSearchSubmenu(searchKey);
-        } else {
-          deactivateSearchSubmenu(searchKey);
+        if (shouldActivateSearchSubmenu) {
+          if (value) {
+            activateSearchSubmenu(searchKey);
+          } else {
+            deactivateSearchSubmenu(searchKey);
+          }
         }
         searchHandlers.endComposition(searchKey, value);
       },
@@ -557,6 +563,7 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
     const searchKey = keyPath;
     const currentSearchValue = searchValues[searchKey] || "";
     const currentInputValue = inputValues[searchKey] ?? currentSearchValue;
+    const shouldActivateSearchSubmenu = !(item.type === "group" && path.length === 0);
     const filteredChildren = currentSearchValue ? (/* @__PURE__ */ __name(function deepFilter(items2) {
       const searchText = currentSearchValue.toLowerCase();
       return items2.map((child) => {
@@ -581,7 +588,8 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
       t,
       searchHandlers,
       activateSearchSubmenu,
-      deactivateSearchSubmenu
+      deactivateSearchSubmenu,
+      shouldActivateSearchSubmenu
     );
     const dividerItem = { key: `${keyPath}-search-divider`, type: "divider" };
     if (currentSearchValue && resolvedFiltered.length === 0) {

package/lib/executor/FlowExecutor.js

@@ -153,9 +153,6 @@ const _FlowExecutor = class _FlowExecutor {
         const stepDefaultParams = await (0, import_utils.resolveDefaultParams)(step.defaultParams, runtimeCtx);
         combinedParams = { ...stepDefaultParams };
       } else {
-        flowContext.logger.warn(
-          `BaseModel.applyFlow: Step '${stepKey}' in flow '${flowKey}' has neither 'use' nor 'handler'. Skipping.`
-        );
         continue;
       }
       const modelStepParams = model.getStepParams(flowKey, stepKey);

package/lib/flowContext.d.ts

@@ -222,6 +222,10 @@ export type FlowContextGetApiInfosOptions = {
      * RunJS 文档版本（默认 v1）。
      */
     version?: RunJSVersion;
+    /**
+     * Include editor completion metadata. Defaults to false so API-doc callers keep the compact public shape.
+     */
+    includeCompletion?: boolean;
 };
 export type FlowContextGetVarInfosOptions = {
     /**
@@ -293,7 +297,7 @@ export declare class FlowContext {
      * - 输出仅来自 RunJS doc 与 defineProperty/defineMethod 的 info
      * - 不读取/展开 PropertyMeta（变量结构）
      * - 不自动展开深层 properties
-     * - 不返回自动补全字段（例如 completion）
+     * - 默认不返回自动补全字段（例如 completion），传入 includeCompletion=true 时返回
      */
     getApiInfos(options?: FlowContextGetApiInfosOptions): Promise<Record<string, FlowContextApiInfo>>;
     /**
@@ -423,6 +427,7 @@ export declare class FlowRuntimeContext<TModel extends FlowModel = FlowModel, TM
 export type FlowSettingsContext<TModel extends FlowModel = FlowModel> = FlowRuntimeContext<TModel, 'settings'>;
 export type RunJSDocCompletionDoc = {
     insertText?: string;
+    requires?: Array<'element'>;
 };
 export type RunJSDocHiddenDoc = boolean | ((ctx: any) => boolean | Promise<boolean>);
 export type RunJSDocHiddenOrPathsDoc = boolean | string[] | ((ctx: any) => boolean | string[] | Promise<boolean | string[]>);

package/lib/flowContext.js

@@ -399,10 +399,11 @@ const _FlowContext = class _FlowContext {
    * - 输出仅来自 RunJS doc 与 defineProperty/defineMethod 的 info
    * - 不读取/展开 PropertyMeta（变量结构）
    * - 不自动展开深层 properties
-   * - 不返回自动补全字段（例如 completion）
+   * - 默认不返回自动补全字段（例如 completion），传入 includeCompletion=true 时返回
    */
   async getApiInfos(options = {}) {
     const version = options.version || "v1";
+    const includeCompletion = !!options.includeCompletion;
     const evalCtx = this.createProxy();
     const isPrivateKey = /* @__PURE__ */ __name((key) => typeof key === "string" && key.startsWith("_"), "isPrivateKey");
     const isVarRootKey = /* @__PURE__ */ __name((key) => key === "record" || key === "formValues" || key === "popup", "isVarRootKey");
@@ -439,7 +440,14 @@ const _FlowContext = class _FlowContext {
       const src = toDocObject(obj);
       if (!src) return {};
       const out2 = {};
-      for (const k of ["description", "examples", "ref", "params", "returns"]) {
+      for (const k of [
+        "description",
+        "examples",
+        ...includeCompletion ? ["completion"] : [],
+        "ref",
+        "params",
+        "returns"
+      ]) {
         const v = src[k];
         if (typeof v !== "undefined") out2[k] = v;
       }
@@ -452,7 +460,17 @@ const _FlowContext = class _FlowContext {
       const src = toDocObject(obj);
       if (!src) return {};
       const out2 = {};
-      for (const k of ["title", "type", "interface", "description", "examples", "ref", "params", "returns"]) {
+      for (const k of [
+        "title",
+        "type",
+        "interface",
+        "description",
+        "examples",
+        ...includeCompletion ? ["completion"] : [],
+        "ref",
+        "params",
+        "returns"
+      ]) {
         const v = src[k];
         if (typeof v !== "undefined") out2[k] = v;
       }
@@ -539,7 +557,7 @@ const _FlowContext = class _FlowContext {
       node = { ...node, ...pickPropertyInfo(docObj) };
       node = { ...node, ...pickPropertyInfo(infoObj) };
       delete node.properties;
-      delete node.completion;
+      if (!includeCompletion) delete node.completion;
       if (!Object.keys(node).length) continue;
       const outKey = mapDocKeyToApiKey(key, docNode);
       out[outKey] = out[outKey] ? { ...out[outKey] || {}, ...node || {} } : node;
@@ -554,7 +572,7 @@ const _FlowContext = class _FlowContext {
       node = { ...node, ...pickMethodInfo(docObj) };
       node = { ...node, ...pickMethodInfo(info) };
       delete node.properties;
-      delete node.completion;
+      if (!includeCompletion) delete node.completion;
       if (!Object.keys(node).length) continue;
       node.type = "function";
       if (!out[key]) out[key] = node;
@@ -571,7 +589,7 @@ const _FlowContext = class _FlowContext {
         let node = {};
         node = { ...node, ...pickPropertyInfo(childObj) };
         delete node.properties;
-        delete node.completion;
+        if (!includeCompletion) delete node.completion;
         if (!node.description || !String(node.description).trim()) continue;
         out[outKey] = node;
       }
@@ -2255,6 +2273,17 @@ const _BaseFlowEngineContext = class _BaseFlowEngineContext extends FlowContext
         });
         const jsCode = await (0, import_utils.prepareRunJsCode)(String(code ?? ""), { preprocessTemplates: shouldPreprocessTemplates });
         return runner.run(jsCode);
+      },
+      {
+        description: "Execute a RunJS code string in the current Flow context.",
+        detail: "(code: string, variables?: Record<string, any>, options?: JSRunnerOptions) => Promise<RunJSResult>",
+        params: [
+          { name: "code", type: "string", description: "RunJS code to execute." },
+          { name: "variables", type: "Record<string, any>", optional: true, description: "Additional globals." },
+          { name: "options", type: "JSRunnerOptions", optional: true, description: "Runner options." }
+        ],
+        returns: { type: "Promise<{ success: boolean; value?: any; error?: any; timeout?: boolean }>" },
+        completion: { insertText: `await ctx.runjs('return 1')` }
       }
     );
   }

package/lib/flowEngine.d.ts

@@ -93,6 +93,7 @@ export declare class FlowEngine {
      * @private
      */
     private _savingModels;
+    private _loadedPageCache;
     /**
      * Flow engine context object.
      * @private
@@ -537,11 +538,11 @@ export declare class FlowEngine {
     replaceModel<T extends FlowModel = FlowModel>(uid: string, optionsOrFn?: Partial<FlowModelOptions> | ((currentOptions: FlowModelOptions) => Partial<FlowModelOptions>)): Promise<T | null>;
     /**
      * Move a model instance within its parent model.
-     * @param {any} sourceId Source model UID
-     * @param {any} targetId Target model UID
+     * @param {string | number} sourceId Source model UID
+     * @param {string | number} targetId Target model UID
      * @returns {Promise<void>} No return value
      */
-    moveModel(sourceId: any, targetId: any, options?: PersistOptions): Promise<void>;
+    moveModel(sourceId: string | number, targetId: string | number, options?: PersistOptions): Promise<void>;
     /**
      * Filter model classes by parent class (supports multi-level inheritance).
      * @param {string | ModelConstructor} parentClass Parent class name or constructor

package/lib/flowEngine.js

@@ -61,6 +61,7 @@ var import_ReactView = require("./ReactView");
 var import_resources = require("./resources");
 var import_emitter = require("./emitter");
 var import_ModelOperationScheduler = __toESM(require("./scheduler/ModelOperationScheduler"));
+var import_loadedPageCache = require("./utils/loadedPageCache");
 var import_utils = require("./utils");
 var _FlowEngine_instances, registerModel_fn;
 const getFlowEngineLoggerLevel = /* @__PURE__ */ __name(() => process.env.NODE_ENV === "production" ? "warn" : "trace", "getFlowEngineLoggerLevel");
@@ -130,6 +131,7 @@ const _FlowEngine = class _FlowEngine {
      * @private
      */
     __publicField(this, "_savingModels", /* @__PURE__ */ new Map());
+    __publicField(this, "_loadedPageCache", (0, import_loadedPageCache.createLoadedPageCache)());
     /**
      * Flow engine context object.
      * @private
@@ -1138,10 +1140,11 @@ const _FlowEngine = class _FlowEngine {
   async loadModel(options) {
     if (!this.ensureModelRepository()) return;
     const refresh = !!(options == null ? void 0 : options.refresh);
-    if (!refresh) {
-      const model = this.findModelByParentId(options.parentId, options.subKey);
-      if (model) {
-        return model;
+    const bypassLoadedPageCache = this._loadedPageCache.shouldBypass(options, () => this.context.flowSettingsEnabled);
+    if (!refresh && !bypassLoadedPageCache) {
+      const model2 = this.findModelByParentId(options.parentId, options.subKey);
+      if (model2) {
+        return model2;
       }
       const hydrated = await this.hydrateModelFromPreviousEngines(options);
       if (hydrated) {
@@ -1149,15 +1152,24 @@ const _FlowEngine = class _FlowEngine {
       }
     }
     const data = await this._modelRepository.findOne(options);
-    if (!(data == null ? void 0 : data.uid)) return null;
-    await this.resolveModelTree(data);
-    if (refresh) {
+    if (!(data == null ? void 0 : data.uid)) {
+      if (bypassLoadedPageCache) {
+        this._loadedPageCache.clear(options);
+      }
+      return null;
+    }
+    if (refresh || bypassLoadedPageCache) {
       const existing = this.getModel(data.uid);
       if (existing) {
         this.removeModelWithSubModels(existing.uid);
       }
     }
-    return this.createModelAsync(data);
+    const model = await this.createModelAsync(data);
+    if (bypassLoadedPageCache) {
+      this._loadedPageCache.mountModelToParent(model, true);
+      this._loadedPageCache.clear(options);
+    }
+    return model;
   }
   /**
    * Find a sub-model by parent model ID and subKey.
@@ -1188,20 +1200,29 @@ const _FlowEngine = class _FlowEngine {
   async loadOrCreateModel(options, extra) {
     if (!this.ensureModelRepository()) return;
     const { uid, parentId, subKey } = options;
-    if (uid && this._modelInstances.has(uid)) {
+    const bypassLoadedPageCache = this._loadedPageCache.shouldBypass(options, () => this.context.flowSettingsEnabled);
+    if (uid && !bypassLoadedPageCache && this._modelInstances.has(uid)) {
       return this._modelInstances.get(uid);
     }
-    const m = this.findModelByParentId(parentId, subKey);
-    if (m) {
-      return m;
-    }
-    const hydrated = await this.hydrateModelFromPreviousEngines(options, extra);
-    if (hydrated) {
-      return hydrated;
+    if (!bypassLoadedPageCache) {
+      const m = this.findModelByParentId(parentId, subKey);
+      if (m) {
+        return m;
+      }
+      const hydrated = await this.hydrateModelFromPreviousEngines(options, extra);
+      if (hydrated) {
+        return hydrated;
+      }
     }
     const data = await this._modelRepository.findOne(options);
     let model = null;
     if (data == null ? void 0 : data.uid) {
+      if (bypassLoadedPageCache) {
+        const existing = this.getModel(data.uid);
+        if (existing) {
+          this.removeModelWithSubModels(existing.uid);
+        }
+      }
       model = await this.createModelAsync(data, extra);
     } else {
       model = await this.createModelAsync(options, extra);
@@ -1209,18 +1230,9 @@ const _FlowEngine = class _FlowEngine {
         await model.save();
       }
     }
-    if (model.parent) {
-      const subModel = model.parent.findSubModel(model.subKey, (m2) => {
-        return m2.uid === model.uid;
-      });
-      if (subModel) {
-        return model;
-      }
-      if (model.subType === "array") {
-        model.parent.addSubModel(model.subKey, model);
-      } else {
-        model.parent.setSubModel(model.subKey, model);
-      }
+    this._loadedPageCache.mountModelToParent(model, bypassLoadedPageCache);
+    if (bypassLoadedPageCache) {
+      this._loadedPageCache.clear(options);
     }
     return model;
   }
@@ -1238,6 +1250,9 @@ const _FlowEngine = class _FlowEngine {
   async saveModel(model, options) {
     if (!this.ensureModelRepository()) return;
     const modelUid = model.uid;
+    const dirtyLoadedPageKey = this._loadedPageCache.getDirtyKeyForModel(model, {
+      force: !!(options == null ? void 0 : options.onlyStepParams)
+    });
     if (this._savingModels.has(modelUid)) {
       this.logger.debug(`Model ${modelUid} is already being saved, waiting for existing save operation`);
       return await this._savingModels.get(modelUid);
@@ -1246,6 +1261,7 @@ const _FlowEngine = class _FlowEngine {
     this._savingModels.set(modelUid, savePromise);
     try {
       const result = await savePromise;
+      this._loadedPageCache.markDirty(dirtyLoadedPageKey);
       return result;
     } finally {
       this._savingModels.delete(modelUid);
@@ -1276,10 +1292,15 @@ const _FlowEngine = class _FlowEngine {
    * @returns {Promise<boolean>} Whether destroyed successfully
    */
   async destroyModel(uid) {
-    if (this.ensureModelRepository()) {
+    const modelInstance = this._modelInstances.get(uid);
+    const dirtyLoadedPageKey = this._loadedPageCache.getDirtyKeyForModel(modelInstance);
+    const hasModelRepository = this.ensureModelRepository();
+    if (hasModelRepository) {
       await this._modelRepository.destroy(uid);
     }
-    const modelInstance = this._modelInstances.get(uid);
+    if (hasModelRepository) {
+      this._loadedPageCache.markDirty(dirtyLoadedPageKey);
+    }
     const parent = modelInstance == null ? void 0 : modelInstance.parent;
     const result = this.removeModel(uid);
     parent && parent.emitter.emit("onSubModelDestroyed", modelInstance);
@@ -1355,18 +1376,25 @@ const _FlowEngine = class _FlowEngine {
   }
   /**
    * Move a model instance within its parent model.
-   * @param {any} sourceId Source model UID
-   * @param {any} targetId Target model UID
+   * @param {string | number} sourceId Source model UID
+   * @param {string | number} targetId Target model UID
    * @returns {Promise<void>} No return value
    */
   async moveModel(sourceId, targetId, options) {
     var _a, _b;
-    const sourceModel = this.getModel(sourceId);
-    const targetModel = this.getModel(targetId);
+    const sourceUid = String(sourceId);
+    const targetUid = String(targetId);
+    if (!sourceUid || !targetUid || sourceUid === targetUid) {
+      return;
+    }
+    const sourceModel = this.getModel(sourceUid);
+    const targetModel = this.getModel(targetUid);
     if (!sourceModel || !targetModel) {
       console.warn(`FlowEngine: Cannot move model. Source or target model not found.`);
       return;
     }
+    let position = "after";
+    const dirtyLoadedPageKey = this._loadedPageCache.getDirtyKeyForModel(sourceModel);
     const move = /* @__PURE__ */ __name((sourceModel2, targetModel2) => {
       if (!sourceModel2.parent || !targetModel2.parent || sourceModel2.parent !== targetModel2.parent) {
         console.error("FlowModel.moveTo: Both models must have the same parent to perform move operation.");
@@ -1389,6 +1417,7 @@ const _FlowEngine = class _FlowEngine {
         console.warn("FlowModel.moveTo: Current model is already at the target position. No action taken.");
         return false;
       }
+      position = currentIndex < targetIndex ? "after" : "before";
       const [movedModel] = subModelsCopy.splice(currentIndex, 1);
       subModelsCopy.splice(targetIndex, 0, movedModel);
       subModelsCopy.forEach((model, index) => {
@@ -1397,10 +1426,13 @@ const _FlowEngine = class _FlowEngine {
       subModels.splice(0, subModels.length, ...subModelsCopy);
       return true;
     }, "move");
-    move(sourceModel, targetModel);
+    const moved = move(sourceModel, targetModel);
+    if (!moved) {
+      return;
+    }
     if ((options == null ? void 0 : options.persist) !== false && this.ensureModelRepository()) {
-      const position = sourceModel.sortIndex - targetModel.sortIndex > 0 ? "after" : "before";
-      await this._modelRepository.move(sourceId, targetId, position);
+      await this._modelRepository.move(sourceUid, targetUid, position);
+      this._loadedPageCache.markDirty(dirtyLoadedPageKey);
     }
     sourceModel.parent.emitter.emit("onSubModelMoved", { source: sourceModel, target: targetModel });
     (_b = this.emitter) == null ? void 0 : _b.emit("model:subModel:moved", {