@nocobase/flow-engine 2.0.0-alpha.21 → 2.0.0-alpha.23

package/lib/components/settings/independents/dropdown/FlowsDropdownButton.js

@@ -96,7 +96,7 @@ const FlowsDropdownButtonWithModel = (0, import_react.observer)(
         const flowsArray = Array.from(flows.values());
         return flowsArray.map((flow) => {
           const configurableSteps = Object.entries(flow.steps).map(([stepKey, stepDefinition]) => {
-            var _a, _b;
+            var _a;
             const actionStep = stepDefinition;
             if (actionStep.hideInSettings) {
               return null;
@@ -104,7 +104,7 @@ const FlowsDropdownButtonWithModel = (0, import_react.observer)(
             const stepUiSchema = actionStep.uiSchema || {};
             let actionUiSchema = {};
             if (actionStep.use) {
-              const action = (_b = (_a = model.flowEngine) == null ? void 0 : _a.getAction) == null ? void 0 : _b.call(_a, actionStep.use);
+              const action = (_a = model.getAction) == null ? void 0 : _a.call(model, actionStep.use);
               if (action && action.uiSchema) {
                 actionUiSchema = action.uiSchema;
               }

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

@@ -222,7 +222,7 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
           flowsArray.map(async (flow) => {
             const configurableSteps = await Promise.all(
               Object.entries(flow.steps).map(async ([stepKey, stepDefinition]) => {
-                var _a, _b;
+                var _a;
                 const actionStep = stepDefinition;
                 if (actionStep.hideInSettings) {
                   return null;
@@ -232,9 +232,9 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
                 let stepTitle = actionStep.title;
                 if (actionStep.use) {
                   try {
-                    const action = (_b = (_a = targetModel.flowEngine) == null ? void 0 : _a.getAction) == null ? void 0 : _b.call(_a, actionStep.use);
+                    const action = (_a = targetModel.getAction) == null ? void 0 : _a.call(targetModel, actionStep.use);
                     hasActionUiSchema = action && action.uiSchema != null;
-                    stepTitle = stepTitle || action.title;
+                    stepTitle = stepTitle || (action == null ? void 0 : action.title);
                   } catch (error) {
                     console.warn(t("Failed to get action {{action}}", { action: actionStep.use }), ":", error);
                   }

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

@@ -122,7 +122,7 @@ const FlowsContextMenuWithModel = (0, import_react.observer)(
         const flowsArray = Array.from(flows.values());
         return flowsArray.map((flow) => {
           const configurableSteps = Object.entries(flow.steps).map(([stepKey, stepDefinition]) => {
-            var _a, _b;
+            var _a;
             const actionStep = stepDefinition;
             if (actionStep.hideInSettings) {
               return null;
@@ -130,7 +130,7 @@ const FlowsContextMenuWithModel = (0, import_react.observer)(
             const stepUiSchema = actionStep.uiSchema || {};
             let actionUiSchema = {};
             if (actionStep.use) {
-              const action = (_b = (_a = model.flowEngine) == null ? void 0 : _a.getAction) == null ? void 0 : _b.call(_a, actionStep.use);
+              const action = (_a = model.getAction) == null ? void 0 : _a.call(model, actionStep.use);
               if (action && action.uiSchema) {
                 actionUiSchema = action.uiSchema;
               }

package/lib/flowEngine.js

@@ -714,7 +714,8 @@ const _FlowEngine = class _FlowEngine {
         console.error("FlowModel.moveTo: Parent subModels must be an array to perform move operation.");
         return false;
       }
-      const findIndex = /* @__PURE__ */ __name((model) => subModels.findIndex((item) => item.uid === model.uid), "findIndex");
+      const subModelsCopy = [...subModels];
+      const findIndex = /* @__PURE__ */ __name((model) => subModelsCopy.findIndex((item) => item.uid === model.uid), "findIndex");
       const currentIndex = findIndex(sourceModel2);
       const targetIndex = findIndex(targetModel2);
       if (currentIndex === -1 || targetIndex === -1) {
@@ -725,11 +726,12 @@ const _FlowEngine = class _FlowEngine {
         console.warn("FlowModel.moveTo: Current model is already at the target position. No action taken.");
         return false;
       }
-      const [movedModel] = subModels.splice(currentIndex, 1);
-      subModels.splice(targetIndex, 0, movedModel);
-      subModels.forEach((model, index) => {
+      const [movedModel] = subModelsCopy.splice(currentIndex, 1);
+      subModelsCopy.splice(targetIndex, 0, movedModel);
+      subModelsCopy.forEach((model, index) => {
         model.sortIndex = index;
       });
+      sourceModel2.parent.subModels[sourceModel2.subKey] = subModelsCopy;
       return true;
     }, "move");
     move(sourceModel, targetModel);

package/lib/flowSettings.js

@@ -438,7 +438,7 @@ const _FlowSettings = class _FlowSettings {
    * @returns {Promise<boolean>} 是否成功打开弹窗
    */
   async open(options) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e;
     __privateGet(this, _emitter).emit("beforeOpen", options);
     const { model, flowKey, flowKeys, stepKey, uiMode = "dialog", preset, onCancel, onSaved } = options;
     if (!model) {
@@ -473,7 +473,7 @@ const _FlowSettings = class _FlowSettings {
         let actionDefaultParams = {};
         let uiMode2;
         if (step.use) {
-          const action = (_c = (_b = model.flowEngine) == null ? void 0 : _b.getAction) == null ? void 0 : _c.call(_b, step.use);
+          const action = (_b = model.getAction) == null ? void 0 : _b.call(model, step.use);
           if (action) {
             actionDefaultParams = action.defaultParams || {};
             stepTitle = stepTitle || action.title;
@@ -511,7 +511,7 @@ const _FlowSettings = class _FlowSettings {
     }
     if (entries.length === 0) {
       if (!preset) {
-        (_d = message == null ? void 0 : message.info) == null ? void 0 : _d.call(message, t("This model has no configurable flow settings"));
+        (_c = message == null ? void 0 : message.info) == null ? void 0 : _c.call(message, t("This model has no configurable flow settings"));
       }
       return false;
     }
@@ -523,7 +523,7 @@ const _FlowSettings = class _FlowSettings {
     const scopes = {
       // 为 schema 表达式提供上下文能力（可在表达式中使用 useFlowSettingsContext 等）
       useFlowSettingsContext: import_useFlowSettingsContext.useFlowSettingsContext,
-      ...((_e = flowEngine == null ? void 0 : flowEngine.flowSettings) == null ? void 0 : _e.scopes) || {}
+      ...((_d = flowEngine == null ? void 0 : flowEngine.flowSettings) == null ? void 0 : _d.scopes) || {}
     };
     let modeProps = typeof resolvedUiMode === "object" && resolvedUiMode ? resolvedUiMode.props || {} : {};
     if (modeType === "embed") {
@@ -537,7 +537,7 @@ const _FlowSettings = class _FlowSettings {
         target,
         styles: {
           body: {
-            padding: (_f = flowEngine.context.themeToken) == null ? void 0 : _f.padding
+            padding: (_e = flowEngine.context.themeToken) == null ? void 0 : _e.padding
           }
         },
         ...modeProps,

package/lib/utils/params-resolvers.js

@@ -277,7 +277,7 @@ async function compileExpression(expression, ctx) {
     if (segs.length === 0) return base;
     return (0, import_shared.getValuesByPath)(base, segs.join("."));
   }, "resolveDotOnlyPath");
-  const singleMatch = expression.match(/^\{\{\s*(.+)\s*\}\}$/);
+  const singleMatch = expression.match(/^\s*\{\{\s*([^{}]+?)\s*\}\}\s*$/);
   if (singleMatch) {
     const inner = singleMatch[1];
     const dotPath = matchDotOnly(inner);

package/lib/utils/schema-utils.js

@@ -131,14 +131,14 @@ function compileUiSchema(scope, uiSchema, options = {}) {
 }
 __name(compileUiSchema, "compileUiSchema");
 async function resolveStepUiSchema(model, flow, step) {
-  var _a, _b;
+  var _a;
   const flowRuntimeContext = new import_flowContext.FlowRuntimeContext(model, flow.key, "settings");
   (0, import_setupRuntimeContextSteps.setupRuntimeContextSteps)(flowRuntimeContext, flow.steps, model, flow.key);
   flowRuntimeContext.defineProperty("currentStep", { value: step });
   let stepUiSchema = step.uiSchema;
   if (step.use) {
     try {
-      const action = (_b = (_a = model.flowEngine) == null ? void 0 : _a.getAction) == null ? void 0 : _b.call(_a, step.use);
+      const action = (_a = model.getAction) == null ? void 0 : _a.call(model, step.use);
       if (action && action.uiSchema) {
         stepUiSchema = stepUiSchema || action.uiSchema;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.0-alpha.21",
+  "version": "2.0.0-alpha.23",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -8,8 +8,8 @@
   "dependencies": {
     "@formily/antd-v5": "1.x",
     "@formily/reactive": "2.x",
-    "@nocobase/sdk": "2.0.0-alpha.21",
-    "@nocobase/shared": "2.0.0-alpha.21",
+    "@nocobase/sdk": "2.0.0-alpha.23",
+    "@nocobase/shared": "2.0.0-alpha.23",
     "ahooks": "^3.7.2",
     "dompurify": "^3.0.2",
     "lodash": "^4.x",
@@ -34,5 +34,5 @@
   ],
   "author": "NocoBase Team",
   "license": "AGPL-3.0",
-  "gitHead": "0398c85e979d09e834952e71c5c1a1ccf1a3a8e1"
+  "gitHead": "ea67a7ad1c12fce26e0fff992f33de10901eff6a"
 }

package/src/components/settings/independents/dropdown/FlowsDropdownButton.tsx

@@ -132,7 +132,7 @@ const FlowsDropdownButtonWithModel: React.FC<ModelProvidedProps> = observer(
                 // 如果step使用了action，也获取action的uiSchema
                 let actionUiSchema = {};
                 if (actionStep.use) {
-                  const action = model.flowEngine?.getAction?.(actionStep.use);
+                  const action = model.getAction?.(actionStep.use);
                   if (action && action.uiSchema) {
                     actionUiSchema = action.uiSchema;
                   }

package/src/components/settings/wrappers/contextual/DefaultSettingsIcon.tsx

@@ -278,9 +278,9 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
                 let stepTitle = actionStep.title;
                 if (actionStep.use) {
                   try {
-                    const action = targetModel.flowEngine?.getAction?.(actionStep.use);
+                    const action = targetModel.getAction?.(actionStep.use);
                     hasActionUiSchema = action && action.uiSchema != null;
-                    stepTitle = stepTitle || action.title;
+                    stepTitle = stepTitle || action?.title;
                   } catch (error) {
                     console.warn(t('Failed to get action {{action}}', { action: actionStep.use }), ':', error);
                   }

package/src/components/settings/wrappers/contextual/FlowsContextMenu.tsx

@@ -162,7 +162,7 @@ const FlowsContextMenuWithModel: React.FC<ModelProvidedProps> = observer(
                 // 如果step使用了action，也获取action的uiSchema
                 let actionUiSchema = {};
                 if (actionStep.use) {
-                  const action = model.flowEngine?.getAction?.(actionStep.use);
+                  const action = model.getAction?.(actionStep.use);
                   if (action && action.uiSchema) {
                     actionUiSchema = action.uiSchema;
                   }

package/src/flowEngine.ts

@@ -848,7 +848,8 @@ export class FlowEngine {
         return false;
       }
 
-      const findIndex = (model: FlowModel) => subModels.findIndex((item) => item.uid === model.uid);
+      const subModelsCopy = [...subModels];
+      const findIndex = (model: FlowModel) => subModelsCopy.findIndex((item) => item.uid === model.uid);
 
       const currentIndex = findIndex(sourceModel);
       const targetIndex = findIndex(targetModel);
@@ -864,14 +865,17 @@ export class FlowEngine {
       }
 
       // 使用splice直接移动数组元素（O(n)比排序O(n log n)更快）
-      const [movedModel] = subModels.splice(currentIndex, 1);
-      subModels.splice(targetIndex, 0, movedModel);
+      const [movedModel] = subModelsCopy.splice(currentIndex, 1);
+      subModelsCopy.splice(targetIndex, 0, movedModel);
 
       // 重新分配连续的sortIndex
-      subModels.forEach((model, index) => {
+      subModelsCopy.forEach((model, index) => {
         model.sortIndex = index;
       });
 
+      // 更新父模型的subModels引用
+      sourceModel.parent.subModels[sourceModel.subKey] = subModelsCopy;
+
       return true;
     };
     move(sourceModel, targetModel);

package/src/flowSettings.ts

@@ -604,7 +604,7 @@ export class FlowSettings {
         let actionDefaultParams: Record<string, any> = {};
         let uiMode;
         if (step.use) {
-          const action = (model as any).flowEngine?.getAction?.(step.use);
+          const action = model.getAction?.(step.use);
           if (action) {
             actionDefaultParams = action.defaultParams || {};
             stepTitle = stepTitle || action.title;

package/src/utils/params-resolvers.ts

@@ -440,7 +440,7 @@ async function compileExpression<TModel extends FlowModel = FlowModel>(expressio
    * ✅ "{{ctx.user}}"            -> 捕获: "ctx.user"
    * ❌ "Hello {{ ctx.user }}"    -> 不匹配（不是纯表达式）
    */
-  const singleMatch = expression.match(/^\{\{\s*(.+)\s*\}\}$/);
+  const singleMatch = expression.match(/^\s*\{\{\s*([^{}]+?)\s*\}\}\s*$/);
   if (singleMatch) {
     const inner = singleMatch[1];
     const dotPath = matchDotOnly(inner);

package/src/utils/schema-utils.ts

@@ -181,7 +181,7 @@ export async function resolveStepUiSchema<TModel extends FlowModel = FlowModel>(
 
   if (step.use) {
     try {
-      const action = model.flowEngine?.getAction?.(step.use);
+      const action = model.getAction?.(step.use);
       if (action && action.uiSchema) {
         stepUiSchema = stepUiSchema || action.uiSchema;
       }