@nocobase/flow-engine 2.0.0-alpha.53 → 2.0.0-alpha.55

package/lib/components/settings/wrappers/component/SelectWithTitle.d.ts

@@ -0,0 +1,18 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import React from 'react';
+export interface SelectWithTitleProps {
+    title?: any;
+    getDefaultValue?: any;
+    options?: any;
+    fieldNames?: any;
+    itemKey?: string;
+    onChange?: (...args: any[]) => void;
+}
+export declare function SelectWithTitle({ title, getDefaultValue, onChange, options, fieldNames, itemKey, ...others }: SelectWithTitleProps): React.JSX.Element;

package/lib/components/settings/wrappers/component/SelectWithTitle.js

@@ -0,0 +1,135 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var SelectWithTitle_exports = {};
+__export(SelectWithTitle_exports, {
+  SelectWithTitle: () => SelectWithTitle
+});
+module.exports = __toCommonJS(SelectWithTitle_exports);
+var import_antd = require("antd");
+var import_react = __toESM(require("react"));
+var import_provider = require("../../../../provider");
+function SelectWithTitle({
+  title,
+  getDefaultValue,
+  onChange,
+  options,
+  fieldNames,
+  itemKey,
+  ...others
+}) {
+  const [open, setOpen] = (0, import_react.useState)(false);
+  const [value, setValue] = (0, import_react.useState)("");
+  const ctx = (0, import_provider.useFlowEngineContext)();
+  (0, import_react.useEffect)(() => {
+    let cancelled = false;
+    const run = /* @__PURE__ */ __name(async () => {
+      if (!getDefaultValue) return;
+      try {
+        const val = await getDefaultValue();
+        if (cancelled || !val) return;
+        const entries = Object.entries(val);
+        if (!entries.length) return;
+        const [key, result] = entries[0];
+        setValue(result);
+      } catch (e) {
+        console.error(e);
+      }
+    }, "run");
+    run();
+    return () => {
+      cancelled = true;
+    };
+  }, [getDefaultValue]);
+  const timerRef = (0, import_react.useRef)(null);
+  const handleChange = /* @__PURE__ */ __name((val) => {
+    setValue(val);
+    onChange == null ? void 0 : onChange({ [itemKey]: val });
+  }, "handleChange");
+  return /* @__PURE__ */ import_react.default.createElement(
+    "div",
+    {
+      style: { alignItems: "center", display: "flex", justifyContent: "space-between" },
+      onClick: (e) => {
+        e.stopPropagation();
+        setOpen((v) => !v);
+      },
+      onMouseLeave: () => {
+        timerRef.current = setTimeout(() => {
+          setOpen(false);
+        }, 200);
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement(
+      "span",
+      {
+        style: {
+          whiteSpace: "nowrap",
+          // 不换行
+          flexShrink: 0
+          // 不被挤压
+        }
+      },
+      title
+    ),
+    /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Select,
+      {
+        ...others,
+        open,
+        popupMatchSelectWidth: false,
+        bordered: false,
+        value,
+        onChange: handleChange,
+        popupClassName: `select-popup-${title.replaceAll(" ", "-")}`,
+        fieldNames,
+        options,
+        labelRender: (props) => ctx.t(props.label),
+        optionRender: (o) => ctx.t(o.label),
+        style: { textAlign: "right", minWidth: 100 },
+        onMouseEnter: () => {
+          clearTimeout(timerRef.current);
+        }
+      }
+    )
+  );
+}
+__name(SelectWithTitle, "SelectWithTitle");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SelectWithTitle
+});

package/lib/components/settings/wrappers/component/SwitchWithTitle.d.ts

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { FC } from 'react';
+export declare const SwitchWithTitle: FC;

package/lib/components/settings/wrappers/component/SwitchWithTitle.js

@@ -0,0 +1,110 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var SwitchWithTitle_exports = {};
+__export(SwitchWithTitle_exports, {
+  SwitchWithTitle: () => SwitchWithTitle
+});
+module.exports = __toCommonJS(SwitchWithTitle_exports);
+var import_react = require("@formily/react");
+var import_antd = require("antd");
+var import_react2 = __toESM(require("react"));
+var import_provider = require("../../../../provider");
+const ml32 = { marginLeft: 32 };
+const SwitchWithTitle = (0, import_react.observer)(
+  ({ title, onChange, getDefaultValue, disabled, itemKey, ...others }) => {
+    const [checked, setChecked] = (0, import_react2.useState)(false);
+    const ctx = (0, import_provider.useFlowEngineContext)();
+    (0, import_react2.useEffect)(() => {
+      let cancelled = false;
+      const run = /* @__PURE__ */ __name(async () => {
+        if (!getDefaultValue) return;
+        try {
+          const val = await getDefaultValue();
+          if (cancelled || !val) return;
+          const entries = Object.entries(val);
+          if (!entries.length) return;
+          const [key, value] = entries[0];
+          setChecked(!!value);
+        } catch (e) {
+          console.error(e);
+        }
+      }, "run");
+      run();
+      return () => {
+        cancelled = true;
+      };
+    }, [getDefaultValue]);
+    const handleChange = /* @__PURE__ */ __name((val) => {
+      setChecked(val);
+      onChange == null ? void 0 : onChange({ [itemKey]: val });
+    }, "handleChange");
+    const handleWrapperClick = /* @__PURE__ */ __name(() => {
+      if (disabled) return;
+      handleChange(!checked);
+    }, "handleWrapperClick");
+    return /* @__PURE__ */ import_react2.default.createElement(
+      "div",
+      {
+        style: {
+          alignItems: "center",
+          display: "flex",
+          justifyContent: "space-between",
+          cursor: disabled ? "not-allowed" : "pointer"
+        },
+        onClick: handleWrapperClick
+      },
+      title,
+      /* @__PURE__ */ import_react2.default.createElement(
+        import_antd.Switch,
+        {
+          size: "small",
+          ...others,
+          checkedChildren: others.checkedChildren ? ctx.t(others.checkedChildren) : void 0,
+          unCheckedChildren: others.unCheckedChildren ? ctx.t(others.unCheckedChildren) : void 0,
+          checked,
+          style: ml32,
+          disabled
+        }
+      )
+    );
+  }
+);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SwitchWithTitle
+});

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

