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 index c91559352..f33514682 100644 --- 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}
diff --git a/packages/form-render/src/widgets/antd/percentSlider.js b/packages/form-render/src/widgets/antd/percentSlider.js index 4faf6490e..2b22efef4 100644 --- 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 index 8117532a8..749986861 100644 --- a/packages/table-render/src/components/ToolBarAction/DensityIcon.tsx +++ b/packages/table-render/src/components/ToolBarAction/DensityIcon.tsx @@ -1,7 +1,8 @@ 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; @@ -9,25 +10,26 @@ const DesityIcon = () => { const { tableState, setTable }: any = useTable(); const dropRef = useRef(); // 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 (
dropRef.current} - overlay={ - { - setTable({ tableSize: key as DensitySize }); - }} - style={{ - width: 80, - }} - > - 默认 - 中等 - 紧凑 - - } + menu={menuProps} trigger={['click']} > diff --git a/tools/schema-generator/src/widgets/percentSlider.jsx b/tools/schema-generator/src/widgets/percentSlider.jsx index 109952828..89402c3f5 100644 --- 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} />