@nocobase/client 2.0.31 → 2.0.33

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;
   },
@@ -3813,6 +3816,12 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get getRenderContent() {
     return getRenderContent;
   },
+  get getSchemaSettingsConfirmZIndex() {
+    return getSchemaSettingsConfirmZIndex;
+  },
+  get getSchemaSettingsDialogZIndex() {
+    return getSchemaSettingsDialogZIndex;
+  },
   get getShouldChange() {
     return getShouldChange;
   },
@@ -5280,7 +5289,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 +9973,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.31", 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.33", 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 +9996,10 @@ const name = "@nocobase/client", version = "2.0.31", 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.31",
-  "@nocobase/flow-engine": "2.0.31",
-  "@nocobase/sdk": "2.0.31",
-  "@nocobase/utils": "2.0.31",
+  "@nocobase/evaluators": "2.0.33",
+  "@nocobase/flow-engine": "2.0.33",
+  "@nocobase/sdk": "2.0.33",
+  "@nocobase/utils": "2.0.33",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -23217,8 +23226,8 @@ const findGridSchema = (e) => e.reduceProperties((t, o) => {
     type: "divider"
   };
   return t(n), null;
-}, SchemaSettingsRemove = (e) => {
-  const { disabled: t, confirm: o, title: n, removeParentsIfNoChildren: r, breakRemoveOn: i } = e, { dn: a, template: l } = useSchemaSettings(), { t: c } = useTranslation(), u = useField(), d = useCompile(), p = useFieldSchema(), m = useBlockTemplateContext(), h = useForm(), { modal: g } = App.useApp(), { removeActiveFieldName: f } = useFormActiveFields() || {}, { removeDataBlock: y } = useFilterBlock();
+}, getSchemaSettingsDialogZIndex = (e) => Math.max(getZIndex("modal", e + 10, 0), ICON_POPUP_Z_INDEX + 200), getSchemaSettingsConfirmZIndex = (e) => Math.max(getZIndex("modal", e, 1), 1e3), SchemaSettingsRemove = (e) => {
+  const { disabled: t, confirm: o, title: n, removeParentsIfNoChildren: r, breakRemoveOn: i } = e, { dn: a, template: l } = useSchemaSettings(), { t: c } = useTranslation(), u = useField(), d = useCompile(), p = useFieldSchema(), m = useBlockTemplateContext(), h = useForm(), { modal: g } = App.useApp(), { removeActiveFieldName: f } = useFormActiveFields() || {}, { removeDataBlock: y } = useFilterBlock(), b = useZIndexContext(), S = getSchemaSettingsConfirmZIndex(b);
   return /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     {
@@ -23228,18 +23237,19 @@ const findGridSchema = (e) => e.reduceProperties((t, o) => {
       onClick: () => {
         g.confirm(A(x({
           title: n ? d(n) : c("Delete block"),
-          content: c("Are you sure you want to delete it?")
+          content: c("Are you sure you want to delete it?"),
+          zIndex: S
         }, o), {
           onOk() {
             return L(this, null, function* () {
-              var C;
-              const S = {
+              var P;
+              const F = {
                 removeParentsIfNoChildren: r,
                 breakRemoveOn: i
               };
-              u != null && u.required && (u.required = !1, p.required = !1), l && l.uid === p["x-uid"] && (m != null && m.dn) ? yield m == null ? void 0 : m.dn.remove(null, S) : yield a.remove(null, S), yield (C = o == null ? void 0 : o.onOk) == null ? void 0 : C.call(o), delete h.values[p.name], a.refresh({ refreshParentSchema: !0 }), f == null || f(p.name), h == null || h.query(new RegExp(`${p.parent.name}.${p.name}$`)).forEach((F) => {
-                var P, v;
-                (P = F.setValue) == null || P.call(F, void 0), (v = F.setInitialValue) == null || v.call(F, void 0);
+              u != null && u.required && (u.required = !1, p.required = !1), l && l.uid === p["x-uid"] && (m != null && m.dn) ? yield m == null ? void 0 : m.dn.remove(null, F) : yield a.remove(null, F), yield (P = o == null ? void 0 : o.onOk) == null ? void 0 : P.call(o), delete h.values[p.name], a.refresh({ refreshParentSchema: !0 }), f == null || f(p.name), h == null || h.query(new RegExp(`${p.parent.name}.${p.name}$`)).forEach((v) => {
+                var k, I;
+                (k = v.setValue) == null || k.call(v, void 0), (I = v.setInitialValue) == null || I.call(v, void 0);
               }), y(p["x-uid"]);
             });
           }
@@ -23395,7 +23405,7 @@ const SchemaSettingsSwitchItem = (e) => {
 });
 SchemaSettingsActionModalItem.displayName = "SchemaSettingsActionModalItem";
 const SchemaSettingsModalItem = (e) => {
-  const G = e, {
+  const X = e, {
     hidden: t,
     title: o,
     components: n,
@@ -23406,9 +23416,9 @@ const SchemaSettingsModalItem = (e) => {
     initialValues: c,
     width: u = "fit-content",
     noRecord: d = !1,
-    ModalContextProvider: p = (W) => /* @__PURE__ */ jsx(Fragment$1, { children: W.children }),
+    ModalContextProvider: p = (Q) => /* @__PURE__ */ jsx(Fragment$1, { children: Q.children }),
     dialogRootClassName: m
-  } = G, h = ee(G, [
+  } = X, h = ee(X, [
     "hidden",
     "title",
     "components",
@@ -23421,34 +23431,35 @@ const SchemaSettingsModalItem = (e) => {
     "noRecord",
     "ModalContextProvider",
     "dialogRootClassName"
-  ]), g = useContext(SchemaOptionsContext), f = useCollection(), y = useAPIClient(), b = useApp(), { theme: S } = useGlobalTheme(), C = useBlockRequestContext(), F = useFormActiveFields(), { locale: P } = useContext(ConfigProvider.ConfigContext), v = useDataSourceManager(), k = useDataSourceKey(), I = useCollectionRecord(), { association: M } = useDataBlockProps() || {}, E = useCurrentRecord(), $ = useFormBlockContext(), D = useBlockContext(), { getOperators: T } = useOperators(), w = useLocationSearch(), B = useVariables$1(), N = useContext(AllDataBlocksContext), j = useContext(SchemaComponentContext), O = useContext(VariableScopeContext$1), { formValue: q, collection: V, parent: z } = useSubFormValue(), U = useCurrentPopupRecord(), K = useParentPopupRecord();
+  ]), g = useContext(SchemaOptionsContext), f = useCollection(), y = useAPIClient(), b = useApp(), { theme: S } = useGlobalTheme(), C = useBlockRequestContext(), F = useFormActiveFields(), { locale: P } = useContext(ConfigProvider.ConfigContext), v = useDataSourceManager(), k = useDataSourceKey(), I = useCollectionRecord(), { association: M } = useDataBlockProps() || {}, E = useCurrentRecord(), $ = useFormBlockContext(), D = useBlockContext(), { getOperators: T } = useOperators(), w = useLocationSearch(), B = useVariables$1(), N = useContext(AllDataBlocksContext), j = useContext(SchemaComponentContext), O = useContext(VariableScopeContext$1), q = useZIndexContext(), V = getSchemaSettingsDialogZIndex(q), { formValue: z, collection: U, parent: K } = useSubFormValue(), G = useCurrentPopupRecord(), W = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     A(x({
       title: o
     }, h), {
       onClick: () => L(void 0, null, function* () {
-        const W = l ? yield l() : c, X = _.isFunction(e.schema) ? e.schema() : e.schema;
+        const Q = l ? yield l() : c, J = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
           {
-            title: X.title || o,
+            title: J.title || o,
             width: u,
             rootClassName: m,
-            getContainer: () => document.body
+            getContainer: () => document.body,
+            zIndex: V
           },
           () => /* @__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: D, children: /* @__PURE__ */ jsx(
             VariablePopupRecordProvider,
             {
-              recordData: U == null ? void 0 : U.value,
-              collection: U == null ? void 0 : U.collection,
+              recordData: G == null ? void 0 : G.value,
+              collection: G == null ? void 0 : G.collection,
               parent: {
-                recordData: K == null ? void 0 : K.value,
-                collection: K == null ? void 0 : K.collection
+                recordData: W == null ? void 0 : W.value,
+                collection: W == null ? void 0 : W.collection
               },
               children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : I, children: /* @__PURE__ */ jsx(CurrentRecordContextProvider, A(x({}, E), { children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: $, children: /* @__PURE__ */ jsx(
                 SubFormProvider,
                 {
-                  value: { value: q, collection: V, parent: z },
+                  value: { value: z, collection: U, parent: K },
                   children: /* @__PURE__ */ jsx(
                     FormActiveFieldsProvider,
                     {
@@ -23485,12 +23496,12 @@ const SchemaSettingsModalItem = (e) => {
                                                         min-width: 320px;
                                                       }
                                                     `,
-                                      children: /* @__PURE__ */ jsx(ApplicationContext.Provider, { value: b, children: /* @__PURE__ */ jsx(APIClientProvider, { apiClient: y, children: /* @__PURE__ */ jsx(ConfigProvider, { locale: P, children: /* @__PURE__ */ jsx(zIndexContext.Provider, { value: ICON_POPUP_Z_INDEX, children: /* @__PURE__ */ jsx(
+                                      children: /* @__PURE__ */ jsx(ApplicationContext.Provider, { value: b, children: /* @__PURE__ */ jsx(APIClientProvider, { apiClient: y, children: /* @__PURE__ */ jsx(ConfigProvider, { locale: P, children: /* @__PURE__ */ jsx(zIndexContext.Provider, { value: V, children: /* @__PURE__ */ jsx(
                                         SchemaComponent,
                                         {
                                           components: n,
                                           scope: r,
-                                          schema: X
+                                          schema: J
                                         }
                                       ) }) }) }) })
                                     }
@@ -23509,10 +23520,10 @@ const SchemaSettingsModalItem = (e) => {
           ) }) }) }) }) }) }) }),
           S
         ).open({
-          initialValues: W,
+          initialValues: Q,
           effects: i
-        }).then((Q) => (a(Q), Q)).catch((Q) => {
-          console.error(Q);
+        }).then((Z) => (a(Z), Z)).catch((Z) => {
+          console.error(Z);
         });
       }),
       children: e.children || e.title
@@ -30630,7 +30641,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);
@@ -72043,7 +72054,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);
@@ -79468,6 +79479,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 +79536,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({
@@ -79784,24 +79816,24 @@ function omitHiddenModelValuesFromSubmit(e, t) {
 }
 function submitHandler(e, t, o) {
   return L(this, null, function* () {
-    var c, u;
+    var c, u, d;
     const n = e.resource, r = e.blockModel, i = e != null && e.flowSettingsEnabled ? getValidationNamePathsExcludingHiddenModels(r) : null;
     Array.isArray(i) ? i.length && (yield r.form.validateFields(i)) : yield r.form.validateFields();
     const a = r.form.getFieldsValue(!0), l = omitHiddenModelValuesFromSubmit(a, r);
     if (n instanceof SingleRecordResource) {
       if (r instanceof EditFormModel) {
-        const p = n.getMeta("currentFilterByTk");
-        p ? n.setFilterByTk(p) : n.isNewRecord = !0;
+        const m = n.getMeta("currentFilterByTk");
+        m ? n.setFilterByTk(m) : n.isNewRecord = !0;
       }
-      const d = o ? yield o(l) : yield n.save(l, t.requestConfig);
-      r instanceof EditFormModel ? (n.isNewRecord = !1, (c = r.resetUserModifiedFields) == null || c.call(r), yield n.refresh()) : (r.form.resetFields(), (u = r.resetUserModifiedFields) == null || u.call(r), r.emitter.emit("onFieldReset"), e.view.inputArgs.collectionName === r.collection.name && e.view.inputArgs.onChange && e.view.inputArgs.onChange(d == null ? void 0 : d.data));
+      const p = o ? yield o(l) : yield n.save(l, t.requestConfig);
+      r instanceof EditFormModel ? (n.isNewRecord = !1, (c = r.resetUserModifiedFields) == null || c.call(r), yield n.refresh()) : (r.form.resetFields(), r.emitter.emit("onFieldReset"), (u = r.resetUserModifiedFields) == null || u.call(r), e.view.inputArgs.collectionName === r.collection.name && e.view.inputArgs.onChange && e.view.inputArgs.onChange(p == null ? void 0 : p.data));
     } else if (n instanceof MultiRecordResource) {
-      const d = n.getMeta("currentFilterByTk");
-      if (!d) {
+      const p = n.getMeta("currentFilterByTk");
+      if (!p) {
         e.message.error(e.t("No filterByTk found for multi-record resource."));
         return;
       }
-      (yield o) ? yield o(l, d) : yield n.update(d, l, t.requestConfig);
+      (yield o) ? yield o(l, p) : yield n.update(p, l, t.requestConfig), (d = r.resetUserModifiedFields) == null || d.call(r);
     }
   });
 }
@@ -84131,16 +84163,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]);
@@ -95801,6 +95837,7 @@ const models = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
   formatNumber,
   getAllDataModels,
   getDefaultOperator,
+  getDetailsItemValue,
   getDisplayNumber,
   getValueWithIndex,
   injectRecordPickerPopupContext,
@@ -108678,6 +108715,7 @@ export {
   getDatePickerLabels,
   getDateRanges,
   getDefaultOperator,
+  getDetailsItemValue,
   getDisplayNumber,
   getFieldDefaultValue,
   getFlowPageMenuSchema,
@@ -108690,6 +108728,8 @@ export {
   getPageSchema,
   getPopupPathFromParams,
   getRenderContent,
+  getSchemaSettingsConfirmZIndex,
+  getSchemaSettingsDialogZIndex,
   getShouldChange,
   getSimpleModePaginationClassName,
   getStoredPopupContext,

package/es/schema-settings/SchemaSettings.d.ts

@@ -69,6 +69,8 @@ export interface SchemaSettingsRemoveProps {
     removeParentsIfNoChildren?: boolean;
     breakRemoveOn?: ISchema | ((s: ISchema) => boolean);
 }
+export declare const getSchemaSettingsDialogZIndex: (parentZIndex: number) => number;
+export declare const getSchemaSettingsConfirmZIndex: (parentZIndex: number) => number;
 export declare const SchemaSettingsRemove: FC<SchemaSettingsRemoveProps>;
 export interface SchemaSettingsSelectItemProps extends Omit<SchemaSettingsItemProps, 'onChange' | 'onClick'>, Omit<SelectWithTitleProps, 'title' | 'defaultValue'> {
     value?: SelectWithTitleProps['defaultValue'];