@nocobase/client 2.0.30 → 2.0.32

package/es/flow/models/blocks/details/DetailsItemModel.d.ts

@@ -17,6 +17,13 @@ import { DetailsGridModel } from './DetailsGridModel';
  * @param idx Form.List 的索引
  */
 export declare function getValueWithIndex(record: any, fieldPath: string, idx?: string[]): any;
+export declare function getDetailsItemValue(options: {
+    record: any;
+    currentObject?: any;
+    fieldPath: string;
+    prefixFieldPath?: string;
+    idx?: string[];
+}): any;
 export declare class DetailsItemModel extends DisplayItemModel<{
     parent: DetailsGridModel;
     subModels: {

package/es/index.mjs

@@ -80,7 +80,7 @@ import { ErrorBoundary } from "react-error-boundary";
 import * as reactI18next from "react-i18next";
 import { useTranslation, initReactI18next, Trans, I18nextProvider } from "react-i18next";
 import * as nocobaseSDK from "@nocobase/sdk";
-import { APIClient as APIClient$1, getSubAppName } from "@nocobase/sdk";
+import { APIClient as APIClient$1, hasHeaderValue, getSubAppName } from "@nocobase/sdk";
 import get$1 from "lodash/get";
 import merge$1 from "lodash/merge";
 import set$1 from "lodash/set";
@@ -3777,6 +3777,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get getDefaultOperator() {
     return getDefaultOperator;
   },
+  get getDetailsItemValue() {
+    return getDetailsItemValue;
+  },
   get getDisplayNumber() {
     return getDisplayNumber;
   },
@@ -5280,7 +5283,7 @@ class APIClient extends APIClient$1 {
       o.headers["X-With-ACL-Meta"] = !0;
       const n = this.getHeaders();
       return Object.keys(n).forEach((r) => {
-        o.headers[r] = o.headers[r] || n[r];
+        hasHeaderValue(o.headers, r) || (o.headers[r] = n[r]);
       }), o;
     }), super.interceptors(), this.useNotificationMiddleware(), this.axios.interceptors.response.use(
       (o) => o,
@@ -9964,7 +9967,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.30", 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.32", 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 +9990,10 @@ const name = "@nocobase/client", version = "2.0.30", 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.30",
-  "@nocobase/flow-engine": "2.0.30",
-  "@nocobase/sdk": "2.0.30",
-  "@nocobase/utils": "2.0.30",
+  "@nocobase/evaluators": "2.0.32",
+  "@nocobase/flow-engine": "2.0.32",
+  "@nocobase/sdk": "2.0.32",
+  "@nocobase/utils": "2.0.32",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -30630,7 +30633,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 +72046,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);
@@ -79468,6 +79471,18 @@ function getValueWithIndex(e, t, o) {
   }
   return get(e, r);
 }
