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

package/lib/models/flowModel.js

@@ -71,6 +71,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();
 const sortExtraMenuItems = /* @__PURE__ */ __name((items) => {
@@ -204,7 +216,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 = "";
@@ -416,7 +428,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 {
@@ -628,26 +640,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) {
@@ -933,7 +962,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);
@@ -981,7 +1013,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);
@@ -995,7 +1027,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);
     });

package/lib/runjs-context/contexts/FormJSFieldItemRunJSContext.js

@@ -31,6 +31,7 @@ __export(FormJSFieldItemRunJSContext_exports, {
 });
 module.exports = __toCommonJS(FormJSFieldItemRunJSContext_exports);
 var import_flowContext = require("../../flowContext");
+var import_elementDoc = require("./elementDoc");
 const _FormJSFieldItemRunJSContext = class _FormJSFieldItemRunJSContext extends import_flowContext.FlowRunJSContext {
 };
 __name(_FormJSFieldItemRunJSContext, "FormJSFieldItemRunJSContext");
@@ -38,8 +39,8 @@ let FormJSFieldItemRunJSContext = _FormJSFieldItemRunJSContext;
 FormJSFieldItemRunJSContext.define({
   label: "FormJSFieldItem RunJS context",
   properties: {
-    element: `ElementProxy instance providing a safe DOM container for form field rendering.
-      Supports innerHTML, append, and other DOM manipulation methods.`,
+    element: (0, import_elementDoc.createElementPropertyDoc)(`ElementProxy instance providing a safe DOM container for form field rendering.
+      Supports innerHTML, append, and other DOM manipulation methods.`),
     value: `Current field value (read-only in display mode; in controlled scenarios, use setProps to modify).`,
     record: `Current record data object (read-only).
       Contains all field values of the parent record.`,
@@ -61,7 +62,7 @@ FormJSFieldItemRunJSContext.define(
   {
     label: "\u8868\u5355 JS \u5B57\u6BB5\u9879 RunJS \u4E0A\u4E0B\u6587",
     properties: {
-      element: "ElementProxy\uFF0C\u8868\u5355\u5B57\u6BB5\u5BB9\u5668",
+      element: (0, import_elementDoc.createZhCNElementPropertyDoc)("ElementProxy\uFF0C\u8868\u5355\u5B57\u6BB5\u5BB9\u5668"),
       value: "\u5B57\u6BB5\u503C\uFF08\u5C55\u793A\u6A21\u5F0F\u4E3A\u53EA\u8BFB\uFF1B\u53D7\u63A7\u573A\u666F\u7528 setProps \u4FEE\u6539\uFF09",
       record: "\u5F53\u524D\u8BB0\u5F55\uFF08\u53EA\u8BFB\uFF09",
       formValues: {

package/lib/runjs-context/contexts/JSBlockRunJSContext.js

@@ -31,6 +31,7 @@ __export(JSBlockRunJSContext_exports, {
 });
 module.exports = __toCommonJS(JSBlockRunJSContext_exports);
 var import_flowContext = require("../../flowContext");
+var import_elementDoc = require("./elementDoc");
 const _JSBlockRunJSContext = class _JSBlockRunJSContext extends import_flowContext.FlowRunJSContext {
 };
 __name(_JSBlockRunJSContext, "JSBlockRunJSContext");
@@ -38,15 +39,9 @@ let JSBlockRunJSContext = _JSBlockRunJSContext;
 JSBlockRunJSContext.define({
   label: "RunJS context",
   properties: {
-    element: {
-      description: `ElementProxy instance providing a safe DOM container.
+    element: (0, import_elementDoc.createElementPropertyDoc)(`ElementProxy instance providing a safe DOM container.
       Supports innerHTML, append, and other DOM manipulation methods.
-      Use this to render content in the JS block.`,
-      detail: "ElementProxy",
-      properties: {
-        innerHTML: "Set or read the HTML content of the container element."
-      }
-    },
+      Use this to render content in the JS block.`),
     record: `Current record data object (read-only).
       Available when the JS block is within a data block or detail view context.`,
     value: "Current value of the field or component, if available in the current context.",
@@ -65,13 +60,7 @@ JSBlockRunJSContext.define(
   {
     label: "RunJS \u4E0A\u4E0B\u6587",
     properties: {
-      element: {
-        description: "ElementProxy\uFF0C\u5B89\u5168\u7684 DOM \u5BB9\u5668\uFF0C\u652F\u6301 innerHTML/append \u7B49",
-        detail: "ElementProxy",
-        properties: {
-          innerHTML: "\u8BFB\u53D6\u6216\u8BBE\u7F6E\u5BB9\u5668\u7684 HTML \u5185\u5BB9"
-        }
-      },
+      element: (0, import_elementDoc.createZhCNElementPropertyDoc)("ElementProxy\uFF0C\u5B89\u5168\u7684 DOM \u5BB9\u5668\uFF0C\u652F\u6301 innerHTML/append \u7B49"),
       record: "\u5F53\u524D\u8BB0\u5F55\uFF08\u53EA\u8BFB\uFF0C\u7528\u4E8E\u6570\u636E\u533A\u5757/\u8BE6\u60C5\u7B49\u573A\u666F\uFF09",
       value: "\u5F53\u524D\u503C\uFF08\u82E5\u5B58\u5728\uFF09",
       React: "React \u5E93",

package/lib/runjs-context/contexts/JSColumnRunJSContext.js

@@ -31,6 +31,7 @@ __export(JSColumnRunJSContext_exports, {
 });
 module.exports = __toCommonJS(JSColumnRunJSContext_exports);
 var import_flowContext = require("../../flowContext");
+var import_elementDoc = require("./elementDoc");
 const _JSColumnRunJSContext = class _JSColumnRunJSContext extends import_flowContext.FlowRunJSContext {
 };
 __name(_JSColumnRunJSContext, "JSColumnRunJSContext");
@@ -38,7 +39,9 @@ let JSColumnRunJSContext = _JSColumnRunJSContext;
 JSColumnRunJSContext.define({
   label: "JSColumn RunJS context",
   properties: {
-    element: "ElementProxy instance providing a safe DOM container for the current table cell. Supports innerHTML/append and basic DOM APIs.",
+    element: (0, import_elementDoc.createElementPropertyDoc)(
+      "ElementProxy instance providing a safe DOM container for the current table cell. Supports innerHTML/append and basic DOM APIs."
+    ),
     record: "Current row record object (read-only).",
     recordIndex: "Index of the current row in the page (0-based).",
     collection: "Collection definition metadata (read-only).",
@@ -56,7 +59,7 @@ JSColumnRunJSContext.define(
   {
     label: "JS \u5217 RunJS \u4E0A\u4E0B\u6587",
     properties: {
-      element: "ElementProxy\uFF0C\u8868\u683C\u5355\u5143\u683C\u7684\u5B89\u5168 DOM \u5BB9\u5668\uFF0C\u652F\u6301 innerHTML/append \u7B49",
+      element: (0, import_elementDoc.createZhCNElementPropertyDoc)("ElementProxy\uFF0C\u8868\u683C\u5355\u5143\u683C\u7684\u5B89\u5168 DOM \u5BB9\u5668\uFF0C\u652F\u6301 innerHTML/append \u7B49"),
       record: "\u5F53\u524D\u884C\u8BB0\u5F55\u5BF9\u8C61\uFF08\u53EA\u8BFB\uFF09",
       recordIndex: "\u5F53\u524D\u884C\u7D22\u5F15\uFF08\u4ECE 0 \u5F00\u59CB\uFF09",
       collection: "\u96C6\u5408\u5B9A\u4E49\u5143\u6570\u636E\uFF08\u53EA\u8BFB\uFF09",

package/lib/runjs-context/contexts/JSEditableFieldRunJSContext.js

@@ -31,6 +31,7 @@ __export(JSEditableFieldRunJSContext_exports, {
 });
 module.exports = __toCommonJS(JSEditableFieldRunJSContext_exports);
 var import_flowContext = require("../../flowContext");
+var import_elementDoc = require("./elementDoc");
 const _JSEditableFieldRunJSContext = class _JSEditableFieldRunJSContext extends import_flowContext.FlowRunJSContext {
 };
 __name(_JSEditableFieldRunJSContext, "JSEditableFieldRunJSContext");
@@ -38,10 +39,9 @@ let JSEditableFieldRunJSContext = _JSEditableFieldRunJSContext;
 JSEditableFieldRunJSContext.define({
   label: "JSEditableField RunJS context",
   properties: {
-    element: {
-      description: "ElementProxy instance providing a safe DOM container for field rendering. In editable mode this container is typically a <span> element.",
-      detail: "ElementProxy"
-    },
+    element: (0, import_elementDoc.createElementPropertyDoc)(
+      "ElementProxy instance providing a safe DOM container for field rendering. In editable mode this container is typically a <span> element."
+    ),
     value: {
       description: "Current field value (read-only snapshot). In editable scenarios, prefer ctx.getValue()/ctx.setValue(v) for two-way binding.",
       detail: "any",
@@ -84,10 +84,7 @@ JSEditableFieldRunJSContext.define(
   {
     label: "JS \u53EF\u7F16\u8F91\u5B57\u6BB5 RunJS \u4E0A\u4E0B\u6587",
     properties: {
-      element: {
-        description: "ElementProxy\uFF0C\u5B57\u6BB5\u6E32\u67D3\u7684\u5B89\u5168\u5BB9\u5668\uFF08\u901A\u5E38\u4E3A <span> \u5BB9\u5668\uFF09\u3002",
-        detail: "ElementProxy"
-      },
+      element: (0, import_elementDoc.createZhCNElementPropertyDoc)("ElementProxy\uFF0C\u5B57\u6BB5\u6E32\u67D3\u7684\u5B89\u5168\u5BB9\u5668\uFF08\u901A\u5E38\u4E3A <span> \u5BB9\u5668\uFF09\u3002"),
       value: {
         description: "\u5B57\u6BB5\u5F53\u524D\u503C\uFF08\u53EA\u8BFB\u5FEB\u7167\uFF09\u3002\u53EF\u7F16\u8F91\u573A\u666F\u5EFA\u8BAE\u4F7F\u7528 ctx.getValue()/ctx.setValue(v) \u505A\u53CC\u5411\u7ED1\u5B9A\u3002",
         detail: "any",

package/lib/runjs-context/contexts/JSFieldRunJSContext.js

@@ -31,6 +31,7 @@ __export(JSFieldRunJSContext_exports, {
 });
 module.exports = __toCommonJS(JSFieldRunJSContext_exports);
 var import_flowContext = require("../../flowContext");
+var import_elementDoc = require("./elementDoc");
 const _JSFieldRunJSContext = class _JSFieldRunJSContext extends import_flowContext.FlowRunJSContext {
 };
 __name(_JSFieldRunJSContext, "JSFieldRunJSContext");
@@ -38,8 +39,8 @@ let JSFieldRunJSContext = _JSFieldRunJSContext;
 JSFieldRunJSContext.define({
   label: "JSField RunJS context",
   properties: {
-    element: `ElementProxy instance providing a safe DOM container for field rendering.
-      Supports innerHTML, append, and other DOM manipulation methods.`,
+    element: (0, import_elementDoc.createElementPropertyDoc)(`ElementProxy instance providing a safe DOM container for field rendering.
+      Supports innerHTML, append, and other DOM manipulation methods.`),
     value: `Current value of the field (read-only).
       Contains the data value stored in this field.`,
     record: `Current record data object (read-only).
@@ -57,7 +58,7 @@ JSFieldRunJSContext.define(
   {
     label: "JS \u5B57\u6BB5 RunJS \u4E0A\u4E0B\u6587",
     properties: {
-      element: "ElementProxy\uFF0C\u5B57\u6BB5\u6E32\u67D3\u5BB9\u5668\uFF0C\u652F\u6301 innerHTML/append \u7B49 DOM \u64CD\u4F5C",
+      element: (0, import_elementDoc.createZhCNElementPropertyDoc)("ElementProxy\uFF0C\u5B57\u6BB5\u6E32\u67D3\u5BB9\u5668\uFF0C\u652F\u6301 innerHTML/append \u7B49 DOM \u64CD\u4F5C"),
       value: "\u5B57\u6BB5\u5F53\u524D\u503C\uFF08\u53EA\u8BFB\uFF09",
       record: "\u5F53\u524D\u8BB0\u5F55\u5BF9\u8C61\uFF08\u53EA\u8BFB\uFF0C\u5305\u542B\u7236\u8BB0\u5F55\u5168\u90E8\u5B57\u6BB5\u503C\uFF09",
       collection: "\u96C6\u5408\u5B9A\u4E49\u5143\u6570\u636E\uFF08\u53EA\u8BFB\uFF0C\u63CF\u8FF0\u5B57\u6BB5\u6240\u5C5E\u96C6\u5408\u7684 Schema\uFF09"

package/lib/runjs-context/contexts/JSItemRunJSContext.js

@@ -31,6 +31,7 @@ __export(JSItemRunJSContext_exports, {
 });
 module.exports = __toCommonJS(JSItemRunJSContext_exports);
 var import_flowContext = require("../../flowContext");
+var import_elementDoc = require("./elementDoc");
 const _JSItemRunJSContext = class _JSItemRunJSContext extends import_flowContext.FlowRunJSContext {
 };
 __name(_JSItemRunJSContext, "JSItemRunJSContext");
@@ -38,8 +39,8 @@ let JSItemRunJSContext = _JSItemRunJSContext;
 JSItemRunJSContext.define({
   label: "JSItem RunJS context",
   properties: {
-    element: `ElementProxy instance providing a safe DOM container for form item rendering.
-      Supports innerHTML, append, and other DOM manipulation methods.`,
+    element: (0, import_elementDoc.createElementPropertyDoc)(`ElementProxy instance providing a safe DOM container for form item rendering.
+      Supports innerHTML, append, and other DOM manipulation methods.`),
     resource: `Current resource instance (read-only).
       Provides access to the data resource associated with the current form context.`,
     record: `Current record data object (read-only).
@@ -59,7 +60,7 @@ JSItemRunJSContext.define(
   {
     label: "JS \u8868\u5355\u9879 RunJS \u4E0A\u4E0B\u6587",
     properties: {
-      element: "ElementProxy\uFF0C\u8868\u5355\u9879\u6E32\u67D3\u5BB9\u5668\uFF0C\u652F\u6301 innerHTML/append \u7B49 DOM \u64CD\u4F5C",
+      element: (0, import_elementDoc.createZhCNElementPropertyDoc)("ElementProxy\uFF0C\u8868\u5355\u9879\u6E32\u67D3\u5BB9\u5668\uFF0C\u652F\u6301 innerHTML/append \u7B49 DOM \u64CD\u4F5C"),
       resource: "\u5F53\u524D\u8D44\u6E90\uFF08\u53EA\u8BFB\uFF09",
       record: "\u5F53\u524D\u8BB0\u5F55\uFF08\u53EA\u8BFB\uFF09",
       formValues: {