|
@@ -50,6 +50,7 @@ const BasicTable: {
|
|
|
Summary: typeof import('rc-table/lib/Footer/Summary').default
|
|
Summary: typeof import('rc-table/lib/Footer/Summary').default
|
|
|
} = ({
|
|
} = ({
|
|
|
// resizable = false,
|
|
// resizable = false,
|
|
|
|
|
+ rowKey,
|
|
|
headerTitle,
|
|
headerTitle,
|
|
|
params,
|
|
params,
|
|
|
mainMenuType,
|
|
mainMenuType,
|
|
@@ -86,7 +87,6 @@ const BasicTable: {
|
|
|
const column = state.columnsStateMap[columnsKey]
|
|
const column = state.columnsStateMap[columnsKey]
|
|
|
if (!column.show) filterKey.push(columnsKey)
|
|
if (!column.show) filterKey.push(columnsKey)
|
|
|
})
|
|
})
|
|
|
-
|
|
|
|
|
return originalColumns?.filter((_, i) => !filterKey.includes(i.toString()))
|
|
return originalColumns?.filter((_, i) => !filterKey.includes(i.toString()))
|
|
|
}, [state.columnsStateMap])
|
|
}, [state.columnsStateMap])
|
|
|
|
|
|
|
@@ -133,7 +133,11 @@ const BasicTable: {
|
|
|
|
|
|
|
|
const handleOnColumnsChange = (map: Record<string, ColumnsState>) => {
|
|
const handleOnColumnsChange = (map: Record<string, ColumnsState>) => {
|
|
|
setState({ ...state, columnsStateMap: map })
|
|
setState({ ...state, columnsStateMap: map })
|
|
|
- setAuthCache(TABLE_COLUMNS_MAP, { [ColumnStateEnum[columnStateType]]: map })
|
|
|
|
|
|
|
+ const authColumnsStateMap = getAuthCache(TABLE_COLUMNS_MAP)
|
|
|
|
|
+ setAuthCache(TABLE_COLUMNS_MAP, {
|
|
|
|
|
+ ...authColumnsStateMap,
|
|
|
|
|
+ [ColumnStateEnum[columnStateType]]: map
|
|
|
|
|
+ })
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const handleOnSizeChange = (size: DensitySize) => {
|
|
const handleOnSizeChange = (size: DensitySize) => {
|
|
@@ -192,12 +196,15 @@ const BasicTable: {
|
|
|
// return columns
|
|
// return columns
|
|
|
// }, [columns])
|
|
// }, [columns])
|
|
|
|
|
|
|
|
|
|
+ const computedParams = mainMenuType ? { ...params, ...state.params } : params
|
|
|
|
|
+
|
|
|
return (
|
|
return (
|
|
|
<div ref={tableElRef} className={styles.BasicTable}>
|
|
<div ref={tableElRef} className={styles.BasicTable}>
|
|
|
<ProTable
|
|
<ProTable
|
|
|
{...resetProps}
|
|
{...resetProps}
|
|
|
|
|
+ rowKey={rowKey || 'id'}
|
|
|
columns={originalColumns}
|
|
columns={originalColumns}
|
|
|
- params={{ ...params, ...state.params }}
|
|
|
|
|
|
|
+ params={computedParams}
|
|
|
columnsStateMap={state.columnsStateMap}
|
|
columnsStateMap={state.columnsStateMap}
|
|
|
onColumnsStateChange={handleOnColumnsChange}
|
|
onColumnsStateChange={handleOnColumnsChange}
|
|
|
scroll={getScrollRef}
|
|
scroll={getScrollRef}
|