+function getDetailsItemValue(e) {
+  const { record: t, currentObject: o, fieldPath: n, prefixFieldPath: r, idx: i } = e, a = getValueWithIndex(t, n, i);
+  if (a !== void 0 || o == null)
+    return a;
+  if (r && n === r)
+    return o;
+  const l = r && n.startsWith(`${r}.`) ? n.slice(r.length + 1) : n;
+  return l ? get(o, l) : o;
+}
+function normalizeDetailsAssociationValue(e, t) {
+  return !isToManyAssociationField(e) || Array.isArray(t) ? t : t && typeof t == "object" && Array.isArray(t.rows) ? t.rows : t == null ? [] : [t];
+}
 class DetailsItemModel extends DisplayItemModel {
   static defineChildren(t) {
     const o = t.collection;
@@ -79513,29 +79528,38 @@ class DetailsItemModel extends DisplayItemModel {
     });
   }
   renderItem() {
-    const t = this.subModels.field, o = this.context.fieldIndex, n = this.context.record, r = this.context.currentObject, i = this.context.item, a = this.context.getPropertyOptions("item"), l = o != null ? (() => {
-      const d = t.createFork({}, `${o}`);
-      d.context.defineProperty("fieldIndex", {
+    const t = this.subModels.field, o = this.context.fieldIndex, n = this.context.record, r = this.context.currentObject, i = this.context.item, a = this.context.getPropertyOptions("item"), l = this.context.prefixFieldPath, c = o != null ? (() => {
+      const p = t.createFork({}, `${o}`);
+      p.context.defineProperty("fieldIndex", {
         get: () => o
-      }), d.context.defineProperty("record", {
+      }), p.context.defineProperty("record", {
         get: () => n,
         cache: !1
-      }), d.context.defineProperty("currentObject", {
+      }), p.context.defineProperty("currentObject", {
         get: () => r,
         cache: !1
       });
-      const h = a || {}, { value: p } = h, m = ee(h, ["value"]);
-      return d.context.defineProperty("item", A(x({}, m), {
+      const g = a || {}, { value: m } = g, h = ee(g, ["value"]);
+      return p.context.defineProperty("item", A(x({}, h), {
         get: () => i,
         cache: !1
-      })), this.context.pattern && d.context.defineProperty("pattern", {
+      })), this.context.pattern && p.context.defineProperty("pattern", {
         get: () => this.context.pattern
-      }), d;
-    })() : t, c = this.context.pattern ? A(x(x({}, this.context.blockModel.props), this.props), {
+      }), p;
+    })() : t, u = this.context.pattern ? A(x(x({}, this.context.blockModel.props), this.props), {
       pattern: this.context.pattern,
       disabled: this.context.pattern === "readPretty"
-    }) : x(x({}, this.context.blockModel.props), this.props), u = getValueWithIndex(n, this.fieldPath, o);
-    return /* @__PURE__ */ jsx(FormItem$2, A(x({}, c), { value: u, children: /* @__PURE__ */ jsx(FieldModelRenderer, { model: l }) }));
+    }) : x(x({}, this.context.blockModel.props), this.props), d = normalizeDetailsAssociationValue(
+      this.collectionField,
+      getDetailsItemValue({
+        record: n,
+        currentObject: r,
+        fieldPath: this.fieldPath,
+        prefixFieldPath: l,
+        idx: o
+      })
+    );
+    return /* @__PURE__ */ jsx(FormItem$2, A(x({}, u), { value: d, children: /* @__PURE__ */ jsx(FieldModelRenderer, { model: c }) }));
   }
 }
 DetailsItemModel.define({
@@ -83703,7 +83727,12 @@ const CustomWidth = ({ setOpen: e, t, handleChange: o, defaultValue: n }) => {
       ] })
     }
   );
