diff --git a/src/layout/tabs-layout.tsx b/src/layout/tabs-layout.tsx index 12723b0..ceb535d 100644 --- a/src/layout/tabs-layout.tsx +++ b/src/layout/tabs-layout.tsx @@ -77,10 +77,13 @@ const TabsLayout: React.FC = () => { height: 'calc(100vh - 107px)' }} > -
+
{tab.children}
diff --git a/src/pages/custom/product/material/index.tsx b/src/pages/custom/product/material/index.tsx index d36edc5..b01011e 100644 --- a/src/pages/custom/product/material/index.tsx +++ b/src/pages/custom/product/material/index.tsx @@ -6,6 +6,7 @@ import type { FilterConfirmProps, TableRowSelection } from 'antd/es/table/interf import { t } from '@/utils/i18n'; import { PlusOutlined, ExclamationCircleFilled, DeleteOutlined, SearchOutlined } from '@ant-design/icons'; import { antdUtils } from '@/utils/antd'; +import { useSize, useEventListener } from 'ahooks'; import mData from '../../../../../mock/findMaterialPage.json' import MaterialClassifyView from './classify'; @@ -122,7 +123,7 @@ const TablePage: React.FC = () => { dataIndex: DataIndex, ) => { setOnSearching(true); - setTimeout(()=>{ + setTimeout(() => { setOnSearching(false); confirm(); }, 1000) @@ -147,8 +148,8 @@ const TablePage: React.FC = () => { onSearch={() => handleSearch(selectedKeys as string[], confirm, dataIndex)} allowClear style={{ marginBottom: 8, display: 'block' }} - enterButton="搜索" - size="large" + enterButton="搜索" + size="large" loading={onSearching} />
@@ -257,8 +258,6 @@ const TablePage: React.FC = () => { }, ]; - - const data: Array = mData as Array; const [isDisableDelete, setDisableDelete] = useState(true) @@ -308,24 +307,47 @@ const TablePage: React.FC = () => { ], }; + const [viewHeight, setViewHeight ] = useState(window.innerHeight - 120); + const ref = useRef(null); + const size = useSize(ref); + console.log('size', size); + useEventListener('resize', (ev) => { + console.log('resize', ev); + // if(ev.target) { + // useSize(document) + // } + setViewHeight(window.innerHeight - 120) + + }); return ( <> -
- - - - +
+ + + +
+ +
+ -
- - -
- - +
+
+ + +
+
+
+ + + + + );