@nocobase/client 2.0.12 → 2.0.13

package/es/flow/actions/afterSuccess.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 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.
+ */
+export declare const afterSuccess: import("@nocobase/flow-engine").ActionDefinition<import("@nocobase/flow-engine").FlowModel<import("@nocobase/flow-engine").DefaultStructure>, import("@nocobase/flow-engine").FlowContext>;

package/es/flow/actions/index.d.ts

@@ -6,6 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+export * from './afterSuccess';
 export * from './confirm';
 export * from './dataScope';
 export * from './openView';

package/es/flow/models/blocks/filter-form/FilterFormGridModel.d.ts

@@ -26,6 +26,7 @@ export declare class FilterFormGridModel extends GridModel {
     readonly loading: {
         value: boolean;
     };
+    private getAssociationFilterTargetKey;
     toggleFormFieldsCollapse(collapse: boolean, visibleRows: number): void;
     onModelCreated(subModel: FilterFormItemModel): Promise<void>;
     renderAddSubModelButton(): React.JSX.Element;

package/es/index.mjs

@@ -3459,6 +3459,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get actionSettingsItems() {
     return actionSettingsItems;
   },
+  get afterSuccess() {
+    return afterSuccess;
+  },
   get allowAddNew() {
     return allowAddNew;
   },
@@ -9949,7 +9952,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.12", 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.13", 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",
@@ -9972,10 +9975,10 @@ const name = "@nocobase/client", version = "2.0.12", 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.12",
-  "@nocobase/flow-engine": "2.0.12",
-  "@nocobase/sdk": "2.0.12",
-  "@nocobase/utils": "2.0.12",
+  "@nocobase/evaluators": "2.0.13",
+  "@nocobase/flow-engine": "2.0.13",
+  "@nocobase/sdk": "2.0.13",
+  "@nocobase/utils": "2.0.13",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -66418,7 +66421,98 @@ const BlockConfigsContext = createContext({
       }
     )
   ] });
