Browse Source

feat: 标段页的table增加高度自适应的功能。

lanjianrong 4 years ago
parent
commit
662b295829

+ 0 - 1
src/pages/Contract/Content/Income/components/Modal/index.tsx

@@ -162,7 +162,6 @@ const ContractModal: React.FC<iModalCommonProps> = ({ modalObj: { type, visible,
               form
                 .validateFields()
                 .then(values => {
-                  console.log(values)
 
                   form.resetFields()
                   if (type === 'update') {

+ 5 - 2
src/pages/Contract/List/index.tsx

@@ -5,7 +5,7 @@ import { tenderStore } from '@/store/mobx'
 import { ContractTree } from '@/types/contract'
 import consts from '@/utils/consts'
 import { CaretDownOutlined } from '@ant-design/icons'
-import { useContractTree, useTableExpand } from '@/utils/common/customHooks'
+import { useAutoTable, useContractTree, useTableExpand } from '@/utils/common/customHooks'
 import { Button, Dropdown, Menu, Table } from 'antd'
 import { ColumnsType } from 'antd/lib/table'
 import React, { useState, useEffect } from 'react'
@@ -14,6 +14,8 @@ import styles from './index.module.scss'
 import { apiContractList } from '@/utils/common/api'
 import { formatMoney, handleIntoBidsection } from '@/utils/util'
 const List: React.FC<{}> = () => {
+  const needSubtractHeight = 34 + 32
+  const [ y ] = useAutoTable(needSubtractHeight)
   const { clear } = useAliveController()
   const [ loading, setLoading ] = useState<boolean>(false)
   useEffect(() => {
@@ -129,7 +131,7 @@ const List: React.FC<{}> = () => {
           </Dropdown>
         </Slot>
       </Header>
-      <div className={styles.tableContent}>
+      <div className={[ styles.tableContent, 'wrap-content' ].join(' ')}>
         <Table<ContractTree>
           columns={columns}
           loading={loading}
@@ -137,6 +139,7 @@ const List: React.FC<{}> = () => {
           pagination={false}
           rowKey={record => record.id}
           indentSize={20}
+          scroll={{ y }}
           expandable={{ expandedRowKeys, onExpand: setRowKeys }}
           bordered />
       </div>

+ 4 - 2
src/pages/Quality/List/index.tsx

@@ -4,7 +4,7 @@ import SvgIcon from '@/components/SvgIcon'
 import { tenderStore } from '@/store/mobx'
 import { ContractTree } from '@/types/contract'
 import { apiContractList } from '@/utils/common/api'
-import { useContractTree, useTableExpand } from '@/utils/common/customHooks'
+import { useAutoTable, useContractTree, useTableExpand } from '@/utils/common/customHooks'
 import consts from '@/utils/consts'
 import { handleIntoBidsection } from '@/utils/util'
 import { CaretDownOutlined } from '@ant-design/icons'
@@ -16,6 +16,7 @@ import { RouteComponentProps, withRouter } from 'react-router-dom'
 import styles from './index.module.scss'
 
 const List: React.FC<RouteComponentProps> = () => {
+  const [ y ] = useAutoTable(66)
   const { clear } = useAliveController()
   useEffect(() => {
     // 清除所有的缓存页面
@@ -113,7 +114,7 @@ const List: React.FC<RouteComponentProps> = () => {
           </Dropdown>
         </Slot>
       </Header>
-      <div className={styles.tableContent}>
+      <div className={[ styles.tableContent, 'wrap-content' ].join(' ')}>
         <Table<ContractTree>
           loading={loading}
           columns={columns}
@@ -121,6 +122,7 @@ const List: React.FC<RouteComponentProps> = () => {
           pagination={false}
           rowKey={record => record.id}
           indentSize={20}
+          scroll={{ y }}
           expandable={{ expandedRowKeys, onExpand: setRowKeys }}
           bordered />
       </div>

+ 5 - 3
src/pages/Safe/List/index.tsx

@@ -1,5 +1,5 @@
 import Header from '@/components/Header'
-import { useContractTree, useTableExpand } from '@/utils/common/customHooks'
+import { useAutoTable, useContractTree, useTableExpand } from '@/utils/common/customHooks'
 import Slot from '@/components/Header/slot'
 import SvgIcon from '@/components/SvgIcon'
 import { tenderStore } from '@/store/mobx'
@@ -14,7 +14,8 @@ import { RouteComponentProps, withRouter } from 'react-router-dom'
 import styles from './index.module.scss'
 import { apiContractList } from '@/utils/common/api'
 import { handleIntoBidsection } from '@/utils/util'
-const List: React.FC<RouteComponentProps> = props => {
+const List: React.FC<RouteComponentProps> = () => {
+  const [ y ] = useAutoTable(66)
   const { clear } = useAliveController()
   const [ loading, setLoading ] = useState<boolean>(false)
   useEffect(() => {
@@ -110,7 +111,7 @@ const List: React.FC<RouteComponentProps> = props => {
           </Dropdown>
         </Slot>
       </Header>
-      <div className={styles.tableContent}>
+      <div className={[ styles.tableContent, 'wrap-content' ].join(' ')}>
         <Table<ContractTree>
           columns={columns}
           loading={loading}
@@ -118,6 +119,7 @@ const List: React.FC<RouteComponentProps> = props => {
           pagination={false}
           rowKey={record => record.id}
           indentSize={20}
+          scroll={{ y }}
           expandable={{ expandedRowKeys, onExpand: setRowKeys }}
           bordered />
       </div>