@nocobase/client 2.0.0-alpha.35 → 2.0.0-alpha.36

package/es/flow/models/base/PageModel/ChildPageModel.d.ts

@@ -16,4 +16,5 @@ export declare class ChildPageModel extends PageModel {
     };
     createPageTabModelOptions: () => CreateModelOptions;
     handleDragEnd(event: DragEndEvent): Promise<void>;
+    render(): React.JSX.Element;
 }

package/es/index.mjs

@@ -9613,7 +9613,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.0-alpha.35", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "2.0.0-alpha.36", license = "AGPL-3.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",
@@ -9636,10 +9636,10 @@ const name = "@nocobase/client", version = "2.0.0-alpha.35", license = "AGPL-3.0
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "2.0.0-alpha.35",
-  "@nocobase/flow-engine": "2.0.0-alpha.35",
-  "@nocobase/sdk": "2.0.0-alpha.35",
-  "@nocobase/utils": "2.0.0-alpha.35",
+  "@nocobase/evaluators": "2.0.0-alpha.36",
+  "@nocobase/flow-engine": "2.0.0-alpha.36",
+  "@nocobase/sdk": "2.0.0-alpha.36",
+  "@nocobase/utils": "2.0.0-alpha.36",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -30043,7 +30043,7 @@ const useStyles$a = genStyleHook("nb-markdown", (e, { isDarkTheme: t }) => {
     }, t ? i : r)
   };
 }), parseMarkdown$1 = _.memoize((e) => O(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$1(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -65260,7 +65260,7 @@ const BlockConfigsContext = createContext({
           zIndex: 1,
           lineHeight: 0
         },
-        children: /* @__PURE__ */ jsx(FlowContextSelector, { metaTree: m, onChange: (h) => p(h), onlyLeafSelectable: !0, children: /* @__PURE__ */ jsx(
+        children: /* @__PURE__ */ jsx(FlowContextSelector, { metaTree: m, onChange: (h) => p(h), children: /* @__PURE__ */ jsx(
           Button,
           {
             type: "default",
@@ -67574,7 +67574,7 @@ BlockGridModel.registerFlow({
   }
 });
 const parseMarkdown = _.memoize((e) => O(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(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -69715,7 +69715,12 @@ class PageModel extends FlowModel {
         FlowModelRenderer,
         {
           model: o,
-          showFlowSettings: { showBackground: !0, showBorder: !1 },
+          showFlowSettings: {
+            showBackground: !0,
+            showBorder: !1,
+            toolbarPosition: "above",
+            style: { transform: "translateY(8px)" }
+          },
           extraToolbarItems: [
             {
               key: "drag-handler",
@@ -69864,6 +69869,12 @@ class ChildPageModel extends PageModel {
       this.flowEngine.moveModel(o.active.id, o.over.id);
     });
   }
+  render() {
+    return /* @__PURE__ */ jsxs(Fragment$1, { children: [
+      this.props.displayTitle && this.props.title ? /* @__PURE__ */ jsx(PageHeader, { title: this.props.title, style: this.props.headerStyle }) : this.context.view.type !== "embed" && /* @__PURE__ */ jsx("div", { style: { height: this.context.themeToken.paddingContentVerticalLG } }),
+      this.props.enableTabs ? this.renderTabs() : this.renderFirstTab()
+    ] });
+  }
 }
 const BackButtonUsedInSubPage = () => {
   const e = useFlowContext(), t = e.themeToken, o = 32, n = useMemo(() => ({
@@ -70869,7 +70880,7 @@ UpdateRecordActionModel.registerFlow({
       },
       handler(e, t) {
         return O(this, null, function* () {
-          var l, c, u, d, p, m, h;
+          var u, d, p, m, h, g, x, b;
           const o = e.model.getStepParams(SETTINGS_FLOW_KEY, "confirm"), n = o && typeof o == "object" ? o : { enable: !1 };
           yield e.runAction("confirm", n);
           const r = (t == null ? void 0 : t.assignedValues) || {};
@@ -70877,12 +70888,16 @@ UpdateRecordActionModel.registerFlow({
             e.message.warning(e.t("No assigned fields configured"));
             return;
           }
-          const i = (l = e.collection) == null ? void 0 : l.name, a = (u = (c = e.collection) == null ? void 0 : c.getFilterByTK) == null ? void 0 : u.call(c, e.record);
+          const i = (u = e.collection) == null ? void 0 : u.name, a = (p = (d = e.collection) == null ? void 0 : d.getFilterByTK) == null ? void 0 : p.call(d, e.record);
           if (!i || typeof a == "undefined" || a === null) {
             e.message.error(e.t("Record is required to perform this action"));
             return;
           }
-          yield e.api.resource(i).update(f({ filterByTk: a, values: r }, (d = t.requestConfig) == null ? void 0 : d.params)), (h = (m = (p = e.blockModel) == null ? void 0 : p.resource) == null ? void 0 : m.refresh) == null || h.call(m), e.message.success(e.t("Saved successfully"));
+          let l = r;
+          const c = (m = e.collection) == null ? void 0 : m.getFilterByTK(e.record);
+          Array.isArray(a) ? l = f(f({}, r), c || {}) : l = I(f({}, r), {
+            [a]: c
+          }), yield e.api.resource(i).update(f({ filterByTk: a, values: l }, (h = t.requestConfig) == null ? void 0 : h.params)), (b = (x = (g = e.blockModel) == null ? void 0 : g.resource) == null ? void 0 : x.refresh) == null || b.call(x), e.message.success(e.t("Saved successfully"));
         });
       }
     }
@@ -71150,7 +71165,10 @@ class FormBlockModel extends CollectionBlockModel {
       get: () => this.context.form.getFieldsValue(),
       cache: !1,
       meta: n,
-      resolveOnServer: createAssociationSubpathResolver(() => this.collection),
+      resolveOnServer: createAssociationSubpathResolver(
+        () => this.collection,
+        () => this.form.getFieldsValue()
+      ),
       serverOnlyWhenContextParams: !0
     });
   }
@@ -75168,6 +75186,9 @@ class TableActionsColumnModel extends TableCustomColumnModel {
     });
   }
   getColumnProps() {
+    var o;
+    if (this.hidden && !((o = this.flowEngine.flowSettings) != null && o.enabled))
+      return null;
     const t = /* @__PURE__ */ jsx(Droppable, { model: this, children: /* @__PURE__ */ jsx(
       FlowsFloatContextMenu,
       {
@@ -77729,7 +77750,10 @@ class SubFormFieldModel extends FormAssociationFieldModel {
         this.context.t("Current object"),
         () => this.context.form.getFieldValue(this.props.name)
       ),
-      resolveOnServer: createAssociationSubpathResolver(() => this.context.collection),
+      resolveOnServer: createAssociationSubpathResolver(
+        () => this.context.collection,
+        () => this.context.form.getFieldValue(this.props.name)
+      ),
       serverOnlyWhenContextParams: !0
     });
   }
@@ -77806,7 +77830,10 @@ const ArrayNester$1 = ({ name: e, value: t, disabled: o }) => {
               y.context.t("Current object"),
               () => y.context.form.getFieldValue([e, x])
             ),
-            resolveOnServer: createAssociationSubpathResolver(() => y.context.collection),
+            resolveOnServer: createAssociationSubpathResolver(
+              () => y.context.collection,
+              () => y.context.form.getFieldValue([e, x])
+            ),
             serverOnlyWhenContextParams: !0
           }), // key 使用 index 是为了在移除前面行时，能重新渲染后面的行，以更新上下文中的值
           /* @__PURE__ */ jsxs("div", { style: { marginBottom: 12 }, children: [
@@ -77852,7 +77879,10 @@ class SubFormListFieldModel extends FormAssociationFieldModel {
         this.context.t("Current object"),
         (n) => n.currentObject
       ),
-      resolveOnServer: createAssociationSubpathResolver(() => this.context.collection),
+      resolveOnServer: createAssociationSubpathResolver(
+        () => this.context.collection,
+        () => this.context.currentObject
+      ),
       serverOnlyWhenContextParams: !0
     });
   }
@@ -77952,16 +77982,16 @@ CollectionSelectorFieldModel.registerFlow({
   steps: {
     init: {
       handler(e) {
-        const t = e.dataSourceManager.getDataSource("main").getCollections(), o = e.model.context.collectionField.uiSchema.enum, n = t.filter((r) => !r.options.hidden).map((r) => {
+        const t = e.dataSourceManager.getDataSource("main").getCollections(), o = e.model.context.collectionField.uiSchema.enum || [], n = t.filter((r) => !r.options.hidden).filter((r) => o.length ? o.find((i) => i.value === r.name) : !0).map((r) => {
           var i;
           return {
-            label: e.t(r.title || r.label),
+            label: e.t(r.title) || r.name,
             value: r.name || r.value,
             color: (i = r.category) == null ? void 0 : i.color
           };
         });
         e.model.setProps({
-          options: o.length ? o : n
+          options: n
         });
       }
     }