diff --git a/pc4mobx/organization/components/columnSetting/defineShowItems.js b/pc4mobx/organization/components/columnSetting/defineShowItems.js index 66838ef..48f9adf 100644 --- a/pc4mobx/organization/components/columnSetting/defineShowItems.js +++ b/pc4mobx/organization/components/columnSetting/defineShowItems.js @@ -38,11 +38,16 @@ export default class DefineShowItems extends Component { draggable deleteConfirm title="" + pageSize={10} + pageSizeOptions={[10, 20, 50]} columns={toJS(columns)} datas={toJS(datas)} copyFilterProps={["id"]} selectedData={!loading && toJS(selectedData)} onChange={e => columnSetting.setTableEditDatas(e)} + tableProps={{ + scroll: { y: 400 } + }} onRowSelect={(sRowKeys, rows, dataIndex, selectedDatas) => this.onRowSelect(sRowKeys, rows, dataIndex, selectedDatas)} /> ); diff --git a/pc4mobx/organization/style/card.less b/pc4mobx/organization/style/card.less index f98d1a4..9497d8f 100644 --- a/pc4mobx/organization/style/card.less +++ b/pc4mobx/organization/style/card.less @@ -188,12 +188,17 @@ width: 10%; background-color: #ffffff; margin-left: 20px; + position: fixed; + height: 100%; + top: 0; + right: 0; + overflow: scroll; .right{ height: 100%; padding-left: 20px; .ant-timeline{ - position: fixed; - top: 20px; + // position: fixed; + margin-top: 20px; .title { cursor: pointer; }