@nocobase/client 2.0.40 → 2.0.41

package/es/flow/models/blocks/form/value-runtime/rules.d.ts

@@ -96,6 +96,7 @@ export declare class RuleEngine {
     private tryUnregisterDefaultRuleInstance;
     private bindMasterInitialValue;
     private removeRule;
+    rescheduleAllRules(): void;
     private scheduleRule;
     private flushRules;
     private runRule;

package/es/flow/models/blocks/form/value-runtime/runtime.d.ts

@@ -51,6 +51,7 @@ export declare class FormValueRuntime {
         sync?: boolean;
     }): void;
     dispose(): void;
+    resetAfterFormReset(): void;
     isSuppressed(): boolean;
     handleFormFieldsChange(changedFields: Array<{
         name?: NamePath | string | number;

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.40", 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.41", 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.40", 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.40",
-  "@nocobase/flow-engine": "2.0.40",
-  "@nocobase/sdk": "2.0.40",
-  "@nocobase/utils": "2.0.40",
+  "@nocobase/evaluators": "2.0.41",
+  "@nocobase/flow-engine": "2.0.41",
+  "@nocobase/sdk": "2.0.41",
+  "@nocobase/utils": "2.0.41",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -65807,6 +65807,7 @@ const LocalPlugins = () => {
     "Notification",
     "System management",
     "Security",
+    "Architecture",
     "Logging and monitoring",
     "Others"
   ], y = useMemo(() => f.map((P) => {
@@ -73316,7 +73317,7 @@ class PageModel extends FlowModel {
   }
   renderTabs() {
     var i, a, l, c, u;
-    const o = (a = (i = this.context.themeToken) == null ? void 0 : i.paddingLG) != null ? a : 16, n = this.tabBarExtraContent.left !== void 0 ? this.tabBarExtraContent.left : /* @__PURE__ */ jsx("span", { "aria-hidden": "true", style: { display: "inline-block", width: o, height: 1 } }), r = this.tabBarExtraContent.right !== void 0 ? this.tabBarExtraContent.right : /* @__PURE__ */ jsx(
+    const o = (a = (i = this.context.themeToken) == null ? void 0 : i.paddingLG) != null ? a : 16, n = this.tabBarExtraContent.left !== void 0 ? this.tabBarExtraContent.left : /* @__PURE__ */ jsx("span", { "aria-hidden": "true", style: { display: "inline-block", width: o, height: 1 } }), r = this.tabBarExtraContent.right !== void 0 ? this.tabBarExtraContent.right : /* @__PURE__ */ jsx("span", { style: { display: "inline-flex", marginInlineEnd: o }, children: /* @__PURE__ */ jsx(
       AddSubModelButton,
       {
         model: this,
@@ -73330,7 +73331,7 @@ class PageModel extends FlowModel {
         ],
         children: /* @__PURE__ */ jsx(FlowSettingsButton, { icon: /* @__PURE__ */ jsx(PlusOutlined, {}), children: this.context.t("Add tab") })
       }
-    );
+    ) });
     return /* @__PURE__ */ jsx(DndProvider, { onDragEnd: this.handleDragEnd.bind(this), children: /* @__PURE__ */ jsx(
       Tabs$1,
       {
@@ -77747,6 +77748,15 @@ class RuleEngine {
       a && a(), this.defaultRuleMasterDisposers.delete(r);
     }
   }
+  rescheduleAllRules() {
+    if (!this.options.isDisposed()) {
+      this.lastRuleWriteByTargetKey.clear();
+      for (const t of this.rules.values())
+        t.state.runSeq += 1;
+      for (const t of this.rules.keys())
+        this.scheduleRule(t);
+    }
+  }
   scheduleRule(t) {
     var a;
     if (this.options.isDisposed())
@@ -78352,6 +78362,18 @@ class FormValueRuntime {
       r.dispose();
     this.observableBindings.clear(), this.txWriteCounts.clear();
   }
+  resetAfterFormReset() {
+    if (this.disposed)
+      return;
+    this.explicitSet.clear(), this.lastDefaultValueByPathKey.clear(), this.lastWriteMetaByPathKey.clear(), this.txWriteCounts.clear(), this.lastObservedChangedPaths = null, this.lastObservedSource = null, this.lastObservedToken += 1;
+    for (const o of this.observableBindings.values())
+      o.dispose();
+    this.observableBindings.clear();
+    const t = this.getFormValuesSnapshot();
+    for (const o of Object.keys(this.valuesMirror))
+      delete this.valuesMirror[o];
+    t && typeof t == "object" && _.merge(this.valuesMirror, t), this.writeSeq += 1, this.bumpChangeTick(), this.ruleEngine.rescheduleAllRules();
+  }
   isSuppressed() {
     return this.suppressFormCallbackDepth > 0;
   }
@@ -79954,7 +79976,7 @@ function omitHiddenModelValuesFromSubmit(e, t) {
 }
 function submitHandler(e, t, o) {
   return L(this, null, function* () {
-    var l, c, u;
+    var l, c, u, d, p;
     const n = e.resource, r = e.blockModel;
     yield validateSubmitForm({
       form: r == null ? void 0 : r.form,
@@ -79965,18 +79987,18 @@ function submitHandler(e, t, o) {
     const i = r.form.getFieldsValue(!0), a = omitHiddenModelValuesFromSubmit(i, r);
     if (n instanceof SingleRecordResource) {
       if (r instanceof EditFormModel) {
-        const p = n.getMeta("currentFilterByTk");
-        p ? n.setFilterByTk(p) : n.isNewRecord = !0;
+        const h = n.getMeta("currentFilterByTk");
+        h ? n.setFilterByTk(h) : n.isNewRecord = !0;
       }
-      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));
+      const m = 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), (d = (u = r.formValueRuntime) == null ? void 0 : u.resetAfterFormReset) == null || d.call(u), e.view.inputArgs.collectionName === r.collection.name && e.view.inputArgs.onChange && e.view.inputArgs.onChange(m == null ? void 0 : m.data));
     } else if (n instanceof MultiRecordResource) {
-      const d = n.getMeta("currentFilterByTk");
-      if (!d) {
+      const m = n.getMeta("currentFilterByTk");
+      if (!m) {
         e.message.error(e.t("No filterByTk found for multi-record resource."));
         return;
       }
-      (yield o) ? yield o(a, d) : yield n.update(d, a, t.requestConfig), (u = r.resetUserModifiedFields) == null || u.call(r);
+      (yield o) ? yield o(a, m) : yield n.update(m, a, t.requestConfig), (p = r.resetUserModifiedFields) == null || p.call(r);
     }
   });
 }