@nocobase/client 2.0.36 → 2.0.37

package/es/flow/models/blocks/form/submitValues.d.ts

@@ -15,6 +15,19 @@ import type { FormBlockModel } from './FormBlockModel';
  * - 返回 null 表示无法安全推断，调用方应回退到 `validateFields()` 全量校验。
  */
 export declare function getValidationNamePathsExcludingHiddenModels(blockModel: FormBlockModel): NamePath[] | null;
+export declare function shouldSkipSubmitValidation(model: {
+    getStepParams?: (flowKey: string, stepKey: string) => {
+        skipValidator?: boolean;
+    } | undefined;
+} | null | undefined): boolean;
+export declare function validateSubmitForm(options: {
+    form?: {
+        validateFields?: (nameList?: any) => Promise<any>;
+    } | null;
+    blockModel?: FormBlockModel | null;
+    flowSettingsEnabled?: boolean;
+    skipValidator?: boolean;
+}): Promise<void>;
 /**
  * 提交前过滤：移除当前表单 block 中被「联动规则隐藏」的字段值（`model.hidden === true`）。
  *

package/es/index.mjs

@@ -9976,7 +9976,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.36", 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.37", 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",
@@ -9999,10 +9999,10 @@ const name = "@nocobase/client", version = "2.0.36", 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.36",
-  "@nocobase/flow-engine": "2.0.36",
-  "@nocobase/sdk": "2.0.36",
-  "@nocobase/utils": "2.0.36",
+  "@nocobase/evaluators": "2.0.37",
+  "@nocobase/flow-engine": "2.0.37",
+  "@nocobase/sdk": "2.0.37",
+  "@nocobase/utils": "2.0.37",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -79806,6 +79806,23 @@ function getValidationNamePathsExcludingHiddenModels(e) {
   const i = collectHiddenModelNamePaths(e);
   return i.length ? n.filter((a) => !i.some((l) => isNamePathPrefix(l, a))) : n;
 }
+function shouldSkipSubmitValidation(e) {
+  var t, o;
+  return ((o = (t = e == null ? void 0 : e.getStepParams) == null ? void 0 : t.call(e, "submitSettings", "skipRequiredValidation")) == null ? void 0 : o.skipValidator) === !0;
+}
+function validateSubmitForm(e) {
+  return L(this, null, function* () {
+    const { form: t, blockModel: o, flowSettingsEnabled: n, skipValidator: r } = e;
+    if (r || !t || typeof t.validateFields != "function")
+      return;
+    const i = n && o ? getValidationNamePathsExcludingHiddenModels(o) : null;
+    if (Array.isArray(i)) {
+      i.length && (yield t.validateFields(i));
+      return;
+    }
+    yield t.validateFields();
+  });
+}
 function omitHiddenModelValuesFromSubmit(e, t) {
   if (!e || typeof e != "object")
     return e;
@@ -79819,24 +79836,29 @@ function omitHiddenModelValuesFromSubmit(e, t) {
 }
 function submitHandler(e, t, o) {
   return L(this, null, function* () {
-    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);
+    var l, c, u;
+    const n = e.resource, r = e.blockModel;
+    yield validateSubmitForm({
+      form: r == null ? void 0 : r.form,
+      blockModel: r,
+      flowSettingsEnabled: e == null ? void 0 : e.flowSettingsEnabled,
+      skipValidator: shouldSkipSubmitValidation(e == null ? void 0 : e.model)
+    });
+    const i = r.form.getFieldsValue(!0), a = omitHiddenModelValuesFromSubmit(i, r);
     if (n instanceof SingleRecordResource) {
       if (r instanceof EditFormModel) {
-        const m = n.getMeta("currentFilterByTk");
-        m ? n.setFilterByTk(m) : n.isNewRecord = !0;
+        const p = n.getMeta("currentFilterByTk");
+        p ? n.setFilterByTk(p) : n.isNewRecord = !0;
       }
-      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));
+      const d = o ? yield o(a) : yield n.save(a, t.requestConfig);
+      r instanceof EditFormModel ? (n.isNewRecord = !1, (l = r.resetUserModifiedFields) == null || l.call(r), yield n.refresh()) : (r.form.resetFields(), r.emitter.emit("onFieldReset"), (c = r.resetUserModifiedFields) == null || c.call(r), e.view.inputArgs.collectionName === r.collection.name && e.view.inputArgs.onChange && e.view.inputArgs.onChange(d == null ? void 0 : d.data));
     } else if (n instanceof MultiRecordResource) {
-      const p = n.getMeta("currentFilterByTk");
-      if (!p) {
+      const d = n.getMeta("currentFilterByTk");
+      if (!d) {
         e.message.error(e.t("No filterByTk found for multi-record resource."));
         return;
       }
-      (yield o) ? yield o(l, p) : yield n.update(p, l, t.requestConfig), (d = r.resetUserModifiedFields) == null || d.call(r);
+      (yield o) ? yield o(a, d) : yield n.update(d, a, t.requestConfig), (u = r.resetUserModifiedFields) == null || u.call(r);
     }
   });
 }
@@ -82470,8 +82492,12 @@ FormSubmitActionModel.registerFlow({
         return L(this, null, function* () {
           if (t.enable)
             try {
-              const o = e != null && e.flowSettingsEnabled ? getValidationNamePathsExcludingHiddenModels(e.blockModel) : null;
-              Array.isArray(o) ? o.length && (yield e.form.validateFields(o)) : yield e.form.validateFields(), (yield e.modal.confirm({
+              yield validateSubmitForm({
+                form: e.form,
+                blockModel: e.blockModel,
+                flowSettingsEnabled: e == null ? void 0 : e.flowSettingsEnabled,
+                skipValidator: shouldSkipSubmitValidation(e == null ? void 0 : e.model)
+              }), (yield e.modal.confirm({
                 title: e.t(t.title, { ns: "lm-flow-engine" }),
                 content: e.t(t.content, { ns: "lm-flow-engine" }),
                 okText: e.t("Confirm"),
@@ -82483,6 +82509,15 @@ FormSubmitActionModel.registerFlow({
         });
       }
     },
+    skipRequiredValidation: {
+      title: tExpr("Skip required validation"),
+      uiMode: { type: "switch", key: "skipValidator" },
+      defaultParams: {
+        skipValidator: !1
+      },
+      handler() {
+      }
+    },
     saveResource: {
       handler(e, t) {
         return L(this, null, function* () {
@@ -87953,8 +87988,12 @@ PopupSubTableFormSubmitActionModel.registerFlow({
         return L(this, null, function* () {
           if (t.enable)
             try {
-              const o = e != null && e.flowSettingsEnabled ? getValidationNamePathsExcludingHiddenModels(e.blockModel) : null;
-              Array.isArray(o) ? o.length && (yield e.form.validateFields(o)) : yield e.form.validateFields(), (yield e.modal.confirm({
+              yield validateSubmitForm({
+                form: e.form,
+                blockModel: e.blockModel,
+                flowSettingsEnabled: e == null ? void 0 : e.flowSettingsEnabled,
+                skipValidator: shouldSkipSubmitValidation(e == null ? void 0 : e.model)
+              }), (yield e.modal.confirm({
                 title: e.t(t.title, { ns: "lm-flow-engine" }),
                 content: e.t(t.content, { ns: "lm-flow-engine" }),
                 okText: e.t("Confirm"),
@@ -87966,20 +88005,33 @@ PopupSubTableFormSubmitActionModel.registerFlow({
         });
       }
     },
+    skipRequiredValidation: {
+      title: tExpr("Skip required validation"),
+      uiMode: { type: "switch", key: "skipValidator" },
+      defaultParams: {
+        skipValidator: !1
+      },
+      handler() {
+      }
+    },
     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 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);
+            yield validateSubmitForm({
+              form: o == null ? void 0 : o.form,
+              blockModel: o,
+              flowSettingsEnabled: e == null ? void 0 : e.flowSettingsEnabled,
+              skipValidator: shouldSkipSubmitValidation(e == null ? void 0 : e.model)
+            });
+            const p = o.form.getFieldsValue(!0), m = omitHiddenModelValuesFromSubmit(p, o);
             n.dispatchEvent("updateRow", {
-              updatedRecord: h
+              updatedRecord: m
             });
-            const g = a.map((f) => `${u}.${f}`);
-            r.addUpdateAssociationValues(g), (d = o.resetUserModifiedFields) == null || d.call(o);
+            const h = a.map((g) => `${u}.${g}`);
+            r.addUpdateAssociationValues(h), (d = o.resetUserModifiedFields) == null || d.call(o);
           } catch (p) {
             return;
           }