Merge pull request #4578 from easyops-cn/jimmy/fix/form-renderer

fix(): form-renderer 支持 getFieldsValue 方法
easyops-cn · Dec 12, 2024 · 37f9597 · 37f9597
2 parents 4df20c8 + eb4453d
commit 37f9597
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/packages/brick-kit/src/core/CustomForms/registerFormRenderer.spec.ts b/packages/brick-kit/src/core/CustomForms/registerFormRenderer.spec.ts
@@ -84,4 +84,17 @@ describe("registerFormRenderer is work", () => {
 
     expect(form.resetFields).toHaveBeenCalled();
   });
+
+  it("should work with getFieldsValue method", () => {
+    const formRender = document.createElement(formRenderer) as any;
+    formRender.renderRoot = false;
+    const form = document.createElement("forms.general-form") as any;
+    form.getFieldsValue = jest.fn();
+
+    formRender.appendChild(form);
+
+    formRender.getFieldsValue({ runInMacrotask: true });
+
+    expect(form.getFieldsValue).toHaveBeenCalledWith({ runInMacrotask: true });
+  });
 });
diff --git a/packages/brick-kit/src/core/CustomForms/registerFormRenderer.ts b/packages/brick-kit/src/core/CustomForms/registerFormRenderer.ts
@@ -12,7 +12,7 @@ class FormElement extends HTMLElement implements FormElementProps {
 
   renderRoot?: boolean | undefined;
 
-  #proxyFormMethod(method: string, args: unknown[] = []): void {
+  #proxyFormMethod(method: string, args: unknown[] = []): any {
     const containerElement =
       this.renderRoot !== false
         ? this.firstElementChild?.firstElementChild
@@ -21,7 +21,7 @@ class FormElement extends HTMLElement implements FormElementProps {
     const tagName = containerElement?.tagName?.toLowerCase();
 
     if (formContainers.includes(tagName as string)) {
-      (containerElement as any)[method](...args);
+      return (containerElement as any)[method](...args);
     } else {
       // eslint-disable-next-line no-console
       console.error(`no ${method} method in the container element`, {
@@ -41,6 +41,10 @@ class FormElement extends HTMLElement implements FormElementProps {
   resetFields(...args: unknown[]): void {
     this.#proxyFormMethod("resetFields", args);
   }
+
+  getFieldsValue(...args: unknown[]): any {
+    return this.#proxyFormMethod("getFieldsValue", args);
+  }
 }
 
 export function registerFormRenderer(): void {