Merge pull request alibaba#992 from jaw52/chore_antd_deprecated_api

chore(antd): 继续调整部分弃用API
king-jam1 · Dec 19, 2022 · 59dadea · 59dadea
2 parents 733506c + fdbfc6e
commit 59dadea
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/DrawerList.js b/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/DrawerList.js
@@ -215,11 +215,11 @@ const DrawerList = ({
           : null}
       </div>
       <Drawer
-        width="600"
+        width={600}
         title={actionColumnProps.colHeaderText}
         placement="right"
         onClose={closeDrawer}
-        visible={showDrawer}
+        open={showDrawer}
         destroyOnClose // 必须要加，currentIndex不是一个state，Core不会重新渲染就跪了
       >
         <div className="fr-container">

diff --git a/packages/form-render/src/widgets/antd/percentSlider.js b/packages/form-render/src/widgets/antd/percentSlider.js
@@ -61,7 +61,7 @@ const PercentSlider = p => {
         {...setting}
         onChange={handleChange}
         max={100}
-        tipFormatter={v => v + '%'}
+        tooltip={{ formatter: v => v + '%' }}
         value={numberValue || 100}
         disabled={p.disabled || p.readonly}
       />

diff --git a/packages/table-render/src/components/ToolBarAction/DensityIcon.tsx b/packages/table-render/src/components/ToolBarAction/DensityIcon.tsx
@@ -1,33 +1,35 @@
 import { ColumnHeightOutlined } from '@ant-design/icons';
-import { Dropdown, Menu, Tooltip } from 'antd';
+import { Dropdown, Tooltip } from 'antd';
 import React, { useRef } from 'react';
 import { useTable } from '../hooks';
+import { MenuProps } from 'antd/lib/menu';
 
 export type DensitySize = 'middle' | 'small' | 'default' | undefined;
 
 const DesityIcon = () => {
   const { tableState, setTable }: any = useTable();
   const dropRef = useRef<any>(); // class组件用 React.createRef()
 
+  const menuProps: MenuProps = {
+    items: [
+      { label: '默认', key: 'default' },
+      { label: '中等', key: 'middle' },
+      { label: '紧凑', key: 'small' },
+    ],
+    selectedKeys: [tableState.tableSize],
+    onClick: ({ key }) => {
+      setTable({ tableSize: key as DensitySize });
+    },
+    style: {
+      width: 80,
+    },
+  };
+
   return (
     <div ref={dropRef}>
       <Dropdown
         getPopupContainer={() => dropRef.current}
-        overlay={
-          <Menu
-            selectedKeys={[tableState.tableSize]}
-            onClick={({ key }) => {
-              setTable({ tableSize: key as DensitySize });
-            }}
-            style={{
-              width: 80,
-            }}
-          >
-            <Menu.Item key="default">默认</Menu.Item>
-            <Menu.Item key="middle">中等</Menu.Item>
-            <Menu.Item key="small">紧凑</Menu.Item>
-          </Menu>
-        }
+        menu={menuProps}
         trigger={['click']}
       >
         <Tooltip title="表格密度">

diff --git a/tools/schema-generator/src/widgets/percentSlider.jsx b/tools/schema-generator/src/widgets/percentSlider.jsx
@@ -62,7 +62,7 @@ const PercentSlider = p => {
         {...setting}
         onChange={handleChange}
         max={100}
-        tipFormatter={v => v + '%'}
+        tooltip={{ formatter: v => v + '%' }}
         value={numberValue || 100}
         disabled={p.disabled || p.readonly}
       />