修正antd升级引起的tablebug

codebdy · Dec 24, 2023 · b0467c7 · b0467c7
1 parent 77bbf9d
commit b0467c7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/packages/react-antd-materials/package.json b/packages/react-antd-materials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/react-antd-materials",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "module": "index.ts",
   "files": [
     "dist"

diff --git a/packages/react-antd-materials/src/materials/datas/Table/designer/index.tsx b/packages/react-antd-materials/src/materials/datas/Table/designer/index.tsx
@@ -2,9 +2,9 @@ import { IFieldMeta } from "@rxdrag/fieldy";
 import { TableProps } from "@rxdrag/react-antd-components";
 import { useNode, useTreeNodes, ComponentDesignerView } from "@rxdrag/react-core";
 import { Table } from "antd";
-import { forwardRef, memo, useMemo } from "react"
+import { Ref, forwardRef, memo, useMemo } from "react"
 
-export const TableDesigner = memo(forwardRef<HTMLDivElement>((
+export const TableDesigner = memo(forwardRef<any | undefined>((
   props: TableProps,
   ref
 ) => {
@@ -43,6 +43,7 @@ export const TableDesigner = memo(forwardRef<HTMLDivElement>((
 
   return (
     <Table
+      id="ttt"
       ref={ref}
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       columns={columns as any}

diff --git a/packages/react-antd-materials/src/materials/datas/Table/index.ts b/packages/react-antd-materials/src/materials/datas/Table/index.ts
@@ -1,5 +1,5 @@
 import { Table } from "@rxdrag/react-antd-components";
-import { IMaterial } from "@rxdrag/react-core";
+import { IMaterial, forwardRefById } from "@rxdrag/react-core";
 import { FooterMaterial } from "../../common/Footer";
 import { HeaderMaterial } from "../../common/Header";
 import { TableSummaryMaterial } from "../TableSummary";
@@ -12,7 +12,7 @@ const name = "Table"
 export const TableMaterial: IMaterial = {
   componentName: name,
   component: Table,
-  designer: TableDesigner,
+  designer: forwardRefById(TableDesigner),
   designerLocales: locales,
   propsSchema: materialSchema,
   designerProps: {

diff --git a/packages/rxeditor/react-core/package.json b/packages/rxeditor/react-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/react-core",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "module": "index.ts",
   "files": [
     "dist"

diff --git a/packages/rxeditor/react-core/src/ComponentTreeWidget/ComponentDesignerView.tsx b/packages/rxeditor/react-core/src/ComponentTreeWidget/ComponentDesignerView.tsx
@@ -18,6 +18,7 @@ export const ComponentDesignerView = memo((props: { nodeId: string }) => {
   const handleRef = useCallback((element: HTMLElement | undefined) => {
     for (const key of Object.keys(node?.rxProps || {})) {
       if (isHTMLElement(element) && !locked) {
+        console.log("===> handleRef", node?.meta?.componentName, element)
         element?.setAttribute(key, (node?.rxProps as any)[key])
       }
     }

diff --git a/packages/rxeditor/react-core/src/hocs/types.ts b/packages/rxeditor/react-core/src/hocs/types.ts
@@ -1,4 +1,4 @@
 
 //antd组件的ref，有时候不是HTMLElement
-export type Callback = (element?: HTMLElement | unknown) => HTMLElement | unknown;
-export const defaultCallback = (element?: HTMLElement | unknown): HTMLElement | unknown => element || null;
+export type Callback = (element?: HTMLElement | null) => HTMLElement | null | undefined;
+export const defaultCallback = (element?: HTMLElement | null): HTMLElement | null | undefined => element ;