@nocobase/flow-engine 2.0.59 → 2.0.61

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

@@ -184,8 +184,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);
@@ -217,24 +226,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}`)) {
@@ -244,15 +257,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;
@@ -494,7 +514,7 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
         return [];
       }
     },
-    []
+    [t]
   );
   const getConfigurableFlowsAndSteps = (0, import_react.useCallback)(async () => {
     const result = [];
@@ -532,20 +552,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();
@@ -670,10 +717,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"
@@ -695,9 +741,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/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>>;
     /**
@@ -421,6 +425,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

@@ -71,6 +71,7 @@ export declare class FlowEngine {
      * @private
      */
     private _savingModels;
+    private _loadedPageCache;
     /**
      * Flow engine context object.
      * @private
@@ -406,11 +407,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");
@@ -108,6 +109,7 @@ const _FlowEngine = class _FlowEngine {
      * @private
      */
     __publicField(this, "_savingModels", /* @__PURE__ */ new Map());
+    __publicField(this, "_loadedPageCache", (0, import_loadedPageCache.createLoadedPageCache)());
     /**
      * Flow engine context object.
      * @private
@@ -789,10 +791,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 = this.hydrateModelFromPreviousEngines(options);
       if (hydrated) {
@@ -800,14 +803,24 @@ const _FlowEngine = class _FlowEngine {
       }
     }
     const data = await this._modelRepository.findOne(options);
-    if (!(data == null ? void 0 : data.uid)) return null;
-    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.createModel(data);
+    const model = this.createModel(data);
+    if (bypassLoadedPageCache) {
+      this._loadedPageCache.mountModelToParent(model, true);
+      this._loadedPageCache.clear(options);
+    }
+    return model;
   }
   /**
    * Find a sub-model by parent model ID and subKey.
@@ -838,20 +851,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 = this.hydrateModelFromPreviousEngines(options, extra);
-    if (hydrated) {
-      return hydrated;
+    if (!bypassLoadedPageCache) {
+      const m = this.findModelByParentId(parentId, subKey);
+      if (m) {
+        return m;
+      }
+      const hydrated = 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 = this.createModel(data, extra);
     } else {
       model = this.createModel(options, extra);
@@ -859,18 +881,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;
   }
@@ -888,6 +901,7 @@ const _FlowEngine = class _FlowEngine {
   async saveModel(model, options) {
     if (!this.ensureModelRepository()) return;
     const modelUid = model.uid;
+    const dirtyLoadedPageKey = this._loadedPageCache.getDirtyKeyForModel(model);
     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);
@@ -896,6 +910,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);
@@ -926,10 +941,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);
@@ -1005,18 +1025,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.");
@@ -1039,6 +1066,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) => {
@@ -1047,10 +1075,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", {

package/lib/models/flowModel.js

@@ -73,6 +73,18 @@ var _flowContext;
 const classActionRegistries = /* @__PURE__ */ new WeakMap();
 const classEventRegistries = /* @__PURE__ */ new WeakMap();
 const modelMetas = /* @__PURE__ */ new WeakMap();
+function getStableSortIndex(item, fallbackIndex) {
+  return typeof (item == null ? void 0 : item.sortIndex) === "number" && Number.isFinite(item.sortIndex) ? item.sortIndex : fallbackIndex + 1;
+}
+__name(getStableSortIndex, "getStableSortIndex");
+function sortByStableSortIndex(items) {
+  return items.map((item, index) => ({
+    item,
+    index,
+    sortIndex: getStableSortIndex(item, index)
+  })).sort((a, b) => a.sortIndex - b.sortIndex || a.index - b.index).map(({ item }) => item);
+}
+__name(sortByStableSortIndex, "sortByStableSortIndex");
 const modelGlobalRegistries = /* @__PURE__ */ new WeakMap();
 const classMenuExtensions = /* @__PURE__ */ new WeakMap();
 var ModelRenderMode = /* @__PURE__ */ ((ModelRenderMode2) => {
@@ -161,7 +173,7 @@ const _FlowModel = class _FlowModel {
     };
     this.stepParams = options.stepParams || {};
     this.subModels = {};
-    this.sortIndex = options.sortIndex || 0;
+    this.sortIndex = getStableSortIndex({ sortIndex: options.sortIndex }, -1);
     this._options = options;
     this._title = "";
     this._extraTitle = "";
@@ -373,7 +385,7 @@ const _FlowModel = class _FlowModel {
     }
     Object.entries(mergedSubModels || {}).forEach(([key, value]) => {
       if (Array.isArray(value)) {
-        value.sort((a, b) => (a.sortIndex || 0) - (b.sortIndex || 0)).forEach((item) => {
+        sortByStableSortIndex(value).forEach((item) => {
           this.addSubModel(key, item);
         });
       } else {
@@ -584,26 +596,43 @@ const _FlowModel = class _FlowModel {
     return this.props;
   }
   setStepParams(flowKeyOrAllParams, stepKeyOrStepsParams, params) {
+    var _a;
+    let hasChanged = false;
     if (typeof flowKeyOrAllParams === "string") {
       const flowKey = flowKeyOrAllParams;
       if (typeof stepKeyOrStepsParams === "string" && params !== void 0) {
-        if (!this.stepParams[flowKey]) {
-          this.stepParams[flowKey] = {};
+        const currentStepParams = ((_a = this.stepParams[flowKey]) == null ? void 0 : _a[stepKeyOrStepsParams]) || {};
+        const nextStepParams = { ...currentStepParams, ...params };
+        if (!import_lodash.default.isEqual(currentStepParams, nextStepParams)) {
+          if (!this.stepParams[flowKey]) {
+            this.stepParams[flowKey] = {};
+          }
+          this.stepParams[flowKey][stepKeyOrStepsParams] = nextStepParams;
+          hasChanged = true;
         }
-        this.stepParams[flowKey][stepKeyOrStepsParams] = {
-          ...this.stepParams[flowKey][stepKeyOrStepsParams],
-          ...params
-        };
       } else if (typeof stepKeyOrStepsParams === "object" && stepKeyOrStepsParams !== null) {
-        this.stepParams[flowKey] = { ...this.stepParams[flowKey] || {}, ...stepKeyOrStepsParams };
+        const currentFlowParams = this.stepParams[flowKey] || {};
+        const nextFlowParams = { ...currentFlowParams, ...stepKeyOrStepsParams };
+        if (!import_lodash.default.isEqual(currentFlowParams, nextFlowParams)) {
+          this.stepParams[flowKey] = nextFlowParams;
+          hasChanged = true;
+        }
       }
     } else if (typeof flowKeyOrAllParams === "object" && flowKeyOrAllParams !== null) {
       for (const fk in flowKeyOrAllParams) {
         if (Object.prototype.hasOwnProperty.call(flowKeyOrAllParams, fk)) {
-          this.stepParams[fk] = { ...this.stepParams[fk] || {}, ...flowKeyOrAllParams[fk] };
+          const currentFlowParams = this.stepParams[fk] || {};
+          const nextFlowParams = { ...currentFlowParams, ...flowKeyOrAllParams[fk] };
+          if (!import_lodash.default.isEqual(currentFlowParams, nextFlowParams)) {
+            this.stepParams[fk] = nextFlowParams;
+            hasChanged = true;
+          }
         }
       }
     }
+    if (!hasChanged) {
+      return;
+    }
     this.emitter.emit("onStepParamsChanged");
   }
   getStepParams(flowKey, stepKey) {
@@ -889,7 +918,10 @@ const _FlowModel = class _FlowModel {
     if (!Array.isArray(subModels[subKey])) {
       subModels[subKey] = import_reactive.observable.shallow([]);
     }
-    const maxSortIndex = Math.max(...subModels[subKey].map((item) => item.sortIndex || 0), 0);
+    const maxSortIndex = Math.max(
+      ...subModels[subKey].map((item, index) => getStableSortIndex(item, index)),
+      0
+    );
     model.sortIndex = maxSortIndex + 1;
     subModels[subKey].push(model);
     actualParent.emitter.emit("onSubModelAdded", model);
@@ -937,7 +969,7 @@ const _FlowModel = class _FlowModel {
       return [];
     }
     const results = [];
-    import_lodash.default.castArray(model).sort((a, b) => (a.sortIndex || 0) - (b.sortIndex || 0)).forEach((item, index) => {
+    sortByStableSortIndex(import_lodash.default.castArray(model)).forEach((item, index) => {
       const result = callback(item, index);
       if (result) {
         results.push(item);
@@ -951,7 +983,7 @@ const _FlowModel = class _FlowModel {
       return [];
     }
     const results = [];
-    import_lodash.default.castArray(model).sort((a, b) => (a.sortIndex || 0) - (b.sortIndex || 0)).forEach((item, index) => {
+    sortByStableSortIndex(import_lodash.default.castArray(model)).forEach((item, index) => {
       const result = callback(item, index);
       results.push(result);
     });