@nocobase/client 2.0.29 → 2.0.31

package/es/flow/models/fields/AssociationFieldModel/PopupSubTableFieldModel/actions/popupSubTableBeforeClose.d.ts

@@ -0,0 +1,25 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import type { FlowModel } from '@nocobase/flow-engine';
+import type { HookAPI } from 'antd/es/modal/useModal';
+type PopupBeforeClosePayload = {
+    result?: any;
+    force?: boolean;
+    ignoredDirtyFormModelUids?: string[];
+};
+type PopupViewLike = {
+    beforeClose?: (payload: PopupBeforeClosePayload) => Promise<boolean | void> | boolean | void;
+};
+export declare function bindPopupSubTableBeforeClose({ view, model, modal, t, }: {
+    view: PopupViewLike;
+    model?: FlowModel | null;
+    modal: Pick<HookAPI, 'confirm'>;
+    t: (key: string) => string;
+}): () => void;
+export {};

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.29", 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.31", 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.29", 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.29",
-  "@nocobase/flow-engine": "2.0.29",
-  "@nocobase/sdk": "2.0.29",
-  "@nocobase/utils": "2.0.29",
+  "@nocobase/evaluators": "2.0.31",
+  "@nocobase/flow-engine": "2.0.31",
+  "@nocobase/sdk": "2.0.31",
+  "@nocobase/utils": "2.0.31",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -83703,7 +83703,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 +83870,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 +84028,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) {
@@ -86387,6 +86396,66 @@ EditableItemModel.bindModelToInterface("CascadeSelectListFieldModel", ["m2m", "o
   isDefault: !0,
   order: 60
 });
+const POPUP_BEFORE_CLOSE_NEXT = Symbol("popupBeforeCloseNext");
+function visitModelTree(e, t) {
+  const o = e ? [e] : [], n = /* @__PURE__ */ new Set();
+  for (; o.length; ) {
+    const r = o.pop();
+    !(r != null && r.uid) || n.has(r.uid) || (n.add(r.uid), t(r), Object.values(r.subModels || {}).forEach((i) => {
+      Array.isArray(i) ? o.push(...i) : i && typeof i == "object" && o.push(i);
+    }));
+  }
+}
+function unlinkBeforeClose(e, t) {
+  let o, n = e.beforeClose;
+  for (; n; ) {
+    if (n === t) {
+      o ? o[POPUP_BEFORE_CLOSE_NEXT] = n[POPUP_BEFORE_CLOSE_NEXT] : e.beforeClose = n[POPUP_BEFORE_CLOSE_NEXT];
+      break;
+    }
+    if (!(POPUP_BEFORE_CLOSE_NEXT in n))
+      break;
+    o = n, n = n[POPUP_BEFORE_CLOSE_NEXT];
+  }
+}
+function bindPopupSubTableBeforeClose({
+  view: e,
+  model: t,
+  modal: o,
+  t: n
+}) {
+  const r = (l = []) => {
+    const c = [], u = l.length ? new Set(l) : null;
+    return visitModelTree(t, (d) => {
+      var p, m;
+      d.uid && ((m = (p = d.getUserModifiedFields) == null ? void 0 : p.call(d)) != null && m.size) && !(u != null && u.has(d.uid)) && c.push(d.uid);
+    }), c;
+  }, i = (l) => {
+    if (!l.length)
+      return;
+    const c = new Set(l);
+    visitModelTree(t, (u) => {
+      var d;
+      u.uid && c.has(u.uid) && ((d = u.resetUserModifiedFields) == null || d.call(u));
+    });
+  }, a = (l) => L(this, null, function* () {
+    const c = l.force ? [] : r(l.ignoredDirtyFormModelUids);
+    if (c.length && !(yield o.confirm({
+      title: n("Unsaved changes"),
+      content: n("Are you sure you don't want to save?"),
+      okText: n("Confirm"),
+      cancelText: n("Cancel")
+    })))
+      return !1;
+    const u = a[POPUP_BEFORE_CLOSE_NEXT], d = c.length ? Array.from(/* @__PURE__ */ new Set([...l.ignoredDirtyFormModelUids || [], ...c])) : l.ignoredDirtyFormModelUids;
+    return (yield u == null ? void 0 : u(A(x({}, l), {
+      ignoredDirtyFormModelUids: d
+    }))) !== !1 ? (c.length && i(c), !0) : !1;
+  });
+  return a[POPUP_BEFORE_CLOSE_NEXT] = e.beforeClose, e.beforeClose = a, () => {
+    unlinkBeforeClose(e, a);
+  };
+}
 function FieldWithoutPermissionPlaceholder({ targetModel: e, children: t }) {
   const o = e.context.t, n = e, r = n.context.collectionField.collection, i = r.dataSource, a = n.context.collectionField.name, l = useMemo(() => {
     const d = `${o(i.displayName || i.key)} > `, p = r ? `${o(r.title) || r.name || r.tableName} > ` : "";
@@ -86416,7 +86485,15 @@ function RemoteModelRenderer({ options: e, fieldModel: t }) {
       refreshDeps: [o, e]
     }
   );
-  return r || !(n != null && n.uid) ? /* @__PURE__ */ jsx(SkeletonFallback, { style: { margin: 16 } }) : /* @__PURE__ */ jsx(FlowModelRenderer, { model: n, fallback: /* @__PURE__ */ jsx(SkeletonFallback, { style: { margin: 16 } }) });
+  return useEffect(() => {
+    if (n != null && n.uid)
+      return bindPopupSubTableBeforeClose({
+        view: o.view,
+        model: n,
+        modal: o.modal,
+        t: o.t
+      });
+  }, [o, n]), r || !(n != null && n.uid) ? /* @__PURE__ */ jsx(SkeletonFallback, { style: { margin: 16 } }) : /* @__PURE__ */ jsx(FlowModelRenderer, { model: n, fallback: /* @__PURE__ */ jsx(SkeletonFallback, { style: { margin: 16 } }) });
 }
 function EditFormContent({ model: e, scene: t = "update" }) {
   const o = useFlowContext(), { Header: n, type: r } = o.view;
@@ -87775,17 +87852,18 @@ PopupSubTableFormSubmitActionModel.registerFlow({
     save: {
       handler(e, t) {
         return L(this, null, function* () {
+          var d;
           const o = e.blockModel, n = o.context.associationModel, r = n.context.resource, a = o.resource.getUpdateAssociationValues(), l = n.context.collectionField.name, c = r.getUpdateAssociationValues(), u = matchPath(c, l);
           try {
-            const d = e != null && e.flowSettingsEnabled ? getValidationNamePathsExcludingHiddenModels(o) : null;
-            Array.isArray(d) ? d.length && (yield o.form.validateFields(d)) : yield o.form.validateFields();
-            const p = o.form.getFieldsValue(!0), m = omitHiddenModelValuesFromSubmit(p, o);
+            const p = e != null && e.flowSettingsEnabled ? getValidationNamePathsExcludingHiddenModels(o) : null;
+            Array.isArray(p) ? p.length && (yield o.form.validateFields(p)) : yield o.form.validateFields();
+            const m = o.form.getFieldsValue(!0), h = omitHiddenModelValuesFromSubmit(m, o);
             n.dispatchEvent("updateRow", {
-              updatedRecord: m
+              updatedRecord: h
             });
-            const h = a.map((g) => `${u}.${g}`);
-            r.addUpdateAssociationValues(h);
-          } catch (d) {
+            const g = a.map((f) => `${u}.${f}`);
+            r.addUpdateAssociationValues(g), (d = o.resetUserModifiedFields) == null || d.call(o);
+          } catch (p) {
             return;
           }
           e.view && e.view.close();
@@ -95737,47 +95815,64 @@ const models = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
   transformNestedData,
   transformRowsToSingleColumn
 }, Symbol.toStringTag, { value: "Module" }));
-function collectDirtyFormModelUids(e) {
+function collectDirtyFormModelUids(e, t = []) {
   if (!e)
     return [];
-  const t = /* @__PURE__ */ new Set(), o = [], n = (r) => {
-    var a;
-    if (!(r != null && r.uid) || t.has(r.uid))
+  const o = /* @__PURE__ */ new Set(), n = [], r = t.length ? new Set(t) : null, i = (a) => {
+    var c;
+    if (!(a != null && a.uid) || o.has(a.uid))
       return;
-    t.add(r.uid);
-    const i = (a = r.getUserModifiedFields) == null ? void 0 : a.call(r);
-    i != null && i.size && o.push(r.uid), Object.values(r.subModels || {}).forEach((l) => {
-      _.castArray(l).forEach((c) => {
-        c && typeof c == "object" && n(c);
+    o.add(a.uid);
+    const l = (c = a.getUserModifiedFields) == null ? void 0 : c.call(a);
+    l != null && l.size && !(r != null && r.has(a.uid)) && n.push(a.uid), Object.values(a.subModels || {}).forEach((u) => {
+      _.castArray(u).forEach((d) => {
+        d && typeof d == "object" && i(d);
       });
     });
   };
-  return n(e), o;
+  return i(e), n;
 }
-function createBeforeCloseDirtyState(e) {
-  const t = collectDirtyFormModelUids(e);
+function createBeforeCloseDirtyState(e, t = []) {
+  const o = collectDirtyFormModelUids(e, t);
   return {
-    hasDirtyForms: t.length > 0,
-    formModelUids: t
+    hasDirtyForms: o.length > 0,
+    formModelUids: o
   };
 }
+function resetDirtyFormModels(e, t = []) {
+  if (!e || !t.length)
+    return;
+  const o = /* @__PURE__ */ new Set(), n = new Set(t), r = (i) => {
+    var a;
+    !(i != null && i.uid) || o.has(i.uid) || (o.add(i.uid), n.has(i.uid) && ((a = i.resetUserModifiedFields) == null || a.call(i)), Object.values(i.subModels || {}).forEach((l) => {
+      _.castArray(l).forEach((c) => {
+        c && typeof c == "object" && r(c);
+      });
+    }));
+  };
+  r(e);
+}
 function createViewBeforeCloseHandler(e) {
-  return (n) => L(this, [n], function* ({ result: t, force: o }) {
+  return (r) => L(this, [r], function* ({
+    result: t,
+    force: o,
+    ignoredDirtyFormModelUids: n
+  }) {
     if (o)
       return !0;
-    const r = createBeforeCloseDirtyState(e);
-    let i = !1;
-    const a = yield e.dispatchEvent("close", {
+    const i = createBeforeCloseDirtyState(e, n);
+    let a = !1;
+    const l = yield e.dispatchEvent("close", {
       result: t,
       force: !1,
-      dirty: r,
+      dirty: i,
       controller: {
         prevent() {
-          i = !0;
+          a = !0;
         }
       }
-    }), l = (a == null ? void 0 : a.__abortedByExitAll) === !0 || (Array.isArray(a) ? a.some((c) => c instanceof FlowExitAllException) : !1);
-    return !i && !l;
+    }), c = (l == null ? void 0 : l.__abortedByExitAll) === !0 || (Array.isArray(l) ? l.some((d) => d instanceof FlowExitAllException) : !1), u = !a && !c;
+    return u && i.hasDirtyForms && resetDirtyFormModels(e, i.formModelUids), u;
   });
 }
 const openView = defineAction({
@@ -95868,9 +95963,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) {