|
@@ -68,7 +68,7 @@ const BasicTable: {
|
|
|
} = useModel('@@initialState')
|
|
} = useModel('@@initialState')
|
|
|
// 如果数据权限不存在,就不渲染
|
|
// 如果数据权限不存在,就不渲染
|
|
|
if (isNullOrUnDef(permData)) return null
|
|
if (isNullOrUnDef(permData)) return null
|
|
|
- const [columns] = useState(originalColumns)
|
|
|
|
|
|
|
+ // const [columns] = useState(originalColumns)
|
|
|
const permAuthCache = getAuthCache(PERMISSION_SELECT_KEY)
|
|
const permAuthCache = getAuthCache(PERMISSION_SELECT_KEY)
|
|
|
let defaultpermAuthCache = 'oneself'
|
|
let defaultpermAuthCache = 'oneself'
|
|
|
if (permAuthCache && permAuthCache[mainMenuType]) {
|
|
if (permAuthCache && permAuthCache[mainMenuType]) {
|
|
@@ -184,24 +184,24 @@ const BasicTable: {
|
|
|
// }
|
|
// }
|
|
|
// setColumns(nextColumns)
|
|
// setColumns(nextColumns)
|
|
|
// }
|
|
// }
|
|
|
- const finallyColumns = useMemo(() => {
|
|
|
|
|
- // if (resizable) {
|
|
|
|
|
- // return columns.map((col, index) => ({
|
|
|
|
|
- // ...col,
|
|
|
|
|
- // onHeaderCell: column => ({
|
|
|
|
|
- // width: column.width,
|
|
|
|
|
- // onResize: handleResize(index)
|
|
|
|
|
- // })
|
|
|
|
|
- // }))
|
|
|
|
|
- // }
|
|
|
|
|
- return columns
|
|
|
|
|
- }, [columns])
|
|
|
|
|
|
|
+ // const finallyColumns = useMemo(() => {
|
|
|
|
|
+ // if (resizable) {
|
|
|
|
|
+ // return columns.map((col, index) => ({
|
|
|
|
|
+ // ...col,
|
|
|
|
|
+ // onHeaderCell: column => ({
|
|
|
|
|
+ // width: column.width,
|
|
|
|
|
+ // onResize: handleResize(index)
|
|
|
|
|
+ // })
|
|
|
|
|
+ // }))
|
|
|
|
|
+ // }
|
|
|
|
|
+ // return columns
|
|
|
|
|
+ // }, [columns])
|
|
|
|
|
|
|
|
return (
|
|
return (
|
|
|
<div ref={tableElRef} className={styles.BasicTable}>
|
|
<div ref={tableElRef} className={styles.BasicTable}>
|
|
|
<ProTable
|
|
<ProTable
|
|
|
{...resetProps}
|
|
{...resetProps}
|
|
|
- columns={finallyColumns}
|
|
|
|
|
|
|
+ columns={originalColumns}
|
|
|
params={{ ...params, ...state.params }}
|
|
params={{ ...params, ...state.params }}
|
|
|
columnsStateMap={state.columnsStateMap}
|
|
columnsStateMap={state.columnsStateMap}
|
|
|
onColumnsStateChange={handleOnColumnsChange}
|
|
onColumnsStateChange={handleOnColumnsChange}
|