Browse Source

refactor: 调整useDrawer返回按钮渲染逻辑

lanjianrong 2 years ago
parent
commit
ed15d69385
2 changed files with 7 additions and 7 deletions
  1. 2 0
      src/components/Drawer/index.less
  2. 5 7
      src/components/Drawer/index.tsx

+ 2 - 0
src/components/Drawer/index.less

@@ -10,4 +10,6 @@
   :global(.ant-drawer-body) {
   :global(.ant-drawer-body) {
     padding: 0 24px;
     padding: 0 24px;
   }
   }
+  :global(.ant-drawer-close) {
+  }
 }
 }

+ 5 - 7
src/components/Drawer/index.tsx

@@ -8,13 +8,13 @@ import React, {
   useImperativeHandle,
   useImperativeHandle,
   useId
   useId
 } from 'react'
 } from 'react'
-import { Button, Drawer, PageHeader } from 'antd'
+import { Drawer, PageHeader } from 'antd'
 import { useModel } from '@umijs/max'
 import { useModel } from '@umijs/max'
 import type { DrawerProps } from 'antd'
 import type { DrawerProps } from 'antd'
 
 
 import styles from './index.less'
 import styles from './index.less'
 import classNames from 'classnames'
 import classNames from 'classnames'
-import { isNullOrUnDef } from '@/utils/is'
+import { isDef } from '@/utils/is'
 type DrawerHocProps = {
 type DrawerHocProps = {
   mode?: 'default' | 'innerEdge'
   mode?: 'default' | 'innerEdge'
 } & DrawerProps
 } & DrawerProps
@@ -80,7 +80,6 @@ const DrawerHoc = memo(
       title,
       title,
       mask,
       mask,
       push = false,
       push = false,
-      destroyOnClose = true,
       ...reset
       ...reset
     } = drawerProps
     } = drawerProps
 
 
@@ -114,9 +113,9 @@ const DrawerHoc = memo(
     )
     )
 
 
     const mergedCloseIcon = useMemo(() => {
     const mergedCloseIcon = useMemo(() => {
-      if (!isNullOrUnDef(closeIcon)) return closeIcon
-      return mode === 'innerEdge' ? <Button onClick={onClose}>返回</Button> : closeIcon, [mode, closeIcon]
-    })
+      if (isDef(closeIcon)) return closeIcon
+      return mode === 'innerEdge' ? <div className="ant-btn ant-btn-default">返回</div> : closeIcon
+    }, [mode, closeIcon])
 
 
     const mergedMask = useMemo(() => (mode === 'innerEdge' ? false : mask), [mode, mask])
     const mergedMask = useMemo(() => (mode === 'innerEdge' ? false : mask), [mode, mask])
     return (
     return (
@@ -125,7 +124,6 @@ const DrawerHoc = memo(
         className={mergedClassName}
         className={mergedClassName}
         title={mergedTitle}
         title={mergedTitle}
         mask={mergedMask}
         mask={mergedMask}
-        destroyOnClose={destroyOnClose}
         push={push}
         push={push}
         width={mergedWidth}
         width={mergedWidth}
         style={mergedStyle}
         style={mergedStyle}