@nocobase/client 2.0.11 → 2.0.12

package/es/index.mjs

@@ -9949,7 +9949,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.11", license = "Apache-2.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "2.0.12", license = "Apache-2.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.6.1",
@@ -9972,10 +9972,10 @@ const name = "@nocobase/client", version = "2.0.11", license = "Apache-2.0", mai
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "2.0.11",
-  "@nocobase/flow-engine": "2.0.11",
-  "@nocobase/sdk": "2.0.11",
-  "@nocobase/utils": "2.0.11",
+  "@nocobase/evaluators": "2.0.12",
+  "@nocobase/flow-engine": "2.0.12",
+  "@nocobase/sdk": "2.0.12",
+  "@nocobase/utils": "2.0.12",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -12612,22 +12612,22 @@ function FormDialog(e, t, o, n) {
   ), u = (p = !0, m, h) => {
     const { form: g } = r;
     return g ? /* @__PURE__ */ jsx(GlobalThemeProvider, { theme: n, children: /* @__PURE__ */ jsx(Observer, { children: () => {
-      const { token: f } = useToken$1(), y = useMemo(() => document.querySelector("#nocobase-app-container"), []);
+      var P;
+      const { token: f } = useToken$1(), y = useMemo(() => document.body, []), b = Number(l == null ? void 0 : l.zIndex), S = f.zIndexPopupBase + 1e3, C = Number.isFinite(b) && b > 0 ? Math.max(S, b) : S;
       return /* @__PURE__ */ jsx(
         Modal,
-        A(x({
-          zIndex: f.zIndexPopupBase + 1e3,
-          getContainer: y
-        }, l), {
+        A(x({}, l), {
+          zIndex: C,
+          getContainer: (P = l == null ? void 0 : l.getContainer) != null ? P : y,
           open: p,
           confirmLoading: g.submitting,
-          onCancel: (b) => {
-            var S;
-            ((S = l == null ? void 0 : l.onCancel) == null ? void 0 : S.call(l, b)) !== !1 && (h == null || h());
+          onCancel: (F) => {
+            var v;
+            ((v = l == null ? void 0 : l.onCancel) == null ? void 0 : v.call(l, F)) !== !1 && (h == null || h());
           },
-          onOk: (b) => L(this, null, function* () {
-            var S;
-            ((S = l == null ? void 0 : l.onOk) == null ? void 0 : S.call(l, b)) !== !1 && (m == null || m());
+          onOk: (F) => L(this, null, function* () {
+            var v;
+            ((v = l == null ? void 0 : l.onOk) == null ? void 0 : v.call(l, F)) !== !1 && (m == null || m());
           }),
           children: /* @__PURE__ */ jsx(FormProvider$1, { form: g, children: /* @__PURE__ */ jsx(c, {}) })
         })
@@ -14974,15 +14974,31 @@ const useDateVariable = ({ operator: e, schema: t, noDisabled: o }) => {
     /** 变量的配置项 */
     currentObjectSettings: u
   };
+}, ParentCollectionContext = createContext(null);
+ParentCollectionContext.displayName = "ParentCollectionContext";
+const ParentCollectionProvider = (e) => {
+  const t = useCollection();
+  return /* @__PURE__ */ jsx(ParentCollectionContext.Provider, { value: t, children: e.children });
+}, useParentCollection = () => useContext(ParentCollectionContext), AssociationProvider = (e) => {
+  const { name: t, children: o } = e, r = useCollectionManager().getCollectionName(t);
+  return r ? /* @__PURE__ */ jsx(CollectionProvider, { name: String(t).split(".")[0], children: /* @__PURE__ */ jsx(ParentCollectionProvider, { children: /* @__PURE__ */ jsx(CollectionFieldProvider, { name: t, children: /* @__PURE__ */ jsx(CollectionProvider, { name: r, children: o }) }) }) }) : /* @__PURE__ */ jsx(CollectionDeletedPlaceholder, { type: "Collection", name: t });
+}, useAssociationName = () => {
+  const e = useCollectionField();
+  return e != null && e.target ? `${e.collectionName}.${e.name}` : null;
+}, getResolvedParent = (e, t) => {
+  let o = e;
+  for (; o != null && o.parent && o.value === t; )
+    o = o.parent;
+  return o;
 }, useParentObjectContext = () => {
-  const { parent: e } = useSubFormValue(), { value: t, collection: o } = e || {}, { isInSubForm: n, isInSubTable: r } = useFlag() || {};
+  const { parent: e, formValue: t } = useSubFormValue(), o = useCollectionParentRecordData(), n = useParentCollection(), r = getResolvedParent(e, t), i = r == null ? void 0 : r.value, a = _.isEmpty(i) && !_.isEmpty(o) ? o : i, l = (r == null ? void 0 : r.collection) || n, { isInSubForm: c, isInSubTable: u } = useFlag() || {};
   return {
     /** 是否显示变量 */
-    shouldDisplayParentObject: (n || r) && !!o,
+    shouldDisplayParentObject: (c || u) && !!l,
     /** 变量的值 */
-    parentObjectCtx: t,
-    collectionName: o == null ? void 0 : o.name,
-    dataSource: o == null ? void 0 : o.dataSource
+    parentObjectCtx: a,
+    collectionName: l == null ? void 0 : l.name,
+    dataSource: l == null ? void 0 : l.dataSource
   };
 }, useParentObjectVariable = ({
   collectionField: e,
@@ -15045,17 +15061,6 @@ const useDateVariable = ({ operator: e, schema: t, noDisabled: o }) => {
     dataSource: r,
     defaultValue: i
   };
-}, ParentCollectionContext = createContext(null);
-ParentCollectionContext.displayName = "ParentCollectionContext";
-const ParentCollectionProvider = (e) => {
-  const t = useCollection();
-  return /* @__PURE__ */ jsx(ParentCollectionContext.Provider, { value: t, children: e.children });
-}, useParentCollection = () => useContext(ParentCollectionContext), AssociationProvider = (e) => {
-  const { name: t, children: o } = e, r = useCollectionManager().getCollectionName(t);
-  return r ? /* @__PURE__ */ jsx(CollectionProvider, { name: String(t).split(".")[0], children: /* @__PURE__ */ jsx(ParentCollectionProvider, { children: /* @__PURE__ */ jsx(CollectionFieldProvider, { name: t, children: /* @__PURE__ */ jsx(CollectionProvider, { name: r, children: o }) }) }) }) : /* @__PURE__ */ jsx(CollectionDeletedPlaceholder, { type: "Collection", name: t });
-}, useAssociationName = () => {
-  const e = useCollectionField();
-  return e != null && e.target ? `${e.collectionName}.${e.name}` : null;
 }, useCurrentParentRecordContext = () => {
   var c, u;
   const e = useCollectionRecord(), { name: t, dataSource: o } = useParentCollection() || {}, n = useCollection(), { isInSubForm: r, isInSubTable: i } = useFlag() || {}, a = t ? o : n == null ? void 0 : n.dataSource, l = useCollectionField();
@@ -23234,7 +23239,7 @@ const SchemaSettingsSwitchItem = (e) => {
     "modalTip",
     "components",
     "scope"
-  ]), [m, h] = useState(!1), [g, f] = useState(e.uid), { t: y } = useTranslation(), b = useFieldSchema(), S = useContext(SchemaSettingsContext), { dn: C } = useSchemaSettings(), P = useCompile(), F = useAPIClient(), v = useFormActiveFields(), k = useZIndexContext(), I = getZIndex("modal", k + 10, 0), D = useMemo(
+  ]), [m, h] = useState(!1), [g, f] = useState(e.uid), { t: y } = useTranslation(), b = useFieldSchema(), S = useContext(SchemaSettingsContext), { dn: C } = useSchemaSettings(), P = useCompile(), F = useAPIClient(), v = useFormActiveFields(), k = useZIndexContext(), I = Math.max(getZIndex("modal", k + 10, 0), ICON_POPUP_Z_INDEX + 200), D = useMemo(
     () => createForm({
       initialValues: cloneDeep$1(r),
       values: cloneDeep$1(r)
@@ -23332,7 +23337,12 @@ const SchemaSettingsModalItem = (e) => {
       onClick: () => L(void 0, null, function* () {
         const H = l ? yield l() : c, X = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
-          { title: X.title || o, width: u, rootClassName: m },
+          {
+            title: X.title || o,
+            width: u,
+            rootClassName: m,
+            getContainer: () => document.body
+          },
           () => /* @__PURE__ */ jsx(VariableScopeContext$1.Provider, { value: O, children: /* @__PURE__ */ jsx(SchemaComponentContext.Provider, { value: j, children: /* @__PURE__ */ jsx(AllDataBlocksContext.Provider, { value: N, children: /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: T(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: B, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: M, children: /* @__PURE__ */ jsx(
             VariablePopupRecordProvider,
             {
@@ -30524,7 +30534,7 @@ const useStyles$a = genStyleHook("nb-markdown", (e, { isDarkTheme: t }) => {
     }, t ? i : r)
   };
 }), parseMarkdown$1 = _.memoize((e) => L(void 0, null, function* () {
-  return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
+  return e && (yield import("./md-BbvRKckr.mjs")).default.render(e);
 }));
 function useParseMarkdown$1(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -70601,6 +70611,39 @@ ActionModel.registerEvents({
     handler: commonConditionHandler
   }
 });
+const VIEW_ACTION_ALIASES = {
+  view: "get"
+}, normalizeCapabilityActionName = (e) => e ? VIEW_ACTION_ALIASES[e] || e : null, getExplicitCapabilityNames = (e, t) => {
+  for (const o of t) {
+    if (!(o in e))
+      continue;
+    const n = e[o];
+    return n == null ? null : (Array.isArray(n) ? n : [n]).map((r) => normalizeCapabilityActionName(r)).filter(Boolean);
+  }
+}, isCapabilitySupported = (e, t) => {
+  const o = normalizeCapabilityActionName(t);
+  if (!o || !(e != null && e.options))
+    return !0;
+  const { availableActions: n, unavailableActions: r } = e.options;
+  return Array.isArray(n) ? n.includes(o) : Array.isArray(r) ? !r.includes(o) : !0;
+}, areCapabilitiesSupported = (e, t) => t != null && t.length ? t.every((o) => isCapabilitySupported(e, o)) : !0, getActionCapabilityNamesFromModelClass = (e) => {
+  var n;
+  const t = getExplicitCapabilityNames(e, ["capabilityActionNames", "capabilityActionName"]);
+  if (t !== void 0)
+    return t;
+  const o = (n = e == null ? void 0 : e.prototype) == null ? void 0 : n.getAclActionName;
+  if (typeof o != "function")
+    return null;
+  try {
+    const r = o.call({}), i = normalizeCapabilityActionName(r);
+    return i ? [i] : null;
+  } catch (r) {
+    return null;
+  }
+}, getBlockCapabilityNamesFromModelClass = (e) => {
+  const t = getExplicitCapabilityNames(e, ["blockCapabilityActionNames", "blockCapabilityActionName"]);
+  return t != null ? t : null;
+};
 class ActionGroupModel extends FlowModel {
   static getAllParentClasses() {
     const t = [];
@@ -70625,11 +70668,26 @@ class ActionGroupModel extends FlowModel {
     for (const [o, n] of Object.entries(t))
       Object.defineProperty(n, "name", { value: o }), this.currentModels.set(o, n);
   }
+  /**
+   * 判断动作模型在当前数据表上下文下是否应显示在 v2 的“添加动作”菜单中。
+   *
+   * @param ModelClass 动作模型类
+   * @param ctx Flow 上下文
+   * @returns 是否显示
+   */
+  static isActionModelVisible(t, o) {
+    var i;
+    const n = o.collection || ((i = o.blockModel) == null ? void 0 : i.collection), r = getActionCapabilityNamesFromModelClass(t);
+    return areCapabilitiesSupported(n, r);
+  }
   static defineChildren(t) {
     return L(this, null, function* () {
-      const o = this.baseClass ? yield buildSubModelItems(this.baseClass)(t) : [], n = [], r = o.filter((i) => this.scene ? t.engine.getModelClass(i.useModel)._isScene(this.scene) : !0);
+      const o = this.baseClass ? yield buildSubModelItems(this.baseClass)(t) : [], n = [], r = o.filter((i) => {
+        const a = t.engine.getModelClass(i.useModel);
+        return this.isActionModelVisible(a, t) ? this.scene ? a._isScene(this.scene) : !0 : !1;
+      });
       for (const [i, a] of this.models) {
-        if (r.find((u) => u.useModel === a.name))
+        if (!this.isActionModelVisible(a, t) || r.find((u) => u.useModel === a.name))
           continue;
         const c = yield buildSubModelItem(a, t);
         c && n.push(c);
@@ -71774,7 +71832,7 @@ BlockGridModel.registerFlow({
   }
 });
 const parseMarkdown = _.memoize((e) => L(void 0, null, function* () {
-  return e && (yield import("./md-BbvRKckr.mjs")).default.render(e);
+  return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
 }));
 function useParseMarkdown(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -72484,6 +72542,18 @@ class CollectionBlockModel extends DataBlockModel {
   static filterCollection(o) {
     return !!o.filterTargetKey;
   }
+  /**
+   * 判断当前区块模型在 collection 选择菜单中是否应该展示指定数据表。
+   *
+   * @param collection 数据表
+   * @returns 是否显示
+   */
+  static isCollectionAvailable(o) {
+    if (!o)
+      return !1;
+    const n = getBlockCapabilityNamesFromModelClass(this);
+    return areCapabilitiesSupported(o, n);
+  }
   /**
    * 定义子菜单选项
    */
@@ -72504,7 +72574,7 @@ class CollectionBlockModel extends DataBlockModel {
         searchable: !0,
         searchPlaceholder: tExpr("Search"),
         children: (h) => m.getCollections().map((g) => {
-          if (!this.filterCollection(g))
+          if (!this.filterCollection(g) || !this.isCollectionAvailable(g))
             return null;
           const f = {
             dataSourceKey: g.dataSourceKey,
@@ -72532,25 +72602,24 @@ class CollectionBlockModel extends DataBlockModel {
           collectionName: a
           // filterByTk: '{{ctx.view.inputArgs.filterByTk}}',
         };
-        return l && (m.associationName = l, m.sourceId = "{{ctx.view.inputArgs.sourceId}}"), [
-          {
-            key: r("current-collection"),
-            label: "Current collection",
-            useModel: this.name,
-            createModelOptions: n({
-              stepParams: {
-                resourceSettings: {
-                  init: m
-                }
+        l && (m.associationName = l, m.sourceId = "{{ctx.view.inputArgs.sourceId}}");
+        const h = o.dataSourceManager.getCollection(i, a), g = [];
+        return this.isCollectionAvailable(h) && g.push({
+          key: r("current-collection"),
+          label: "Current collection",
+          useModel: this.name,
+          createModelOptions: n({
+            stepParams: {
+              resourceSettings: {
+                init: m
               }
-            })
-          },
-          {
-            key: r("others-collections"),
-            label: "Other collections",
-            children: d(o)
-          }
-        ];
+            }
+          })
+        }), g.push({
+          key: r("others-collections"),
+          label: "Other collections",
+          children: d(o)
+        }), g;
       }
       if (this._isScene("new")) {
         const m = {
@@ -72559,42 +72628,40 @@ class CollectionBlockModel extends DataBlockModel {
           // filterByTk: '{{ctx.view.inputArgs.filterByTk}}',
         };
         l && (m.associationName = l, m.sourceId = "{{ctx.view.inputArgs.sourceId}}");
-        const h = [
-          {
-            key: r("current-collection"),
-            label: "Current collection",
-            useModel: this.name,
-            createModelOptions: n({
-              stepParams: {
-                resourceSettings: {
-                  init: m
-                }
+        const h = [], g = o.dataSourceManager.getCollection(i, a);
+        return this.isCollectionAvailable(g) && h.push({
+          key: r("current-collection"),
+          label: "Current collection",
+          useModel: this.name,
+          createModelOptions: n({
+            stepParams: {
+              resourceSettings: {
+                init: m
               }
-            })
-          }
-        ];
-        return typeof c != "undefined" && c !== null && h.push({
+            }
+          })
+        }), typeof c != "undefined" && c !== null && h.push({
           key: r("associated"),
           label: "Associated records",
-          children: () => o.dataSourceManager.getCollection(i, a).getAssociationFields(this._getScene()).map((f) => {
-            if (!f.targetCollection || f.type === "belongsToArray" || !this.filterCollection(f.targetCollection))
+          children: () => o.dataSourceManager.getCollection(i, a).getAssociationFields(this._getScene()).map((y) => {
+            if (!y.targetCollection || y.type === "belongsToArray" || !this.filterCollection(y.targetCollection) || !this.isCollectionAvailable(y.targetCollection))
               return null;
-            let y = `{{ctx.popup.record.${f.sourceKey || f.collection.filterTargetKey}}}`;
-            f.sourceKey === f.collection.filterTargetKey && (y = "{{ctx.view.inputArgs.filterByTk}}");
-            const b = {
+            let b = `{{ctx.popup.record.${y.sourceKey || y.collection.filterTargetKey}}}`;
+            y.sourceKey === y.collection.filterTargetKey && (b = "{{ctx.view.inputArgs.filterByTk}}");
+            const S = {
               dataSourceKey: i,
-              collectionName: f.target,
-              associationName: f.resourceName,
-              sourceId: y
+              collectionName: y.target,
+              associationName: y.resourceName,
+              sourceId: b
             };
             return {
-              key: r(`associated-${f.name}`),
-              label: f.title,
+              key: r(`associated-${y.name}`),
+              label: y.title,
               useModel: this.name,
               createModelOptions: n({
                 stepParams: {
                   resourceSettings: {
-                    init: b
+                    init: S
                   }
                 }
               })
@@ -72611,7 +72678,7 @@ class CollectionBlockModel extends DataBlockModel {
           key: r("associated"),
           label: "Associated records",
           children: () => o.dataSourceManager.getCollection(i, a).getAssociationFields(this._getScene()).map((h) => {
-            if (!h.targetCollection || h.type === "belongsToArray" || !this.filterCollection(h.targetCollection))
+            if (!h.targetCollection || h.type === "belongsToArray" || !this.filterCollection(h.targetCollection) || !this.isCollectionAvailable(h.targetCollection))
               return null;
             let g = `{{ctx.popup.record.${h.sourceKey || h.collection.filterTargetKey}}}`;
             h.sourceKey === h.collection.filterTargetKey && (g = "{{ctx.view.inputArgs.filterByTk}}");
@@ -72643,7 +72710,7 @@ class CollectionBlockModel extends DataBlockModel {
       ];
       if (this._isScene("one")) {
         const m = o.dataSourceManager.getCollection(i, a);
-        if (!m || !this.filterCollection(m))
+        if (!m || !this.filterCollection(m) || !this.isCollectionAvailable(m))
           return p;
         const h = {
           dataSourceKey: i,
@@ -72861,11 +72928,7 @@ class FieldModel extends FlowModel {
 class FilterBlockModel extends BlockModel {
 }
 FilterBlockModel.define({ hide: !0, label: "Filter blocks" });
-const TABS_BASE_ROOT_CLASS_NAME = css`
-  > .ant-tabs-nav .ant-tabs-nav-list {
-    padding-inline-start: var(--nb-flow-page-tabs-nav-padding-inline-start, 16px);
-  }
-`, TABS_DESIGN_MODE_ROOT_CLASS_NAME = css`
+const TABS_DESIGN_MODE_ROOT_CLASS_NAME = css`
   > .ant-tabs-nav .ant-tabs-tab {
     min-width: 54px;
   }
@@ -73032,14 +73095,25 @@ class PageModel extends FlowModel {
   }
   renderTabs() {
     var a, l, c, u, d;
-    const o = (l = (a = this.context.themeToken) == null ? void 0 : a.paddingLG) != null ? l : 16, n = typeof o == "number" ? `${o}px` : o, r = this.context.flowSettingsEnabled ? `${TABS_BASE_ROOT_CLASS_NAME} ${TABS_DESIGN_MODE_ROOT_CLASS_NAME}` : TABS_BASE_ROOT_CLASS_NAME, i = {
-      "--nb-flow-page-tabs-nav-padding-inline-start": n
-    };
+    const o = (l = (a = this.context.themeToken) == null ? void 0 : a.paddingLG) != null ? l : 16, n = this.context.flowSettingsEnabled ? TABS_DESIGN_MODE_ROOT_CLASS_NAME : void 0, r = this.tabBarExtraContent.left !== void 0 ? this.tabBarExtraContent.left : /* @__PURE__ */ jsx("span", { "aria-hidden": "true", style: { display: "inline-block", width: o, height: 1 } }), i = this.tabBarExtraContent.right !== void 0 ? this.tabBarExtraContent.right : /* @__PURE__ */ jsx(
+      AddSubModelButton,
+      {
+        model: this,
+        subModelKey: "tabs",
+        items: [
+          {
+            key: "blank",
+            label: this.context.t("Blank tab"),
+            createModelOptions: this.createPageTabModelOptions
+          }
+        ],
+        children: /* @__PURE__ */ jsx(FlowSettingsButton, { icon: /* @__PURE__ */ jsx(PlusOutlined, {}), children: this.context.t("Add tab") })
+      }
+    );
     return /* @__PURE__ */ jsx(DndProvider, { onDragEnd: this.handleDragEnd.bind(this), children: /* @__PURE__ */ jsx(
       Tabs$1,
       {
-        style: i,
-        rootClassName: r,
+        className: n,
         activeKey: (u = (c = this.context.view) == null ? void 0 : c.navigation) != null && u.viewParams ? this.context.view.navigation.viewParams.tabUid || ((d = this.getFirstTab()) == null ? void 0 : d.uid) : this.props.tabActiveKey,
         tabBarStyle: this.props.tabBarStyle,
         items: this.mapTabs(),
@@ -73049,23 +73123,10 @@ class PageModel extends FlowModel {
             tabUid: p
           }), this.invokeTabModelLifecycleMethod(p, "onActive"), this.invokeTabModelLifecycleMethod(this.props.tabActiveKey, "onInactive"), this.setProps("tabActiveKey", p);
         },
-        tabBarExtraContent: x({
-          right: /* @__PURE__ */ jsx(
-            AddSubModelButton,
-            {
-              model: this,
-              subModelKey: "tabs",
-              items: [
-                {
-                  key: "blank",
-                  label: this.context.t("Blank tab"),
-                  createModelOptions: this.createPageTabModelOptions
-                }
-              ],
-              children: /* @__PURE__ */ jsx(FlowSettingsButton, { icon: /* @__PURE__ */ jsx(PlusOutlined, {}), children: this.context.t("Add tab") })
-            }
-          )
-        }, this.tabBarExtraContent)
+        tabBarExtraContent: {
+          left: r,
+          right: i
+        }
       }
     ) });
   }
@@ -73181,20 +73242,22 @@ class ChildPageModel extends PageModel {
   }
 }
 const BackButtonUsedInSubPage = () => {
-  const e = useFlowContext(), t = e.themeToken, o = 32, n = useMemo(() => ({
+  var i;
+  const e = useFlowContext(), t = e.themeToken, o = 32, n = (i = t == null ? void 0 : t.paddingLG) != null ? i : 16, r = useMemo(() => ({
     width: "auto",
     height: "auto",
     lineHeight: 1,
     padding: t.paddingXS,
+    marginLeft: t.paddingLG,
     marginRight: o - t.paddingXS
-  }), [t.paddingXS]);
-  return e.view.type !== "embed" ? null : /* @__PURE__ */ jsx(
+  }), [t.paddingLG, t.paddingXS]);
+  return e.view.type !== "embed" ? /* @__PURE__ */ jsx("span", { "aria-hidden": "true", style: { display: "inline-block", width: n, height: 1 } }) : /* @__PURE__ */ jsx(
     Button,
     {
       "aria-label": "back-button",
       type: "text",
       icon: /* @__PURE__ */ jsx(ArrowLeftOutlined, {}),
-      style: n,
+      style: r,
       onClick: e.view.close
     }
   );
@@ -73639,6 +73702,12 @@ function PageTabChildrenRenderer({ ctx: e, options: t }) {
   ), r = e != null && e.isMobileLayout ? 8 : e == null ? void 0 : e.themeToken.marginBlock;
   return n || !(o != null && o.uid) ? /* @__PURE__ */ jsx(SkeletonFallback, { style: { margin: r } }) : /* @__PURE__ */ jsx(FlowModelRenderer, { model: o, fallback: /* @__PURE__ */ jsx(SkeletonFallback, { style: { margin: r } }) });
 }
+function normalizePersistedRoute(e) {
+  if (Array.isArray(e))
+    return e.find((t) => !!t && typeof t == "object");
+  if (e && typeof e == "object")
+    return e;
+}
 class BasePageTabModel extends FlowModel {
   onInit(t) {
     super.onInit(t), this.context.defineProperty("tabActive", {
@@ -73743,9 +73812,8 @@ class RootPageTabModel extends BasePageTabModel {
   }
   save() {
     return L(this, null, function* () {
-      var n, r, i;
-      const t = this.serialize(), o = (i = (r = (n = this.stepParams) == null ? void 0 : n.pageTabSettings) == null ? void 0 : r.tab) == null ? void 0 : i.documentTitle;
-      yield this.context.api.request({
+      var i, a, l, c, u;
+      const t = this.serialize(), o = (l = (a = (i = this.stepParams) == null ? void 0 : i.pageTabSettings) == null ? void 0 : a.tab) == null ? void 0 : l.documentTitle, n = yield this.context.api.request({
         method: "post",
         url: "desktopRoutes:updateOrCreate",
         params: {
@@ -73759,7 +73827,10 @@ class RootPageTabModel extends BasePageTabModel {
             documentTitle: o
           }
         })
-      });
+      }), r = normalizePersistedRoute((c = n == null ? void 0 : n.data) == null ? void 0 : c.data);
+      r && this.setProps("route", A(x(x({}, this.props.route), r), {
+        options: x(x({}, (u = this.props.route) == null ? void 0 : u.options), r.options)
+      }));
     });
   }
   destroy() {
@@ -73804,6 +73875,20 @@ class RootPageModel extends PageModel {
     super(...arguments);
     R(this, "mounted", !1);
   }
+  /**
+   * 新建 tab 在首次保存完成前，前端 route 里可能还没有数据库 id。
+   * 拖拽前兜底触发一次保存，确保 move 接口拿到真实主键。
+   *
+   * @param model - 当前参与拖拽的 tab model
+   * @returns 可用于排序接口的 route id
+   */
+  ensurePersistedRouteId(o) {
+    return L(this, null, function* () {
+      var r, i, a, l;
+      const n = (i = (r = o == null ? void 0 : o.props) == null ? void 0 : r.route) == null ? void 0 : i.id;
+      return n != null ? n : (typeof (o == null ? void 0 : o.save) == "function" && (yield o.save()), (l = (a = o == null ? void 0 : o.props) == null ? void 0 : a.route) == null ? void 0 : l.id);
+    });
+  }
   onMount() {
     super.onMount(), reaction$1(
       () => this.context.pageActive.value,
@@ -73837,14 +73922,20 @@ class RootPageModel extends PageModel {
   }
   handleDragEnd(o) {
     return L(this, null, function* () {
-      var i, a;
-      const n = this.flowEngine.getModel((i = o.active) == null ? void 0 : i.id), r = this.flowEngine.getModel((a = o.over) == null ? void 0 : a.id);
-      !n || !r || (yield this.context.api.request({
+      var l, c;
+      const n = this.flowEngine.getModel((l = o.active) == null ? void 0 : l.id), r = this.flowEngine.getModel((c = o.over) == null ? void 0 : c.id);
+      if (!n || !r || n.uid === r.uid)
+        return;
+      const [i, a] = yield Promise.all([
+        this.ensurePersistedRouteId(n),
+        this.ensurePersistedRouteId(r)
+      ]);
+      i == null || a == null || (yield this.context.api.request({
         url: "desktopRoutes:move",
         method: "post",
         params: {
-          sourceId: n.props.route.id,
-          targetId: r.props.route.id,
+          sourceId: i,
+          targetId: a,
           sortField: "sort"
         }
       }), this.flowEngine.moveModel(n.uid, r.uid, { persist: !1 }));
@@ -75086,7 +75177,7 @@ class BulkDeleteActionModel extends ActionModel {
     return "destroy";
   }
 }
-R(BulkDeleteActionModel, "scene", ActionSceneEnum.collection);
+R(BulkDeleteActionModel, "scene", ActionSceneEnum.collection), R(BulkDeleteActionModel, "capabilityActionName", "destroyMany");
 BulkDeleteActionModel.define({
   label: tExpr("Delete")
 });
@@ -76164,6 +76255,7 @@ class AddChildActionModel extends PopupActionModel {
     });
   }
 }
+R(AddChildActionModel, "capabilityActionName", null);
 AddChildActionModel.registerFlow({
   key: "addChildSettingsInit",
   steps: {
@@ -79441,7 +79533,7 @@ class EditFormModel extends FormBlockModel {
     );
   }
 }
-R(EditFormModel, "scene", BlockSceneEnum.oam);
+R(EditFormModel, "scene", BlockSceneEnum.oam), R(EditFormModel, "blockCapabilityActionName", "update");
 EditFormModel.registerFlow({
   key: "formSettings",
   title: tExpr("Edit form settings"),
@@ -81797,7 +81889,7 @@ class CreateFormModel extends FormBlockModel {
     );
   }
 }
-R(CreateFormModel, "scene", BlockSceneEnum.new);
+R(CreateFormModel, "scene", BlockSceneEnum.new), R(CreateFormModel, "blockCapabilityActionName", "create");
 CreateFormModel.registerFlow({
   key: "formSettings",
   title: tExpr("Form settings"),

package/es/schema-settings/VariableInput/hooks/useParentIterationVariable.d.ts

@@ -13,8 +13,8 @@ export declare const useParentObjectContext: () => {
     shouldDisplayParentObject: boolean;
     /** 变量的值 */
     parentObjectCtx: any;
-    collectionName: string;
-    dataSource: string;
+    collectionName: any;
+    dataSource: any;
 };
 /**
  * 变量：`上级对象`
@@ -34,5 +34,5 @@ export declare const useParentObjectVariable: ({ collectionField, schema, noDisa
     shouldDisplayParentObject: boolean;
     /** 变量的值 */
     parentObjectCtx: any;
-    collectionName: string;
+    collectionName: any;
 };