|
|
@@ -2,7 +2,7 @@
|
|
|
/* eslint-disable no-param-reassign */
|
|
|
import PermSelect from '@/pages/Customer/Company/components/PermSelect'
|
|
|
import { TABLE_COLUMNS_MAP, ColumnStateEnum } from '@/utils/cache/cacheEnum'
|
|
|
-import { isNullOrUnDef, isUnDef } from '@/utils/is'
|
|
|
+import { isBoolean, isNullOrUnDef } from '@/utils/is'
|
|
|
import type { ColumnsState } from '@ant-design/pro-table'
|
|
|
import ProTable from '@ant-design/pro-table'
|
|
|
import { useModel } from 'umi'
|
|
|
@@ -96,7 +96,8 @@ const BasicTable: {
|
|
|
columnsRef,
|
|
|
state.selectKeysRef,
|
|
|
state.sizeRef,
|
|
|
- isUnDef(resetProps.pagination)
|
|
|
+ // TODO: 只要是boolean[false]说明不需要分页器, 则高度计算时不应该计入
|
|
|
+ !isBoolean(resetProps.pagination)
|
|
|
)
|
|
|
|
|
|
useLayoutEffect(() => {
|
lanjianrong