-}, confirm$1 = defineAction({
+}, afterSuccess = defineAction({
+  name: "afterSuccess",
+  title: tExpr("After successful submission"),
+  uiSchema: {
+    successMessage: {
+      type: "string",
+      title: tExpr("Popup message"),
+      "x-decorator": "FormItem",
+      "x-component": "Input.TextArea"
+    },
+    manualClose: {
+      type: "boolean",
+      title: tExpr("Message popup close method"),
+      "x-decorator": "FormItem",
+      "x-component": "Radio.Group",
+      enum: [
+        { label: tExpr("Automatic close"), value: !1 },
+        { label: tExpr("Manually close"), value: !0 }
+      ]
+    },
+    actionAfterSuccess: {
+      type: "string",
+      title: tExpr("Action after successful submission"),
+      "x-decorator": "FormItem",
+      "x-component": "Radio.Group",
+      enum: [
+        { label: tExpr("Stay on the current popup or page"), value: "stay" },
+        { label: tExpr("Return to the previous popup or page"), value: "previous" },
+        { label: tExpr("Close popup and redirect to"), value: "redirect" }
+      ]
+    },
+    redirectTo: {
+      type: "string",
+      title: tExpr("Link"),
+      "x-decorator": "FormItem",
+      "x-component": TextAreaWithContextSelector,
+      "x-reactions": {
+        dependencies: ["actionAfterSuccess"],
+        fulfill: {
+          state: {
+            visible: "{{$deps[0]==='redirect'}}"
+          }
+        }
+      }
+    }
+  },
+  defaultParams: {
+    successMessage: tExpr("Saved successfully"),
+    manualClose: !1,
+    actionAfterSuccess: "previous"
+  },
+  handler(e, t) {
+    return L(this, null, function* () {
+      const { successMessage: o, manualClose: n = !1, actionAfterSuccess: r = "previous", redirectTo: i } = t;
+      r === "previous" && e.view && e.view.close();
+      const a = (c) => {
+        if (e.engine) {
+          let u = e.engine;
+          for (; u.nextEngine; )
+            u = u.nextEngine;
+          const d = [];
+          let p = u;
+          for (; p; )
+            d.push(p), p = p.previousEngine;
+          for (const m of d)
+            m.destroyView();
+        }
+        e.router.navigate(c);
+      }, l = (c) => {
+        if (isURL(c)) {
+          window.location.href = c;
+          return;
+        }
+        a(c);
+      };
+      if (o) {
+        const c = e.t(o);
+        if (n) {
+          yield e.modal.success({
+            title: c,
+            onOk: () => L(this, null, function* () {
+              r === "redirect" && i && l(i);
+            })
+          });
+          return;
+        } else
+          e.message.success(c);
+      }
+      r === "redirect" && i && l(i);
+    });
+  }
+}), confirm$1 = defineAction({
   name: "confirm",
   title: tExpr("Confirmation"),
   uiSchema: {
@@ -73669,7 +73763,7 @@ const FlowRoute = () => {
           }
         };
       }
-      const m = yield a.loadOrCreateModel(p);
+      const m = yield a.loadOrCreateModel(p, { skipSave: !a.context.flowSettingsEnabled });
       return m != null && m.uid && n && (m.context.addDelegate(l), m.removeParentDelegate(), n(m.uid, m)), m;
     }),
     {
@@ -73693,7 +73787,7 @@ const RemoteFlowModelRenderer = (e) => {
 function PageTabChildrenRenderer({ ctx: e, options: t }) {
   const { data: o, loading: n } = useRequest$1(
     () => L(this, null, function* () {
-      const i = yield e.engine.loadOrCreateModel(t);
+      const i = yield e.engine.loadOrCreateModel(t, { skipSave: !e.flowSettingsEnabled });
       return i.context.addDelegate(e), i;
     }),
     {
@@ -75776,11 +75870,14 @@ function AssignFieldsEditor() {
   return useEffect(() => {
     let l = !1;
     return L(this, null, function* () {
-      const c = yield n.loadOrCreateModel({
-        parentId: o.uid,
-        subKey: "assignForm",
-        use: "AssignFormModel"
-      });
+      const c = yield n.loadOrCreateModel(
+        {
+          parentId: o.uid,
+          subKey: "assignForm",
+          use: "AssignFormModel"
+        },
+        { skipSave: !e.context.flowSettingsEnabled }
+      );
       l || (a(c), o.assignFormUid = (c == null ? void 0 : c.uid) || o.assignFormUid);
     }), () => {
       l = !0;
@@ -80590,6 +80687,19 @@ DetailsBlockModel.registerFlow({
     }
   }
 });
+DetailsBlockModel.registerFlow({
+  key: "initialPaginationChangeRefresh",
+  sort: 10001,
+  steps: {
+    refreshPaginationRelatedStates: {
+      handler(e) {
+        return L(this, null, function* () {
+          e.model.hidden || !e.model.isMultiRecordResource() || (yield dispatchEventDeep(e.model, "paginationChange"));
+        });
+      }
+    }
+  }
+});
 DetailsBlockModel.define({
   label: tExpr("Details"),
   searchable: !0,
@@ -81155,7 +81265,11 @@ function markAssociationHydrationDone(e, t) {
 function RemoteModelRenderer$2({ options: e }) {
   const t = useFlowViewContext(), { data: o, loading: n } = useRequest$1(
     () => L(this, null, function* () {
-      return yield t.engine.loadOrCreateModel(e, { delegateToParent: !1, delegate: t });
+      return yield t.engine.loadOrCreateModel(e, {
+        delegateToParent: !1,
+        delegate: t,
+        skipSave: !t.flowSettingsEnabled
+      });
     }),
     {
       refreshDeps: [t, e]
@@ -82846,7 +82960,11 @@ function injectRecordPickerPopupContext(e, t, o) {
 function RemoteModelRenderer$1({ options: e, fieldModel: t }) {
   const o = useFlowViewContext(), { data: n, loading: r } = useRequest$1(
     () => L(this, null, function* () {
-      const i = yield o.engine.loadOrCreateModel(e, { delegateToParent: !1, delegate: o });
+      const i = yield o.engine.loadOrCreateModel(e, {
+        delegateToParent: !1,
+        delegate: o,
+        skipSave: !o.flowSettingsEnabled
+      });
       return injectRecordPickerPopupContext(i, o, t), i;
     }),
     {
@@ -85962,7 +86080,11 @@ function FieldWithoutPermissionPlaceholder({ targetModel: e, children: t }) {
 function RemoteModelRenderer({ options: e, fieldModel: t }) {
   const o = useFlowViewContext(), { data: n, loading: r } = useRequest$1(
     () => L(this, null, function* () {
-      const i = yield o.engine.loadOrCreateModel(e, { delegateToParent: !1, delegate: o });
+      const i = yield o.engine.loadOrCreateModel(e, {
+        delegateToParent: !1,
+        delegate: o,
+        skipSave: !o.flowSettingsEnabled
+      });
       return i.context.defineProperty("associationModel", {
         value: t.context.associationModel
       }), i.actionName = e.scene, i;
@@ -89891,6 +90013,11 @@ class FilterFormGridModel extends GridModel {
     R(this, "hiddenRows", {});
     R(this, "loading", observable$1.ref(!1));
   }
+  getAssociationFilterTargetKey(o) {
+    var r;
+    const n = (r = o == null ? void 0 : o.targetCollection) == null ? void 0 : r.filterTargetKey;
+    return Array.isArray(n) ? n[0] || "id" : n || "id";
+  }
   toggleFormFieldsCollapse(o, n) {
     const r = this.props.rows || {};
     if (o) {
@@ -89931,7 +90058,7 @@ class FilterFormGridModel extends GridModel {
             if (m || (m = (p = c.getField) == null ? void 0 : p.call(c, n)), m != null && m.target)
               return {
                 targetId: l.uid,
-                filterPaths: [`${n}.${m.targetKey}`]
+                filterPaths: [`${n}.${this.getAssociationFilterTargetKey(m)}`]
               };
           }
           return {
@@ -95343,7 +95470,11 @@ const models = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
       const o = e.inputArgs || {}, n = (w = (T = o.defineProperties) != null ? T : (M = ($ = e.model.context) == null ? void 0 : $.inputArgs) == null ? void 0 : M.defineProperties) != null ? w : void 0, r = (O = (j = o.defineMethods) != null ? j : (N = (B = e.model.context) == null ? void 0 : B.inputArgs) == null ? void 0 : N.defineMethods) != null ? O : void 0, i = ((z = (q = e.model) == null ? void 0 : q.getInputArgs) == null ? void 0 : z.call(q)) || {}, a = (o == null ? void 0 : o.defaultInputKeys) || [], l = (re) => {
         const ie = typeof (o == null ? void 0 : o[re]) != "undefined", ne = a.includes(re);
         return ie && !ne ? o[re] : typeof (t == null ? void 0 : t[re]) != "undefined" ? t[re] : ie ? o[re] : i == null ? void 0 : i[re];
-      }, c = l("filterByTk"), 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 = (V = e.inputArgs) != null && V.isMobileLayout ? "embed" : ((U = e.inputArgs) == null ? void 0 : U.mode) || t.mode || "drawer";
+      }, c = (() => {
+        var ie;
+        const re = l("filterByTk");
+        return Array.isArray((ie = e.collection) == null ? void 0 : ie.filterTargetKey) && e.collection.filterTargetKey.length === 1 && re != null && typeof re != "object" ? { [e.collection.filterTargetKey[0]]: re } : re;
+      })(), 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 = (V = e.inputArgs) != null && V.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) {
         const re = g, ie = A(x({}, e.inputArgs), {
@@ -95399,13 +95530,16 @@ const models = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
       }, b = e.inputArgs.pageModelClass || t.pageModelClass || "ChildPageModel", S = e.inputArgs.size || t.size || "medium";
       let C = null, P = null, F = e.model.uid;
       if (t.subModelKey) {
-        const re = yield e.engine.loadOrCreateModel({
-          async: !0,
-          parentId: e.model.uid,
-          subKey: t.subModelKey,
-          subType: "object",
-          use: "FlowModel"
-        });
+        const re = yield e.engine.loadOrCreateModel(
+          {
+            async: !0,
+            parentId: e.model.uid,
+            subKey: t.subModelKey,
+            subType: "object",
+            use: "FlowModel"
+          },
+          { skipSave: !e.flowSettingsEnabled }
+        );
         re != null && re.uid && (F = re.uid);
       }
       const v = !!((Z = e.inputArgs) != null && Z.navigation), k = ((W = (ee = e.view) == null ? void 0 : ee.inputArgs) == null ? void 0 : W.openerUids) || o.openerUids || [], I = v ? o.openerUids || k : [...k, ((oe = (Y = e.model.context) == null ? void 0 : Y.inputArgs) == null ? void 0 : oe.viewUid) || e.model.uid], D = typeof o.preventClose != "undefined" ? !!o.preventClose : !!t.preventClose, E = A(x(x({
@@ -100062,6 +100196,7 @@ const overflowMode = defineAction({
   aclCheck,
   aclCheckRefresh,
   actionLinkageRules,
+  afterSuccess,
   blockHeight,
   blockLinkageRules,
   confirm: confirm$1,
@@ -107936,6 +108071,7 @@ export {
   actionLinkageRules,
   actionSettings,
   actionSettingsItems,
+  afterSuccess,
   allowAddNew,
   appendQueryStringToUrl,
   applyMobilePaginationProps,