@@ -46,6 +46,8 @@ var import_react = __toESM(require("react"));
 var import_models = require("../../../../models");
 var import_utils = require("../../../../utils");
 var import_hooks = require("../../../../hooks");
+var import_SwitchWithTitle = require("../component/SwitchWithTitle");
+var import_SelectWithTitle = require("../component/SelectWithTitle");
 const findSubModelByKey = /* @__PURE__ */ __name((model, subModelKey) => {
   var _a;
   if (!model || !subModelKey || typeof subModelKey !== "string") {
@@ -82,6 +84,18 @@ const findSubModelByKey = /* @__PURE__ */ __name((model, subModelKey) => {
     return subModel instanceof import_models.FlowModel ? subModel : null;
   }
 }, "findSubModelByKey");
+const componentMap = {
+  switch: import_SwitchWithTitle.SwitchWithTitle,
+  select: import_SelectWithTitle.SelectWithTitle
+};
+const MenuLabelItem = /* @__PURE__ */ __name(({ title, uiMode, itemProps }) => {
+  const type = (uiMode == null ? void 0 : uiMode.type) || uiMode;
+  const Component = type ? componentMap[type] : null;
+  if (!Component) {
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, title);
+  }
+  return /* @__PURE__ */ import_react.default.createElement(Component, { title, ...itemProps });
+}, "MenuLabelItem");
 const DefaultSettingsIcon = /* @__PURE__ */ __name(({
   model,
   showDeleteButton = true,
@@ -238,28 +252,33 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
               Object.entries(flow.steps).map(async ([stepKey, stepDefinition]) => {
                 var _a;
                 const actionStep = stepDefinition;
+                let step = actionStep;
                 if (await (0, import_utils.shouldHideStepInSettings)(targetModel, flow, actionStep)) {
                   return null;
                 }
+                let uiMode = await (0, import_utils.resolveUiMode)(actionStep.uiMode, targetModel.context);
                 const hasStepUiSchema = actionStep.uiSchema != null;
                 let hasActionUiSchema = false;
                 let stepTitle = actionStep.title;
                 if (actionStep.use) {
                   try {
                     const action = (_a = targetModel.getAction) == null ? void 0 : _a.call(targetModel, actionStep.use);
+                    step = { ...action || {}, ...actionStep };
+                    uiMode = await (0, import_utils.resolveUiMode)((action == null ? void 0 : action.uiMode) || uiMode, targetModel.context);
                     hasActionUiSchema = action && action.uiSchema != null;
                     stepTitle = stepTitle || (action == null ? void 0 : action.title);
                   } catch (error) {
                     console.warn(t("Failed to get action {{action}}", { action: actionStep.use }), ":", error);
                   }
                 }
-                if (!hasStepUiSchema && !hasActionUiSchema) {
+                const selectOrSwitchMode = ["select", "switch"].includes((uiMode == null ? void 0 : uiMode.type) || uiMode);
+                if (!selectOrSwitchMode && !hasStepUiSchema && !hasActionUiSchema) {
                   return null;
                 }
                 let mergedUiSchema = {};
                 try {
                   const resolvedSchema = await (0, import_utils.resolveStepUiSchema)(targetModel, flow, actionStep);
-                  if (!resolvedSchema) {
+                  if (!resolvedSchema && !selectOrSwitchMode) {
                     return null;
                   }
                   mergedUiSchema = resolvedSchema;
@@ -269,11 +288,12 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
                 }
                 return {
                   stepKey,
-                  step: actionStep,
+                  step,
                   uiSchema: mergedUiSchema,
                   title: t(stepTitle) || stepKey,
-                  modelKey
+                  modelKey,
                   // 添加模型标识
+                  uiMode
                 };
               })
             ).then((steps) => steps.filter(Boolean));
@@ -403,19 +423,55 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
       if (flattenSubMenus) {
         configurableFlowsAndSteps.forEach(({ flow, steps, modelKey }) => {
           const groupKey = generateUniqueKey(`flow-group-${modelKey ? `${modelKey}-` : ""}${flow.key}`);
-          items.push({
-            key: groupKey,
-            label: t(flow.title) || flow.key,
-            type: "group"
-          });
+          if (flow.options.divider === "top") {
+            items.push({
+              type: "divider"
+            });
+          }
+          if (flow.options.enableTitle) {
+            items.push({
+              key: groupKey,
+              label: t(flow.title) || flow.key,
+              type: "group"
+            });
+          }
           steps.forEach((stepInfo) => {
             const baseMenuKey = modelKey ? `${modelKey}:${flow.key}:${stepInfo.stepKey}` : `${flow.key}:${stepInfo.stepKey}`;
             const uniqueKey = generateUniqueKey(baseMenuKey);
+            const uiMode = stepInfo.uiMode;
+            const subModel = findSubModelByKey(model, stepInfo.modelKey);
+            const targetModel = subModel || model;
+            const stepParams = targetModel.getStepParams(flow.key, stepInfo.stepKey) || {};
+            const itemProps = {
+              getDefaultValue: /* @__PURE__ */ __name(async () => {
+                var _a;
+                let defaultParams = await (0, import_utils.resolveDefaultParams)(stepInfo.step.defaultParams, targetModel.context);
+                if (stepInfo.step.use) {
+                  const action = (_a = targetModel.getAction) == null ? void 0 : _a.call(targetModel, stepInfo.step.use);
+                  defaultParams = await (0, import_utils.resolveDefaultParams)(action.defaultParams, targetModel.context);
+                }
+                return { ...defaultParams, ...stepParams };
+              }, "getDefaultValue"),
+              onChange: /* @__PURE__ */ __name(async (val) => {
+                var _a;
+                targetModel.setStepParams(flow.key, stepInfo.stepKey, val);
+                if (typeof stepInfo.step.beforeParamsSave === "function") {
+                  await stepInfo.step.beforeParamsSave(targetModel.context, val, stepParams);
+                }
+                await targetModel.saveStepParams();
+                (_a = message == null ? void 0 : message.success) == null ? void 0 : _a.call(message, t("Configuration saved"));
+                if (typeof stepInfo.step.afterParamsSave === "function") {
+                  await stepInfo.step.afterParamsSave(targetModel.context, val, stepParams);
+                }
+              }, "onChange"),
+              ...(uiMode == null ? void 0 : uiMode.props) || {},
+              itemKey: uiMode == null ? void 0 : uiMode.key
+            };
             items.push({
               key: uniqueKey,
-              label: t(stepInfo.title)
+              label: /* @__PURE__ */ import_react.default.createElement(MenuLabelItem, { title: t(stepInfo.title), uiMode, itemProps })
             });
-            if (flow.key === "popupSettings") {
+            if (flow.key === "popupSettings" && baseMenuKey.includes("openView")) {
               const copyKey = generateUniqueKey(`copy-pop-uid:${baseMenuKey}`);
               items.push({
                 key: copyKey,
@@ -423,6 +479,11 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
               });
             }
           });
+          if (flow.options.divider === "bottom") {
+            items.push({
+              type: "divider"
+            });
+          }
         });
       } else {
         const modelGroups = /* @__PURE__ */ new Map();
@@ -494,9 +555,7 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
     const items = [...menuItems];
     if (showCopyUidButton || showDeleteButton) {
       items.push({
-        key: "common-actions",
-        label: t("Common actions"),
-        type: "group"
+        type: "divider"
       });
       if (showCopyUidButton && model.uid) {
         items.push({

package/lib/flowEngine.js

@@ -759,7 +759,11 @@ const _FlowEngine = class _FlowEngine {
     if (this.ensureModelRepository()) {
       await this._modelRepository.destroy(uid);
     }
-    return this.removeModel(uid);
+    const modelInstance = this._modelInstances.get(uid);
+    const parent = modelInstance == null ? void 0 : modelInstance.parent;
+    const result = this.removeModel(uid);
+    parent && parent.emitter.emit("onSubModelDestroyed", modelInstance);
+    return result;
   }
   /**
    * Duplicate a model tree via repository API.

package/lib/flowSettings.d.ts

@@ -25,8 +25,8 @@ export interface FlowSettingsOpenOptions {
     /** 指定打开的步骤 key（配合 flowKey 使用） */
     stepKey?: string;
     /** 弹窗展现形式（drawer 或 dialog） */
-    uiMode?: 'dialog' | 'drawer' | 'embed' | {
-        type?: 'dialog' | 'drawer' | 'embed';
+    uiMode?: 'select' | 'switch' | 'dialog' | 'drawer' | 'embed' | {
+        type?: 'dialog' | 'drawer' | 'embed' | 'select' | 'switch';
         props?: {
             title?: string;
             width?: number;

package/lib/flowSettings.js

@@ -466,12 +466,11 @@ const _FlowSettings = class _FlowSettings {
         if (!preset && (!step || await (0, import_utils.shouldHideStepInSettings)(model, flow, step))) continue;
         if (preset && !step.preset) continue;
         const mergedUiSchema = await (0, import_utils.resolveStepUiSchema)(model, flow, step);
-        if (!mergedUiSchema || Object.keys(mergedUiSchema).length === 0) continue;
         let stepTitle = step.title;
         let beforeParamsSave = step.beforeParamsSave;
         let afterParamsSave = step.afterParamsSave;
         let actionDefaultParams = {};
-        let uiMode2;
+        let uiMode2 = step.uiMode;
         if (step.use) {
           const action = (_b = model.getAction) == null ? void 0 : _b.call(model, step.use);
           if (action) {
@@ -497,6 +496,9 @@ const _FlowSettings = class _FlowSettings {
           ...resolvedDefaultParams || {},
           ...modelStepParams
         };
+        if ((!mergedUiSchema || Object.keys(mergedUiSchema).length === 0) && !["select", "switch"].includes((uiMode2 == null ? void 0 : uiMode2.type) || uiMode2)) {
+          continue;
+        }
         entries.push({
           flowKey: fk,
           flowTitle: t(flow.title) || fk,
@@ -522,6 +524,9 @@ const _FlowSettings = class _FlowSettings {
     const viewer = model.context.viewer;
     const resolvedUiMode = entries.length === 1 ? await (0, import_utils.resolveUiMode)(entries[0].uiMode || uiMode, entries[0].ctx) : uiMode;
     const modeType = typeof resolvedUiMode === "string" ? resolvedUiMode : resolvedUiMode.type || "dialog";
+    if (["select", "switch"].includes(modeType)) {
+      return;
+    }
     const openView = viewer[modeType || "dialog"].bind(viewer);
     const flowEngine = model.flowEngine;
     const scopes = {

package/lib/resources/sqlResource.js

@@ -265,10 +265,11 @@ const _SQLResource = class _SQLResource extends import_baseRecordResource.BaseRe
         try {
           this.clearError();
           this.loading = true;
+          this.emit("loading");
           const { data, meta } = await this.run();
           this.setData(data).setMeta(meta);
-          this.emit("refresh");
           this.loading = false;
+          this.emit("refresh");
           resolve();
         } catch (error) {
           this.setError(error);

package/lib/types.d.ts

@@ -94,6 +94,8 @@ export interface FlowDefinitionOptions<TModel extends FlowModel = FlowModel> {
      * 仅填补缺失，不覆盖已有。固定返回形状：{ [stepKey]: params }
      */
     defaultParams?: Record<string, any> | ((ctx: FlowModelContext) => StepParam | Promise<StepParam>);
+    enableTitle?: boolean;
+    divider?: 'top' | 'bottom';
 }
 export interface IModelComponentProps {
     [key: string]: any;
@@ -185,8 +187,9 @@ export interface DispatchEventOptions {
  */
 export type EventDefinition<TModel extends FlowModel = FlowModel, TCtx extends FlowContext = FlowContext> = ActionDefinition<TModel, TCtx>;
 export type StepUIMode = 'dialog' | 'drawer' | 'embed' | {
-    type?: 'dialog' | 'drawer' | 'embed';
+    type?: 'dialog' | 'drawer' | 'embed' | 'select' | 'switch';
     props?: Record<string, any>;
+    key?: string;
 };
 /**
  * Step definition with unified support for both registered actions and inline handlers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.0-alpha.53",
+  "version": "2.0.0-alpha.55",
   "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.53",
-    "@nocobase/shared": "2.0.0-alpha.53",
+    "@nocobase/sdk": "2.0.0-alpha.55",
+    "@nocobase/shared": "2.0.0-alpha.55",
     "ahooks": "^3.7.2",
     "dayjs": "^1.11.9",
     "dompurify": "^3.0.2",
@@ -36,5 +36,5 @@
   ],
   "author": "NocoBase Team",
   "license": "AGPL-3.0",
-  "gitHead": "ff30cf8261f5a97b3f24c3752af5bbc564167b37"
+  "gitHead": "7e65ad6b6e4e76a51f82c69b04b563fbcc7e1c25"
 }

package/src/__tests__/flowEngine.destroyModel.test.ts

@@ -0,0 +1,74 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { FlowEngine } from '../flowEngine';
+import { FlowModel } from '../models';
+
+describe('FlowEngine destroyModel', () => {
+  let engine: FlowEngine;
+
+  beforeEach(() => {
+    engine = new FlowEngine();
+    engine.registerModels({ FlowModel });
+  });
+
+  it('calls repository.destroy when repository exists and emits onSubModelDestroyed on parent', async () => {
+    const parent = engine.createModel({ uid: 'parent', use: 'FlowModel' });
+    const child = engine.createModel({
+      uid: 'child',
+      use: 'FlowModel',
+      parentId: 'parent',
+      subKey: 'child',
+      subType: 'object',
+    });
+
+    const repo = { destroy: vi.fn().mockResolvedValue(true) } as any;
+    (engine as any)._modelRepository = repo;
+
+    const emitSpy = vi.spyOn(parent.emitter, 'emit');
+
+    const res = await engine.destroyModel('child');
+
+    expect(repo.destroy).toHaveBeenCalledWith('child');
+    expect(res).toBe(true);
+    expect(emitSpy).toHaveBeenCalledWith('onSubModelDestroyed', child);
+  });
+
+  it('emits onSubModelDestroyed even if there is no repository', async () => {
+    const parent = engine.createModel({ uid: 'parent', use: 'FlowModel' });
+    const child = engine.createModel({
+      uid: 'child',
+      use: 'FlowModel',
+      parentId: 'parent',
+      subKey: 'child',
+      subType: 'object',
+    });
+
+    // ensure no repository
+    (engine as any)._modelRepository = null;
+
+    const emitSpy = vi.spyOn(parent.emitter, 'emit');
+
+    const res = await engine.destroyModel('child');
+
+    expect(res).toBe(true);
+    expect(emitSpy).toHaveBeenCalledWith('onSubModelDestroyed', child);
+  });
+
+  it('returns false when destroying a non-existent model but still calls repo.destroy if repo exists', async () => {
+    const repo = { destroy: vi.fn().mockResolvedValue(true) } as any;
+    (engine as any)._modelRepository = repo;
+
+    const res = await engine.destroyModel('no-such-uid');
+
+    expect(repo.destroy).toHaveBeenCalledWith('no-such-uid');
+    expect(res).toBe(false);
+  });
+});

package/src/components/settings/wrappers/component/SelectWithTitle.tsx

@@ -0,0 +1,108 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Select } from 'antd';
+import React, { useEffect, useRef, useState } from 'react';
+import { useFlowEngineContext } from '../../../../provider';
+
+export interface SelectWithTitleProps {
+  title?: any;
+  getDefaultValue?: any;
+  options?: any;
+  fieldNames?: any;
+  itemKey?: string;
+  onChange?: (...args: any[]) => void;
+}
+
+export function SelectWithTitle({
+  title,
+  getDefaultValue,
+  onChange,
+  options,
+  fieldNames,
+  itemKey,
+  ...others
+}: SelectWithTitleProps) {
+  const [open, setOpen] = useState(false);
+  const [value, setValue] = useState<any>('');
+  const ctx = useFlowEngineContext();
+  useEffect(() => {
+    let cancelled = false;
+
+    const run = async () => {
+      if (!getDefaultValue) return;
+
+      try {
+        const val = await getDefaultValue();
+        if (cancelled || !val) return;
+
+        const entries = Object.entries(val);
+        if (!entries.length) return;
+
+        const [key, result] = entries[0];
+        setValue(result);
+      } catch (e) {
+        console.error(e);
+      }
+    };
+
+    run();
+
+    return () => {
+      cancelled = true;
+    };
+  }, [getDefaultValue]);
+
+  const timerRef = useRef<any>(null);
+
+  const handleChange = (val: any) => {
+    setValue(val);
+    onChange?.({ [itemKey]: val });
+  };
+  return (
+    <div
+      style={{ alignItems: 'center', display: 'flex', justifyContent: 'space-between' }}
+      onClick={(e) => {
+        e.stopPropagation();
+        setOpen((v) => !v);
+      }}
+      onMouseLeave={() => {
+        timerRef.current = setTimeout(() => {
+          setOpen(false);
+        }, 200);
+      }}
+    >
+      <span
+        style={{
+          whiteSpace: 'nowrap', // 不换行
+          flexShrink: 0, // 不被挤压
+        }}
+      >
+        {title}
+      </span>
+      <Select
+        {...others}
+        open={open}
+        popupMatchSelectWidth={false}
+        bordered={false}
+        value={value}
+        onChange={handleChange}
+        popupClassName={`select-popup-${title.replaceAll(' ', '-')}`}
+        fieldNames={fieldNames}
+        options={options}
+        labelRender={(props) => ctx.t(props.label)}
+        optionRender={(o) => ctx.t(o.label)}
+        style={{ textAlign: 'right', minWidth: 100 }}
+        onMouseEnter={() => {
+          clearTimeout(timerRef.current);
+        }}
+      />
+    </div>
+  );
+}

package/src/components/settings/wrappers/component/SwitchWithTitle.tsx

@@ -0,0 +1,82 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { observer } from '@formily/react';
+import { Switch } from 'antd';
+import React, { FC, useEffect, useState } from 'react';
+import { useFlowEngineContext } from '../../../../provider';
+
+const ml32 = { marginLeft: 32 };
+
+export const SwitchWithTitle: FC = observer(
+  ({ title, onChange, getDefaultValue, disabled, itemKey, ...others }: any) => {
+    const [checked, setChecked] = useState<boolean>(false);
+    const ctx = useFlowEngineContext();
+
+    useEffect(() => {
+      let cancelled = false;
+
+      const run = async () => {
+        if (!getDefaultValue) return;
+
+        try {
+          const val = await getDefaultValue();
+          if (cancelled || !val) return;
+
+          const entries = Object.entries(val);
+          if (!entries.length) return;
+
+          const [key, value] = entries[0];
+          setChecked(!!value);
+        } catch (e) {
+          console.error(e);
+        }
+      };
+
+      run();
+
+      return () => {
+        cancelled = true;
+      };
+    }, [getDefaultValue]);
+
+    const handleChange = (val: boolean) => {
+      setChecked(val);
+      onChange?.({ [itemKey]: val });
+    };
+
+    // 点击整个容器时触发
+    const handleWrapperClick = () => {
+      if (disabled) return;
+      handleChange(!checked);
+    };
+    return (
+      <div
+        style={{
+          alignItems: 'center',
+          display: 'flex',
+          justifyContent: 'space-between',
+          cursor: disabled ? 'not-allowed' : 'pointer',
+        }}
+        onClick={handleWrapperClick}
+      >
+        {title}
+        <Switch
+          size="small"
+          {...others}
+          checkedChildren={others.checkedChildren ? ctx.t(others.checkedChildren) : undefined}
+          unCheckedChildren={others.unCheckedChildren ? ctx.t(others.unCheckedChildren) : undefined}
+          checked={checked}
+          style={ml32}
+          disabled={disabled}
+        />
+      </div>
+    );
+  },
+);

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

@@ -10,13 +10,19 @@
 import { ExclamationCircleOutlined, MenuOutlined } from '@ant-design/icons';
 import type { DropdownProps, MenuProps } from 'antd';
 import { App, Dropdown, Modal } from 'antd';
-import React, { startTransition, useCallback, useEffect, useMemo, useState } from 'react';
+import React, { startTransition, useCallback, useEffect, useMemo, useState, FC } from 'react';
 import { FlowModel } from '../../../../models';
-import { StepDefinition } from '../../../../types';
-import { getT, resolveStepUiSchema, shouldHideStepInSettings } from '../../../../utils';
-import { openStepSettings } from './StepSettings';
+import { StepDefinition, StepUIMode } from '../../../../types';
+import {
+  getT,
+  resolveStepUiSchema,
+  shouldHideStepInSettings,
+  resolveDefaultParams,
+  resolveUiMode,
+} from '../../../../utils';
 import { useNiceDropdownMaxHeight } from '../../../../hooks';
-
+import { SwitchWithTitle } from '../component/SwitchWithTitle';
+import { SelectWithTitle } from '../component/SelectWithTitle';
 // Type definitions for better type safety
 interface StepInfo {
   stepKey: string;
@@ -24,6 +30,7 @@ interface StepInfo {
   uiSchema: Record<string, any>;
   title: string;
   modelKey?: string;
+  uiMode?: StepUIMode;
 }
 
 interface FlowInfo {
@@ -85,6 +92,22 @@ const findSubModelByKey = (model: FlowModel, subModelKey: string): FlowModel | n
   }
 };
 
+const componentMap = {
+  switch: SwitchWithTitle,
+  select: SelectWithTitle,
+};
+
+const MenuLabelItem = ({ title, uiMode, itemProps }) => {
+  const type = uiMode?.type || uiMode;
+  const Component = type ? componentMap[type] : null;
+
+  if (!Component) {
+    return <>{title}</>;
+  }
+
+  return <Component title={title} {...itemProps} />;
+};
+
 /**
  * 默认的设置菜单图标组件
  * 提供原有的配置菜单功能
@@ -281,12 +304,12 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
             const configurableSteps = await Promise.all(
               Object.entries(flow.steps).map(async ([stepKey, stepDefinition]) => {
                 const actionStep = stepDefinition;
-
+                let step = actionStep;
                 // 支持静态与动态 hideInSettings
                 if (await shouldHideStepInSettings(targetModel, flow, actionStep)) {
                   return null;
                 }
-
+                let uiMode: any = await resolveUiMode(actionStep.uiMode, (targetModel as any).context);
                 // 检查是否有uiSchema（静态或动态）
                 const hasStepUiSchema = actionStep.uiSchema != null;
 
@@ -296,15 +319,18 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
                 if (actionStep.use) {
                   try {
                     const action = targetModel.getAction?.(actionStep.use);
+                    step = { ...(action || {}), ...actionStep };
+                    uiMode = await resolveUiMode(action?.uiMode || uiMode, (targetModel as any).context);
                     hasActionUiSchema = action && action.uiSchema != null;
                     stepTitle = stepTitle || action?.title;
                   } catch (error) {
                     console.warn(t('Failed to get action {{action}}', { action: actionStep.use }), ':', error);
                   }
                 }
+                const selectOrSwitchMode = ['select', 'switch'].includes(uiMode?.type || uiMode);
 
                 // 如果都没有uiSchema（静态或动态），返回null
-                if (!hasStepUiSchema && !hasActionUiSchema) {
+                if (!selectOrSwitchMode && !hasStepUiSchema && !hasActionUiSchema) {
                   return null;
                 }
 
@@ -316,7 +342,7 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
                   const resolvedSchema = await resolveStepUiSchema(targetModel, flow, actionStep);
 
                   // 如果解析后没有可配置的UI Schema，跳过此步骤
-                  if (!resolvedSchema) {
+                  if (!resolvedSchema && !selectOrSwitchMode) {
                     return null;
                   }
 
@@ -325,13 +351,13 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
                   console.warn(t('Failed to resolve uiSchema for step {{stepKey}}', { stepKey }), ':', error);
                   return null;
                 }
-
                 return {
                   stepKey,
-                  step: actionStep,
+                  step,
                   uiSchema: mergedUiSchema,
                   title: t(stepTitle) || stepKey,
                   modelKey, // 添加模型标识
+                  uiMode,
                 };
               }),
             ).then((steps) => steps.filter(Boolean));
@@ -489,13 +515,19 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
         // 平铺模式：只有流程分组，没有模型层级
         configurableFlowsAndSteps.forEach(({ flow, steps, modelKey }: FlowInfo) => {
           const groupKey = generateUniqueKey(`flow-group-${modelKey ? `${modelKey}-` : ''}${flow.key}`);
-
+          if (flow.options.divider === 'top') {
+            items.push({
+              type: 'divider',
+            });
+          }
           // 在平铺模式下始终按流程分组
-          items.push({
-            key: groupKey,
-            label: t(flow.title) || flow.key,
-            type: 'group',
-          });
+          if (flow.options.enableTitle) {
+            items.push({
+              key: groupKey,
+              label: t(flow.title) || flow.key,
+              type: 'group',
+            });
+          }
 
           steps.forEach((stepInfo: StepInfo) => {
             // 构建菜单项key，为子模型包含modelKey
@@ -504,14 +536,39 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
               : `${flow.key}:${stepInfo.stepKey}`;
 
             const uniqueKey = generateUniqueKey(baseMenuKey);
-
+            const uiMode = stepInfo.uiMode;
+            const subModel: any = findSubModelByKey(model, stepInfo.modelKey);
+            const targetModel = subModel || model;
+            const stepParams = targetModel.getStepParams(flow.key, stepInfo.stepKey) || {};
+            const itemProps = {
+              getDefaultValue: async () => {
+                let defaultParams = await resolveDefaultParams(stepInfo.step.defaultParams, targetModel.context);
+                if (stepInfo.step.use) {
+                  const action = targetModel.getAction?.(stepInfo.step.use);
+                  defaultParams = await resolveDefaultParams(action.defaultParams, targetModel.context);
+                }
+                return { ...defaultParams, ...stepParams };
+              },
+              onChange: async (val) => {
+                targetModel.setStepParams(flow.key, stepInfo.stepKey, val);
+                if (typeof stepInfo.step.beforeParamsSave === 'function') {
+                  await stepInfo.step.beforeParamsSave(targetModel.context, val, stepParams);
+                }
+                await targetModel.saveStepParams();
+                message?.success?.(t('Configuration saved'));
+                if (typeof stepInfo.step.afterParamsSave === 'function') {
+                  await stepInfo.step.afterParamsSave(targetModel.context, val, stepParams);
+                }
+              },
+              ...((uiMode as any)?.props || {}),
+              itemKey: (uiMode as any)?.key,
+            };
             items.push({
               key: uniqueKey,
-              label: t(stepInfo.title),
+              label: <MenuLabelItem title={t(stepInfo.title)} uiMode={uiMode} itemProps={itemProps} />,
             });
-
             // add per-step copy popup uid under each configurable step
-            if (flow.key === 'popupSettings') {
+            if (flow.key === 'popupSettings' && baseMenuKey.includes('openView')) {
               const copyKey = generateUniqueKey(`copy-pop-uid:${baseMenuKey}`);
               items.push({
                 key: copyKey,
@@ -519,6 +576,11 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
               });
             }
           });
+          if (flow.options.divider === 'bottom') {
+            items.push({
+              type: 'divider',
+            });
+          }
         });
       } else {
         // 层级模式：真正的子菜单结构
@@ -542,7 +604,6 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
             // 直接添加当前模型的flows
             flows.forEach(({ flow, steps }: FlowInfo) => {
               const groupKey = generateUniqueKey(`flow-group-${flow.key}`);
-
               items.push({
                 key: groupKey,
                 label: t(flow.title) || flow.key,
@@ -608,12 +669,16 @@ export const DefaultSettingsIcon: React.FC<DefaultSettingsIconProps> = ({
     const items = [...menuItems];
 
     if (showCopyUidButton || showDeleteButton) {
-      // 使用分组呈现常用操作（不再使用分割线）
       items.push({
-        key: 'common-actions',
-        label: t('Common actions'),
-        type: 'group' as const,
+        type: 'divider',
       });
+      // 使用分组呈现常用操作（不再使用分割线）
+
+      // items.push({
+      //   key: 'common-actions',
+      //   label: t('Common actions'),
+      //   type: 'group' as const,
+      // });
 
       // 添加复制uid按钮
       if (showCopyUidButton && model.uid) {

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

@@ -49,9 +49,8 @@ const openStepSettings = async ({ model, flowKey, stepKey, width = 600, title }:
 
   // 解析 uiMode，支持函数式
   const resolvedUiMode = await resolveUiMode(step.uiMode, ctx);
-
   // 提取模式和属性
-  let settingMode: 'dialog' | 'drawer' | 'embed';
+  let settingMode: 'dialog' | 'drawer' | 'embed' | 'select' | 'switch';
   let uiModeProps: Record<string, any> = {};
   let cleanup: () => void;
 

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

@@ -140,23 +140,19 @@ describe('DefaultSettingsIcon - only static flows are shown', () => {
       ),
     );
 
-    // 等待菜单内出现静态流分组，确保异步加载完成
+    // 等待菜单渲染完成，并且只包含静态流的步骤
     await waitFor(() => {
       const menu = (globalThis as any).__lastDropdownMenu;
       expect(menu).toBeTruthy();
       const items = (menu?.items || []) as any[];
-      const groupLabels = items.filter((it) => it.type === 'group').map((it) => String(it.label));
-      expect(groupLabels).toContain('Static Flow');
+      const keys = items.map((it) => String(it.key || ''));
+      expect(keys.some((k) => k.startsWith('static1:'))).toBe(true);
+      expect(keys.some((k) => k.startsWith('dyn1:'))).toBe(false);
     });
 
     const menu = (globalThis as any).__lastDropdownMenu;
     const items = (menu?.items || []) as any[];
 
-    // groups for flows are labeled with flow.title; ensure static group exists, dynamic group不存在
-    const groupLabels = items.filter((it) => it.type === 'group').map((it) => String(it.label));
-    expect(groupLabels).toContain('Static Flow');
-    expect(groupLabels).not.toContain('Dynamic Flow');
-
     // 静态流的 step 存在（key: `${flowKey}:${stepKey}`），动态流 step 不存在
     expect(items.some((it) => String(it.key || '').startsWith('static1:'))).toBe(true);
     expect(items.some((it) => String(it.key || '').startsWith('dyn1:'))).toBe(false);
@@ -361,7 +357,7 @@ describe('DefaultSettingsIcon - only static flows are shown', () => {
     });
   });
 
-  it('adds "Copy popup UID" for popupSettings flow (current model and sub-model)', async () => {
+  it('adds "Copy popup UID" for popupSettings openView step (current model and sub-model)', async () => {
     class Parent extends FlowModel {}
     class Child extends FlowModel {}
     const engine = new FlowEngine();
@@ -372,13 +368,13 @@ describe('DefaultSettingsIcon - only static flows are shown', () => {
     Parent.registerFlow({
       key: 'popupSettings',
       title: 'Popup',
-      steps: { stage: { title: 'Stage', uiSchema: { a: { type: 'string', 'x-component': 'Input' } } } },
+      steps: { openView: { title: 'Open view', uiSchema: { a: { type: 'string', 'x-component': 'Input' } } } },
     });
     // sub model popupSettings
     Child.registerFlow({
       key: 'popupSettings',
       title: 'Popup Child',
-      steps: { stage: { title: 'Stage', uiSchema: { a: { type: 'string', 'x-component': 'Input' } } } },
+      steps: { openView: { title: 'Open view', uiSchema: { a: { type: 'string', 'x-component': 'Input' } } } },
     });
     parent.addSubModel('items', child);
 
@@ -408,18 +404,18 @@ describe('DefaultSettingsIcon - only static flows are shown', () => {
     await waitFor(() => {
       const m = (globalThis as any).__lastDropdownMenu;
       const is = (m?.items || []) as any[];
-      const current = is.find((it) => String(it.key) === 'copy-pop-uid:popupSettings:stage');
-      const sub = is.find((it) => String(it.key).startsWith('copy-pop-uid:items[0]:popupSettings:stage'));
+      const current = is.find((it) => String(it.key) === 'copy-pop-uid:popupSettings:openView');
+      const sub = is.find((it) => String(it.key).startsWith('copy-pop-uid:items[0]:popupSettings:openView'));
       expect(current).toBeTruthy();
       expect(sub).toBeTruthy();
     });
 
     // click and verify clipboard（直接使用最新的 menu）
     const menu = (globalThis as any).__lastDropdownMenu;
-    menu.onClick?.({ key: 'copy-pop-uid:popupSettings:stage' });
+    menu.onClick?.({ key: 'copy-pop-uid:popupSettings:openView' });
     expect((navigator as any).clipboard.writeText).toHaveBeenCalledWith('parent-2');
 
-    menu.onClick?.({ key: 'copy-pop-uid:items[0]:popupSettings:stage' });
+    menu.onClick?.({ key: 'copy-pop-uid:items[0]:popupSettings:openView' });
     expect((navigator as any).clipboard.writeText).toHaveBeenCalledWith('child-2');
   });
 

package/src/flowEngine.ts

@@ -902,7 +902,13 @@ export class FlowEngine {
     if (this.ensureModelRepository()) {
       await this._modelRepository.destroy(uid);
     }
-    return this.removeModel(uid);
+
+    const modelInstance = this._modelInstances.get(uid) as FlowModel;
+    const parent = modelInstance?.parent;
+    const result = this.removeModel(uid);
+    parent && parent.emitter.emit('onSubModelDestroyed', modelInstance);
+
+    return result;
   }
 
   /**

package/src/flowSettings.ts

@@ -53,11 +53,13 @@ export interface FlowSettingsOpenOptions {
   stepKey?: string;
   /** 弹窗展现形式（drawer 或 dialog） */
   uiMode?:
+    | 'select'
+    | 'switch'
     | 'dialog'
     | 'drawer'
     | 'embed'
     | {
-        type?: 'dialog' | 'drawer' | 'embed';
+        type?: 'dialog' | 'drawer' | 'embed' | 'select' | 'switch';
         props?: {
           title?: string;
           width?: number;
@@ -597,14 +599,12 @@ export class FlowSettings {
 
         // 解析合并后的 uiSchema（包含 action 的 schema）
         const mergedUiSchema = await resolveStepUiSchema(model, flow, step);
-        if (!mergedUiSchema || Object.keys(mergedUiSchema).length === 0) continue;
-
         // 计算标题与 hooks
         let stepTitle: string = step.title;
         let beforeParamsSave = step.beforeParamsSave;
         let afterParamsSave = step.afterParamsSave;
         let actionDefaultParams: Record<string, any> = {};
-        let uiMode;
+        let uiMode = step.uiMode;
         if (step.use) {
           const action = model.getAction?.(step.use);
           if (action) {
@@ -633,7 +633,12 @@ export class FlowSettings {
           ...(resolvedDefaultParams || {}),
           ...modelStepParams,
         };
-
+        if (
+          (!mergedUiSchema || Object.keys(mergedUiSchema).length === 0) &&
+          !['select', 'switch'].includes(uiMode?.type || uiMode)
+        ) {
+          continue;
+        }
         entries.push({
           flowKey: fk,
           flowTitle: t(flow.title) || fk,
@@ -664,6 +669,9 @@ export class FlowSettings {
     const resolvedUiMode =
       entries.length === 1 ? await resolveUiMode(entries[0].uiMode || uiMode, entries[0].ctx) : uiMode;
     const modeType = typeof resolvedUiMode === 'string' ? resolvedUiMode : resolvedUiMode.type || 'dialog';
+    if (['select', 'switch'].includes(modeType)) {
+      return;
+    }
     const openView = viewer[modeType || 'dialog'].bind(viewer);
     const flowEngine = (model as any).flowEngine as FlowEngine;
     const scopes = {

package/src/resources/sqlResource.ts

@@ -276,10 +276,11 @@ export class SQLResource<TData = any> extends BaseRecordResource<TData> {
         try {
           this.clearError();
           this.loading = true;
+          this.emit('loading');
           const { data, meta } = await this.run();
           this.setData(data).setMeta(meta);
-          this.emit('refresh');
           this.loading = false;
+          this.emit('refresh');
           resolve();
         } catch (error) {
           this.setError(error);

package/src/types.ts

@@ -110,6 +110,8 @@ export interface FlowDefinitionOptions<TModel extends FlowModel = FlowModel> {
    * 仅填补缺失，不覆盖已有。固定返回形状：{ [stepKey]: params }
    */
   defaultParams?: Record<string, any> | ((ctx: FlowModelContext) => StepParam | Promise<StepParam>);
+  enableTitle?: boolean;
+  divider?: 'top' | 'bottom';
 }
 
 export interface IModelComponentProps {
@@ -242,7 +244,7 @@ export type StepUIMode =
   | 'embed'
   // | 'switch'
   // | 'select'
-  | { type?: 'dialog' | 'drawer' | 'embed'; props?: Record<string, any> };
+  | { type?: 'dialog' | 'drawer' | 'embed' | 'select' | 'switch'; props?: Record<string, any>; key?: string };
 // | { type: 'switch'; props?: Record<string, any> }
 // | { type: 'select'; props?: Record<string, any> }