feat: formdrawer支持antd^5.13.0版本,解决footer/extra不显示问题 (#36)

Co-authored-by: xuyongchao <xuyongchao@bytedance.com>
formilyjs · Apr 10, 2024 · dc41909 · dc41909
1 parent 8bbcf6d
commit dc41909
Show file tree

Hide file tree

Showing 6 changed files with 417 additions and 272 deletions.
diff --git a/docs/components/FormDrawer.md b/docs/components/FormDrawer.md
@@ -76,6 +76,20 @@ export default () => {
                   <Reset>Reset</Reset>
                 </FormButtonGroup>
               </FormDrawer.Extra>
+              <FormDrawer.Footer>
+                <FormButtonGroup align="right">
+                  <Submit
+                    onSubmit={() => {
+                      return new Promise((resolve) => {
+                        setTimeout(resolve, 1000)
+                      })
+                    }}
+                  >
+                    Submit
+                  </Submit>
+                  <Reset>Reset</Reset>
+                </FormButtonGroup>
+              </FormDrawer.Footer>
             </FormLayout>
           )
         })

diff --git a/docs/components/FormDrawer.zh-CN.md b/docs/components/FormDrawer.zh-CN.md
@@ -76,6 +76,20 @@ export default () => {
                   <Reset>重置</Reset>
                 </FormButtonGroup>
               </FormDrawer.Extra>
+              <FormDrawer.Footer>
+                <FormButtonGroup align="right">
+                  <Submit
+                    onSubmit={() => {
+                      return new Promise((resolve) => {
+                        setTimeout(resolve, 1000)
+                      })
+                    }}
+                  >
+                    Submit
+                  </Submit>
+                  <Reset>Reset</Reset>
+                </FormButtonGroup>
+              </FormDrawer.Footer>
             </FormLayout>
           )
         })

diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "@types/react-dom": "^18.0.9",
     "@typescript-eslint/eslint-plugin": "^5.44.0",
     "@typescript-eslint/parser": "^5.44.0",
-    "antd": "^5.4.0",
+    "antd": "^5.13.0",
     "cross-env": "^7.0.3",
     "dumi": "^1.1.0",
     "eslint": "^8.28.0",
@@ -94,4 +94,4 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.1.5"
   }
-}
+}
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -38,7 +38,7 @@
   "peerDependencies": {
     "@types/react": ">=16.8.0 || >=17.0.0",
     "@types/react-dom": ">=16.8.0 || >=17.0.0",
-    "antd": "^5.1.0",
+    "antd": "^5.13.0",
     "react": ">=16.8.0 || >=17.0.0",
     "react-dom": ">=16.8.0",
     "react-is": ">=16.8.0 || >=17.0.0"

diff --git a/packages/components/src/form-drawer/index.tsx b/packages/components/src/form-drawer/index.tsx
@@ -179,7 +179,7 @@ const DrawerExtra: ReactFC = (props) => {
   const prefixCls = usePrefixCls('drawer')
   useLayoutEffect(() => {
     const content = ref.current
-      ?.closest(`.${prefixCls}-wrapper-body`)
+      ?.closest(`.${prefixCls}-content`)
       ?.querySelector(`.${prefixCls}-header`)
     if (content) {
       if (!extraRef.current) {
@@ -211,7 +211,7 @@ const DrawerFooter: ReactFC = (props) => {
   const footerRef = useRef<HTMLDivElement>()
   const prefixCls = usePrefixCls('drawer')
   useLayoutEffect(() => {
-    const content = ref.current?.closest(`.${prefixCls}-wrapper-body`)
+    const content = ref.current?.closest(`.${prefixCls}-content`)
     if (content) {
       if (!footerRef.current) {
         footerRef.current = content.querySelector(