-}, Ze = class Ze extends DisplayItemModel {
+};
+function getSavedAssociationTitleField(e) {
+  var t, o, n;
+  return ((o = (t = e.getStepParams) == null ? void 0 : t.call(e, "tableColumnSettings", "fieldNames")) == null ? void 0 : o.label) || ((n = e.props) == null ? void 0 : n.titleField);
+}
+const Ze = class Ze extends DisplayItemModel {
   afterAddAsSubModel() {
     return L(this, null, function* () {
       yield Ne(Ze.prototype, this, "afterAddAsSubModel").call(this), yield this.dispatchEvent("beforeRender");
@@ -83865,8 +83894,12 @@ TableColumnModel.registerFlow({
     init: {
       handler(e, t) {
         return L(this, null, function* () {
+          var i, a, l, c;
           const o = e.model.context.collectionField;
-          o && (e.model.setProps("title", o.title), e.model.setProps("dataIndex", o.name), yield e.model.applySubModelsBeforeRenderFlows("field"), e.model.setProps(x({}, o.getComponentProps())));
+          if (!o)
+            return;
+          const n = getSavedAssociationTitleField(e.model), r = o.isAssociationField() && n ? x(x({}, o.getComponentProps()), (c = (l = (a = (i = o.targetCollection) == null ? void 0 : i.getField) == null ? void 0 : a.call(i, n)) == null ? void 0 : l.getComponentProps) == null ? void 0 : c.call(l)) : o.getComponentProps();
+          e.model.setProps("title", o.title), e.model.setProps("dataIndex", o.name), yield e.model.applySubModelsBeforeRenderFlows("field"), e.model.setProps(x({}, r));
         });
       }
     },
@@ -84019,7 +84052,7 @@ TableColumnModel.registerFlow({
       defaultParams: (e) => {
         const t = e.model.context.collectionField.targetCollectionTitleFieldName;
         return {
-          label: e.model.props.titleField || t
+          label: getSavedAssociationTitleField(e.model) || t
         };
       },
       handler(e, t) {
@@ -84122,16 +84155,20 @@ const LargeFieldEdit = observer((a) => {
       )
     }
   );
-}), handleModelName = (e) => ["RadioGroupFieldModel", "CheckboxGroupFieldModel"].includes(e) ? "SelectFieldModel" : e, MemoFieldRenderer = React.memo(FieldModelRenderer, (e, t) => e.value === t.value && e.model === t.model), FieldModelRendererOptimize = React.memo((e) => {
+}), handleModelName = (e) => ["RadioGroupFieldModel", "CheckboxGroupFieldModel"].includes(e) ? "SelectFieldModel" : e, MemoFieldRenderer = React.memo(FieldModelRenderer, (e, t) => e.value === t.value && e.model === t.model);
+function shouldCommitImmediately(e) {
+  return Array.isArray(e) ? !0 : e && typeof e == "object" ? !("target" in e) : !1;
+}
+const FieldModelRendererOptimize = React.memo((e) => {
   const c = e, { model: t, onChange: o, value: n } = c, r = ee(c, ["model", "onChange", "value"]), i = React.useRef(e == null ? void 0 : e.value);
   useEffect(() => {
     i.current = n;
   }, [n]);
   const a = React.useCallback(
     (u) => {
-      i.current = u;
+      i.current = u, shouldCommitImmediately(u) && (o == null || o(u));
     },
-    [t]
+    [o]
   ), l = React.useCallback(() => {
     o == null || o(i.current);
   }, [o]);
@@ -95792,6 +95829,7 @@ const models = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
   formatNumber,
   getAllDataModels,
   getDefaultOperator,
+  getDetailsItemValue,
   getDisplayNumber,
   getValueWithIndex,
   injectRecordPickerPopupContext,
@@ -95954,9 +95992,9 @@ const openView = defineAction({
         const se = typeof (o == null ? void 0 : o[ne]) != "undefined", re = a.includes(ne);
         return se && !re ? o[ne] : typeof (t == null ? void 0 : t[ne]) != "undefined" ? t[ne] : se ? o[ne] : i == null ? void 0 : i[ne];
       }, c = (() => {
-        var se;
+        var se, re;
         const ne = l("filterByTk");
-        return Array.isArray((se = e.collection) == null ? void 0 : se.filterTargetKey) && e.collection.filterTargetKey.length === 1 && ne != null && typeof ne != "object" ? { [e.collection.filterTargetKey[0]]: ne } : ne;
+        return ((se = e.collection) == null ? void 0 : se.template) === "sql" && Array.isArray((re = e.collection) == null ? void 0 : re.filterTargetKey) && e.collection.filterTargetKey.length === 1 && ne != null && typeof ne != "object" ? { [e.collection.filterTargetKey[0]]: ne } : ne;
       })(), u = l("sourceId"), d = typeof (o == null ? void 0 : o.dataSourceKey) != "undefined" ? o.dataSourceKey : t == null ? void 0 : t.dataSourceKey, p = typeof (o == null ? void 0 : o.collectionName) != "undefined" ? o.collectionName : t == null ? void 0 : t.collectionName, m = typeof (o == null ? void 0 : o.associationName) != "undefined" ? o.associationName : t == null ? void 0 : t.associationName, h = typeof o.tabUid != "undefined" ? o.tabUid : t.tabUid, g = (z = e.inputArgs) != null && z.isMobileLayout ? "embed" : ((U = e.inputArgs) == null ? void 0 : U.mode) || t.mode || "drawer";
       let f = typeof o.navigation != "undefined" ? o.navigation : t.navigation;
       if ((n || r) && (f = !1), f !== !1 && e.isNavigationEnabled !== !1 && !e.inputArgs.navigation && (K = e.view) != null && K.navigation) {
@@ -108669,6 +108707,7 @@ export {
   getDatePickerLabels,
   getDateRanges,
   getDefaultOperator,
+  getDetailsItemValue,
   getDisplayNumber,
   getFieldDefaultValue,
   getFlowPageMenuSchema,