@nocobase/client 2.0.25 → 2.0.27

package/es/flow/models/fields/DisplayTextFieldModel.d.ts

@@ -9,5 +9,6 @@
 import React from 'react';
 import { ClickableFieldModel } from './ClickableFieldModel';
 export declare class DisplayTextFieldModel extends ClickableFieldModel {
+    t(value: string | undefined | null): any;
     renderComponent(value: any, wrap: any): React.JSX.Element;
 }

package/es/index.mjs

@@ -9964,7 +9964,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.25", 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.27", 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",
@@ -9987,10 +9987,10 @@ const name = "@nocobase/client", version = "2.0.25", 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.25",
-  "@nocobase/flow-engine": "2.0.25",
-  "@nocobase/sdk": "2.0.25",
-  "@nocobase/utils": "2.0.25",
+  "@nocobase/evaluators": "2.0.27",
+  "@nocobase/flow-engine": "2.0.27",
+  "@nocobase/sdk": "2.0.27",
+  "@nocobase/utils": "2.0.27",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -30630,7 +30630,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-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);
@@ -72043,7 +72043,7 @@ BlockGridModel.registerFlow({
   }
 });
 const parseMarkdown = _.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(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -76669,11 +76669,12 @@ AddChildActionModel.registerFlow({
       handler(e, t) {
         return L(this, null, function* () {
           e.model.onClick = (o) => {
-            e.resource.setSourceId(e.record.id), e.model.dispatchEvent(
+            e.model.dispatchEvent(
               "click",
               A(x({
                 event: o
               }, e.inputArgs), {
+                sourceId: e.record.id,
                 filterByTk: null
               }),
               {
@@ -79016,6 +79017,9 @@ const getOuterHeight$1 = (e) => {
     return 0;
   const t = e.getBoundingClientRect(), o = window.getComputedStyle(e), n = parseFloat(o.marginTop) || 0, r = parseFloat(o.marginBottom) || 0;
   return t.height + n + r;
+}, normalizeCssSize = (e) => {
+  if (!(e == null || e === ""))
+    return typeof e == "number" ? `${e}px` : /^\d+(\.\d+)?$/.test(e) ? `${e}px` : e;
 }, useFormGridHeight = ({
   heightMode: e,
   containerRef: t,
@@ -79056,8 +79060,12 @@ const getOuterHeight$1 = (e) => {
   heightMode: l,
   height: c
 }) => {
-  var y, b;
-  const u = useRef(null), d = useRef(null), p = useRef(null), m = l === "specifyValue" || l === "fullHeight", h = useFormGridHeight({
+  var S, C;
+  const u = useRef(null), d = useRef(null), p = useRef(null), m = l === "specifyValue" || l === "fullHeight", h = {
+    paddingTop: (C = (S = e.context) == null ? void 0 : S.themeToken) == null ? void 0 : C.padding
+  }, g = (o == null ? void 0 : o.layout) === "horizontal" ? normalizeCssSize(o == null ? void 0 : o.labelWidth) : void 0;
+  g && (h.marginInlineStart = g);
+  const f = useFormGridHeight({
     heightMode: l,
     containerRef: u,
     actionsRef: i ? d : void 0,
@@ -79065,12 +79073,12 @@ const getOuterHeight$1 = (e) => {
     deps: [c]
   });
   return useEffect(() => {
-    var C;
+    var P;
     if (!t)
       return;
-    const S = m ? h : void 0;
-    ((C = t.props) == null ? void 0 : C.height) !== S && t.setProps({ height: S });
-  }, [t, h, m]), /* @__PURE__ */ jsx(FormComponent, { model: e, layoutProps: o, onFinish: n, style: m ? {
+    const F = m ? f : void 0;
+    ((P = t.props) == null ? void 0 : P.height) !== F && t.setProps({ height: F });
+  }, [t, f, m]), /* @__PURE__ */ jsx(FormComponent, { model: e, layoutProps: o, onFinish: n, style: m ? {
     display: "flex",
     flexDirection: "column",
     minHeight: 0,
@@ -79082,7 +79090,7 @@ const getOuterHeight$1 = (e) => {
     flex: 1
   } : void 0, children: [
     r,
-    i ? /* @__PURE__ */ jsx("div", { style: { paddingTop: (b = (y = e.context) == null ? void 0 : y.themeToken) == null ? void 0 : b.padding }, ref: d, children: i }) : null,
+    i ? /* @__PURE__ */ jsx("div", { style: h, ref: d, children: i }) : null,
     a ? /* @__PURE__ */ jsx("div", { ref: p, children: a }) : null
   ] }) });
 };
@@ -81309,7 +81317,7 @@ function toSelectValue(e, t, o = !1, n = "record", r = []) {
   return a(e) ? l(e) : void 0;
 }
 function resolveOptions(e, t, o) {
-  return e != null && e.length ? e.map((n) => omit(n, "disabled", "options")) : o ? Array.isArray(t) ? t.filter((n) => typeof n == "object" && n !== null) : [] : t && typeof t == "object" ? [t] : [];
+  return e != null && e.length ? e.map((n) => omit(n, "disabled", "options", "style")) : o ? Array.isArray(t) ? t.filter((n) => typeof n == "object" && n !== null) : [] : t && typeof t == "object" ? [t] : [];
 }
 const labelClassName = css`
   div {
@@ -95434,11 +95442,14 @@ DisplayItemModel.bindModelToInterface("DisplayPercentFieldModel", ["percent"], {
   isDefault: !0
 });
 class DisplayTextFieldModel extends ClickableFieldModel {
+  t(t) {
+    return t != null && t.startsWith("{{") && (t != null && t.endsWith("}}")) ? this.translate(t) : t;
+  }
   renderComponent(t, o) {
     const { prefix: n, suffix: r, overflowMode: i } = this.props;
     return /* @__PURE__ */ jsxs("span", { style: { whiteSpace: i === "wrap" || o ? "pre-line" : "nowrap" }, children: [
       n,
-      this.translate(t),
+      this.t(t),
       r
     ] });
   }